]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Import CUPS 1.4svn r7023 into easysw/current.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 17 Oct 2007 20:05:25 +0000 (20:05 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 17 Oct 2007 20:05:25 +0000 (20:05 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@502 a1ca3aef-8c08-0410-bb20-df032aa958be

1420 files changed:
CHANGES-1.3.txt [new file with mode: 0644]
CHANGES.txt
INSTALL.txt
Makedefs.in
Makefile
README.txt
backend/ieee1284.c
backend/ipp.c
backend/lpd.c
backend/pap.c
backend/parallel.c
backend/runloop.c
backend/scsi-irix.c
backend/scsi-linux.c
backend/scsi.c
backend/serial.c
backend/socket.c
backend/usb-darwin.c
backend/usb-unix.c
backend/usb.c
berkeley/lpr.c
cgi-bin/admin.c
cgi-bin/classes.c
cgi-bin/help.c
cgi-bin/ipp-var.c
cgi-bin/jobs.c
cgi-bin/printers.c
cgi-bin/template.c
config-scripts/cups-common.m4
config-scripts/cups-compiler.m4
config-scripts/cups-directories.m4
config.h.in
cups/adminutil.c
cups/cups.h
cups/dest.c
cups/file.c
cups/http-addr.c
cups/http-private.h
cups/ipp-support.c
cups/ipp.h
cups/language.c
cups/libcups.exp
cups/localize.c
cups/mark.c
cups/options.c
cups/ppd.c
cups/request.c
cups/test.ppd
cups/testfile.c
cups/testppd.c
cups/util.c
data/Makefile
desktop/cups-128.png
desktop/cups-16.png
desktop/cups-256.png [new file with mode: 0644]
desktop/cups-32.png
desktop/cups-512.png [new file with mode: 0644]
desktop/cups-64.png
desktop/cups.icns [new file with mode: 0644]
desktop/cups.svg [new file with mode: 0644]
doc/Makefile
doc/cups.css
doc/de/images/button-accept-jobs.gif [deleted file]
doc/de/images/button-add-class.gif [deleted file]
doc/de/images/button-add-printer.gif [deleted file]
doc/de/images/button-add-rss-subscription.gif [deleted file]
doc/de/images/button-add-this-printer.gif [deleted file]
doc/de/images/button-cancel-all-jobs.gif [deleted file]
doc/de/images/button-cancel-job.gif [deleted file]
doc/de/images/button-cancel-subscription.gif [deleted file]
doc/de/images/button-change-settings.gif [deleted file]
doc/de/images/button-clean-print-heads.gif [deleted file]
doc/de/images/button-clear.gif [deleted file]
doc/de/images/button-continue.gif [deleted file]
doc/de/images/button-delete-class.gif [deleted file]
doc/de/images/button-delete-printer.gif [deleted file]
doc/de/images/button-edit-configuration-file.gif [deleted file]
doc/de/images/button-export-samba.gif [deleted file]
doc/de/images/button-find-new-printers.gif [deleted file]
doc/de/images/button-help.gif [deleted file]
doc/de/images/button-hold-job.gif [deleted file]
doc/de/images/button-manage-classes.gif [deleted file]
doc/de/images/button-manage-jobs.gif [deleted file]
doc/de/images/button-manage-printers.gif [deleted file]
doc/de/images/button-manage-server.gif [deleted file]
doc/de/images/button-modify-class.gif [deleted file]
doc/de/images/button-modify-printer.gif [deleted file]
doc/de/images/button-move-job.gif [deleted file]
doc/de/images/button-move-jobs.gif [deleted file]
doc/de/images/button-print-self-test-page.gif [deleted file]
doc/de/images/button-print-test-page.gif [deleted file]
doc/de/images/button-publish-printer.gif [deleted file]
doc/de/images/button-reject-jobs.gif [deleted file]
doc/de/images/button-release-job.gif [deleted file]
doc/de/images/button-restart-job.gif [deleted file]
doc/de/images/button-save-changes.gif [deleted file]
doc/de/images/button-search.gif [deleted file]
doc/de/images/button-set-allowed-users.gif [deleted file]
doc/de/images/button-set-as-default.gif [deleted file]
doc/de/images/button-set-printer-options.gif [deleted file]
doc/de/images/button-show-active.gif [deleted file]
doc/de/images/button-show-all.gif [deleted file]
doc/de/images/button-show-completed.gif [deleted file]
doc/de/images/button-show-next.gif [deleted file]
doc/de/images/button-show-previous.gif [deleted file]
doc/de/images/button-sort-ascending.gif [deleted file]
doc/de/images/button-sort-descending.gif [deleted file]
doc/de/images/button-start-class.gif [deleted file]
doc/de/images/button-start-printer.gif [deleted file]
doc/de/images/button-stop-class.gif [deleted file]
doc/de/images/button-stop-printer.gif [deleted file]
doc/de/images/button-unpublish-printer.gif [deleted file]
doc/de/images/button-use-default-config.gif [deleted file]
doc/de/images/button-view-access-log.gif [deleted file]
doc/de/images/button-view-error-log.gif [deleted file]
doc/de/images/button-view-page-log.gif [deleted file]
doc/de/images/button-view-printable-version.gif [deleted file]
doc/de/index.html.in [deleted file]
doc/es/images/button-accept-jobs.gif [deleted file]
doc/es/images/button-add-class.gif [deleted file]
doc/es/images/button-add-printer.gif [deleted file]
doc/es/images/button-add-rss-subscription.gif [deleted file]
doc/es/images/button-add-this-printer.gif [deleted file]
doc/es/images/button-cancel-all-jobs.gif [deleted file]
doc/es/images/button-cancel-job.gif [deleted file]
doc/es/images/button-cancel-subscription.gif [deleted file]
doc/es/images/button-change-settings.gif [deleted file]
doc/es/images/button-clean-print-heads.gif [deleted file]
doc/es/images/button-clear.gif [deleted file]
doc/es/images/button-continue.gif [deleted file]
doc/es/images/button-delete-class.gif [deleted file]
doc/es/images/button-delete-printer.gif [deleted file]
doc/es/images/button-edit-configuration-file.gif [deleted file]
doc/es/images/button-export-samba.gif [deleted file]
doc/es/images/button-find-new-printers.gif [deleted file]
doc/es/images/button-help.gif [deleted file]
doc/es/images/button-hold-job.gif [deleted file]
doc/es/images/button-manage-classes.gif [deleted file]
doc/es/images/button-manage-jobs.gif [deleted file]
doc/es/images/button-manage-printers.gif [deleted file]
doc/es/images/button-manage-server.gif [deleted file]
doc/es/images/button-modify-class.gif [deleted file]
doc/es/images/button-modify-printer.gif [deleted file]
doc/es/images/button-move-job.gif [deleted file]
doc/es/images/button-move-jobs.gif [deleted file]
doc/es/images/button-print-self-test-page.gif [deleted file]
doc/es/images/button-print-test-page.gif [deleted file]
doc/es/images/button-publish-printer.gif [deleted file]
doc/es/images/button-reject-jobs.gif [deleted file]
doc/es/images/button-release-job.gif [deleted file]
doc/es/images/button-restart-job.gif [deleted file]
doc/es/images/button-save-changes.gif [deleted file]
doc/es/images/button-search.gif [deleted file]
doc/es/images/button-set-allowed-users.gif [deleted file]
doc/es/images/button-set-as-default.gif [deleted file]
doc/es/images/button-set-printer-options.gif [deleted file]
doc/es/images/button-show-active.gif [deleted file]
doc/es/images/button-show-all.gif [deleted file]
doc/es/images/button-show-completed.gif [deleted file]
doc/es/images/button-show-next.gif [deleted file]
doc/es/images/button-show-previous.gif [deleted file]
doc/es/images/button-sort-ascending.gif [deleted file]
doc/es/images/button-sort-descending.gif [deleted file]
doc/es/images/button-start-class.gif [deleted file]
doc/es/images/button-start-printer.gif [deleted file]
doc/es/images/button-stop-class.gif [deleted file]
doc/es/images/button-stop-printer.gif [deleted file]
doc/es/images/button-unpublish-printer.gif [deleted file]
doc/es/images/button-use-default-config.gif [deleted file]
doc/es/images/button-view-access-log.gif [deleted file]
doc/es/images/button-view-error-log.gif [deleted file]
doc/es/images/button-view-page-log.gif [deleted file]
doc/es/images/button-view-printable-version.gif [deleted file]
doc/es/images/buttons_es.txt [deleted file]
doc/es/index.html.in [deleted file]
doc/et/images/button-accept-jobs.gif [deleted file]
doc/et/images/button-add-class.gif [deleted file]
doc/et/images/button-add-printer.gif [deleted file]
doc/et/images/button-add-this-printer.gif [deleted file]
doc/et/images/button-cancel-all-jobs.gif [deleted file]
doc/et/images/button-cancel-job.gif [deleted file]
doc/et/images/button-change-settings.gif [deleted file]
doc/et/images/button-clean-print-heads.gif [deleted file]
doc/et/images/button-clear.gif [deleted file]
doc/et/images/button-continue.gif [deleted file]
doc/et/images/button-delete-class.gif [deleted file]
doc/et/images/button-delete-printer.gif [deleted file]
doc/et/images/button-edit-configuration-file.gif [deleted file]
doc/et/images/button-export-samba.gif [deleted file]
doc/et/images/button-help.gif [deleted file]
doc/et/images/button-hold-job.gif [deleted file]
doc/et/images/button-manage-classes.gif [deleted file]
doc/et/images/button-manage-jobs.gif [deleted file]
doc/et/images/button-manage-printers.gif [deleted file]
doc/et/images/button-manage-server.gif [deleted file]
doc/et/images/button-modify-class.gif [deleted file]
doc/et/images/button-modify-printer.gif [deleted file]
doc/et/images/button-move-job.gif [deleted file]
doc/et/images/button-move-jobs.gif [deleted file]
doc/et/images/button-print-self-test-page.gif [deleted file]
doc/et/images/button-print-test-page.gif [deleted file]
doc/et/images/button-publish-printer.gif [deleted file]
doc/et/images/button-reject-jobs.gif [deleted file]
doc/et/images/button-release-job.gif [deleted file]
doc/et/images/button-restart-job.gif [deleted file]
doc/et/images/button-save-changes.gif [deleted file]
doc/et/images/button-search.gif [deleted file]
doc/et/images/button-set-allowed-users.gif [deleted file]
doc/et/images/button-set-as-default.gif [deleted file]
doc/et/images/button-set-printer-options.gif [deleted file]
doc/et/images/button-show-active.gif [deleted file]
doc/et/images/button-show-all.gif [deleted file]
doc/et/images/button-show-completed.gif [deleted file]
doc/et/images/button-show-next.gif [deleted file]
doc/et/images/button-show-previous.gif [deleted file]
doc/et/images/button-sort-ascending.gif [deleted file]
doc/et/images/button-sort-descending.gif [deleted file]
doc/et/images/button-start-class.gif [deleted file]
doc/et/images/button-start-printer.gif [deleted file]
doc/et/images/button-stop-class.gif [deleted file]
doc/et/images/button-stop-printer.gif [deleted file]
doc/et/images/button-unpublish-printer.gif [deleted file]
doc/et/images/button-use-default-config.gif [deleted file]
doc/et/images/button-view-access-log.gif [deleted file]
doc/et/images/button-view-error-log.gif [deleted file]
doc/et/images/button-view-page-log.gif [deleted file]
doc/et/images/button-view-printable-version.gif [deleted file]
doc/et/index.html.in [deleted file]
doc/favicon.ico [deleted file]
doc/favicon.png [new file with mode: 0644]
doc/fr/images/button-accept-jobs.gif [deleted file]
doc/fr/images/button-add-class.gif [deleted file]
doc/fr/images/button-add-printer.gif [deleted file]
doc/fr/images/button-add-this-printer.gif [deleted file]
doc/fr/images/button-cancel-all-jobs.gif [deleted file]
doc/fr/images/button-cancel-job.gif [deleted file]
doc/fr/images/button-change-settings.gif [deleted file]
doc/fr/images/button-clean-print-heads.gif [deleted file]
doc/fr/images/button-clear.gif [deleted file]
doc/fr/images/button-continue.gif [deleted file]
doc/fr/images/button-delete-class.gif [deleted file]
doc/fr/images/button-delete-printer.gif [deleted file]
doc/fr/images/button-edit-configuration-file.gif [deleted file]
doc/fr/images/button-export-samba.gif [deleted file]
doc/fr/images/button-help.gif [deleted file]
doc/fr/images/button-hold-job.gif [deleted file]
doc/fr/images/button-manage-classes.gif [deleted file]
doc/fr/images/button-manage-jobs.gif [deleted file]
doc/fr/images/button-manage-printers.gif [deleted file]
doc/fr/images/button-manage-server.gif [deleted file]
doc/fr/images/button-modify-class.gif [deleted file]
doc/fr/images/button-modify-printer.gif [deleted file]
doc/fr/images/button-move-job.gif [deleted file]
doc/fr/images/button-move-jobs.gif [deleted file]
doc/fr/images/button-print-self-test-page.gif [deleted file]
doc/fr/images/button-print-test-page.gif [deleted file]
doc/fr/images/button-publish-printer.gif [deleted file]
doc/fr/images/button-reject-jobs.gif [deleted file]
doc/fr/images/button-release-job.gif [deleted file]
doc/fr/images/button-restart-job.gif [deleted file]
doc/fr/images/button-save-changes.gif [deleted file]
doc/fr/images/button-search.gif [deleted file]
doc/fr/images/button-set-allowed-users.gif [deleted file]
doc/fr/images/button-set-as-default.gif [deleted file]
doc/fr/images/button-set-printer-options.gif [deleted file]
doc/fr/images/button-show-active.gif [deleted file]
doc/fr/images/button-show-all.gif [deleted file]
doc/fr/images/button-show-completed.gif [deleted file]
doc/fr/images/button-show-next.gif [deleted file]
doc/fr/images/button-show-previous.gif [deleted file]
doc/fr/images/button-sort-ascending.gif [deleted file]
doc/fr/images/button-sort-descending.gif [deleted file]
doc/fr/images/button-start-class.gif [deleted file]
doc/fr/images/button-start-printer.gif [deleted file]
doc/fr/images/button-stop-class.gif [deleted file]
doc/fr/images/button-stop-printer.gif [deleted file]
doc/fr/images/button-unpublish-printer.gif [deleted file]
doc/fr/images/button-use-default-config.gif [deleted file]
doc/fr/images/button-view-access-log.gif [deleted file]
doc/fr/images/button-view-error-log.gif [deleted file]
doc/fr/images/button-view-page-log.gif [deleted file]
doc/fr/images/button-view-printable-version.gif [deleted file]
doc/fr/index.html.in [deleted file]
doc/he/cups.css [deleted file]
doc/he/images/button-accept-jobs.gif [deleted file]
doc/he/images/button-add-class.gif [deleted file]
doc/he/images/button-add-printer.gif [deleted file]
doc/he/images/button-add-this-printer.gif [deleted file]
doc/he/images/button-cancel-all-jobs.gif [deleted file]
doc/he/images/button-cancel-job.gif [deleted file]
doc/he/images/button-change-settings.gif [deleted file]
doc/he/images/button-clean-print-heads.gif [deleted file]
doc/he/images/button-clear.gif [deleted file]
doc/he/images/button-continue.gif [deleted file]
doc/he/images/button-delete-class.gif [deleted file]
doc/he/images/button-delete-printer.gif [deleted file]
doc/he/images/button-edit-configuration-file.gif [deleted file]
doc/he/images/button-export-samba.gif [deleted file]
doc/he/images/button-help.gif [deleted file]
doc/he/images/button-hold-job.gif [deleted file]
doc/he/images/button-manage-classes.gif [deleted file]
doc/he/images/button-manage-jobs.gif [deleted file]
doc/he/images/button-manage-printers.gif [deleted file]
doc/he/images/button-manage-server.gif [deleted file]
doc/he/images/button-modify-class.gif [deleted file]
doc/he/images/button-modify-printer.gif [deleted file]
doc/he/images/button-move-job.gif [deleted file]
doc/he/images/button-move-jobs.gif [deleted file]
doc/he/images/button-print-self-test-page.gif [deleted file]
doc/he/images/button-print-test-page.gif [deleted file]
doc/he/images/button-publish-printer.gif [deleted file]
doc/he/images/button-reject-jobs.gif [deleted file]
doc/he/images/button-release-job.gif [deleted file]
doc/he/images/button-restart-job.gif [deleted file]
doc/he/images/button-save-changes.gif [deleted file]
doc/he/images/button-search.gif [deleted file]
doc/he/images/button-set-allowed-users.gif [deleted file]
doc/he/images/button-set-as-default.gif [deleted file]
doc/he/images/button-set-printer-options.gif [deleted file]
doc/he/images/button-show-active.gif [deleted file]
doc/he/images/button-show-all.gif [deleted file]
doc/he/images/button-show-completed.gif [deleted file]
doc/he/images/button-show-next.gif [deleted file]
doc/he/images/button-show-previous.gif [deleted file]
doc/he/images/button-sort-ascending.gif [deleted file]
doc/he/images/button-sort-descending.gif [deleted file]
doc/he/images/button-start-class.gif [deleted file]
doc/he/images/button-start-printer.gif [deleted file]
doc/he/images/button-stop-class.gif [deleted file]
doc/he/images/button-stop-printer.gif [deleted file]
doc/he/images/button-unpublish-printer.gif [deleted file]
doc/he/images/button-use-default-config.gif [deleted file]
doc/he/images/button-view-access-log.gif [deleted file]
doc/he/images/button-view-error-log.gif [deleted file]
doc/he/images/button-view-page-log.gif [deleted file]
doc/he/images/button-view-printable-version.gif [deleted file]
doc/he/index.html.in [deleted file]
doc/help/api-array.html
doc/help/api-cups.html
doc/help/api-filedir.html
doc/help/api-filter.html
doc/help/api-httpipp.html
doc/help/api-ppd.html
doc/help/policies.html
doc/help/spec-ipp.html
doc/help/spec-ppd.html
doc/help/translation.html
doc/images/bottom-left.gif [deleted file]
doc/images/bottom-right.gif [deleted file]
doc/images/button-accept-jobs.gif [deleted file]
doc/images/button-add-class.gif [deleted file]
doc/images/button-add-printer.gif [deleted file]
doc/images/button-add-rss-subscription.gif [deleted file]
doc/images/button-add-this-printer.gif [deleted file]
doc/images/button-cancel-all-jobs.gif [deleted file]
doc/images/button-cancel-job.gif [deleted file]
doc/images/button-cancel-subscription.gif [deleted file]
doc/images/button-change-settings.gif [deleted file]
doc/images/button-clean-print-heads.gif [deleted file]
doc/images/button-clear.gif [deleted file]
doc/images/button-continue.gif [deleted file]
doc/images/button-delete-class.gif [deleted file]
doc/images/button-delete-printer.gif [deleted file]
doc/images/button-edit-configuration-file.gif [deleted file]
doc/images/button-export-samba.gif [deleted file]
doc/images/button-find-new-printers.gif [deleted file]
doc/images/button-help.gif [deleted file]
doc/images/button-hold-job.gif [deleted file]
doc/images/button-manage-classes.gif [deleted file]
doc/images/button-manage-jobs.gif [deleted file]
doc/images/button-manage-printers.gif [deleted file]
doc/images/button-manage-server.gif [deleted file]
doc/images/button-modify-class.gif [deleted file]
doc/images/button-modify-printer.gif [deleted file]
doc/images/button-move-job.gif [deleted file]
doc/images/button-move-jobs.gif [deleted file]
doc/images/button-print-self-test-page.gif [deleted file]
doc/images/button-print-test-page.gif [deleted file]
doc/images/button-publish-printer.gif [deleted file]
doc/images/button-reject-jobs.gif [deleted file]
doc/images/button-release-job.gif [deleted file]
doc/images/button-restart-job.gif [deleted file]
doc/images/button-save-changes.gif [deleted file]
doc/images/button-search.gif [deleted file]
doc/images/button-set-allowed-users.gif [deleted file]
doc/images/button-set-as-default.gif [deleted file]
doc/images/button-set-printer-options.gif [deleted file]
doc/images/button-show-active.gif [deleted file]
doc/images/button-show-all.gif [deleted file]
doc/images/button-show-completed.gif [deleted file]
doc/images/button-show-next.gif [deleted file]
doc/images/button-show-previous.gif [deleted file]
doc/images/button-sort-ascending.gif [deleted file]
doc/images/button-sort-descending.gif [deleted file]
doc/images/button-start-class.gif [deleted file]
doc/images/button-start-printer.gif [deleted file]
doc/images/button-stop-class.gif [deleted file]
doc/images/button-stop-printer.gif [deleted file]
doc/images/button-unpublish-printer.gif [deleted file]
doc/images/button-use-default-config.gif [deleted file]
doc/images/button-view-access-log.gif [deleted file]
doc/images/button-view-error-log.gif [deleted file]
doc/images/button-view-page-log.gif [deleted file]
doc/images/button-view-printable-version.gif [deleted file]
doc/images/classes.gif [deleted file]
doc/images/classes.png [new file with mode: 0644]
doc/images/classes.svg
doc/images/cups-black-button-2.2.scm [deleted file]
doc/images/cups-black-button.scm [deleted file]
doc/images/cups-green-button-2.2.scm [deleted file]
doc/images/cups-green-button.scm [deleted file]
doc/images/cups-icon.png [new file with mode: 0644]
doc/images/cups-large.gif [deleted file]
doc/images/cups-medium.gif [deleted file]
doc/images/cups-red-button-2.2.scm [deleted file]
doc/images/cups-red-button.scm [deleted file]
doc/images/cups-small.gif [deleted file]
doc/images/cups-standard-button-2.2.scm [deleted file]
doc/images/cups-standard-button.scm [deleted file]
doc/images/cups.png [new file with mode: 0644]
doc/images/cups.svg [new file with mode: 0644]
doc/images/draft.gif [deleted file]
doc/images/esp-logo.gif [deleted file]
doc/images/happy.gif [deleted file]
doc/images/left.gif [new file with mode: 0644]
doc/images/logo.gif [deleted file]
doc/images/printer-idle.gif [deleted file]
doc/images/printer-idle.png [new file with mode: 0644]
doc/images/printer-idle.svg
doc/images/printer-processing.gif [deleted file]
doc/images/printer-processing.png [new file with mode: 0644]
doc/images/printer-processing.svg
doc/images/printer-stopped.gif [deleted file]
doc/images/printer-stopped.png [new file with mode: 0644]
doc/images/printer-stopped.svg
doc/images/right.gif [new file with mode: 0644]
doc/images/sel.gif [new file with mode: 0644]
doc/images/shadow.png [new file with mode: 0644]
doc/images/tab-left.gif [deleted file]
doc/images/tab-right.gif [deleted file]
doc/images/top-left.gif [deleted file]
doc/images/top-middle.gif [deleted file]
doc/images/top-right.gif [deleted file]
doc/images/unsel-hover.gif [new file with mode: 0644]
doc/images/unsel.gif [new file with mode: 0644]
doc/index.html.in
doc/it/images/button-accept-jobs.gif [deleted file]
doc/it/images/button-add-class.gif [deleted file]
doc/it/images/button-add-printer.gif [deleted file]
doc/it/images/button-add-this-printer.gif [deleted file]
doc/it/images/button-cancel-all-jobs.gif [deleted file]
doc/it/images/button-cancel-job.gif [deleted file]
doc/it/images/button-change-settings.gif [deleted file]
doc/it/images/button-clean-print-heads.gif [deleted file]
doc/it/images/button-clear.gif [deleted file]
doc/it/images/button-continue.gif [deleted file]
doc/it/images/button-delete-class.gif [deleted file]
doc/it/images/button-delete-printer.gif [deleted file]
doc/it/images/button-edit-configuration-file.gif [deleted file]
doc/it/images/button-export-samba.gif [deleted file]
doc/it/images/button-help.gif [deleted file]
doc/it/images/button-hold-job.gif [deleted file]
doc/it/images/button-manage-classes.gif [deleted file]
doc/it/images/button-manage-jobs.gif [deleted file]
doc/it/images/button-manage-printers.gif [deleted file]
doc/it/images/button-manage-server.gif [deleted file]
doc/it/images/button-modify-class.gif [deleted file]
doc/it/images/button-modify-printer.gif [deleted file]
doc/it/images/button-move-job.gif [deleted file]
doc/it/images/button-move-jobs.gif [deleted file]
doc/it/images/button-print-self-test-page.gif [deleted file]
doc/it/images/button-print-test-page.gif [deleted file]
doc/it/images/button-publish-printer.gif [deleted file]
doc/it/images/button-reject-jobs.gif [deleted file]
doc/it/images/button-release-job.gif [deleted file]
doc/it/images/button-restart-job.gif [deleted file]
doc/it/images/button-save-changes.gif [deleted file]
doc/it/images/button-search.gif [deleted file]
doc/it/images/button-set-allowed-users.gif [deleted file]
doc/it/images/button-set-as-default.gif [deleted file]
doc/it/images/button-set-printer-options.gif [deleted file]
doc/it/images/button-show-active.gif [deleted file]
doc/it/images/button-show-all.gif [deleted file]
doc/it/images/button-show-completed.gif [deleted file]
doc/it/images/button-show-next.gif [deleted file]
doc/it/images/button-show-previous.gif [deleted file]
doc/it/images/button-sort-ascending.gif [deleted file]
doc/it/images/button-sort-descending.gif [deleted file]
doc/it/images/button-start-class.gif [deleted file]
doc/it/images/button-start-printer.gif [deleted file]
doc/it/images/button-stop-class.gif [deleted file]
doc/it/images/button-stop-printer.gif [deleted file]
doc/it/images/button-unpublish-printer.gif [deleted file]
doc/it/images/button-use-default-config.gif [deleted file]
doc/it/images/button-view-access-log.gif [deleted file]
doc/it/images/button-view-error-log.gif [deleted file]
doc/it/images/button-view-page-log.gif [deleted file]
doc/it/images/button-view-printable-version.gif [deleted file]
doc/it/index.html.in [deleted file]
doc/ja/images/button-accept-jobs.gif [deleted file]
doc/ja/images/button-add-class.gif [deleted file]
doc/ja/images/button-add-printer.gif [deleted file]
doc/ja/images/button-add-this-printer.gif [deleted file]
doc/ja/images/button-cancel-all-jobs.gif [deleted file]
doc/ja/images/button-cancel-job.gif [deleted file]
doc/ja/images/button-change-settings.gif [deleted file]
doc/ja/images/button-continue.gif [deleted file]
doc/ja/images/button-delete-class.gif [deleted file]
doc/ja/images/button-delete-printer.gif [deleted file]
doc/ja/images/button-edit-configuration-file.gif [deleted file]
doc/ja/images/button-export-samba.gif [deleted file]
doc/ja/images/button-help.gif [deleted file]
doc/ja/images/button-hold-job.gif [deleted file]
doc/ja/images/button-manage-classes.gif [deleted file]
doc/ja/images/button-manage-jobs.gif [deleted file]
doc/ja/images/button-manage-printers.gif [deleted file]
doc/ja/images/button-manage-server.gif [deleted file]
doc/ja/images/button-modify-class.gif [deleted file]
doc/ja/images/button-modify-printer.gif [deleted file]
doc/ja/images/button-move-job.gif [deleted file]
doc/ja/images/button-move-jobs.gif [deleted file]
doc/ja/images/button-print-test-page.gif [deleted file]
doc/ja/images/button-publish-printer.gif [deleted file]
doc/ja/images/button-reject-jobs.gif [deleted file]
doc/ja/images/button-release-job.gif [deleted file]
doc/ja/images/button-restart-job.gif [deleted file]
doc/ja/images/button-save-changes.gif [deleted file]
doc/ja/images/button-search.gif [deleted file]
doc/ja/images/button-set-allowed-users.gif [deleted file]
doc/ja/images/button-set-as-default.gif [deleted file]
doc/ja/images/button-set-printer-options.gif [deleted file]
doc/ja/images/button-show-active.gif [deleted file]
doc/ja/images/button-show-all.gif [deleted file]
doc/ja/images/button-show-completed.gif [deleted file]
doc/ja/images/button-show-next.gif [deleted file]
doc/ja/images/button-show-previous.gif [deleted file]
doc/ja/images/button-sort-ascending.gif [deleted file]
doc/ja/images/button-sort-descending.gif [deleted file]
doc/ja/images/button-start-class.gif [deleted file]
doc/ja/images/button-start-printer.gif [deleted file]
doc/ja/images/button-stop-class.gif [deleted file]
doc/ja/images/button-stop-printer.gif [deleted file]
doc/ja/images/button-unpublish-printer.gif [deleted file]
doc/ja/images/button-use-default-config.gif [deleted file]
doc/ja/images/button-view-access-log.gif [deleted file]
doc/ja/images/button-view-error-log.gif [deleted file]
doc/ja/images/button-view-page-log.gif [deleted file]
doc/ja/images/show-all-jobs.gif [deleted file]
doc/ja/index.html.in [deleted file]
doc/pl/images/button-accept-jobs.gif [deleted file]
doc/pl/images/button-add-class.gif [deleted file]
doc/pl/images/button-add-printer.gif [deleted file]
doc/pl/images/button-add-this-printer.gif [deleted file]
doc/pl/images/button-cancel-all-jobs.gif [deleted file]
doc/pl/images/button-cancel-job.gif [deleted file]
doc/pl/images/button-change-settings.gif [deleted file]
doc/pl/images/button-clean-print-heads.gif [deleted file]
doc/pl/images/button-clear.gif [deleted file]
doc/pl/images/button-continue.gif [deleted file]
doc/pl/images/button-delete-class.gif [deleted file]
doc/pl/images/button-delete-printer.gif [deleted file]
doc/pl/images/button-edit-configuration-file.gif [deleted file]
doc/pl/images/button-export-samba.gif [deleted file]
doc/pl/images/button-help.gif [deleted file]
doc/pl/images/button-hold-job.gif [deleted file]
doc/pl/images/button-manage-classes.gif [deleted file]
doc/pl/images/button-manage-jobs.gif [deleted file]
doc/pl/images/button-manage-printers.gif [deleted file]
doc/pl/images/button-manage-server.gif [deleted file]
doc/pl/images/button-modify-class.gif [deleted file]
doc/pl/images/button-modify-printer.gif [deleted file]
doc/pl/images/button-move-job.gif [deleted file]
doc/pl/images/button-move-jobs.gif [deleted file]
doc/pl/images/button-print-self-test-page.gif [deleted file]
doc/pl/images/button-print-test-page.gif [deleted file]
doc/pl/images/button-publish-printer.gif [deleted file]
doc/pl/images/button-reject-jobs.gif [deleted file]
doc/pl/images/button-release-job.gif [deleted file]
doc/pl/images/button-restart-job.gif [deleted file]
doc/pl/images/button-save-changes.gif [deleted file]
doc/pl/images/button-search.gif [deleted file]
doc/pl/images/button-set-allowed-users.gif [deleted file]
doc/pl/images/button-set-as-default.gif [deleted file]
doc/pl/images/button-set-printer-options.gif [deleted file]
doc/pl/images/button-show-active.gif [deleted file]
doc/pl/images/button-show-all.gif [deleted file]
doc/pl/images/button-show-completed.gif [deleted file]
doc/pl/images/button-show-next.gif [deleted file]
doc/pl/images/button-show-previous.gif [deleted file]
doc/pl/images/button-sort-ascending.gif [deleted file]
doc/pl/images/button-sort-descending.gif [deleted file]
doc/pl/images/button-start-class.gif [deleted file]
doc/pl/images/button-start-printer.gif [deleted file]
doc/pl/images/button-stop-class.gif [deleted file]
doc/pl/images/button-stop-printer.gif [deleted file]
doc/pl/images/button-unpublish-printer.gif [deleted file]
doc/pl/images/button-use-default-config.gif [deleted file]
doc/pl/images/button-view-access-log.gif [deleted file]
doc/pl/images/button-view-error-log.gif [deleted file]
doc/pl/images/button-view-page-log.gif [deleted file]
doc/pl/images/button-view-printable-version.gif [deleted file]
doc/pl/index.html.in [deleted file]
doc/sv/images/button-accept-jobs.gif [deleted file]
doc/sv/images/button-add-class.gif [deleted file]
doc/sv/images/button-add-printer.gif [deleted file]
doc/sv/images/button-add-this-printer.gif [deleted file]
doc/sv/images/button-cancel-all-jobs.gif [deleted file]
doc/sv/images/button-cancel-job.gif [deleted file]
doc/sv/images/button-change-settings.gif [deleted file]
doc/sv/images/button-clean-print-heads.gif [deleted file]
doc/sv/images/button-clear.gif [deleted file]
doc/sv/images/button-continue.gif [deleted file]
doc/sv/images/button-delete-class.gif [deleted file]
doc/sv/images/button-delete-printer.gif [deleted file]
doc/sv/images/button-edit-configuration-file.gif [deleted file]
doc/sv/images/button-export-samba.gif [deleted file]
doc/sv/images/button-help.gif [deleted file]
doc/sv/images/button-hold-job.gif [deleted file]
doc/sv/images/button-manage-classes.gif [deleted file]
doc/sv/images/button-manage-jobs.gif [deleted file]
doc/sv/images/button-manage-printers.gif [deleted file]
doc/sv/images/button-manage-server.gif [deleted file]
doc/sv/images/button-modify-class.gif [deleted file]
doc/sv/images/button-modify-printer.gif [deleted file]
doc/sv/images/button-move-job.gif [deleted file]
doc/sv/images/button-move-jobs.gif [deleted file]
doc/sv/images/button-print-self-test-page.gif [deleted file]
doc/sv/images/button-print-test-page.gif [deleted file]
doc/sv/images/button-publish-printer.gif [deleted file]
doc/sv/images/button-reject-jobs.gif [deleted file]
doc/sv/images/button-release-job.gif [deleted file]
doc/sv/images/button-restart-job.gif [deleted file]
doc/sv/images/button-save-changes.gif [deleted file]
doc/sv/images/button-search.gif [deleted file]
doc/sv/images/button-set-allowed-users.gif [deleted file]
doc/sv/images/button-set-as-default.gif [deleted file]
doc/sv/images/button-set-printer-options.gif [deleted file]
doc/sv/images/button-show-active.gif [deleted file]
doc/sv/images/button-show-all.gif [deleted file]
doc/sv/images/button-show-completed.gif [deleted file]
doc/sv/images/button-show-next.gif [deleted file]
doc/sv/images/button-show-previous.gif [deleted file]
doc/sv/images/button-sort-ascending.gif [deleted file]
doc/sv/images/button-sort-descending.gif [deleted file]
doc/sv/images/button-start-class.gif [deleted file]
doc/sv/images/button-start-printer.gif [deleted file]
doc/sv/images/button-stop-class.gif [deleted file]
doc/sv/images/button-stop-printer.gif [deleted file]
doc/sv/images/button-unpublish-printer.gif [deleted file]
doc/sv/images/button-use-default-config.gif [deleted file]
doc/sv/images/button-view-access-log.gif [deleted file]
doc/sv/images/button-view-error-log.gif [deleted file]
doc/sv/images/button-view-page-log.gif [deleted file]
doc/sv/images/button-view-printable-version.gif [deleted file]
doc/sv/index.html.in [deleted file]
doc/zh_TW/images/button-accept-jobs.gif [deleted file]
doc/zh_TW/images/button-add-class.gif [deleted file]
doc/zh_TW/images/button-add-printer.gif [deleted file]
doc/zh_TW/images/button-add-this-printer.gif [deleted file]
doc/zh_TW/images/button-cancel-all-jobs.gif [deleted file]
doc/zh_TW/images/button-cancel-job.gif [deleted file]
doc/zh_TW/images/button-change-settings.gif [deleted file]
doc/zh_TW/images/button-clean-print-heads.gif [deleted file]
doc/zh_TW/images/button-clear.gif [deleted file]
doc/zh_TW/images/button-continue.gif [deleted file]
doc/zh_TW/images/button-delete-class.gif [deleted file]
doc/zh_TW/images/button-delete-printer.gif [deleted file]
doc/zh_TW/images/button-edit-configuration-file.gif [deleted file]
doc/zh_TW/images/button-export-samba.gif [deleted file]
doc/zh_TW/images/button-help.gif [deleted file]
doc/zh_TW/images/button-hold-job.gif [deleted file]
doc/zh_TW/images/button-manage-classes.gif [deleted file]
doc/zh_TW/images/button-manage-jobs.gif [deleted file]
doc/zh_TW/images/button-manage-printers.gif [deleted file]
doc/zh_TW/images/button-manage-server.gif [deleted file]
doc/zh_TW/images/button-modify-class.gif [deleted file]
doc/zh_TW/images/button-modify-printer.gif [deleted file]
doc/zh_TW/images/button-move-job.gif [deleted file]
doc/zh_TW/images/button-move-jobs.gif [deleted file]
doc/zh_TW/images/button-print-self-test-page.gif [deleted file]
doc/zh_TW/images/button-print-test-page.gif [deleted file]
doc/zh_TW/images/button-publish-printer.gif [deleted file]
doc/zh_TW/images/button-reject-jobs.gif [deleted file]
doc/zh_TW/images/button-release-job.gif [deleted file]
doc/zh_TW/images/button-restart-job.gif [deleted file]
doc/zh_TW/images/button-save-changes.gif [deleted file]
doc/zh_TW/images/button-search.gif [deleted file]
doc/zh_TW/images/button-set-allowed-users.gif [deleted file]
doc/zh_TW/images/button-set-as-default.gif [deleted file]
doc/zh_TW/images/button-set-printer-options.gif [deleted file]
doc/zh_TW/images/button-show-active.gif [deleted file]
doc/zh_TW/images/button-show-all.gif [deleted file]
doc/zh_TW/images/button-show-completed.gif [deleted file]
doc/zh_TW/images/button-show-next.gif [deleted file]
doc/zh_TW/images/button-show-previous.gif [deleted file]
doc/zh_TW/images/button-sort-ascending.gif [deleted file]
doc/zh_TW/images/button-sort-descending.gif [deleted file]
doc/zh_TW/images/button-start-class.gif [deleted file]
doc/zh_TW/images/button-start-printer.gif [deleted file]
doc/zh_TW/images/button-stop-class.gif [deleted file]
doc/zh_TW/images/button-stop-printer.gif [deleted file]
doc/zh_TW/images/button-unpublish-printer.gif [deleted file]
doc/zh_TW/images/button-use-default-config.gif [deleted file]
doc/zh_TW/images/button-view-access-log.gif [deleted file]
doc/zh_TW/images/button-view-error-log.gif [deleted file]
doc/zh_TW/images/button-view-page-log.gif [deleted file]
doc/zh_TW/images/button-view-printable-version.gif [deleted file]
doc/zh_TW/index.html.in [deleted file]
filter/pstops.c
filter/rastertolabel.c
init/cups-lpd.in
locale/Makefile
locale/checkpo.c
locale/cups_ja.po
locale/po2strings.c
locale/strings2po.c
locale/translate.c
man/cupsd.conf.man.in
man/cupsd.man.in
man/cupsfilter.man
monitor/bcp.c
monitor/tbcp.c
packaging/cups.list.in
packaging/cups.spec.in
packaging/installer.gif
packaging/installer.tif
ppd/Makefile
ppd/deskjet.ppd
ppd/dymo.ppd
ppd/epson24.ppd
ppd/epson9.ppd
ppd/generic.ppd [new file with mode: 0644]
ppd/generpcl.ppd [new file with mode: 0644]
ppd/intelbar.ppd
ppd/laserjet.ppd
ppd/okidat24.ppd
ppd/okidata9.ppd
ppd/sample.drv
ppd/stcolor.ppd
ppd/stcolor2.ppd
ppd/stphoto.ppd
ppd/stphoto2.ppd
ppd/zebra.ppd
ppd/zebracpl.ppd
ppd/zebraep1.ppd
ppd/zebraep2.ppd
scheduler/Makefile
scheduler/auth.c
scheduler/client.c
scheduler/client.h
scheduler/conf.c
scheduler/cups-deviced.c
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/dirsvc.c
scheduler/dirsvc.h
scheduler/ipp.c
scheduler/job.c
scheduler/log.c
scheduler/main.c
scheduler/policy.c
scheduler/policy.h
scheduler/printers.c
scheduler/process.c
scheduler/quotas.c
systemv/cupstestppd.c
templates/add-class.tmpl
templates/add-printer.tmpl
templates/add-rss-subscription.tmpl
templates/admin.tmpl
templates/choose-device.tmpl
templates/choose-make.tmpl
templates/choose-model.tmpl
templates/choose-serial.tmpl
templates/choose-uri.tmpl
templates/class-confirm.tmpl
templates/classes.tmpl
templates/de/add-class.tmpl [deleted file]
templates/de/add-printer.tmpl [deleted file]
templates/de/add-rss-subscription.tmpl [deleted file]
templates/de/admin.tmpl [deleted file]
templates/de/choose-device.tmpl [deleted file]
templates/de/choose-make.tmpl [deleted file]
templates/de/choose-model.tmpl [deleted file]
templates/de/choose-serial.tmpl [deleted file]
templates/de/choose-uri.tmpl [deleted file]
templates/de/class-added.tmpl [deleted file]
templates/de/class-confirm.tmpl [deleted file]
templates/de/class-deleted.tmpl [deleted file]
templates/de/class-jobs-header.tmpl [deleted file]
templates/de/class-modified.tmpl [deleted file]
templates/de/classes-header.tmpl [deleted file]
templates/de/classes.tmpl [deleted file]
templates/de/edit-config.tmpl [deleted file]
templates/de/error-op.tmpl [deleted file]
templates/de/error.tmpl [deleted file]
templates/de/header.tmpl.in [deleted file]
templates/de/help-header.tmpl [deleted file]
templates/de/help-printable.tmpl [deleted file]
templates/de/job-cancel.tmpl [deleted file]
templates/de/job-hold.tmpl [deleted file]
templates/de/job-move.tmpl [deleted file]
templates/de/job-moved.tmpl [deleted file]
templates/de/job-release.tmpl [deleted file]
templates/de/job-restart.tmpl [deleted file]
templates/de/jobs-header.tmpl [deleted file]
templates/de/jobs.tmpl [deleted file]
templates/de/list-available-printers.tmpl [deleted file]
templates/de/maintenance.tmpl [deleted file]
templates/de/modify-class.tmpl [deleted file]
templates/de/modify-printer.tmpl [deleted file]
templates/de/option-boolean.tmpl [deleted file]
templates/de/option-conflict.tmpl [deleted file]
templates/de/option-header.tmpl [deleted file]
templates/de/option-pickmany.tmpl [deleted file]
templates/de/option-pickone.tmpl [deleted file]
templates/de/option-trailer.tmpl [deleted file]
templates/de/pager.tmpl [deleted file]
templates/de/printer-accept.tmpl [deleted file]
templates/de/printer-added.tmpl [deleted file]
templates/de/printer-configured.tmpl [deleted file]
templates/de/printer-confirm.tmpl [deleted file]
templates/de/printer-default.tmpl [deleted file]
templates/de/printer-deleted.tmpl [deleted file]
templates/de/printer-jobs-header.tmpl [deleted file]
templates/de/printer-modified.tmpl [deleted file]
templates/de/printer-purge.tmpl [deleted file]
templates/de/printer-reject.tmpl [deleted file]
templates/de/printer-start.tmpl [deleted file]
templates/de/printer-stop.tmpl [deleted file]
templates/de/printers-header.tmpl [deleted file]
templates/de/printers.tmpl [deleted file]
templates/de/restart.tmpl [deleted file]
templates/de/samba-export.tmpl [deleted file]
templates/de/samba-exported.tmpl [deleted file]
templates/de/search.tmpl [deleted file]
templates/de/set-printer-options-header.tmpl [deleted file]
templates/de/set-printer-options-trailer.tmpl [deleted file]
templates/de/subscription-added.tmpl [deleted file]
templates/de/subscription-canceled.tmpl [deleted file]
templates/de/test-page.tmpl [deleted file]
templates/de/trailer.tmpl [deleted file]
templates/de/users.tmpl [deleted file]
templates/edit-config.tmpl
templates/es/add-class.tmpl [deleted file]
templates/es/add-printer.tmpl [deleted file]
templates/es/add-rss-subscription.tmpl [deleted file]
templates/es/admin.tmpl [deleted file]
templates/es/choose-device.tmpl [deleted file]
templates/es/choose-make.tmpl [deleted file]
templates/es/choose-model.tmpl [deleted file]
templates/es/choose-serial.tmpl [deleted file]
templates/es/choose-uri.tmpl [deleted file]
templates/es/class-added.tmpl [deleted file]
templates/es/class-confirm.tmpl [deleted file]
templates/es/class-deleted.tmpl [deleted file]
templates/es/class-jobs-header.tmpl [deleted file]
templates/es/class-modified.tmpl [deleted file]
templates/es/classes-header.tmpl [deleted file]
templates/es/classes.tmpl [deleted file]
templates/es/edit-config.tmpl [deleted file]
templates/es/error-op.tmpl [deleted file]
templates/es/error.tmpl [deleted file]
templates/es/header.tmpl.in [deleted file]
templates/es/help-header.tmpl [deleted file]
templates/es/help-printable.tmpl [deleted file]
templates/es/job-cancel.tmpl [deleted file]
templates/es/job-hold.tmpl [deleted file]
templates/es/job-move.tmpl [deleted file]
templates/es/job-moved.tmpl [deleted file]
templates/es/job-release.tmpl [deleted file]
templates/es/job-restart.tmpl [deleted file]
templates/es/jobs-header.tmpl [deleted file]
templates/es/jobs.tmpl [deleted file]
templates/es/list-available-printers.tmpl [deleted file]
templates/es/maintenance.tmpl [deleted file]
templates/es/modify-class.tmpl [deleted file]
templates/es/modify-printer.tmpl [deleted file]
templates/es/norestart.tmpl [deleted file]
templates/es/option-boolean.tmpl [deleted file]
templates/es/option-conflict.tmpl [deleted file]
templates/es/option-header.tmpl [deleted file]
templates/es/option-pickmany.tmpl [deleted file]
templates/es/option-pickone.tmpl [deleted file]
templates/es/option-trailer.tmpl [deleted file]
templates/es/pager.tmpl [deleted file]
templates/es/printer-accept.tmpl [deleted file]
templates/es/printer-added.tmpl [deleted file]
templates/es/printer-configured.tmpl [deleted file]
templates/es/printer-confirm.tmpl [deleted file]
templates/es/printer-default.tmpl [deleted file]
templates/es/printer-deleted.tmpl [deleted file]
templates/es/printer-jobs-header.tmpl [deleted file]
templates/es/printer-modified.tmpl [deleted file]
templates/es/printer-purge.tmpl [deleted file]
templates/es/printer-reject.tmpl [deleted file]
templates/es/printer-start.tmpl [deleted file]
templates/es/printer-stop.tmpl [deleted file]
templates/es/printers-header.tmpl [deleted file]
templates/es/printers.tmpl [deleted file]
templates/es/restart.tmpl [deleted file]
templates/es/samba-export.tmpl [deleted file]
templates/es/samba-exported.tmpl [deleted file]
templates/es/search.tmpl [deleted file]
templates/es/set-printer-options-header.tmpl [deleted file]
templates/es/set-printer-options-trailer.tmpl [deleted file]
templates/es/subscription-added.tmpl [deleted file]
templates/es/subscription-canceled.tmpl [deleted file]
templates/es/test-page.tmpl [deleted file]
templates/es/trailer.tmpl [deleted file]
templates/es/users.tmpl [deleted file]
templates/et/add-class.tmpl [deleted file]
templates/et/add-printer.tmpl [deleted file]
templates/et/admin.tmpl [deleted file]
templates/et/choose-device.tmpl [deleted file]
templates/et/choose-make.tmpl [deleted file]
templates/et/choose-model.tmpl [deleted file]
templates/et/choose-serial.tmpl [deleted file]
templates/et/choose-uri.tmpl [deleted file]
templates/et/class-added.tmpl [deleted file]
templates/et/class-confirm.tmpl [deleted file]
templates/et/class-deleted.tmpl [deleted file]
templates/et/class-jobs-header.tmpl [deleted file]
templates/et/class-modified.tmpl [deleted file]
templates/et/classes-header.tmpl [deleted file]
templates/et/classes.tmpl [deleted file]
templates/et/edit-config.tmpl [deleted file]
templates/et/error-op.tmpl [deleted file]
templates/et/error.tmpl [deleted file]
templates/et/header.tmpl.in [deleted file]
templates/et/help-header.tmpl [deleted file]
templates/et/help-printable.tmpl [deleted file]
templates/et/job-cancel.tmpl [deleted file]
templates/et/job-hold.tmpl [deleted file]
templates/et/job-moved.tmpl [deleted file]
templates/et/job-release.tmpl [deleted file]
templates/et/job-restart.tmpl [deleted file]
templates/et/jobs-header.tmpl [deleted file]
templates/et/jobs.tmpl [deleted file]
templates/et/maintenance.tmpl [deleted file]
templates/et/modify-class.tmpl [deleted file]
templates/et/modify-printer.tmpl [deleted file]
templates/et/norestart.tmpl [deleted file]
templates/et/option-boolean.tmpl [deleted file]
templates/et/option-conflict.tmpl [deleted file]
templates/et/option-header.tmpl [deleted file]
templates/et/option-pickmany.tmpl [deleted file]
templates/et/option-pickone.tmpl [deleted file]
templates/et/option-trailer.tmpl [deleted file]
templates/et/pager.tmpl [deleted file]
templates/et/printer-accept.tmpl [deleted file]
templates/et/printer-added.tmpl [deleted file]
templates/et/printer-configured.tmpl [deleted file]
templates/et/printer-confirm.tmpl [deleted file]
templates/et/printer-default.tmpl [deleted file]
templates/et/printer-deleted.tmpl [deleted file]
templates/et/printer-jobs-header.tmpl [deleted file]
templates/et/printer-modified.tmpl [deleted file]
templates/et/printer-purge.tmpl [deleted file]
templates/et/printer-reject.tmpl [deleted file]
templates/et/printer-start.tmpl [deleted file]
templates/et/printer-stop.tmpl [deleted file]
templates/et/printers-header.tmpl [deleted file]
templates/et/printers.tmpl [deleted file]
templates/et/restart.tmpl [deleted file]
templates/et/samba-export.tmpl [deleted file]
templates/et/samba-exported.tmpl [deleted file]
templates/et/search.tmpl [deleted file]
templates/et/set-printer-options-header.tmpl [deleted file]
templates/et/set-printer-options-trailer.tmpl [deleted file]
templates/et/test-page.tmpl [deleted file]
templates/et/trailer.tmpl [deleted file]
templates/et/users.tmpl [deleted file]
templates/fr/add-class.tmpl [deleted file]
templates/fr/add-printer.tmpl [deleted file]
templates/fr/admin.tmpl [deleted file]
templates/fr/choose-device.tmpl [deleted file]
templates/fr/choose-make.tmpl [deleted file]
templates/fr/choose-model.tmpl [deleted file]
templates/fr/choose-serial.tmpl [deleted file]
templates/fr/choose-uri.tmpl [deleted file]
templates/fr/class-added.tmpl [deleted file]
templates/fr/class-confirm.tmpl [deleted file]
templates/fr/class-deleted.tmpl [deleted file]
templates/fr/class-jobs-header.tmpl [deleted file]
templates/fr/class-modified.tmpl [deleted file]
templates/fr/classes-header.tmpl [deleted file]
templates/fr/classes.tmpl [deleted file]
templates/fr/edit-config.tmpl [deleted file]
templates/fr/error-op.tmpl [deleted file]
templates/fr/error.tmpl [deleted file]
templates/fr/header.tmpl.in [deleted file]
templates/fr/help-header.tmpl [deleted file]
templates/fr/help-printable.tmpl [deleted file]
templates/fr/job-cancel.tmpl [deleted file]
templates/fr/job-hold.tmpl [deleted file]
templates/fr/job-move.tmpl [deleted file]
templates/fr/job-moved.tmpl [deleted file]
templates/fr/job-release.tmpl [deleted file]
templates/fr/job-restart.tmpl [deleted file]
templates/fr/jobs-header.tmpl [deleted file]
templates/fr/jobs.tmpl [deleted file]
templates/fr/maintenance.tmpl [deleted file]
templates/fr/modify-class.tmpl [deleted file]
templates/fr/modify-printer.tmpl [deleted file]
templates/fr/norestart.tmpl [deleted file]
templates/fr/option-boolean.tmpl [deleted file]
templates/fr/option-conflict.tmpl [deleted file]
templates/fr/option-header.tmpl [deleted file]
templates/fr/option-pickmany.tmpl [deleted file]
templates/fr/option-pickone.tmpl [deleted file]
templates/fr/option-trailer.tmpl [deleted file]
templates/fr/pager.tmpl [deleted file]
templates/fr/printer-accept.tmpl [deleted file]
templates/fr/printer-added.tmpl [deleted file]
templates/fr/printer-configured.tmpl [deleted file]
templates/fr/printer-confirm.tmpl [deleted file]
templates/fr/printer-default.tmpl [deleted file]
templates/fr/printer-deleted.tmpl [deleted file]
templates/fr/printer-jobs-header.tmpl [deleted file]
templates/fr/printer-modified.tmpl [deleted file]
templates/fr/printer-purge.tmpl [deleted file]
templates/fr/printer-reject.tmpl [deleted file]
templates/fr/printer-start.tmpl [deleted file]
templates/fr/printer-stop.tmpl [deleted file]
templates/fr/printers-header.tmpl [deleted file]
templates/fr/printers.tmpl [deleted file]
templates/fr/restart.tmpl [deleted file]
templates/fr/samba-export.tmpl [deleted file]
templates/fr/samba-exported.tmpl [deleted file]
templates/fr/search.tmpl [deleted file]
templates/fr/set-printer-options-header.tmpl [deleted file]
templates/fr/set-printer-options-trailer.tmpl [deleted file]
templates/fr/test-page.tmpl [deleted file]
templates/fr/trailer.tmpl [deleted file]
templates/fr/users.tmpl [deleted file]
templates/he/add-class.tmpl [deleted file]
templates/he/add-printer.tmpl [deleted file]
templates/he/admin.tmpl [deleted file]
templates/he/choose-device.tmpl [deleted file]
templates/he/choose-make.tmpl [deleted file]
templates/he/choose-model.tmpl [deleted file]
templates/he/choose-serial.tmpl [deleted file]
templates/he/choose-uri.tmpl [deleted file]
templates/he/class-added.tmpl [deleted file]
templates/he/class-confirm.tmpl [deleted file]
templates/he/class-deleted.tmpl [deleted file]
templates/he/class-jobs-header.tmpl [deleted file]
templates/he/class-modified.tmpl [deleted file]
templates/he/classes-header.tmpl [deleted file]
templates/he/classes.tmpl [deleted file]
templates/he/edit-config.tmpl [deleted file]
templates/he/error-op.tmpl [deleted file]
templates/he/error.tmpl [deleted file]
templates/he/header.tmpl.in [deleted file]
templates/he/help-header.tmpl [deleted file]
templates/he/help-printable.tmpl [deleted file]
templates/he/job-cancel.tmpl [deleted file]
templates/he/job-hold.tmpl [deleted file]
templates/he/job-move.tmpl [deleted file]
templates/he/job-moved.tmpl [deleted file]
templates/he/job-release.tmpl [deleted file]
templates/he/job-restart.tmpl [deleted file]
templates/he/jobs-header.tmpl [deleted file]
templates/he/jobs.tmpl [deleted file]
templates/he/maintenance.tmpl [deleted file]
templates/he/modify-class.tmpl [deleted file]
templates/he/modify-printer.tmpl [deleted file]
templates/he/norestart.tmpl [deleted file]
templates/he/option-boolean.tmpl [deleted file]
templates/he/option-conflict.tmpl [deleted file]
templates/he/option-header.tmpl [deleted file]
templates/he/option-pickmany.tmpl [deleted file]
templates/he/option-pickone.tmpl [deleted file]
templates/he/option-trailer.tmpl [deleted file]
templates/he/pager.tmpl [deleted file]
templates/he/printer-accept.tmpl [deleted file]
templates/he/printer-added.tmpl [deleted file]
templates/he/printer-configured.tmpl [deleted file]
templates/he/printer-confirm.tmpl [deleted file]
templates/he/printer-default.tmpl [deleted file]
templates/he/printer-deleted.tmpl [deleted file]
templates/he/printer-jobs-header.tmpl [deleted file]
templates/he/printer-modified.tmpl [deleted file]
templates/he/printer-purge.tmpl [deleted file]
templates/he/printer-reject.tmpl [deleted file]
templates/he/printer-start.tmpl [deleted file]
templates/he/printer-stop.tmpl [deleted file]
templates/he/printers-header.tmpl [deleted file]
templates/he/printers.tmpl [deleted file]
templates/he/restart.tmpl [deleted file]
templates/he/samba-export.tmpl [deleted file]
templates/he/samba-exported.tmpl [deleted file]
templates/he/search.tmpl [deleted file]
templates/he/set-printer-options-header.tmpl [deleted file]
templates/he/set-printer-options-trailer.tmpl [deleted file]
templates/he/test-page.tmpl [deleted file]
templates/he/trailer.tmpl [deleted file]
templates/he/users.tmpl [deleted file]
templates/header.tmpl.in
templates/help-header.tmpl
templates/it/add-class.tmpl [deleted file]
templates/it/add-printer.tmpl [deleted file]
templates/it/admin.tmpl [deleted file]
templates/it/choose-device.tmpl [deleted file]
templates/it/choose-make.tmpl [deleted file]
templates/it/choose-model.tmpl [deleted file]
templates/it/choose-serial.tmpl [deleted file]
templates/it/choose-uri.tmpl [deleted file]
templates/it/class-added.tmpl [deleted file]
templates/it/class-confirm.tmpl [deleted file]
templates/it/class-deleted.tmpl [deleted file]
templates/it/class-jobs-header.tmpl [deleted file]
templates/it/class-modified.tmpl [deleted file]
templates/it/classes-header.tmpl [deleted file]
templates/it/classes.tmpl [deleted file]
templates/it/edit-config.tmpl [deleted file]
templates/it/error-op.tmpl [deleted file]
templates/it/error.tmpl [deleted file]
templates/it/header.tmpl.in [deleted file]
templates/it/help-header.tmpl [deleted file]
templates/it/help-printable.tmpl [deleted file]
templates/it/job-cancel.tmpl [deleted file]
templates/it/job-hold.tmpl [deleted file]
templates/it/job-move.tmpl [deleted file]
templates/it/job-moved.tmpl [deleted file]
templates/it/job-release.tmpl [deleted file]
templates/it/job-restart.tmpl [deleted file]
templates/it/jobs-header.tmpl [deleted file]
templates/it/jobs.tmpl [deleted file]
templates/it/maintenance.tmpl [deleted file]
templates/it/modify-class.tmpl [deleted file]
templates/it/modify-printer.tmpl [deleted file]
templates/it/norestart.tmpl [deleted file]
templates/it/option-boolean.tmpl [deleted file]
templates/it/option-conflict.tmpl [deleted file]
templates/it/option-header.tmpl [deleted file]
templates/it/option-pickmany.tmpl [deleted file]
templates/it/option-pickone.tmpl [deleted file]
templates/it/option-trailer.tmpl [deleted file]
templates/it/pager.tmpl [deleted file]
templates/it/printer-accept.tmpl [deleted file]
templates/it/printer-added.tmpl [deleted file]
templates/it/printer-configured.tmpl [deleted file]
templates/it/printer-confirm.tmpl [deleted file]
templates/it/printer-default.tmpl [deleted file]
templates/it/printer-deleted.tmpl [deleted file]
templates/it/printer-jobs-header.tmpl [deleted file]
templates/it/printer-modified.tmpl [deleted file]
templates/it/printer-purge.tmpl [deleted file]
templates/it/printer-reject.tmpl [deleted file]
templates/it/printer-start.tmpl [deleted file]
templates/it/printer-stop.tmpl [deleted file]
templates/it/printers-header.tmpl [deleted file]
templates/it/printers.tmpl [deleted file]
templates/it/restart.tmpl [deleted file]
templates/it/samba-export.tmpl [deleted file]
templates/it/samba-exported.tmpl [deleted file]
templates/it/search.tmpl [deleted file]
templates/it/set-printer-options-header.tmpl [deleted file]
templates/it/set-printer-options-trailer.tmpl [deleted file]
templates/it/test-page.tmpl [deleted file]
templates/it/trailer.tmpl [deleted file]
templates/it/users.tmpl [deleted file]
templates/ja/add-class.tmpl [deleted file]
templates/ja/add-printer.tmpl [deleted file]
templates/ja/admin.tmpl [deleted file]
templates/ja/choose-device.tmpl [deleted file]
templates/ja/choose-make.tmpl [deleted file]
templates/ja/choose-model.tmpl [deleted file]
templates/ja/choose-serial.tmpl [deleted file]
templates/ja/choose-uri.tmpl [deleted file]
templates/ja/class-added.tmpl [deleted file]
templates/ja/class-confirm.tmpl [deleted file]
templates/ja/class-deleted.tmpl [deleted file]
templates/ja/class-jobs-header.tmpl [deleted file]
templates/ja/class-modified.tmpl [deleted file]
templates/ja/classes-header.tmpl [deleted file]
templates/ja/classes.tmpl [deleted file]
templates/ja/edit-config.tmpl [deleted file]
templates/ja/error-op.tmpl [deleted file]
templates/ja/error.tmpl [deleted file]
templates/ja/header.tmpl.in [deleted file]
templates/ja/help-header.tmpl [deleted file]
templates/ja/job-cancel.tmpl [deleted file]
templates/ja/job-hold.tmpl [deleted file]
templates/ja/job-move.tmpl [deleted file]
templates/ja/job-moved.tmpl [deleted file]
templates/ja/job-release.tmpl [deleted file]
templates/ja/job-restart.tmpl [deleted file]
templates/ja/jobs-header.tmpl [deleted file]
templates/ja/jobs.tmpl [deleted file]
templates/ja/maintenance.tmpl [deleted file]
templates/ja/modify-class.tmpl [deleted file]
templates/ja/modify-printer.tmpl [deleted file]
templates/ja/option-conflict.tmpl [deleted file]
templates/ja/option-trailer.tmpl [deleted file]
templates/ja/pager.tmpl [deleted file]
templates/ja/printer-accept.tmpl [deleted file]
templates/ja/printer-added.tmpl [deleted file]
templates/ja/printer-configured.tmpl [deleted file]
templates/ja/printer-confirm.tmpl [deleted file]
templates/ja/printer-default.tmpl [deleted file]
templates/ja/printer-deleted.tmpl [deleted file]
templates/ja/printer-jobs-header.tmpl [deleted file]
templates/ja/printer-modified.tmpl [deleted file]
templates/ja/printer-purge.tmpl [deleted file]
templates/ja/printer-reject.tmpl [deleted file]
templates/ja/printer-start.tmpl [deleted file]
templates/ja/printer-stop.tmpl [deleted file]
templates/ja/printers-header.tmpl [deleted file]
templates/ja/printers.tmpl [deleted file]
templates/ja/restart.tmpl [deleted file]
templates/ja/samba-export.tmpl [deleted file]
templates/ja/samba-exported.tmpl [deleted file]
templates/ja/search.tmpl [deleted file]
templates/ja/test-page.tmpl [deleted file]
templates/ja/users.tmpl [deleted file]
templates/job-move.tmpl
templates/jobs-header.tmpl
templates/jobs.tmpl
templates/list-available-printers.tmpl
templates/modify-class.tmpl
templates/modify-printer.tmpl
templates/option-trailer.tmpl
templates/pager.tmpl
templates/pl/add-class.tmpl [deleted file]
templates/pl/add-printer.tmpl [deleted file]
templates/pl/admin.tmpl [deleted file]
templates/pl/choose-device.tmpl [deleted file]
templates/pl/choose-make.tmpl [deleted file]
templates/pl/choose-model.tmpl [deleted file]
templates/pl/choose-serial.tmpl [deleted file]
templates/pl/choose-uri.tmpl [deleted file]
templates/pl/class-added.tmpl [deleted file]
templates/pl/class-confirm.tmpl [deleted file]
templates/pl/class-deleted.tmpl [deleted file]
templates/pl/class-jobs-header.tmpl [deleted file]
templates/pl/class-modified.tmpl [deleted file]
templates/pl/classes-header.tmpl [deleted file]
templates/pl/classes.tmpl [deleted file]
templates/pl/edit-config.tmpl [deleted file]
templates/pl/error-op.tmpl [deleted file]
templates/pl/error.tmpl [deleted file]
templates/pl/header.tmpl.in [deleted file]
templates/pl/help-header.tmpl [deleted file]
templates/pl/help-printable.tmpl [deleted file]
templates/pl/job-cancel.tmpl [deleted file]
templates/pl/job-hold.tmpl [deleted file]
templates/pl/job-move.tmpl [deleted file]
templates/pl/job-moved.tmpl [deleted file]
templates/pl/job-release.tmpl [deleted file]
templates/pl/job-restart.tmpl [deleted file]
templates/pl/jobs-header.tmpl [deleted file]
templates/pl/jobs.tmpl [deleted file]
templates/pl/maintenance.tmpl [deleted file]
templates/pl/modify-class.tmpl [deleted file]
templates/pl/modify-printer.tmpl [deleted file]
templates/pl/option-boolean.tmpl [deleted file]
templates/pl/option-conflict.tmpl [deleted file]
templates/pl/option-header.tmpl [deleted file]
templates/pl/option-pickmany.tmpl [deleted file]
templates/pl/option-pickone.tmpl [deleted file]
templates/pl/option-trailer.tmpl [deleted file]
templates/pl/pager.tmpl [deleted file]
templates/pl/printer-accept.tmpl [deleted file]
templates/pl/printer-added.tmpl [deleted file]
templates/pl/printer-configured.tmpl [deleted file]
templates/pl/printer-confirm.tmpl [deleted file]
templates/pl/printer-default.tmpl [deleted file]
templates/pl/printer-deleted.tmpl [deleted file]
templates/pl/printer-jobs-header.tmpl [deleted file]
templates/pl/printer-modified.tmpl [deleted file]
templates/pl/printer-purge.tmpl [deleted file]
templates/pl/printer-reject.tmpl [deleted file]
templates/pl/printer-start.tmpl [deleted file]
templates/pl/printer-stop.tmpl [deleted file]
templates/pl/printers-header.tmpl [deleted file]
templates/pl/printers.tmpl [deleted file]
templates/pl/restart.tmpl [deleted file]
templates/pl/samba-export.tmpl [deleted file]
templates/pl/samba-exported.tmpl [deleted file]
templates/pl/search.tmpl [deleted file]
templates/pl/set-printer-options-header.tmpl [deleted file]
templates/pl/set-printer-options-trailer.tmpl [deleted file]
templates/pl/test-page.tmpl [deleted file]
templates/pl/trailer.tmpl [deleted file]
templates/pl/users.tmpl [deleted file]
templates/printer-confirm.tmpl
templates/printers.tmpl
templates/samba-export.tmpl
templates/search.tmpl
templates/sv/add-class.tmpl [deleted file]
templates/sv/add-printer.tmpl [deleted file]
templates/sv/admin.tmpl [deleted file]
templates/sv/choose-device.tmpl [deleted file]
templates/sv/choose-make.tmpl [deleted file]
templates/sv/choose-model.tmpl [deleted file]
templates/sv/choose-serial.tmpl [deleted file]
templates/sv/choose-uri.tmpl [deleted file]
templates/sv/class-added.tmpl [deleted file]
templates/sv/class-confirm.tmpl [deleted file]
templates/sv/class-deleted.tmpl [deleted file]
templates/sv/class-jobs-header.tmpl [deleted file]
templates/sv/class-modified.tmpl [deleted file]
templates/sv/classes-header.tmpl [deleted file]
templates/sv/classes.tmpl [deleted file]
templates/sv/edit-config.tmpl [deleted file]
templates/sv/error-op.tmpl [deleted file]
templates/sv/error.tmpl [deleted file]
templates/sv/header.tmpl.in [deleted file]
templates/sv/help-header.tmpl [deleted file]
templates/sv/help-printable.tmpl [deleted file]
templates/sv/job-cancel.tmpl [deleted file]
templates/sv/job-hold.tmpl [deleted file]
templates/sv/job-move.tmpl [deleted file]
templates/sv/job-moved.tmpl [deleted file]
templates/sv/job-release.tmpl [deleted file]
templates/sv/job-restart.tmpl [deleted file]
templates/sv/jobs-header.tmpl [deleted file]
templates/sv/jobs.tmpl [deleted file]
templates/sv/maintenance.tmpl [deleted file]
templates/sv/modify-class.tmpl [deleted file]
templates/sv/modify-printer.tmpl [deleted file]
templates/sv/option-boolean.tmpl [deleted file]
templates/sv/option-conflict.tmpl [deleted file]
templates/sv/option-header.tmpl [deleted file]
templates/sv/option-pickmany.tmpl [deleted file]
templates/sv/option-pickone.tmpl [deleted file]
templates/sv/option-trailer.tmpl [deleted file]
templates/sv/pager.tmpl [deleted file]
templates/sv/printer-accept.tmpl [deleted file]
templates/sv/printer-added.tmpl [deleted file]
templates/sv/printer-configured.tmpl [deleted file]
templates/sv/printer-confirm.tmpl [deleted file]
templates/sv/printer-default.tmpl [deleted file]
templates/sv/printer-deleted.tmpl [deleted file]
templates/sv/printer-jobs-header.tmpl [deleted file]
templates/sv/printer-modified.tmpl [deleted file]
templates/sv/printer-purge.tmpl [deleted file]
templates/sv/printer-reject.tmpl [deleted file]
templates/sv/printer-start.tmpl [deleted file]
templates/sv/printer-stop.tmpl [deleted file]
templates/sv/printers-header.tmpl [deleted file]
templates/sv/printers.tmpl [deleted file]
templates/sv/restart.tmpl [deleted file]
templates/sv/samba-export.tmpl [deleted file]
templates/sv/samba-exported.tmpl [deleted file]
templates/sv/search.tmpl [deleted file]
templates/sv/set-printer-options-header.tmpl [deleted file]
templates/sv/set-printer-options-trailer.tmpl [deleted file]
templates/sv/test-page.tmpl [deleted file]
templates/sv/trailer.tmpl [deleted file]
templates/sv/users.tmpl [deleted file]
templates/trailer.tmpl
templates/users.tmpl
templates/zh_TW/add-class.tmpl [deleted file]
templates/zh_TW/add-printer.tmpl [deleted file]
templates/zh_TW/admin.tmpl [deleted file]
templates/zh_TW/choose-device.tmpl [deleted file]
templates/zh_TW/choose-make.tmpl [deleted file]
templates/zh_TW/choose-model.tmpl [deleted file]
templates/zh_TW/choose-serial.tmpl [deleted file]
templates/zh_TW/choose-uri.tmpl [deleted file]
templates/zh_TW/class-added.tmpl [deleted file]
templates/zh_TW/class-confirm.tmpl [deleted file]
templates/zh_TW/class-deleted.tmpl [deleted file]
templates/zh_TW/class-jobs-header.tmpl [deleted file]
templates/zh_TW/class-modified.tmpl [deleted file]
templates/zh_TW/classes-header.tmpl [deleted file]
templates/zh_TW/classes.tmpl [deleted file]
templates/zh_TW/edit-config.tmpl [deleted file]
templates/zh_TW/error-op.tmpl [deleted file]
templates/zh_TW/error.tmpl [deleted file]
templates/zh_TW/header.tmpl.in [deleted file]
templates/zh_TW/help-header.tmpl [deleted file]
templates/zh_TW/help-printable.tmpl [deleted file]
templates/zh_TW/job-cancel.tmpl [deleted file]
templates/zh_TW/job-hold.tmpl [deleted file]
templates/zh_TW/job-move.tmpl [deleted file]
templates/zh_TW/job-moved.tmpl [deleted file]
templates/zh_TW/job-release.tmpl [deleted file]
templates/zh_TW/job-restart.tmpl [deleted file]
templates/zh_TW/jobs-header.tmpl [deleted file]
templates/zh_TW/jobs.tmpl [deleted file]
templates/zh_TW/maintenance.tmpl [deleted file]
templates/zh_TW/modify-class.tmpl [deleted file]
templates/zh_TW/modify-printer.tmpl [deleted file]
templates/zh_TW/option-boolean.tmpl [deleted file]
templates/zh_TW/option-conflict.tmpl [deleted file]
templates/zh_TW/option-header.tmpl [deleted file]
templates/zh_TW/option-pickmany.tmpl [deleted file]
templates/zh_TW/option-pickone.tmpl [deleted file]
templates/zh_TW/option-trailer.tmpl [deleted file]
templates/zh_TW/pager.tmpl [deleted file]
templates/zh_TW/printer-accept.tmpl [deleted file]
templates/zh_TW/printer-added.tmpl [deleted file]
templates/zh_TW/printer-configured.tmpl [deleted file]
templates/zh_TW/printer-confirm.tmpl [deleted file]
templates/zh_TW/printer-default.tmpl [deleted file]
templates/zh_TW/printer-deleted.tmpl [deleted file]
templates/zh_TW/printer-jobs-header.tmpl [deleted file]
templates/zh_TW/printer-modified.tmpl [deleted file]
templates/zh_TW/printer-purge.tmpl [deleted file]
templates/zh_TW/printer-reject.tmpl [deleted file]
templates/zh_TW/printer-start.tmpl [deleted file]
templates/zh_TW/printer-stop.tmpl [deleted file]
templates/zh_TW/printers-header.tmpl [deleted file]
templates/zh_TW/printers.tmpl [deleted file]
templates/zh_TW/restart.tmpl [deleted file]
templates/zh_TW/samba-export.tmpl [deleted file]
templates/zh_TW/samba-exported.tmpl [deleted file]
templates/zh_TW/search.tmpl [deleted file]
templates/zh_TW/set-printer-options-header.tmpl [deleted file]
templates/zh_TW/set-printer-options-trailer.tmpl [deleted file]
templates/zh_TW/test-page.tmpl [deleted file]
templates/zh_TW/trailer.tmpl [deleted file]
templates/zh_TW/users.tmpl [deleted file]
tools/makesrcdist
tools/testosx

diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt
new file mode 100644 (file)
index 0000000..c71003c
--- /dev/null
@@ -0,0 +1,361 @@
+CHANGES-1.3.txt
+---------------
+
+CHANGES IN CUPS V1.3.4
+
+       - Updated the Japanese localization (STR #2546)
+       - The parallel backend now gets the current IEEE-1284
+         device ID string on Linux (STR #2553)
+       - The IPP backend now checks the job status at
+         variable intervals (from 1 to 10 seconds) instead
+         of every 10 seconds for faster remote printing
+         (STR #2548)
+       - "lpr -p" and "lpr -l" did not work (STR #2544)
+       - Compilation failed when a previous version of CUPS
+         was installed and was included in the SSL include
+         path (STR #2538)
+       - The scheduler did not reject requests with charsets
+         other than US-ASCII or UTF-8, and the CUPS API
+         incorrectly passed the locale charset to the scheduler
+         instead of UTF-8 (STR #2537)
+       - cups-deviced did not filter out duplicate devices.
+       - The AppleTalk backend incorrectly added a scheme
+         listing when AppleTalk was disabled or no printers
+         were found.
+       - The PostScript filter generated N^2 copies when the
+         printer supported collated copies and user requested
+         reverse-order output.
+       - The scheduler did not reprint all of the files in a
+         job that was held.
+       - The scheduler did not update the printcap file after
+         removing stale remote queues.
+       - The cupsd.conf man page incorrectly referenced
+         "AuthType Kerberos" instead of "AuthType Negotiate".
+
+
+CHANGES IN CUPS V1.3.3
+
+       - The scheduler did not use the attributes-natural-language
+         attribute when passing the LANG environment variable to
+         cups-deviced or cups-driverd.
+       - The scheduler did not use the printer-op-policy when
+         modifying classes or printers (STR #2525)
+       - The auth-info-required attribute was not always updated
+         for remote queues that required authentication.
+       - The German web interface localization contained errors
+         (STR #2523)
+       - The Swedish localization contained errors (STR #2522)
+
+
+CHANGES IN CUPS V1.3.2
+
+       - The 1.3.1 release was incorrectly created from the
+         1.4.x source tree (STR #2519)
+       - Added support for 32/64-bit libraries on HP-UX
+         (STR #2520)
+       - The scheduler incorrectly used portrait as the default
+         orientation (STR #2513)
+       - The scheduler no longer writes the printcap file for
+         every remote printer update (STR #2512)
+       - Remote raw printing with multiple copies did not work
+         (STR #2518)
+       - Updated the configure script to require at least autoconf
+         2.60 (STR #2515)
+       - Some gzip'd PPD files were not read in their entirety
+         (STR #2510)
+
+
+CHANGES IN CUPS V1.3.1
+
+       - Documentation updates.
+       - The USB backend on Mac OS X could hang if the driver and
+          printer did not match.
+       - Delegated Kerberos credentials were not working.
+       - "make distclean" incorrectly removed the edit-config.tmpl
+         files (STR #2508)
+       - Fix compile problem on HP-UX (STR #2501)
+       - The cupstestppd utility now tests for resolutions greater
+         than 99999 DPI to detect a missing  "x" between the X and Y
+         resolutions.
+       - Fixed many problems in the various translations and added
+         a new "checkpo" utility to validate them.
+       - The cupstestppd utility now tests the custom page size code
+         for CUPS raster drivers.
+       - cupsLangDefault() did not attempt to return a language that
+         was supported by the calling application.
+       - If a remote printer stopped while a job was being sent, the
+         local queue would also get stopped and the job re-queued,
+         resulting in duplicate prints in some cases.
+       - A few Apple-specific job options needed to be omitted when
+         printing a banner page.
+       - The new peer credential support did not compile on FreeBSD
+         (STR #2495)
+       - Direct links to help files did not set the current section
+         so the table-of-contents was not shown.
+       - The configure script did not support --localedir=foo (STR #2488)
+       - The backends were not displaying their localized messages.
+       - CUPS-Authenticate-Job did not require Kerberos authentication
+         on queues protected by Kerberos.
+       - The Zebra ZPL driver did not work with Brady label printers
+         (STR #2487)
+       - Norwegian wasn't localized on Mac OS X.
+       - getnameinfo() returns an error on some systems when DNS is
+         not available, leading to numerous problems (STR #2486)
+       - The cupsfilter command did not work properly on Mac OS X.
+       - The scheduler makefile contained a typo (STR #2483)
+       - The TBCP and BCP port monitors did not handle the trailing
+         CTRL-D in some PostScript output properly.
+       - Fixed the localization instructions and German template for
+         the "Find New Printers" button (STR #2478)
+       - The web interface did not work with the Chinese localization
+         (STR #2477)
+       - The web interface home page did not work for languages that
+         were only partially localized (STR #2472)
+       - Updated the Spanish web interface localization (STR #2473)
+       - ppdLocalize() did not work for country-specific localizations.
+
+
+CHANGES IN CUPS V1.3.0
+
+       - The scheduler did not handle out-of-file conditions
+         gracefully when accepting new connections, leading to
+         heavy CPU usage.
+       - The scheduler did not detect ServerBin misconfigurations
+         (STR #2470)
+       - "AuthType Default" did not work as expected when the
+         "DefaultAuthType foo" line appeared after it in the
+         cupsd.conf file.
+       - The on-line help did not describe many common printing
+         options (STR #1846)
+       - The IPP backend did not return the "auth required" status
+         when printing to a Kerberos-protected queue.
+       - The scheduler was not looking in the correct directories
+         for LSB PPD files (STR #2464)
+       - Changed references to ESP Ghostscript to GPL Ghostscript
+         (STR #2463)
+       - The PostScript filter did not cleanly terminate when
+         the job was canceled or stopped.
+       - Fixed generation of Kerberos credentials for remote
+         printing.  Note that this requires a recent version of
+         MIT Kerberos with a working krb5_cc_new_unique()
+         function or Heimdal Kerberos.
+       - Added Portuguese and updated Italian message catalogs.
+
+
+CHANGES IN CUPS V1.3rc2
+
+       - Added more range checking to the pdftops filter. 
+       - The scheduler would crash if a remote IPP queue was stopped
+         (STR #2460)
+       - The scheduler did not allow "DefaultAuthType None".
+
+
+CHANGES IN CUPS V1.3rc1
+
+       - Updated the German localization (STR #2443)
+       - cupsAdminGetServerSettings() did not handle </Foo> properly.
+       - When lprm and cancel are run with no job ID, they now will
+         cancel the first stopped job if no pending or processing
+         jobs are left in the queue.
+       - The scheduler now logs successful print jobs, filter
+         failures, and the job file types at the default log
+         level (STR #2458)
+       - The scheduler now logs the usernames it is using for
+         authorization at LogLevel debug instead of debug2 (STR #2448)
+       - Added Intellitech Intellibar and Zebra CPCL PPDs to the list
+         of installed PPDs.
+       - Added 6" and 8" wide label sizes for the Zebra ZPL Label
+         Printer driver (STR #2442)
+       - The cupsaddsmb program and web interface now support
+         exporting of 64-bit Windows drivers, when available
+         (STR #2439)
+       - Moving a job that was printing did not stop the job on the
+         original printer (STR #2262)
+       - The cups-lpd mini-daemon did not work on Mac OS X server.
+       - Added httpGetAuthString() and httpSetAuthString() APIs to get
+         and set the current (cached) authorization string to use for
+         HTTP requests.
+       - Updated the default cupsd.conf policy to list the
+         "administrative" operations separately from the "printer
+         control" operations so that it is easier to define a
+         group of users that are "printer operators".
+       - The web interface now pulls the default cupsd.conf file
+         from cupsd.conf.default in the CUPS config directory.
+       - Added a help file for using Kerberos with CUPS.
+       - The scheduler now strips the "@KDC" portion of Kerberos
+         usernames since those usernames typically do not appear in
+         the group membership lists used by CUPS.
+       - cupsMarkOptions() could (incorrectly) leave multiple option
+         choices marked.
+       - Backends could (incorrectly) run as root during discovery
+         (STR #2454)
+       - Avahi is now supported for DNS-SD (Bonjour) printer sharing
+         (STR #2455)
+       - The default cupsd.conf file had typos and old operation names
+         (STR #2450)
+       - The scheduler now erases authentication cache files using the
+         7-pass US DoD algorithm.
+       - Delegated Kerberos credentials (proxy authentication) did not
+         work.
+       - The filter makefile did not optimize the libcupsimage.2.dylib
+         with a sectorder file.
+       - The IPP backend incorrectly wrote an empty printer message
+         when processing the "none" state reason.
+       - The USB backend could deadlock on Mac OS X while performing
+         a side-channel command.
+       - The scheduler did not prevent remote queues from being
+         shared/published.
+       - The scheduler did not remove the temporary request file on
+         authentication errors.
+       - ppdLocalizeIPPReason() did not handle "scheme:" schemes or
+         "file" URLs.
+       - ppdLocalizeIPPReason() was not exported on Mac OS X.
+
+
+CHANGES IN CUPS V1.3b1
+
+       - Copyright updates - CUPS is now owned by Apple Inc.
+       - Documentation updates (STR #1775, STR #2027, STR #2130,
+         STR #2131, STR #2263, STR #2356, STR #2397)
+       - Added new cupsfilter utility (STR #1734)
+       - Added new job-printer-state-message and
+         job-printer-state-reasons attributes to jobs (STR #2418)
+       - Added LDAP+SSL support (STR #1967)
+       - CUPS now supports authentication via peer credentials
+         over domain sockets (STR #2242, STR #2277)
+       - The CUPS sample driver PPDs are now generated by the PPD
+         compiler and include all of the localized languages by
+         default (STR #2164)
+       - You can now specify "AuthType Default" in the cupsd.conf
+         file to use the default authentication defined by the
+         DefaultAuthType directive.
+       - The SNMP backend no longer adds a default Address line
+         when none is specified in the snmp.conf file; this allows
+         the backend to be easily disabled as needed (STR #2434)
+       - Added a new cupsctl command for doing basic changes to
+         the cupsd.conf file (STR #1777)
+       - Added a new ppdLocalizeIPPReason() function to get the
+         localized text/URI for a given IPP reason keyword for a
+         driver.
+       - Removed the deskjet2.ppd driver, as it only worked with
+         a very small subset of HP DeskJet printers and was
+         confusing to users.  The rastertohp driver still
+         supports the deskjet2.ppd options for existing queues.
+       - The scheduler did not add a trailing banner page if a
+         client did not specify the last document in a job (STR
+         #1711)
+       - The scheduler did not report Bonjour shared printers as
+         remote printers (STR #2384)
+       - Added new -R and -W options to the cupstestppd program
+         for greater control over the testing of PPDs.
+       - Added a new cupsGetServerPPD() function for getting
+         an available PPD from the server (STR #2334)
+       - Added a new cupsDoIORequest() function for reading
+         and writing files via IPP requests (STR #2334)
+       - Added a new CUPS_GET_PPD operation for getting an
+         available PPD file on the server (STR #2334) 
+       - CUPS_GET_PPDS now reports multiple ppd-product values
+         based on the PPD ModelName and Product strings (STR
+         #2334, STR #2383)
+       - CUPS_GET_PPDS now reports the PSVersion attributes
+         from a PPD file in the ppd-psversion attribute
+         (STR #2334)
+       - CUPS_GET_PPDS now reports the cupsModelNumber attribute
+         from a PPD file in the ppd-model-number attribute (STR
+         #2383)
+       - CUPS_GET_PPDS now reports a driver type string in the
+         ppd-type attribute based on the cupsFax and cupsFilter
+         attributes in a PPD file (STR #2383)
+       - Added a new printer attribute called "cups-version"
+         which reports the version of CUPS that is running
+         (STR #2240)
+       - backendRunLoop() now aborts immediately on SIGTERM
+         if no data has been written yet (STR #2103)
+       - Due to poor IPP support from the vendors, the SNMP
+         backend no longer tries IPP connections; instead,
+         it now uses a lookup file with fallback to port 9100
+         (socket://address) and 515 (lpd://address) printing
+         (STR #2035, STR #2354) 
+       - The scheduler now recreates the CUPS log directory as
+         needed (STR #2353)
+       - cupsLangDefault() now maps new-style Apple locale names
+         to the traditional ll_CC form (STR #2357)
+        - Add new cupsArrayNew2() API to support hashed lookups
+          of array elements (STR #2358)
+        - ppdConflicts() optimizations (STR #2358)
+       - The cupstestppd program now tests for existing filters,
+         icons, profiles, and dialog extensions (STR #2326)
+       - The web interface no longer lists new printers on the
+         main administration page.  Instead, a new "List Available
+         Printers" button is provided that shows a separate page
+         with the list of printers.
+       - The web interface now supports setting the banner and
+         policy options on raw printers and classes (STR #2238)
+       - The socket backend now reads any pending back-channel
+         data before shutting down the socket (STR #2325)
+       - Added a new ErrorPolicy directive in the cupsd.conf
+         file (STR #1871)
+       - Printers that use JCL options are now exported to Samba
+         correctly (STR #1985)
+       - The IPP backend now relays printer-state-message values
+         from the server to the client (STR #2109)
+       - Added support for the PWG printer-alert and
+         printer-alert-description attributes (STR #2088)
+       - Added support for LPD "stream" mode (STR #2036)
+       - The scheduler now reports the PostScript product string
+         from PPD files in CUPS-Get-PPDs responses (STR #1900)
+       - Raw printing with queues pointing to the file pseudo-
+         device and multiple files and/or banners now works (STR
+         #1933)
+       - Added new public cupsAdminGetServerSettings() and
+         cupsAdminSetServerSettings() APIs.
+       - Added new "makebuttons" script in the "tools" directory
+         for creating web interface buttons (STR #2231)
+       - Added support for DNS-SD (aka "Bonjour") printer sharing
+         (STR #1171)
+       - Job operations (cancel, hold, release, etc.) from the
+         web interface now return back to the original page (STR
+         #2239)
+       - The classes or printers list is now shown after a
+         successful deletion from the web interface (STR #1999)
+       - The default configuration now allows browse packets from
+         any address (STR #2008)
+       - The web interface now provides an "allow printing from the
+         Internet" check box (STR #1897)
+       - The notify-events-default and
+         notify-lease-duration-default attributes can now be set
+         (STR #1671)
+       - Server-side default options are now sent to clients when
+         the "printer-defaults" attribute group is requested (STR
+         #1923)
+       - Added support for Linux "relro" linker option (STR #1614)
+       - CUPS now validates the number-up option value (STR #1329)
+       - The on-line help now provides better search capabilities
+         (STR #1701)
+       - The web interface "Add This Printer" button now allows you
+         to change the printer name, description,  and location
+         (STR #1646)
+       - Added support for Mac OS X authorization services
+         (STR #2206)
+       - Added support for driver-specific pre-filters (STR #2108)
+       - Added a new side-channel API for drivers and backends
+         for basic device control and information queries (STR
+         #1898)
+       - The scheduler now uses poll(), epoll(), or /dev/kqueue
+         instead of select() when possible (STR #1261)
+       - Added new cupsArrayGetIndex() and cupsArrayGetInsert()
+         functions to get the current index and insertion
+         positions of an array.
+       - Added a new --with-max-copies configure option (STR
+         #2090)
+       - Added new cupsRemoveDest() and cupsSetDefaultDest()
+         functions.
+       - Added support for cupsPJLCharset attribute in PPD files
+         which specifies the character set that is used in PJL
+         strings (STR #1969)
+       - Moved the definition of the (private) _http_s structure
+         to http-private.h; code that directly accesses the
+         http_t members will no longer compile!
+       - Added support for setting the document-format-default
+         attribute on a per-printer basis.
+       - Added support for IntelliBar label printers.
index 489bfb42850822832991844969d8366068c69bb9..525666acbca7f51536f1e828bbfb4359f82099eb 100644 (file)
-CHANGES.txt - 2007-09-28
+CHANGES.txt - 2007-09-07
 ------------------------
 
-CHANGES IN CUPS V1.3.3
+CHANGES IN CUPS V1.4b1
+
+       - The web interface now enables/disables the printer
+         sharing (formerly publishing) controls based on the
+         server-is-sharing-printers state (STR #2233)
+       - The scheduler now tracks printer sharing via the
+         server-is-sharing-printers attribute, and manages LPD
+         and SMB sharing as well (STR #2233)
+       - The web interface now allows you to go back to the make/
+         manufacturer page if there is no matching printer driver
+         on the model page (STR #2436)
+       - The printer list now shows the default media, banner, and
+         duplex options as well as the color and duplex capabilities
+         of printers (STR #1175)
+       - The web interface look-n-feel has been updated (STR #2492)
+       - The scheduler now supports a CUPS-Get-Document operation
+         that returns the specified print job document (STR #118)
+       - The cupsfilter utility now supports a "-J jobid" option
+         to filter the document from the specified job.
+       - The scheduler (cupsd) now supports a new option (-t) to
+         do a syntax check of the cupsd.conf file (STR #2003)
+       - Added new cupsGetPPD3() API to allow applications to
+         cache PPDs safely (STR #1473)
+       - Added generic PostScript and PCL printer driver PPDs.
 
-       - The scheduler did not use the attributes-natural-language
-         attribute when passing the LANG environment variable to
-         cups-deviced or cups-driverd.
-       - The scheduler did not use the printer-op-policy when
-         modifying classes or printers (STR #2525)
-       - The auth-info-required attribute was not always updated
-         for remote queues that required authentication.
-       - The German web interface localization contained errors
-         (STR #2523)
-       - The Swedish localization contained errors (STR #2522)
-
-
-CHANGES IN CUPS V1.3.2
-
-       - The 1.3.1 release was incorrectly created from the
-         1.4.x source tree (STR #2519)
-       - Added support for 32/64-bit libraries on HP-UX
-         (STR #2520)
-       - The scheduler incorrectly used portrait as the default
-         orientation (STR #2513)
-       - The scheduler no longer writes the printcap file for
-         every remote printer update (STR #2512)
-       - Remote raw printing with multiple copies did not work
-         (STR #2518)
-       - Updated the configure script to require at least autoconf
-         2.60 (STR #2515)
-       - Some gzip'd PPD files were not read in their entirety
-         (STR #2510)
-
-
-CHANGES IN CUPS V1.3.1
-
-       - Documentation updates.
-       - The USB backend on Mac OS X could hang if the driver and
-         printer did not match.
-       - Delegated Kerberos credentials were not working.
-       - "make distclean" incorrectly removed the edit-config.tmpl
-         files (STR #2508)
-       - Fix compile problem on HP-UX (STR #2501)
-       - The cupstestppd utility now tests for resolutions greater
-         than 99999 DPI to detect a missing  "x" between the X and Y
-         resolutions.
-       - Fixed many problems in the various translations and added
-         a new "checkpo" utility to validate them.
-       - The cupstestppd utility now tests the custom page size code
-         for CUPS raster drivers.
-       - cupsLangDefault() did not attempt to return a language that
-         was supported by the calling application.
-       - If a remote printer stopped while a job was being sent, the
-         local queue would also get stopped and the job re-queued,
-         resulting in duplicate prints in some cases.
-       - A few Apple-specific job options needed to be omitted when
-         printing a banner page.
-       - The new peer credential support did not compile on FreeBSD
-         (STR #2495)
-       - Direct links to help files did not set the current section
-         so the table-of-contents was not shown.
-       - The configure script did not support --localedir=foo (STR #2488)
-       - The backends were not displaying their localized messages.
-       - CUPS-Authenticate-Job did not require Kerberos authentication
-         on queues protected by Kerberos.
-       - The Zebra ZPL driver did not work with Brady label printers
-         (STR #2487)
-       - Norwegian wasn't localized on Mac OS X.
-       - getnameinfo() returns an error on some systems when DNS is
-         not available, leading to numerous problems (STR #2486)
-       - The cupsfilter command did not work properly on Mac OS X.
-       - The scheduler makefile contained a typo (STR #2483)
-       - The TBCP and BCP port monitors did not handle the trailing
-         CTRL-D in some PostScript output properly.
-       - Fixed the localization instructions and German template for
-         the "Find New Printers" button (STR #2478)
-       - The web interface did not work with the Chinese localization
-         (STR #2477)
-       - The web interface home page did not work for languages that
-         were only partially localized (STR #2472)
-       - Updated the Spanish web interface localization (STR #2473)
-       - ppdLocalize() did not work for country-specific localizations.
-
-
-CHANGES IN CUPS V1.3.0
-
-       - The scheduler did not handle out-of-file conditions
-         gracefully when accepting new connections, leading to
-         heavy CPU usage.
-       - The scheduler did not detect ServerBin misconfigurations
-         (STR #2470)
-       - "AuthType Default" did not work as expected when the
-         "DefaultAuthType foo" line appeared after it in the
-         cupsd.conf file.
-       - The on-line help did not describe many common printing
-         options (STR #1846)
-       - The IPP backend did not return the "auth required" status
-         when printing to a Kerberos-protected queue.
-       - The scheduler was not looking in the correct directories
-         for LSB PPD files (STR #2464)
-       - Changed references to ESP Ghostscript to GPL Ghostscript
-         (STR #2463)
-       - The PostScript filter did not cleanly terminate when
-         the job was canceled or stopped.
-       - Fixed generation of Kerberos credentials for remote
-         printing.  Note that this requires a recent version of
-         MIT Kerberos with a working krb5_cc_new_unique()
-         function or Heimdal Kerberos.
-       - Added Portuguese and updated Italian message catalogs.
-
-
-CHANGES IN CUPS V1.3rc2
-
-       - Added more range checking to the pdftops filter. 
-       - The scheduler would crash if a remote IPP queue was stopped
-         (STR #2460)
-       - The scheduler did not allow "DefaultAuthType None".
-
-
-CHANGES IN CUPS V1.3rc1
-
-       - Updated the German localization (STR #2443)
-       - cupsAdminGetServerSettings() did not handle </Foo> properly.
-       - When lprm and cancel are run with no job ID, they now will
-         cancel the first stopped job if no pending or processing
-         jobs are left in the queue.
-       - The scheduler now logs successful print jobs, filter
-         failures, and the job file types at the default log
-         level (STR #2458)
-       - The scheduler now logs the usernames it is using for
-         authorization at LogLevel debug instead of debug2 (STR #2448)
-       - Added Intellitech Intellibar and Zebra CPCL PPDs to the list
-         of installed PPDs.
-       - Added 6" and 8" wide label sizes for the Zebra ZPL Label
-         Printer driver (STR #2442)
-       - The cupsaddsmb program and web interface now support
-         exporting of 64-bit Windows drivers, when available
-         (STR #2439)
-       - Moving a job that was printing did not stop the job on the
-         original printer (STR #2262)
-       - The cups-lpd mini-daemon did not work on Mac OS X server.
-       - Added httpGetAuthString() and httpSetAuthString() APIs to get
-         and set the current (cached) authorization string to use for
-         HTTP requests.
-       - Updated the default cupsd.conf policy to list the
-         "administrative" operations separately from the "printer
-         control" operations so that it is easier to define a
-         group of users that are "printer operators".
-       - The web interface now pulls the default cupsd.conf file
-         from cupsd.conf.default in the CUPS config directory.
-       - Added a help file for using Kerberos with CUPS.
-       - The scheduler now strips the "@KDC" portion of Kerberos
-         usernames since those usernames typically do not appear in
-         the group membership lists used by CUPS.
-       - cupsMarkOptions() could (incorrectly) leave multiple option
-         choices marked.
-       - Backends could (incorrectly) run as root during discovery
-         (STR #2454)
-       - Avahi is now supported for DNS-SD (Bonjour) printer sharing
-         (STR #2455)
-       - The default cupsd.conf file had typos and old operation names
-         (STR #2450)
-       - The scheduler now erases authentication cache files using the
-         7-pass US DoD algorithm.
-       - Delegated Kerberos credentials (proxy authentication) did not
-         work.
-       - The filter makefile did not optimize the libcupsimage.2.dylib
-         with a sectorder file.
-       - The IPP backend incorrectly wrote an empty printer message
-         when processing the "none" state reason.
-       - The USB backend could deadlock on Mac OS X while performing
-         a side-channel command.
-       - The scheduler did not prevent remote queues from being
-         shared/published.
-       - The scheduler did not remove the temporary request file on
-         authentication errors.
-       - ppdLocalizeIPPReason() did not handle "scheme:" schemes or
-         "file" URLs.
-       - ppdLocalizeIPPReason() was not exported on Mac OS X.
-
-
-CHANGES IN CUPS V1.3b1
-
-       - Copyright updates - CUPS is now owned by Apple Inc.
-       - Documentation updates (STR #1775, STR #2027, STR #2130,
-         STR #2131, STR #2263, STR #2356, STR #2397)
-       - Added new cupsfilter utility (STR #1734)
-       - Added new job-printer-state-message and
-         job-printer-state-reasons attributes to jobs (STR #2418)
-       - Added LDAP+SSL support (STR #1967)
-       - CUPS now supports authentication via peer credentials
-         over domain sockets (STR #2242, STR #2277)
-       - The CUPS sample driver PPDs are now generated by the PPD
-         compiler and include all of the localized languages by
-         default (STR #2164)
-       - You can now specify "AuthType Default" in the cupsd.conf
-         file to use the default authentication defined by the
-         DefaultAuthType directive.
-       - The SNMP backend no longer adds a default Address line
-         when none is specified in the snmp.conf file; this allows
-         the backend to be easily disabled as needed (STR #2434)
-       - Added a new cupsctl command for doing basic changes to
-         the cupsd.conf file (STR #1777)
-       - Added a new ppdLocalizeIPPReason() function to get the
-         localized text/URI for a given IPP reason keyword for a
-         driver.
-       - Removed the deskjet2.ppd driver, as it only worked with
-         a very small subset of HP DeskJet printers and was
-         confusing to users.  The rastertohp driver still
-         supports the deskjet2.ppd options for existing queues.
-       - The scheduler did not add a trailing banner page if a
-         client did not specify the last document in a job (STR
-         #1711)
-       - The scheduler did not report Bonjour shared printers as
-         remote printers (STR #2384)
-       - Added new -R and -W options to the cupstestppd program
-         for greater control over the testing of PPDs.
-       - Added a new cupsGetServerPPD() function for getting
-         an available PPD from the server (STR #2334)
-       - Added a new cupsDoIORequest() function for reading
-         and writing files via IPP requests (STR #2334)
-       - Added a new CUPS_GET_PPD operation for getting an
-         available PPD file on the server (STR #2334) 
-       - CUPS_GET_PPDS now reports multiple ppd-product values
-         based on the PPD ModelName and Product strings (STR
-         #2334, STR #2383)
-       - CUPS_GET_PPDS now reports the PSVersion attributes
-         from a PPD file in the ppd-psversion attribute
-         (STR #2334)
-       - CUPS_GET_PPDS now reports the cupsModelNumber attribute
-         from a PPD file in the ppd-model-number attribute (STR
-         #2383)
-       - CUPS_GET_PPDS now reports a driver type string in the
-         ppd-type attribute based on the cupsFax and cupsFilter
-         attributes in a PPD file (STR #2383)
-       - Added a new printer attribute called "cups-version"
-         which reports the version of CUPS that is running
-         (STR #2240)
-       - backendRunLoop() now aborts immediately on SIGTERM
-         if no data has been written yet (STR #2103)
-       - Due to poor IPP support from the vendors, the SNMP
-         backend no longer tries IPP connections; instead,
-         it now uses a lookup file with fallback to port 9100
-         (socket://address) and 515 (lpd://address) printing
-         (STR #2035, STR #2354) 
-       - The scheduler now recreates the CUPS log directory as
-         needed (STR #2353)
-       - cupsLangDefault() now maps new-style Apple locale names
-         to the traditional ll_CC form (STR #2357)
-        - Add new cupsArrayNew2() API to support hashed lookups
-          of array elements (STR #2358)
-        - ppdConflicts() optimizations (STR #2358)
-       - The cupstestppd program now tests for existing filters,
-         icons, profiles, and dialog extensions (STR #2326)
-       - The web interface no longer lists new printers on the
-         main administration page.  Instead, a new "List Available
-         Printers" button is provided that shows a separate page
-         with the list of printers.
-       - The web interface now supports setting the banner and
-         policy options on raw printers and classes (STR #2238)
-       - The socket backend now reads any pending back-channel
-         data before shutting down the socket (STR #2325)
-       - Added a new ErrorPolicy directive in the cupsd.conf
-         file (STR #1871)
-       - Printers that use JCL options are now exported to Samba
-         correctly (STR #1985)
-       - The IPP backend now relays printer-state-message values
-         from the server to the client (STR #2109)
-       - Added support for the PWG printer-alert and
-         printer-alert-description attributes (STR #2088)
-       - Added support for LPD "stream" mode (STR #2036)
-       - The scheduler now reports the PostScript product string
-         from PPD files in CUPS-Get-PPDs responses (STR #1900)
-       - Raw printing with queues pointing to the file pseudo-
-         device and multiple files and/or banners now works (STR
-         #1933)
-       - Added new public cupsAdminGetServerSettings() and
-         cupsAdminSetServerSettings() APIs.
-       - Added new "makebuttons" script in the "tools" directory
-         for creating web interface buttons (STR #2231)
-       - Added support for DNS-SD (aka "Bonjour") printer sharing
-         (STR #1171)
-       - Job operations (cancel, hold, release, etc.) from the
-         web interface now return back to the original page (STR
-         #2239)
-       - The classes or printers list is now shown after a
-         successful deletion from the web interface (STR #1999)
-       - The default configuration now allows browse packets from
-         any address (STR #2008)
-       - The web interface now provides an "allow printing from the
-         Internet" check box (STR #1897)
-       - The notify-events-default and
-         notify-lease-duration-default attributes can now be set
-         (STR #1671)
-       - Server-side default options are now sent to clients when
-         the "printer-defaults" attribute group is requested (STR
-         #1923)
-       - Added support for Linux "relro" linker option (STR #1614)
-       - CUPS now validates the number-up option value (STR #1329)
-       - The on-line help now provides better search capabilities
-         (STR #1701)
-       - The web interface "Add This Printer" button now allows you
-         to change the printer name, description,  and location
-         (STR #1646)
-       - Added support for Mac OS X authorization services
-         (STR #2206)
-       - Added support for driver-specific pre-filters (STR #2108)
-       - Added a new side-channel API for drivers and backends
-         for basic device control and information queries (STR
-         #1898)
-       - The scheduler now uses poll(), epoll(), or /dev/kqueue
-         instead of select() when possible (STR #1261)
-       - Added new cupsArrayGetIndex() and cupsArrayGetInsert()
-         functions to get the current index and insertion
-         positions of an array.
-       - Added a new --with-max-copies configure option (STR
-         #2090)
-       - Added new cupsRemoveDest() and cupsSetDefaultDest()
-         functions.
-       - Added support for cupsPJLCharset attribute in PPD files
-         which specifies the character set that is used in PJL
-         strings (STR #1969)
-       - Moved the definition of the (private) _http_s structure
-         to http-private.h; code that directly accesses the
-         http_t members will no longer compile!
-       - Added support for setting the document-format-default
-         attribute on a per-printer basis.
-       - Added support for IntelliBar label printers.
index 8b32d9cbaadddb7bc8a0f690014ae73940912dcc..5732830f39d8ad67cef918a6f48e0e8a9e34e8fb 100644 (file)
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.3.2 - 2007-09-18
+INSTALL - CUPS v1.3.0 - 2007-08-13
 ----------------------------------
 
 This file describes how to compile and install CUPS from source
index ab06b0ce147bab2043a99090006db2d1b7a7bfda..258d577b431e07aa41972c3e5864b8d2115ec8f0 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 6687 2007-07-18 19:49:45Z mike $"
+# "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -108,8 +108,8 @@ INSTALLSTATIC       =       @INSTALLSTATIC@
 #               for extra debug info)
 #
 
-ALL_CFLAGS     =       $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
-                       $(OPTIONS) $(CFLAGS)
+ALL_CFLAGS     =       $(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+                       $(OPTIONS)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -272,5 +272,5 @@ DBUSDIR             =       @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 6687 2007-07-18 19:49:45Z mike $"
+# End of "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
 #
index 62cee85c0557852b99923c495e1c1483f0d310f3..9722914913139c68f6098a819b4230b0ee41701e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6945 2007-09-12 17:08:32Z mike $"
+# "$Id: Makefile 6897 2007-08-30 06:11:59Z mike $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -281,5 +281,5 @@ dist:       all
 
 
 #
-# End of "$Id: Makefile 6945 2007-09-12 17:08:32Z mike $".
+# End of "$Id: Makefile 6897 2007-08-30 06:11:59Z mike $".
 #
index 3b3fd17e37523ad4bbadd79df1fb8ea40b13b68a..48fee5a99a5afe9a2e7c26fb8cda7b6f7cde199c 100644 (file)
@@ -1,4 +1,4 @@
-README - CUPS v1.3.2 - 2007-09-18
+README - CUPS v1.3.0 - 2007-08-13
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
index 2e0f2b242b8d87af35804548044d5c2de7a682f7..5fab7ec84ba53faddb5b1d923a53ba9e27b57f8f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1284.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: ieee1284.c 7019 2007-10-10 22:48:52Z mike $"
  *
  *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
  *
 #  include <linux/lp.h>
 #  define IOCNR_GET_DEVICE_ID          1
 #  define LPIOC_GET_DEVICE_ID(len)     _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
+#  include <linux/parport.h>
+#  include <linux/ppdev.h>
+#  include <unistd.h>
+#  include <fcntl.h>
 #endif /* __linux */
 
 #ifdef __sun
@@ -68,6 +72,7 @@ backendGetDeviceID(
   int  manulen;                        /* Length of manufacturer string */
 #ifdef __linux
   int  length;                         /* Length of device ID info */
+  int   got_id = 0;
 #endif /* __linux */
 #if defined(__sun) && defined(ECPPIOC_GETDEVID)
   struct ecpp_device_id did;           /* Device ID buffer */
@@ -93,9 +98,6 @@ backendGetDeviceID(
   if (make_model)
     *make_model = '\0';
 
-  if (uri)
-    *uri = '\0';
-
   if (fd >= 0)
   {
    /*
@@ -105,7 +107,83 @@ backendGetDeviceID(
     *device_id = '\0';
 
 #ifdef __linux
-    if (!ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
+  if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
+  {
+   /*
+    * Linux has to implement things differently for every device it seems.
+    * Since the standard parallel port driver does not provide a simple
+    * ioctl() to get the 1284 device ID, we have to open the "raw" parallel
+    * device corresponding to this port and do some negotiation trickery
+    * to get the current device ID.
+    */
+
+    if (uri && !strncmp(uri, "parallel:/dev/", 14))
+    {
+      char     devparport[16];         /* /dev/parportN */
+      int      devparportfd,           /* File descriptor for raw device */
+               status,                 /* ioctl status */
+               mode;                   /* Port mode */
+
+
+     /*
+      * Since the Linux parallel backend only supports 4 parallel port
+      * devices, just grab the trailing digit and use it to construct a
+      * /dev/parportN filename...
+      */
+
+      snprintf(devparport, sizeof(devparport), "/dev/parport%s",
+               uri + strlen(uri) - 1);
+
+      if ((devparportfd = open(devparport, O_RDWR | O_NOCTTY)) != -1)
+      {
+       /*
+        * Claim the device...
+        */
+
+       if (!ioctl(devparportfd, PPCLAIM))
+       {
+          fcntl(devparport, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
+
+         mode = IEEE1284_MODE_COMPAT;
+
+         if (!ioctl(devparportfd, PPNEGOT, &mode))
+         {
+          /*
+           * Put the device into Device ID mode...
+           */
+
+           mode = IEEE1284_MODE_NIBBLE | IEEE1284_DEVICEID;
+
+           if (!ioctl(devparportfd, PPNEGOT, &mode))
+           {
+            /*
+             * Read the 1284 device ID...
+             */
+
+             if ((length = read(devparportfd, device_id,
+                                device_id_size - 1)) >= 2)
+              {
+               device_id[length] = '\0';
+               got_id = 1;
+             }
+           }
+         }
+
+         /*
+         * Release the device...
+         */
+
+         ioctl(devparportfd, PPRELEASE);
+       }
+
+        close(devparportfd);
+      }
+    }
+  }
+  else
+    got_id = 1;
+
+  if (got_id)
     {
      /*
       * Extract the length of the device ID string from the first two
@@ -168,6 +246,9 @@ backendGetDeviceID(
 
   DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));
 
+  if (scheme && uri)
+    *uri = '\0';
+
   if (!*device_id)
     return (-1);
 
@@ -494,5 +575,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id: ieee1284.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: ieee1284.c 7019 2007-10-10 22:48:52Z mike $".
  */
index 7cbea4df48ae464e5f7f82329110acaad0ca83e4..3dc0991fe0b1149cbcb2cd5358703934005be121 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 6967 2007-09-17 23:30:52Z mike $"
+ * "$Id: ipp.c 7018 2007-10-10 22:14:03Z mike $"
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
@@ -1055,7 +1055,7 @@ main(int  argc,                           /* I - Number of command-line args */
 
     _cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
 
-    for (; !job_cancelled;)
+    for (delay = 1; !job_cancelled;)
     {
      /*
       * Build an IPP_GET_JOB_ATTRIBUTES request...
@@ -1146,10 +1146,14 @@ main(int  argc,                         /* I - Number of command-line args */
       check_printer_state(http, uri, resource, argv[2], version, job_id);
 
      /*
-      * Wait 10 seconds before polling again...
+      * Wait 1-10 seconds before polling again...
       */
 
-      sleep(10);
+      sleep(delay);
+
+      delay ++;
+      if (delay > 10)
+        delay = 1;
     }
   }
 
@@ -1758,5 +1762,5 @@ sigterm_handler(int sig)          /* I - Signal */
 
 
 /*
- * End of "$Id: ipp.c 6967 2007-09-17 23:30:52Z mike $".
+ * End of "$Id: ipp.c 7018 2007-10-10 22:14:03Z mike $".
  */
index 322eebfade0dd16755577480d2240cea8a7927e6..53a6539c1f33f2240ef8965a6c40d88f6919d8f8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpd.c 6911 2007-09-04 20:35:08Z mike $"
+ * "$Id: lpd.c 6910 2007-09-04 20:34:29Z mike $"
  *
  *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
  *
@@ -1315,5 +1315,5 @@ sigterm_handler(int sig)          /* I - Signal */
 
 
 /*
- * End of "$Id: lpd.c 6911 2007-09-04 20:35:08Z mike $".
+ * End of "$Id: lpd.c 6910 2007-09-04 20:34:29Z mike $".
  */
index 7f04214fa07100a0465b2289071ec7a2641f9e1b..df177bb4a3b35bfb9d866fbcd0a71486dcda52ae 100644 (file)
@@ -1,5 +1,5 @@
 /*
-* "$Id: pap.c 6911 2007-09-04 20:35:08Z mike $"
+* "$Id: pap.c 7010 2007-10-10 21:08:51Z mike $"
 *
 * © Copyright 2004 Apple Computer, Inc. All rights reserved.
 * 
@@ -207,12 +207,7 @@ int main (int argc, const char * argv[])
 
   if (argc == 1 || (argc == 2 && strcmp(argv[1], "-discover") == 0))
   {
-    /* If listDevices() didn't find any devices or returns an error output a 
-    *  legacy style announcement.
-    *  
-    */
-    if (listDevices() <= 0)
-      puts("network pap \"Unknown\" \"AppleTalk Printer Access Protocol (pap)\"");
+    listDevices();
 
     return 0;
   }
@@ -291,7 +286,7 @@ static int listDevices(void)
   /* Make sure it's okay to use appletalk */
   if (!okayToUseAppleTalk())
   {
-    fprintf(stderr, "ERROR: AppleTalk disabled in System Preferences\n");
+    fprintf(stderr, "INFO: AppleTalk disabled in System Preferences\n");
     return -1;  /* Network is down */
   }
 
index 673e6a4c6844efd8cc3befdd66e2514d2cdcec8d..3167d4a994b3cfee196ada903cb6d1746eaaf390 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: parallel.c 6835 2007-08-22 18:34:34Z mike $"
+ * "$Id: parallel.c 7019 2007-10-10 22:48:52Z mike $"
  *
  *   Parallel port backend for the Common UNIX Printing System (CUPS).
  *
@@ -324,7 +324,8 @@ list_devices(void)
   char device[255],            /* Device filename */
        basedevice[255],        /* Base device filename for ports */
        device_id[1024],        /* Device ID string */
-       make_model[1024];       /* Make and model */
+       make_model[1024],       /* Make and model */
+       uri[1024];              /* Device URI */
 
 
   if (!access("/dev/parallel/", 0))
@@ -350,13 +351,15 @@ list_devices(void)
       * Now grab the IEEE 1284 device ID string...
       */
 
+      snprintf(uri, sizeof(uri), "parallel:%s", device);
+
       if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
                               make_model, sizeof(make_model),
-                             NULL, NULL, 0))
-       printf("direct parallel:%s \"%s\" \"%s LPT #%d\" \"%s\"\n", device,
+                             NULL, uri, sizeof(uri)))
+       printf("direct %s \"%s\" \"%s LPT #%d\" \"%s\"\n", uri,
               make_model, make_model, i + 1, device_id);
       else
-       printf("direct parallel:%s \"Unknown\" \"LPT #%d\"\n", device, i + 1);
+       printf("direct %s \"Unknown\" \"LPT #%d\"\n", uri, i + 1);
 
       close(fd);
     }
@@ -558,7 +561,7 @@ list_devices(void)
       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
     }
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int  i;                      /* Looping var */
   int  fd;                     /* File descriptor */
   char device[255];            /* Device filename */
@@ -667,5 +670,5 @@ side_cb(int print_fd,                       /* I - Print file */
 
 
 /*
- * End of "$Id: parallel.c 6835 2007-08-22 18:34:34Z mike $".
+ * End of "$Id: parallel.c 7019 2007-10-10 22:48:52Z mike $".
  */
index 0cd38bb61661a1d109dd4f484bcea18c97c999f0..2e32fd4b72183eb7f705d3ea882903f9b67c2f99 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: runloop.c 6835 2007-08-22 18:34:34Z mike $"
+ * "$Id: runloop.c 6834 2007-08-22 18:29:25Z mike $"
  *
  *   Common run loop APIs for the Common UNIX Printing System (CUPS).
  *
@@ -374,5 +374,5 @@ backendRunLoop(
 
 
 /*
- * End of "$Id: runloop.c 6835 2007-08-22 18:34:34Z mike $".
+ * End of "$Id: runloop.c 6834 2007-08-22 18:29:25Z mike $".
  */
index b3b267651da40bc5b17a5f2bc457c1b5c6dd0efb..36fc9b02d9fe3f1b215ac72aeeddcc4129d1c077 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi-irix.c 6835 2007-08-22 18:34:34Z mike $"
+ * "$Id: scsi-irix.c 6834 2007-08-22 18:29:25Z mike $"
  *
  *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
  *
@@ -236,5 +236,5 @@ print_device(const char *resource,  /* I - SCSI device */
 
 
 /*
- * End of "$Id: scsi-irix.c 6835 2007-08-22 18:34:34Z mike $".
+ * End of "$Id: scsi-irix.c 6834 2007-08-22 18:29:25Z mike $".
  */
index e7017e5722c3b95ce8ed3fac2f5ce04be41bd3ab..d0fc35cfc64dcaea2d2b5ec56f93dbff0fe50555 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi-linux.c 6835 2007-08-22 18:34:34Z mike $"
+ * "$Id: scsi-linux.c 6834 2007-08-22 18:29:25Z mike $"
  *
  *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
  *
@@ -255,5 +255,5 @@ print_device(const char *resource,  /* I - SCSI device */
 
 
 /*
- * End of "$Id: scsi-linux.c 6835 2007-08-22 18:34:34Z mike $".
+ * End of "$Id: scsi-linux.c 6834 2007-08-22 18:29:25Z mike $".
  */
index b0867316739c0347c348ad1ea97819169b04e7e4..3be80c0ded1c454eb7b14c77c758abff96ec93c6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi.c 6835 2007-08-22 18:34:34Z mike $"
+ * "$Id: scsi.c 6834 2007-08-22 18:29:25Z mike $"
  *
  *   SCSI printer backend for the Common UNIX Printing System (CUPS).
  *
@@ -225,5 +225,5 @@ main(int  argc,             /* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: scsi.c 6835 2007-08-22 18:34:34Z mike $".
+ * End of "$Id: scsi.c 6834 2007-08-22 18:29:25Z mike $".
  */
index 86410014901839f2919290edf04c84fb72699e68..08ee0193384fe2ccbd99fe152546a38f63fffd93 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: serial.c 6911 2007-09-04 20:35:08Z mike $"
+ * "$Id: serial.c 6910 2007-09-04 20:34:29Z mike $"
  *
  *   Serial port backend for the Common UNIX Printing System (CUPS).
  *
@@ -723,11 +723,11 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
 static void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   static char  *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
                                        /* Funky hex numbering used for some *
                                         * devices                           */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
 
 #ifdef __linux
   int                  i, j;           /* Looping vars */
@@ -1023,7 +1023,7 @@ list_devices(void)
       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
              device, i + 1);
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int  i, j;           /* Looping vars */
   int  fd;             /* File descriptor */
   char device[255];    /* Device filename */
@@ -1286,5 +1286,5 @@ side_cb(int print_fd,                     /* I - Print file */
 
 
 /*
- * End of "$Id: serial.c 6911 2007-09-04 20:35:08Z mike $".
+ * End of "$Id: serial.c 6910 2007-09-04 20:34:29Z mike $".
  */
index 6efcbf2f292efc4e384219c4c96c46a868edebe0..5d66a160616bbbe92c67d48c898a1cb98e58ec7f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c 6911 2007-09-04 20:35:08Z mike $"
+ * "$Id: socket.c 6910 2007-09-04 20:34:29Z mike $"
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
@@ -533,5 +533,5 @@ wait_bc(int device_fd,                      /* I - Socket */
 
 
 /*
- * End of "$Id: socket.c 6911 2007-09-04 20:35:08Z mike $".
+ * End of "$Id: socket.c 6910 2007-09-04 20:34:29Z mike $".
  */
index d90c85361eb7c4d1a2037ddd15cae4075aab180c..a71d836f5cb801b103a036e628bf43e4ae0beb15 100644 (file)
@@ -1,5 +1,5 @@
 /*
-* "$Id: usb-darwin.c 6996 2007-09-28 18:30:31Z mike $"
+* "$Id: usb-darwin.c 6993 2007-09-28 18:05:28Z mike $"
 *
 * Copyright � 2005-2007 Apple Inc. All rights reserved.
 *
@@ -2017,5 +2017,5 @@ static void get_device_id(cups_sc_status_t *status,
 
 
 /*
- * End of "$Id: usb-darwin.c 6996 2007-09-28 18:30:31Z mike $".
+ * End of "$Id: usb-darwin.c 6993 2007-09-28 18:05:28Z mike $".
  */
index 60f821d975fa9735f92403efe14acb51a11ccb4b..a02b3713d1b9d9259ba5c7344b0f3a47672220b8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 6911 2007-09-04 20:35:08Z mike $"
+ * "$Id: usb-unix.c 6910 2007-09-04 20:34:29Z mike $"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -281,7 +281,7 @@ list_devices(void)
   }
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int   i;                      /* Looping var */
   char  device[255];            /* Device filename */
 
@@ -615,5 +615,5 @@ side_cb(int print_fd,                       /* I - Print file */
 
 
 /*
- * End of "$Id: usb-unix.c 6911 2007-09-04 20:35:08Z mike $".
+ * End of "$Id: usb-unix.c 6910 2007-09-04 20:34:29Z mike $".
  */
index 689d3990060c3213e06559cd14882afe549075a2..396f95ac1ca0927e2a8e6d8ffded2249abf545e5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c 6911 2007-09-04 20:35:08Z mike $"
+ * "$Id: usb.c 6910 2007-09-04 20:34:29Z mike $"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -64,7 +64,7 @@ int   print_device(const char *uri, const char *hostname,
 
 #ifdef __APPLE__
 #  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 #  include "usb-unix.c"
 #else
 /*
@@ -266,5 +266,5 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: usb.c 6911 2007-09-04 20:35:08Z mike $".
+ * End of "$Id: usb.c 6910 2007-09-04 20:34:29Z mike $".
  */
index a7223f2d786203f1917d8db4d667d5a22ae146cc..47e0d814cdc55d3b1472a795bc9fcea6ebddf009 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: lpr.c 7017 2007-10-10 22:09:57Z mike $"
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
@@ -200,11 +200,11 @@ main(int  argc,                           /* I - Number of command-line arguments */
            break;
 
        case 'l' : /* Literal/raw */
-            num_options = cupsAddOption("raw", "", num_options, &options);
+            num_options = cupsAddOption("raw", "true", num_options, &options);
            break;
 
        case 'p' : /* Prettyprint */
-            num_options = cupsAddOption("prettyprint", "", num_options,
+            num_options = cupsAddOption("prettyprint", "true", num_options,
                                        &options);
            break;
 
@@ -520,5 +520,5 @@ sighandler(int s)                   /* I - Signal number */
 
 
 /*
- * End of "$Id: lpr.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: lpr.c 7017 2007-10-10 22:09:57Z mike $".
  */
index 37e565684e14e62c50a05f568677906c927d0d61..bdf42f911ebd8179465bd473c8d3eb3c89f2c63f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c 6733 2007-07-26 18:09:46Z mike $"
+ * "$Id: admin.c 7012 2007-10-10 21:22:45Z mike $"
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
@@ -119,7 +119,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
     do_menu(http);
   }
-  else if ((op = cgiGetVariable("OP")) != NULL)
+  else if ((op = cgiGetVariable("OP")) != NULL && cgiIsPOST())
   {
    /*
     * Do the operation...
@@ -127,25 +127,7 @@ main(int  argc,                            /* I - Number of command-line arguments */
 
     fprintf(stderr, "DEBUG: op=\"%s\"...\n", op);
 
-    if (!strcmp(op, "redirect"))
-    {
-      const char *url;                 /* Redirection URL... */
-      char     prefix[1024];           /* URL prefix */
-
-
-      if (getenv("HTTPS"))
-        snprintf(prefix, sizeof(prefix), "https://%s:%s",
-                getenv("SERVER_NAME"), getenv("SERVER_PORT"));
-      else
-        snprintf(prefix, sizeof(prefix), "http://%s:%s",
-                getenv("SERVER_NAME"), getenv("SERVER_PORT"));
-
-      if ((url = cgiGetVariable("URL")) != NULL)
-        printf("Location: %s%s\n\n", prefix, url);
-      else
-        printf("Location: %s/admin\n\n", prefix);
-    }
-    else if (!strcmp(op, "start-printer"))
+    if (!strcmp(op, "start-printer"))
       do_printer_op(http, IPP_RESUME_PRINTER, cgiText(_("Start Printer")));
     else if (!strcmp(op, "stop-printer"))
       do_printer_op(http, IPP_PAUSE_PRINTER, cgiText(_("Stop Printer")));
@@ -203,6 +185,24 @@ main(int  argc,                            /* I - Number of command-line arguments */
       cgiEndHTML();
     }
   }
+  else if (op && !strcmp(op, "redirect"))
+  {
+    const char *url;                   /* Redirection URL... */
+    char       prefix[1024];           /* URL prefix */
+
+
+    if (getenv("HTTPS"))
+      snprintf(prefix, sizeof(prefix), "https://%s:%s",
+              getenv("SERVER_NAME"), getenv("SERVER_PORT"));
+    else
+      snprintf(prefix, sizeof(prefix), "http://%s:%s",
+              getenv("SERVER_NAME"), getenv("SERVER_PORT"));
+
+    if ((url = cgiGetVariable("URL")) != NULL)
+      printf("Location: %s%s\n\n", prefix, url);
+    else
+      printf("Location: %s/admin\n\n", prefix);
+  }
   else
   {
    /*
@@ -740,67 +740,101 @@ do_am_printer(http_t *http,              /* I - HTTP connection */
   else
     oldinfo = NULL;
 
-  if ((name = cgiGetVariable("PRINTER_NAME")) == NULL ||
-      cgiGetVariable("PRINTER_LOCATION") == NULL)
-  {
-    cgiStartHTML(title);
+  file = cgiGetFile();
 
-    if (modify)
-    {
-     /*
-      * Update the location and description of an existing printer...
-      */
+  if (file)
+  {
+    fprintf(stderr, "DEBUG: file->tempfile=%s\n", file->tempfile);
+    fprintf(stderr, "DEBUG: file->name=%s\n", file->name);
+    fprintf(stderr, "DEBUG: file->filename=%s\n", file->filename);
+    fprintf(stderr, "DEBUG: file->mimetype=%s\n", file->mimetype);
+  }
 
-      if (oldinfo)
-       cgiSetIPPVars(oldinfo, NULL, NULL, NULL, 0);
+  if ((name = cgiGetVariable("PRINTER_NAME")) != NULL)
+  {
+    for (ptr = name; *ptr; ptr ++)
+      if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
+       break;
 
-      cgiCopyTemplateLang("modify-printer.tmpl");
+    if (*ptr || ptr == name || strlen(name) > 127)
+    {
+      cgiSetVariable("ERROR",
+                    cgiText(_("The printer name may only contain up to "
+                              "127 printable characters and may not "
+                              "contain spaces, slashes (/), or the "
+                              "pound sign (#).")));
+      cgiStartHTML(title);
+      cgiCopyTemplateLang("error.tmpl");
+      cgiEndHTML();
+      return;
     }
-    else
+  }
+
+  if ((var = cgiGetVariable("DEVICE_URI")) != NULL)
+  {
+    if ((uriptr = strrchr(var, '|')) != NULL)
     {
      /*
-      * Get the name, location, and description for a new printer...
+      * Extract make and make/model from device URI string...
       */
 
-      cgiCopyTemplateLang("add-printer.tmpl");
-    }
+      char     make[1024],             /* Make string */
+               *makeptr;               /* Pointer into make */
 
-    cgiEndHTML();
 
-    if (oldinfo)
-      ippDelete(oldinfo);
+      *uriptr++ = '\0';
 
-    return;
-  }
+      strlcpy(make, uriptr, sizeof(make));
 
-  for (ptr = name; *ptr; ptr ++)
-    if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
-      break;
+      if ((makeptr = strchr(make, ' ')) != NULL)
+        *makeptr = '\0';
+      else if ((makeptr = strchr(make, '-')) != NULL)
+        *makeptr = '\0';
+      else if (!strncasecmp(make, "laserjet", 8) ||
+               !strncasecmp(make, "deskjet", 7) ||
+               !strncasecmp(make, "designjet", 9))
+        strcpy(make, "HP");
+      else if (!strncasecmp(make, "phaser", 6))
+        strcpy(make, "Xerox");
+      else if (!strncasecmp(make, "stylus", 6))
+        strcpy(make, "Epson");
+      else
+        strcpy(make, "Generic");
 
-  if (*ptr || ptr == name || strlen(name) > 127)
-  {
-    cgiSetVariable("ERROR",
-                   cgiText(_("The printer name may only contain up to "
-                            "127 printable characters and may not "
-                            "contain spaces, slashes (/), or the "
-                            "pound sign (#).")));
-    cgiStartHTML(title);
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-    return;
-  }
+      if (!cgiGetVariable("CURRENT_MAKE"))
+        cgiSetVariable("CURRENT_MAKE", make);
 
-  file = cgiGetFile();
+      cgiSetVariable("PPD_MAKE", make);
 
-  if (file)
-  {
-    fprintf(stderr, "DEBUG: file->tempfile=%s\n", file->tempfile);
-    fprintf(stderr, "DEBUG: file->name=%s\n", file->name);
-    fprintf(stderr, "DEBUG: file->filename=%s\n", file->filename);
-    fprintf(stderr, "DEBUG: file->mimetype=%s\n", file->mimetype);
+      if (!cgiGetVariable("CURRENT_MAKE_AND_MODEL"))
+        cgiSetVariable("CURRENT_MAKE_AND_MODEL", uriptr);
+
+      if (!modify)
+      {
+        char   template[128],          /* Template name */
+               *tptr;                  /* Pointer into template name */
+
+       cgiSetVariable("PRINTER_INFO", uriptr);
+
+       for (tptr = template;
+            tptr < (template + sizeof(template) - 1) && *uriptr;
+            uriptr ++)
+         if (isalnum(*uriptr & 255) || *uriptr == '_' || *uriptr == '-' ||
+             *uriptr == '.')
+           *tptr++ = *uriptr;
+         else if ((*uriptr == ' ' || *uriptr == '/') && tptr[-1] != '_')
+           *tptr++ = '_';
+         else if (*uriptr == '?' || *uriptr == '(')
+           break;
+
+        *tptr = '\0';
+
+        cgiSetVariable("TEMPLATE_NAME", template);
+      }
+    }
   }
 
-  if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
+  if (!var)
   {
    /*
     * Build a CUPS_GET_DEVICES request, which requires the following
@@ -897,6 +931,37 @@ do_am_printer(http_t *http,                /* I - HTTP connection */
     cgiCopyTemplateLang("choose-serial.tmpl");
     cgiEndHTML();
   }
+  else if (!name || !cgiGetVariable("PRINTER_LOCATION"))
+  {
+    cgiStartHTML(title);
+
+    if (modify)
+    {
+     /*
+      * Update the location and description of an existing printer...
+      */
+
+      if (oldinfo)
+       cgiSetIPPVars(oldinfo, NULL, NULL, NULL, 0);
+
+      cgiCopyTemplateLang("modify-printer.tmpl");
+    }
+    else
+    {
+     /*
+      * Get the name, location, and description for a new printer...
+      */
+
+      cgiCopyTemplateLang("add-printer.tmpl");
+    }
+
+    cgiEndHTML();
+
+    if (oldinfo)
+      ippDelete(oldinfo);
+
+    return;
+  }
   else if (!file && (var = cgiGetVariable("PPD_NAME")) == NULL)
   {
     if (modify)
@@ -959,39 +1024,6 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
                strerror(errno));
       }
     }
-    else if ((uriptr = strrchr(cgiGetVariable("DEVICE_URI"), '|')) != NULL)
-    {
-     /*
-      * Extract make and make/model from device URI string...
-      */
-
-      char     make[1024],             /* Make string */
-               *makeptr;               /* Pointer into make */
-
-
-      *uriptr++ = '\0';
-
-      strlcpy(make, uriptr, sizeof(make));
-
-      if ((makeptr = strchr(make, ' ')) != NULL)
-        *makeptr = '\0';
-      else if ((makeptr = strchr(make, '-')) != NULL)
-        *makeptr = '\0';
-      else if (!strncasecmp(make, "laserjet", 8) ||
-               !strncasecmp(make, "deskjet", 7) ||
-               !strncasecmp(make, "designjet", 9))
-        strcpy(make, "HP");
-      else if (!strncasecmp(make, "phaser", 6))
-        strcpy(make, "Xerox");
-      else if (!strncasecmp(make, "stylus", 6))
-        strcpy(make, "Epson");
-      else
-        strcpy(make, "Generic");
-
-      cgiSetVariable("CURRENT_MAKE", make);
-      cgiSetVariable("PPD_MAKE", make);
-      cgiSetVariable("CURRENT_MAKE_AND_MODEL", uriptr);
-    }
 
    /*
     * Build a CUPS_GET_PPDS request, which requires the following
@@ -1007,7 +1039,9 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                  NULL, "ipp://localhost/printers/");
 
-    if ((var = cgiGetVariable("PPD_MAKE")) != NULL)
+    if ((var = cgiGetVariable("CURRENT_MAKE")) == NULL)
+      var = cgiGetVariable("PPD_MAKE");
+    if (var)
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_TEXT,
                    "ppd-make", NULL, var);
     else
@@ -1047,7 +1081,7 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
        cgiCopyTemplateLang("choose-make.tmpl");
         cgiEndHTML();
       }
-      else if (!var)
+      else if (!var || cgiGetVariable("SELECT_MAKE"))
       {
         cgiStartHTML(title);
        cgiCopyTemplateLang("choose-make.tmpl");
@@ -1201,10 +1235,10 @@ do_am_printer(http_t *http,             /* I - HTTP connection */
       cgiShowIPPError(modify ? _("Unable to modify printer:") :
                                _("Unable to add printer:"));
     }
-    else
+    else if (modify)
     {
      /*
-      * Redirect successful updates back to the printer or set-options pages...
+      * Redirect successful updates back to the printer page...
       */
 
       char     refresh[1024];          /* Refresh URL */
@@ -1212,21 +1246,24 @@ do_am_printer(http_t *http,             /* I - HTTP connection */
 
       cgiFormEncode(uri, name, sizeof(uri));
 
-      if (modify)
-       snprintf(refresh, sizeof(refresh),
-                "5;/admin/?OP=redirect&URL=/printers/%s", uri);
-      else
-       snprintf(refresh, sizeof(refresh),
-                "5;URL=/admin/?OP=set-printer-options&PRINTER_NAME=%s", uri);
+      snprintf(refresh, sizeof(refresh),
+              "5;/admin/?OP=redirect&URL=/printers/%s", uri);
 
       cgiSetVariable("refresh_page", refresh);
 
       cgiStartHTML(title);
 
-      if (modify)
-        cgiCopyTemplateLang("printer-modified.tmpl");
-      else
-        cgiCopyTemplateLang("printer-added.tmpl");
+      cgiCopyTemplateLang("printer-modified.tmpl");
+    }
+    else
+    {
+     /*
+      * Set the printer options...
+      */
+
+      cgiSetVariable("OP", "set-printer-options");
+      do_set_options(http, 0);
+      return;
     }
 
     cgiEndHTML();
@@ -1319,7 +1356,7 @@ do_cancel_subscription(http_t *http)/* I - HTTP connection */
 static void
 do_config_server(http_t *http)         /* I - HTTP connection */
 {
-  if (cgiIsPOST() && !cgiGetVariable("CUPSDCONF"))
+  if (cgiGetVariable("CHANGESETTINGS"))
   {
    /*
     * Save basic setting changes...
@@ -1454,7 +1491,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
 
     cgiEndHTML();
   }
-  else if (cgiIsPOST())
+  else if (cgiGetVariable("SAVECHANGES") && cgiGetVariable("CUPSDCONF"))
   {
    /*
     * Save hand-edited config file...
@@ -2132,8 +2169,8 @@ do_list_printers(http_t *http)            /* I - HTTP connection */
            * Not found, so it must be a new printer...
            */
 
-            char       options[1024],  /* Form variables for this device */
-                       *options_ptr;   /* Pointer into string */
+            char       option[1024],   /* Form variables for this device */
+                       *option_ptr;    /* Pointer into string */
            const char  *ptr;           /* Pointer into device string */
 
 
@@ -2145,9 +2182,6 @@ do_list_printers(http_t *http)            /* I - HTTP connection */
            * suitable name.
            */
 
-           strcpy(options, "TEMPLATE_NAME=");
-           options_ptr = options + strlen(options);
-
             if (strncasecmp(device_info, "unknown", 7))
              ptr = device_info;
             else if ((ptr = strstr(device_uri, "://")) != NULL)
@@ -2155,49 +2189,20 @@ do_list_printers(http_t *http)          /* I - HTTP connection */
            else
              ptr = device_make_and_model;
 
-           for (;
-                options_ptr < (options + sizeof(options) - 1) && *ptr;
+           for (option_ptr = option;
+                option_ptr < (option + sizeof(option) - 1) && *ptr;
                 ptr ++)
              if (isalnum(*ptr & 255) || *ptr == '_' || *ptr == '-' ||
                  *ptr == '.')
-               *options_ptr++ = *ptr;
-             else if ((*ptr == ' ' || *ptr == '/') && options_ptr[-1] != '_')
-               *options_ptr++ = '_';
+               *option_ptr++ = *ptr;
+             else if ((*ptr == ' ' || *ptr == '/') && option_ptr[-1] != '_')
+               *option_ptr++ = '_';
              else if (*ptr == '?' || *ptr == '(')
                break;
 
-           /*
-           * Then add the make and model in the printer info, so
-           * that MacOS clients see something reasonable...
-           */
-
-            strlcpy(options_ptr, "&PRINTER_LOCATION=Local+Printer"
-                                "&PRINTER_INFO=",
-                   sizeof(options) - (options_ptr - options));
-           options_ptr += strlen(options_ptr);
+            *option_ptr = '\0';
 
-            cgiFormEncode(options_ptr, device_make_and_model,
-                         sizeof(options) - (options_ptr - options));
-           options_ptr += strlen(options_ptr);
-
-           /*
-           * Then copy the device URI...
-           */
-
-           strlcpy(options_ptr, "&DEVICE_URI=",
-                   sizeof(options) - (options_ptr - options));
-           options_ptr += strlen(options_ptr);
-
-            cgiFormEncode(options_ptr, device_uri,
-                         sizeof(options) - (options_ptr - options));
-           options_ptr += strlen(options_ptr);
-
-            if (options_ptr < (options + sizeof(options) - 1))
-           {
-             *options_ptr++ = '|';
-             cgiFormEncode(options_ptr, device_make_and_model,
-                         sizeof(options) - (options_ptr - options));
-           }
+            cgiSetArray("TEMPLATE_NAME", i, option);
 
            /*
            * Finally, set the form variables for this printer...
@@ -2205,7 +2210,6 @@ do_list_printers(http_t *http)            /* I - HTTP connection */
 
            cgiSetArray("device_info", i, device_info);
            cgiSetArray("device_make_and_model", i, device_make_and_model);
-           cgiSetArray("device_options", i, options);
             cgiSetArray("device_uri", i, device_uri);
            i ++;
          }
@@ -3412,5 +3416,5 @@ match_string(const char *a,               /* I - First string */
 
     
 /*
- * End of "$Id: admin.c 6733 2007-07-26 18:09:46Z mike $".
+ * End of "$Id: admin.c 7012 2007-10-10 21:22:45Z mike $".
  */
index 51c07337f90536e6f5b6c30993bd8d98aa514b94..dbf561c3856bc541b56f729ddbad576c817695d4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: classes.c 6889 2007-08-29 22:23:35Z mike $"
  *
  *   Class status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -98,7 +98,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   * Get the default printer...
   */
 
-  if (!op)
+  if (!op || !cgiIsPOST())
   {
    /*
     * Get the default destination...
@@ -189,9 +189,7 @@ show_all_classes(http_t     *http,  /* I - Connection to server */
                        count;          /* Number of classes */
   const char           *var;           /* Form variable */
   void                 *search;        /* Search data */
-  char                 url[1024],      /* URL for prev/next/this */
-                       *urlptr,        /* Position in URL */
-                       *urlend;        /* End of URL */
+  char                 val[1024];      /* Form variable */
 
 
  /*
@@ -227,7 +225,8 @@ show_all_classes(http_t     *http,  /* I - Connection to server */
     * Get a list of matching job objects.
     */
 
-    if ((var = cgiGetVariable("QUERY")) != NULL)
+    if ((var = cgiGetVariable("QUERY")) != NULL &&
+        !cgiGetVariable("CLEAR"))
       search = cgiCompileSearch(var);
     else
       search = NULL;
@@ -255,8 +254,8 @@ show_all_classes(http_t     *http,  /* I - Connection to server */
     if (first < 0)
       first = 0;
 
-    sprintf(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
 
     if ((var = cgiGetVariable("ORDER")) != NULL)
       ascending = !strcasecmp(var, "asc");
@@ -282,40 +281,18 @@ show_all_classes(http_t     *http,        /* I - Connection to server */
     * Save navigation URLs...
     */
 
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/classes/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/classes/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
+    cgiSetVariable("THISURL", "/classes/");
 
     if (first > 0)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
+      sprintf(val, "%d", first - CUPS_PAGE_MAX);
+      cgiSetVariable("PREV", val);
     }
 
     if ((first + CUPS_PAGE_MAX) < count)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
+      sprintf(val, "%d", first + CUPS_PAGE_MAX);
+      cgiSetVariable("NEXT", val);
     }
 
    /*
@@ -454,5 +431,5 @@ show_class(http_t     *http,                /* I - Connection to server */
 
 
 /*
- * End of "$Id: classes.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: classes.c 6889 2007-08-29 22:23:35Z mike $".
  */
index 38fcec918c79fb568c9f63318ae19d16bf12ffd3..823f88f1257868061b50c77ac93509f3347de091 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- *   On-line help CGI for the Common UNIX Printing System (CUPS).
+ *   Online help CGI for the Common UNIX Printing System (CUPS).
  *
  *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
@@ -86,7 +86,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   {
     perror(filename);
 
-    cgiStartHTML(cgiText(_("Help")));
+    cgiStartHTML(cgiText(_("Online Help")));
     cgiSetVariable("ERROR", "Unable to load help index!");
     cgiCopyTemplateLang("error.tmpl");
     cgiEndHTML();
@@ -127,7 +127,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
     {
       perror(filename);
 
-      cgiStartHTML(cgiText(_("Help")));
+      cgiStartHTML(cgiText(_("Online Help")));
       cgiSetVariable("ERROR", "Unable to access help file!");
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -137,7 +137,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
     if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
     {
-      cgiStartHTML(cgiText(_("Help")));
+      cgiStartHTML(cgiText(_("Online Help")));
       cgiSetVariable("ERROR", "Help file not in index!");
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -168,13 +168,16 @@ main(int  argc,                           /* I - Number of command-line arguments */
     * Send a standard page header...
     */
 
-    cgiStartHTML(cgiText(_("Help")));
+    cgiStartHTML(cgiText(_("Online Help")));
   }
 
  /*
   * Do a search as needed...
   */
 
+  if (cgiGetVariable("CLEAR"))
+    cgiSetVariable("QUERY", "");
+
   query = cgiGetVariable("QUERY");
   topic = cgiGetVariable("TOPIC");
   si    = helpSearchIndex(hi, query, topic, helpfile);
index a2f18de5796006fdb906d11294f176efeb6d1459..e7a26034d9ff7f956f097be7ec30294c496141cb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: ipp-var.c 6889 2007-08-29 22:23:35Z mike $"
  *
  *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
  *
@@ -980,7 +980,7 @@ cgiSetIPPObjectVars(
     for (i = 0; i < attr->num_values; i ++)
     {
       if (i)
-       strlcat(valptr, ",", sizeof(value) - (valptr - value));
+       strlcat(valptr, ", ", sizeof(value) - (valptr - value));
 
       valptr += strlen(valptr);
 
@@ -1207,9 +1207,8 @@ cgiShowJobs(http_t     *http,             /* I - Connection to server */
                        count;          /* Number of jobs */
   const char           *var;           /* Form variable */
   void                 *search;        /* Search data */
-  char                 url[1024],      /* URL for prev/next/this */
-                       *urlptr,        /* Position in URL */
-                       *urlend;        /* End of URL */
+  char                 url[1024],      /* Printer URI */
+                       val[1024];      /* Form variable */
 
 
  /*
@@ -1250,7 +1249,8 @@ cgiShowJobs(http_t     *http,             /* I - Connection to server */
     * Get a list of matching job objects.
     */
 
-    if ((var = cgiGetVariable("QUERY")) != NULL)
+    if ((var = cgiGetVariable("QUERY")) != NULL &&
+        !cgiGetVariable("CLEAR"))
       search = cgiCompileSearch(var);
     else
       search = NULL;
@@ -1278,8 +1278,8 @@ cgiShowJobs(http_t     *http,             /* I - Connection to server */
     if (first < 0)
       first = 0;
 
-    sprintf(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
 
     if ((var = cgiGetVariable("ORDER")) != NULL)
       ascending = !strcasecmp(var, "asc");
@@ -1308,61 +1308,23 @@ cgiShowJobs(http_t     *http,           /* I - Connection to server */
     * Save navigation URLs...
     */
 
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      if (dest)
-        snprintf(url, sizeof(url), "/%s/%s?QUERY=", cgiGetVariable("SECTION"),
-                dest);
-      else
-        strlcpy(url, "/jobs/?QUERY=", sizeof(url));
-
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
+    if (dest)
+      snprintf(val, sizeof(val), "/%s/%s",  cgiGetVariable("SECTION"), dest);
     else
-    {
-      if (dest)
-        snprintf(url, sizeof(url), "/%s/%s?", cgiGetVariable("SECTION"), dest);
-      else
-        strlcpy(url, "/jobs/?", sizeof(url));
-
-      urlptr = url + strlen(url);
-    }
-
-    if (which_jobs)
-    {
-      strlcpy(urlptr, "WHICH_JOBS=", urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      cgiFormEncode(urlptr, which_jobs, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
+      strlcpy(val, "/jobs/", sizeof(val));
 
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
+    cgiSetVariable("THISURL", val);
 
     if (first > 0)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
+      sprintf(val, "%d", first - CUPS_PAGE_MAX);
+      cgiSetVariable("PREV", val);
     }
 
     if ((first + CUPS_PAGE_MAX) < count)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
+      sprintf(val, "%d", first + CUPS_PAGE_MAX);
+      cgiSetVariable("NEXT", val);
     }
 
    /*
@@ -1409,5 +1371,5 @@ cgiText(const char *message)              /* I - Message */
 
 
 /*
- * End of "$Id: ipp-var.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: ipp-var.c 6889 2007-08-29 22:23:35Z mike $".
  */
index da4f1357cdb6956b03289ab8cfe7d5408ac63930..20a5417270a9cef23d9bc9ecb474178ed92e80b5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: jobs.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: jobs.c 6889 2007-08-29 22:23:35Z mike $"
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -77,7 +77,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   * Do the operation...
   */
 
-  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0)
+  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0 && cgiIsPOST())
   {
    /*
     * Do the operation...
@@ -204,5 +204,5 @@ do_job_op(http_t      *http,                /* I - HTTP connection */
 
 
 /*
- * End of "$Id: jobs.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: jobs.c 6889 2007-08-29 22:23:35Z mike $".
  */
index 068547cb4f009181185c303ab365deb8fa5206d8..82e19a16ff38d7f7e2cfc007cb0f40397480e478 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: printers.c 6889 2007-08-29 22:23:35Z mike $"
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -101,7 +101,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
   * Get the default printer...
   */
 
-  if (!op)
+  if (!op || !cgiIsPOST())
   {
    /*
     * Get the default destination...
@@ -315,9 +315,7 @@ show_all_printers(http_t     *http, /* I - Connection to server */
                        count;          /* Number of printers */
   const char           *var;           /* Form variable */
   void                 *search;        /* Search data */
-  char                 url[1024],      /* URL for prev/next/this */
-                       *urlptr,        /* Position in URL */
-                       *urlend;        /* End of URL */
+  char                 val[1024];      /* Form variable */
 
 
   fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
@@ -363,7 +361,8 @@ show_all_printers(http_t     *http, /* I - Connection to server */
     * Get a list of matching job objects.
     */
 
-    if ((var = cgiGetVariable("QUERY")) != NULL)
+    if ((var = cgiGetVariable("QUERY")) != NULL &&
+        !cgiGetVariable("CLEAR"))
       search = cgiCompileSearch(var);
     else
       search = NULL;
@@ -391,8 +390,8 @@ show_all_printers(http_t     *http, /* I - Connection to server */
     if (first < 0)
       first = 0;
 
-    sprintf(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
 
     if ((var = cgiGetVariable("ORDER")) != NULL)
       ascending = !strcasecmp(var, "asc");
@@ -446,40 +445,18 @@ show_all_printers(http_t     *http,       /* I - Connection to server */
     * Save navigation URLs...
     */
 
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/printers/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/printers/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
+    cgiSetVariable("THISURL", "/printers/");
 
     if (first > 0)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
+      sprintf(val, "%d", first - CUPS_PAGE_MAX);
+      cgiSetVariable("PREV", val);
     }
 
     if ((first + CUPS_PAGE_MAX) < count)
     {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-              first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
+      sprintf(val, "%d", first + CUPS_PAGE_MAX);
+      cgiSetVariable("NEXT", val);
     }
 
    /*
@@ -629,5 +606,5 @@ show_printer(http_t     *http,              /* I - Connection to server */
 
 
 /*
- * End of "$Id: printers.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: printers.c 6889 2007-08-29 22:23:35Z mike $".
  */
index 021de82f53ca4903074924bfd65d066a0f2b5d4b..0d301e11ae2733e4013e321288a7fbe465648de1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: template.c 6799 2007-08-15 19:33:36Z mike $"
+ * "$Id: template.c 6986 2007-09-25 15:34:52Z mike $"
  *
  *   CGI template function.
  *
@@ -26,6 +26,7 @@
 
 #include "cgi-private.h"
 #include <errno.h>
+#include <regex.h>
 
 
 /*
@@ -229,6 +230,7 @@ cgi_copy(FILE *out,                 /* I - Output file */
                compare[1024];          /* Comparison string */
   int          result;                 /* Result of comparison */
   int          uriencode;              /* Encode as URI */
+  regex_t      re;                     /* Regular expression to match */
 
 
   fprintf(stderr, "DEBUG2: %*sStarting at file position %ld...\n", indent, "",
@@ -250,7 +252,7 @@ cgi_copy(FILE *out,                 /* I - Output file */
       uriencode = 0;
 
       for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
+        if (strchr("}]<>=!~ \t\n", ch))
           break;
        else if (s == name && ch == '%')
          uriencode = 1;
@@ -417,6 +419,7 @@ cgi_copy(FILE *out,                 /* I - Output file */
       *   {name<value?true:false}    Less than
       *   {name>value?true:false}    Greater than
       *   {name!value?true:false}    Not equal
+      *   {name~refex?true:false}    Regex match
       */
 
       op = ch;
@@ -516,6 +519,39 @@ cgi_copy(FILE *out,                        /* I - Output file */
          case '!' :
              result = strcasecmp(outptr, compare) != 0;
              break;
+         case '~' :
+             fprintf(stderr, "DEBUG: Regular expression \"%s\"\n", compare);
+
+             if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
+             {
+               fprintf(stderr,
+                       "ERROR: Unable to compile regular expresion \"%s\"!\n",
+                       compare);
+               result = 0;
+             }
+             else
+             {
+               regmatch_t matches[10];
+
+               result = 0;
+
+               if (!regexec(&re, outptr, 10, matches, 0))
+               {
+                 int i;
+                 for (i = 0; i < 10; i ++)
+                 {
+                   fprintf(stderr, "DEBUG: matches[%d].rm_so=%d\n", i,
+                           (int)matches[i].rm_so);
+                   if (matches[i].rm_so < 0)
+                     break;
+
+                   result ++;
+                 }
+               }
+
+               regfree(&re);
+             }
+             break;
          default :
              result = 1;
              break;
@@ -663,5 +699,5 @@ cgi_puturi(const char *s,           /* I - String to output */
 
 
 /*
- * End of "$Id: template.c 6799 2007-08-15 19:33:36Z mike $".
+ * End of "$Id: template.c 6986 2007-09-25 15:34:52Z mike $".
  */
index 2c76b569a2ec4b1dc5072c032f1a1044af11d4d5..5e98a3933020b1eafdd10027650514025aae2746 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $"
+dnl "$Id: cups-common.m4 6964 2007-09-17 21:33:57Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -20,11 +20,11 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Versio number information...
-CUPS_VERSION="1.3.3"
+CUPS_VERSION="1.4svn"
 CUPS_REVISION=""
-#if test -z "$CUPS_REVISION" -a -d .svn; then
-#      CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-#fi
+if test -z "$CUPS_REVISION" -a -d .svn; then
+       CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+fi
 
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
@@ -287,5 +287,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $".
+dnl End of "$Id: cups-common.m4 6964 2007-09-17 21:33:57Z mike $".
 dnl
index beec9d61734fbff6fa25222ac7aba85cec6bf0d2..5bfcd6a87658081ba99d61cbbd80540187d8309d 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $"
+dnl "$Id: cups-compiler.m4 6975 2007-09-18 20:37:09Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -498,5 +498,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $".
+dnl End of "$Id: cups-compiler.m4 6975 2007-09-18 20:37:09Z mike $".
 dnl
index 86e1d55622c6af92a860a6a2bfc3b448a3f35dfc..4105ba17f2ff585371a1bc1fb3dc1c04c19f20a7 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $"
+dnl "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -163,7 +163,7 @@ if test x$rcdir = x; then
                        RCSTOP="25"
                        ;;
 
-               Linux | GNU)
+               Linux | GNU | GNU/k*BSD*)
                        # Linux/HURD seems to choose an init.d directory at random...
                        if test -d /sbin/init.d; then
                                # SuSE
@@ -229,6 +229,47 @@ fi
 
 AC_SUBST(XINETD)
 
+dnl LPD sharing support...
+AC_ARG_WITH(lpdconfig, [  --with-lpdconfig        set URI for LPD config file],
+       LPDCONFIG="$withval", LPDCONFIG="")
+
+if test "x$LPDCONFIG" = x; then
+       if test -f /System/Library/LaunchDaemons/org.cups.cups-lpd.plist; then
+               LPDCONFIG="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
+       elif test "x$XINETD" != x; then
+               LPDCONFIG="xinetd://$XINETD/cups-lpd"
+       fi
+fi
+
+if test "x$LPDCONFIG" = xoff; then
+       AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "")
+else
+       AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "$LPDCONFIG")
+fi
+
+dnl SMB sharing support...
+AC_ARG_WITH(smbconfig, [  --with-smbconfig        set URI for Samba config file],
+       SMBCONFIG="$withval", SMBCONFIG="")
+
+if test "x$SMBCONFIG" = x; then
+       if test -f /System/Library/LaunchDaemons/smbd.plist; then
+               SMBCONFIG="launchd:///System/Library/LaunchDaemons/smbd.plist"
+       else
+               for dir in /etc /etc/samba /usr/local/etc; do
+                       if test -f $dir/smb.conf; then
+                               SMBCONFIG="samba://$dir/smb.conf"
+                               break
+                       fi
+               done
+       fi
+fi
+
+if test "x$SMBCONFIG" = xoff; then
+       AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "")
+else
+       AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "$SMBCONFIG")
+fi
+
 dnl Setup default locations...
 # Cache data...
 AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")
@@ -297,12 +338,11 @@ fi
 AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
 
-# Locale data (initial assignment allows us not to require autoconf 2.60)
-localedir="${localedir:=}"
-if test "$localedir" = "\${datarootdir}/locale" -o "$localedir" = ""; then
+# Locale data
+if test "$localedir" = "\${datarootdir}/locale"; then
        case "$uname" in
                Linux | GNU | *BSD* | Darwin*)
-                       CUPS_LOCALEDIR="$datadir/locale"
+                       CUPS_LOCALEDIR="$datarootdir/locale"
                        ;;
 
                OSF1* | AIX*)
@@ -367,5 +407,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $".
+dnl End of "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $".
 dnl
index 4c4a217141bc508c31d83ca9adb2edcc29a567ed..2d1c5cdb39cb2f440b577356fdbddb7f343185e9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 6878 2007-08-29 17:22:26Z mike $"
+ * "$Id: config.h.in 6930 2007-09-08 00:28:06Z mike $"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
 #define CUPS_DEFAULT_PRINTCAP  "/etc/printcap"
 
 
+/*
+ * Default Samba and LPD config files...
+ */
+
+#define CUPS_DEFAULT_SMB_CONFIG_FILE   ""
+#define CUPS_DEFAULT_LPD_CONFIG_FILE   ""
+
+
 /*
  * Default MaxCopies value...
  */
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 6878 2007-08-29 17:22:26Z mike $".
+ * End of "$Id: config.h.in 6930 2007-09-08 00:28:06Z mike $".
  */
index a20643e117f5d037dc2fb3f19eee426106353baf..f4a492ee79434f9e95836b2c601b975bb57690ce 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.c 6741 2007-07-27 19:26:53Z mike $"
+ * "$Id: adminutil.c 6930 2007-09-08 00:28:06Z mike $"
  *
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -1458,6 +1458,8 @@ _cupsAdminSetServerSettings(
               !strcasecmp(line, "BrowseAddress") ||
               !strcasecmp(line, "BrowseAllow") ||
               !strcasecmp(line, "BrowseDeny") ||
+              !strcasecmp(line, "BrowseLocalProtocols") ||
+              !strcasecmp(line, "BrowseRemoteProtocols") ||
               !strcasecmp(line, "BrowseOrder")) &&
             (remote_printers >= 0 || share_printers >= 0))
     {
@@ -1474,6 +1476,11 @@ _cupsAdminSetServerSettings(
 
         if (new_remote_printers || new_share_printers)
        {
+         const char *localp = cupsGetOption("BrowseLocalProtocols",
+                                            num_settings, settings);
+         const char *remotep = cupsGetOption("BrowseRemoteProtocols",
+                                             num_settings, settings);
+
          if (new_remote_printers && new_share_printers)
            cupsFilePuts(temp,
                         "# Enable printer sharing and shared printers.\n");
@@ -1488,10 +1495,30 @@ _cupsAdminSetServerSettings(
          cupsFilePuts(temp, "BrowseOrder allow,deny\n");
 
          if (new_remote_printers)
+         {
            cupsFilePuts(temp, "BrowseAllow all\n");
 
+           if (!remotep || !*remotep)
+             cupsFilePuts(temp, "BrowseRemoteProtocols "
+                                CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "\n");
+            else if (remotep)
+             cupsFilePrintf(temp, "BrowseRemoteProtocols %s\n", remotep);
+          }
+         else
+           cupsFilePuts(temp, "BrowseRemoteProtocols\n");
+
          if (new_share_printers)
+         {
            cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
+
+           if (!localp || !*localp)
+             cupsFilePuts(temp, "BrowseLocalProtocols "
+                                CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "\n");
+            else if (localp)
+             cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);
+         }
+         else
+           cupsFilePuts(temp, "BrowseLocalProtocols\n");
         }
        else
        {
@@ -2346,5 +2373,5 @@ write_option(cups_file_t     *dstfp,      /* I - PPD file */
 
 
 /*
- * End of "$Id: adminutil.c 6741 2007-07-27 19:26:53Z mike $".
+ * End of "$Id: adminutil.c 6930 2007-09-08 00:28:06Z mike $".
  */
index 3890ae199868acb16161fc1b080ea333ef8f4170..25807ab0acf45c600d6e9fef59f7859361a53f0d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 6981 2007-09-19 21:51:55Z mike $"
+ * "$Id: cups.h 6870 2007-08-27 21:13:35Z mike $"
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
@@ -59,10 +59,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION         1.0303
+#  define CUPS_VERSION         1.0400
 #  define CUPS_VERSION_MAJOR   1
-#  define CUPS_VERSION_MINOR   3
-#  define CUPS_VERSION_PATCH   3
+#  define CUPS_VERSION_MINOR   4
+#  define CUPS_VERSION_PATCH   0
 #  define CUPS_DATE_ANY                -1
 
 
@@ -248,6 +248,10 @@ extern void                cupsSetDefaultDest(const char *name,
                                           int num_dests,
                                           cups_dest_t *dests);
 
+/**** New in CUPS 1.4 ****/
+extern http_status_t   cupsGetPPD3(http_t *http, const char *name,
+                                   time_t *modtime, char *buffer,
+                                   size_t bufsize);
 
 #  ifdef __cplusplus
 }
@@ -256,5 +260,5 @@ extern void         cupsSetDefaultDest(const char *name,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 6981 2007-09-19 21:51:55Z mike $".
+ * End of "$Id: cups.h 6870 2007-08-27 21:13:35Z mike $".
  */
index afc4ea0c4210aab609da629ead4400ce1552cb82..245f81dda754215ccd8d50de0af59ff7eb0cd86a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: dest.c 6943 2007-09-10 23:00:33Z mike $"
  *
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
@@ -127,7 +127,7 @@ cupsAddDest(const char  *name,              /* I  - Destination name */
   * Initialize the destination...
   */
 
-  dest->name        = strdup(name);
+  dest->name        = _cupsStrAlloc(name);
   dest->is_default  = 0;
   dest->num_options = 0;
   dest->options     = (cups_option_t *)0;
@@ -140,7 +140,7 @@ cupsAddDest(const char  *name,              /* I  - Destination name */
     * Copy options from the primary instance...
     */
 
-    dest->instance = strdup(instance);
+    dest->instance = _cupsStrAlloc(instance);
 
     if ((parent = cupsGetDest(name, NULL, num_dests + 1, *dests)) != NULL)
     {
@@ -174,10 +174,8 @@ cupsFreeDests(int         num_dests,       /* I - Number of destinations */
 
   for (i = num_dests, dest = dests; i > 0; i --, dest ++)
   {
-    free(dest->name);
-
-    if (dest->instance)
-      free(dest->instance);
+    _cupsStrFree(dest->name);
+    _cupsStrFree(dest->instance);
 
     cupsFreeOptions(dest->num_options, dest->options);
   }
@@ -483,6 +481,8 @@ cupsRemoveDest(const char  *name,   /* I  - Destination name */
   * Free memory...
   */
 
+  _cupsStrFree(dest->name);
+  _cupsStrFree(dest->instance);
   cupsFreeOptions(dest->num_options, dest->options);
 
  /*
@@ -1293,5 +1293,5 @@ cups_get_sdests(http_t      *http,        /* I - HTTP connection */
 
 
 /*
- * End of "$Id: dest.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: dest.c 6943 2007-09-10 23:00:33Z mike $".
  */
index eaebda5c7005c02bd805c35f014f05fc41fe958d..e7c7b0b15a85319b1e71fe2a7c309c845d6da99a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c 6963 2007-09-17 20:35:54Z mike $"
+ * "$Id: file.c 6962 2007-09-17 20:35:47Z mike $"
  *
  *   File functions for the Common UNIX Printing System (CUPS).
  *
@@ -2136,5 +2136,5 @@ cups_write(cups_file_t *fp,               /* I - CUPS file */
 
 
 /*
- * End of "$Id: file.c 6963 2007-09-17 20:35:54Z mike $".
+ * End of "$Id: file.c 6962 2007-09-17 20:35:47Z mike $".
  */
index 58504ca1df68c0a6e48649cf6773fbc3f649b39e..bde526ffe82c01793015a6e6c8230eb7522b97f2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c 6816 2007-08-20 20:16:00Z mike $"
+ * "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $"
  *
  *   HTTP address routines for the Common UNIX Printing System (CUPS).
  *
@@ -552,5 +552,5 @@ httpGetHostname(http_t *http,               /* I - HTTP connection or NULL */
 
 
 /*
- * End of "$Id: http-addr.c 6816 2007-08-20 20:16:00Z mike $".
+ * End of "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $".
  */
index c36eb8d011837dcedaf387776a444ffb0a4509f6..30ed0a2ad6e50e3a73ae366f7419e48ae5f447e8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 6934 2007-09-10 16:46:20Z mike $"
+ * "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $"
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -266,5 +266,5 @@ extern void _cups_freeifaddrs(struct ifaddrs *addrs);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 6934 2007-09-10 16:46:20Z mike $".
+ * End of "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $".
  */
index e747602d8c9182eefa3d4d7c54028c4c2beb62dd..eaf48500239a148b6ca55dcf65cfe90bda3ef722 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: ipp-support.c 6879 2007-08-29 20:26:50Z mike $"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -150,6 +150,10 @@ static char        * const ipp_std_ops[] =
                  "CUPS-Move-Job",
                  "CUPS-Authenticate-Job",
                  "CUPS-Get-PPD"
+               },
+               * const ipp_cups_ops2[] =
+               {
+                 "CUPS-Get-Document"
                };
 
 
@@ -244,6 +248,8 @@ ippOpString(ipp_op_t op)            /* I - Operation ID */
     return ("windows-ext");
   else if (op >= CUPS_GET_DEFAULT && op <= CUPS_GET_PPD)
     return (ipp_cups_ops[op - CUPS_GET_DEFAULT]);
+  else if (op == CUPS_GET_DOCUMENT)
+    return (ipp_cups_ops2[0]);
 
  /*
   * No, build an "unknown-xxxx" operation string...
@@ -278,6 +284,10 @@ ippOpValue(const char *name)               /* I - Textual name */
     if (!strcasecmp(name, ipp_cups_ops[i]))
       return ((ipp_op_t)(i + 0x4001));
 
+  for (i = 0; i < (sizeof(ipp_cups_ops2) / sizeof(ipp_cups_ops2[0])); i ++)
+    if (!strcasecmp(name, ipp_cups_ops2[i]))
+      return ((ipp_op_t)(i + 0x4027));
+
   if (!strcasecmp(name, "CUPS-Add-Class"))
     return (CUPS_ADD_MODIFY_CLASS);
 
@@ -361,5 +371,5 @@ ippSetPort(int p)                   /* I - Port number to use */
 
 
 /*
- * End of "$Id: ipp-support.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: ipp-support.c 6879 2007-08-29 20:26:50Z mike $".
  */
index 1f6dd85ba9289f890d6cc28f43cf51a1a96b1ed1..804bc95669add157370e1b87d9bb6a42f829b726 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $"
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -246,7 +246,8 @@ typedef enum ipp_op_e                       /**** IPP operations... ****/
   CUPS_GET_PPDS,                       /* Get a list of supported drivers */
   CUPS_MOVE_JOB,                       /* Move a job to a different printer */
   CUPS_AUTHENTICATE_JOB,               /* Authenticate a job @since CUPS 1.2@ */
-  CUPS_GET_PPD                         /* Get a PPD file @since CUPS 1.3@ */
+  CUPS_GET_PPD,                                /* Get a PPD file @since CUPS 1.3@ */
+  CUPS_GET_DOCUMENT = 0x4027           /* Get a document file @since CUPS 1.4@ */
 } ipp_op_t;
 
 /* Old names for the operations */
@@ -492,5 +493,5 @@ extern ipp_state_t  ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $".
  */
index a615eecba0d710bf48cb3b00dcbd2aa04bf62f8f..c1af03a3d914492f1f77efe1867a065df49f2098 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c 6917 2007-09-05 21:14:17Z mike $"
+ * "$Id: language.c 6916 2007-09-05 21:14:08Z mike $"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -1371,5 +1371,5 @@ cups_unquote(char       *d,               /* O - Unquoted string */
 
 
 /*
- * End of "$Id: language.c 6917 2007-09-05 21:14:17Z mike $".
+ * End of "$Id: language.c 6916 2007-09-05 21:14:08Z mike $".
  */
index 6d3e6e0c82a8cc463fbe99328e5ef69d9cdb82cd..fdd5e775c84975e6bf6f44c2ad817982299398cf 100644 (file)
@@ -116,6 +116,7 @@ _cupsGetOption
 _cupsGetPassword
 _cupsGetPPD
 _cupsGetPPD2
+_cupsGetPPD3
 _cupsGetPrinters
 _cupsGetServerPPD
 _cupsLangDefault
index 347b9d97e294f1e678bdaec7f0d2e59ec52a4bb6..c03786ff350f519c08b7dfd0ff1f8cb8f4b2a219 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: localize.c 6883 2007-08-29 21:05:17Z mike $"
+ * "$Id: localize.c 6882 2007-08-29 21:05:10Z mike $"
  *
  *   PPD custom option routines for the Common UNIX Printing System (CUPS).
  *
@@ -520,5 +520,5 @@ ppd_localized_attr(ppd_file_t *ppd, /* I - PPD file */
 
 
 /*
- * End of "$Id: localize.c 6883 2007-08-29 21:05:17Z mike $".
+ * End of "$Id: localize.c 6882 2007-08-29 21:05:10Z mike $".
  */
index 98720bf01a1668d417a02ecbed5de1d85726f432..689aefb0ffca5c8d5299b80022202f751f6bdf87 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 6942 2007-09-10 22:55:00Z mike $"
+ * "$Id: mark.c 6939 2007-09-10 21:18:02Z mike $"
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
@@ -465,9 +465,9 @@ ppdMarkOption(ppd_file_t *ppd,              /* I - PPD file record */
          case PPD_CUSTOM_PASSWORD :
          case PPD_CUSTOM_STRING :
              if (cparam->current.custom_string)
-               free(cparam->current.custom_string);
+               _cupsStrFree(cparam->current.custom_string);
 
-             cparam->current.custom_string = strdup(choice + 7);
+             cparam->current.custom_string = _cupsStrAlloc(choice + 7);
              break;
        }
       }
@@ -542,9 +542,9 @@ ppdMarkOption(ppd_file_t *ppd,              /* I - PPD file record */
          case PPD_CUSTOM_PASSWORD :
          case PPD_CUSTOM_STRING :
              if (cparam->current.custom_string)
-               free(cparam->current.custom_string);
+               _cupsStrFree(cparam->current.custom_string);
 
-             cparam->current.custom_string = strdup(val->value);
+             cparam->current.custom_string = _cupsStrAlloc(val->value);
              break;
        }
       }
@@ -724,5 +724,5 @@ ppd_defaults(ppd_file_t  *ppd,      /* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c 6942 2007-09-10 22:55:00Z mike $".
+ * End of "$Id: mark.c 6939 2007-09-10 21:18:02Z mike $".
  */
index 493756dde82b63ce50e42b3052ac1e7234fb6763..b0d703e63bbe5c9211225c77954486cc042a640b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c 6703 2007-07-20 21:28:10Z mike $"
+ * "$Id: options.c 6943 2007-09-10 23:00:33Z mike $"
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
@@ -72,7 +72,7 @@ cupsAddOption(const char    *name,    /* I - Name of option */
   */
 
   for (i = 0, temp = *options; i < num_options; i ++, temp ++)
-    if (strcasecmp(temp->name, name) == 0)
+    if (!strcasecmp(temp->name, name))
       break;
 
   if (i >= num_options)
@@ -92,7 +92,7 @@ cupsAddOption(const char    *name,    /* I - Name of option */
 
     *options    = temp;
     temp        += num_options;
-    temp->name  = strdup(name);
+    temp->name  = _cupsStrAlloc(name);
     num_options ++;
   }
   else
@@ -101,10 +101,10 @@ cupsAddOption(const char    *name,        /* I - Name of option */
     * Match found; free the old value...
     */
 
-    free(temp->value);
+    _cupsStrFree(temp->value);
   }
 
-  temp->value = strdup(value);
+  temp->value = _cupsStrAlloc(value);
 
   return (num_options);
 }
@@ -127,8 +127,8 @@ cupsFreeOptions(
 
   for (i = 0; i < num_options; i ++)
   {
-    free(options[i].name);
-    free(options[i].value);
+    _cupsStrFree(options[i].name);
+    _cupsStrFree(options[i].value);
   }
 
   free(options);
@@ -691,9 +691,8 @@ cupsRemoveOption(
     num_options --;
     i --;
 
-    free(option->name);
-    if (option->value)
-      free(option->value);
+    _cupsStrFree(option->name);
+    _cupsStrFree(option->value);
 
     if (i > 0)
       memmove(option, option + 1, i * sizeof(cups_option_t));
@@ -812,5 +811,5 @@ ppd_mark_choices(ppd_file_t *ppd,   /* I - PPD file */
 
 
 /*
- * End of "$Id: options.c 6703 2007-07-20 21:28:10Z mike $".
+ * End of "$Id: options.c 6943 2007-09-10 23:00:33Z mike $".
  */
index 779722070e9d515a5b4512c149d7925ab0a77c8a..a2a7ef1a90fb632ab1f20211f0bbe9f1b6d53a33 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c 6942 2007-09-10 22:55:00Z mike $"
+ * "$Id: ppd.c 6937 2007-09-10 21:13:31Z mike $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
 #define PPD_HASHSIZE   512             /* Size of hash */
 
 
+/*
+ * Line buffer structure...
+ */
+
+typedef struct _ppd_line_s
+{
+  char         *buffer;                /* Pointer to buffer */
+  size_t       bufsize;                /* Size of the buffer */
+} _ppd_line_t;
+
+
 /*
  * Local functions...
  */
@@ -115,8 +126,9 @@ static ppd_group_t  *ppd_get_group(ppd_file_t *ppd, const char *name,
                                       cups_encoding_t encoding);
 static ppd_option_t    *ppd_get_option(ppd_group_t *group, const char *name);
 static int             ppd_hash_option(ppd_option_t *option);
-static int             ppd_read(cups_file_t *fp, char *keyword, char *option,
-                                char *text, char **string, int ignoreblank,
+static int             ppd_read(cups_file_t *fp, _ppd_line_t *line,
+                                char *keyword, char *option, char *text,
+                                char **string, int ignoreblank,
                                 _cups_globals_t *cg);
 
 
@@ -148,12 +160,12 @@ ppdClose(ppd_file_t *ppd)         /* I - PPD file record */
   * Free all strings at the top level...
   */
 
-  ppd_free(ppd->lang_encoding);
-  ppd_free(ppd->nickname);
-  ppd_free(ppd->patches);
-  ppd_free(ppd->jcl_begin);
-  ppd_free(ppd->jcl_end);
-  ppd_free(ppd->jcl_ps);
+  _cupsStrFree(ppd->lang_encoding);
+  _cupsStrFree(ppd->nickname);
+  _cupsStrFree(ppd->patches);
+  _cupsStrFree(ppd->jcl_begin);
+  _cupsStrFree(ppd->jcl_end);
+  _cupsStrFree(ppd->jcl_ps);
 
  /*
   * Free any emulations...
@@ -163,8 +175,8 @@ ppdClose(ppd_file_t *ppd)           /* I - PPD file record */
   {
     for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++)
     {
-      ppd_free(emul->start);
-      ppd_free(emul->stop);
+      _cupsStrFree(emul->start);
+      _cupsStrFree(emul->stop);
     }
 
     ppd_free(ppd->emulations);
@@ -206,9 +218,7 @@ ppdClose(ppd_file_t *ppd)           /* I - PPD file record */
   if (ppd->num_filters > 0)
   {
     for (i = ppd->num_filters, filter = ppd->filters; i > 0; i --, filter ++)
-    {
-      ppd_free(*filter);
-    }
+      _cupsStrFree(*filter);
 
     ppd_free(ppd->filters);
   }
@@ -220,9 +230,7 @@ ppdClose(ppd_file_t *ppd)           /* I - PPD file record */
   if (ppd->num_fonts > 0)
   {
     for (i = ppd->num_fonts, font = ppd->fonts; i > 0; i --, font ++)
-    {
-      ppd_free(*font);
-    }
+      _cupsStrFree(*font);
 
     ppd_free(ppd->fonts);
   }
@@ -242,7 +250,7 @@ ppdClose(ppd_file_t *ppd)           /* I - PPD file record */
   {
     for (i = ppd->num_attrs, attr = ppd->attrs; i > 0; i --, attr ++)
     {
-      ppd_free((*attr)->value);
+      _cupsStrFree((*attr)->value);
       ppd_free(*attr);
     }
 
@@ -268,7 +276,7 @@ ppdClose(ppd_file_t *ppd)           /* I - PPD file record */
         case PPD_CUSTOM_PASSCODE :
         case PPD_CUSTOM_PASSWORD :
         case PPD_CUSTOM_STRING :
-            ppd_free(cparam->current.custom_string);
+            _cupsStrFree(cparam->current.custom_string);
            break;
 
        default :
@@ -425,6 +433,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
 {
   int                  i, j, k;        /* Looping vars */
   int                  count;          /* Temporary count */
+  _ppd_line_t          line;           /* Line buffer */
   ppd_file_t           *ppd;           /* PPD file record */
   ppd_group_t          *group,         /* Current group */
                        *subgroup;      /* Current sub-group */
@@ -538,7 +547,10 @@ ppdOpen2(cups_file_t *fp)          /* I - File to read from */
   * Grab the first line and make sure it reads '*PPD-Adobe: "major.minor"'...
   */
 
-  mask = ppd_read(fp, keyword, name, text, &string, 0, cg);
+  line.buffer  = NULL;
+  line.bufsize = 0;
+
+  mask = ppd_read(fp, &line, keyword, name, text, &string, 0, cg);
 
   DEBUG_printf(("mask=%x, keyword=\"%s\"...\n", mask, keyword));
 
@@ -553,14 +565,14 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
     if (cg->ppd_status == PPD_OK)
       cg->ppd_status = PPD_MISSING_PPDADOBE4;
 
-    ppd_free(string);
+    _cupsStrFree(string);
 
     return (NULL);
   }
 
   DEBUG_printf(("ppdOpen: keyword = %s, string = %p\n", keyword, string));
 
-  ppd_free(string);
+  _cupsStrFree(string);
 
  /*
   * Allocate memory for the PPD file record...
@@ -598,7 +610,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
   ui_keyword = 0;
   encoding   = CUPS_ISO8859_1;
 
-  while ((mask = ppd_read(fp, keyword, name, text, &string, 1, cg)) != 0)
+  while ((mask = ppd_read(fp, &line, keyword, name, text, &string, 1, cg)) != 0)
   {
 #ifdef DEBUG
     printf("mask = %x, keyword = \"%s\"", mask, keyword);
@@ -744,7 +756,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
       * Say all PPD files are UTF-8, since we convert to UTF-8...
       */
 
-      ppd->lang_encoding = strdup("UTF-8");
+      ppd->lang_encoding = _cupsStrAlloc("UTF-8");
       encoding           = _ppdGetEncoding(string);
     }
     else if (!strcmp(keyword, "LanguageVersion"))
@@ -765,10 +777,10 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
 
 
         cupsCharsetToUTF8(utf8, string, sizeof(utf8), encoding);
-       ppd->nickname = strdup((char *)utf8);
+       ppd->nickname = _cupsStrAlloc((char *)utf8);
       }
       else
-        ppd->nickname = strdup(string);
+        ppd->nickname = _cupsStrAlloc(string);
     }
     else if (!strcmp(keyword, "Product"))
       ppd->product = string;
@@ -778,17 +790,17 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
       ppd->ttrasterizer = string;
     else if (!strcmp(keyword, "JCLBegin"))
     {
-      ppd->jcl_begin = strdup(string);
+      ppd->jcl_begin = _cupsStrAlloc(string);
       ppd_decode(ppd->jcl_begin);      /* Decode quoted string */
     }
     else if (!strcmp(keyword, "JCLEnd"))
     {
-      ppd->jcl_end = strdup(string);
+      ppd->jcl_end = _cupsStrAlloc(string);
       ppd_decode(ppd->jcl_end);                /* Decode quoted string */
     }
     else if (!strcmp(keyword, "JCLToPSInterpreter"))
     {
-      ppd->jcl_ps = strdup(string);
+      ppd->jcl_ps = _cupsStrAlloc(string);
       ppd_decode(ppd->jcl_ps);         /* Decode quoted string */
     }
     else if (!strcmp(keyword, "AccurateScreensSupport"))
@@ -840,8 +852,6 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
 
       if (filter == NULL)
       {
-        ppd_free(filter);
-
         cg->ppd_status = PPD_ALLOC_ERROR;
 
        goto error;
@@ -880,7 +890,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
       }
       
       ppd->fonts                 = tempfonts;
-      ppd->fonts[ppd->num_fonts] = strdup(name);
+      ppd->fonts[ppd->num_fonts] = _cupsStrAlloc(name);
       ppd->num_fonts ++;
     }
     else if (!strncmp(keyword, "ParamCustom", 11))
@@ -1179,7 +1189,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
     else if (!strcmp(keyword, "JobPatchFile"))
     {
       if (ppd->patches == NULL)
-        ppd->patches = strdup(string);
+        ppd->patches = _cupsStrAlloc(string);
       else
       {
         temp = realloc(ppd->patches, strlen(ppd->patches) +
@@ -1298,7 +1308,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
 
       option->section = PPD_ORDER_ANY;
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "JCLOpenUI"))
@@ -1377,14 +1387,14 @@ ppdOpen2(cups_file_t *fp)               /* I - File to read from */
       option->section = PPD_ORDER_JCL;
       group = NULL;
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "CloseUI") || !strcmp(keyword, "JCLCloseUI"))
     {
       option = NULL;
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "OpenGroup"))
@@ -1431,14 +1441,14 @@ ppdOpen2(cups_file_t *fp)               /* I - File to read from */
       if (group == NULL)
        goto error;
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "CloseGroup"))
     {
       group = NULL;
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "OrderDependency") ||
@@ -1497,7 +1507,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
        option->order   = order;
       }
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strncmp(keyword, "Default", 7))
@@ -1781,7 +1791,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
       * Don't add this one as an attribute...
       */
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "PaperDimension"))
@@ -1803,7 +1813,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
       size->width  = (float)_cupsStrScand(string, &sptr, loc);
       size->length = (float)_cupsStrScand(sptr, NULL, loc);
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (!strcmp(keyword, "ImageableArea"))
@@ -1827,7 +1837,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
       size->right  = (float)_cupsStrScand(sptr, &sptr, loc);
       size->top    = (float)_cupsStrScand(sptr, NULL, loc);
 
-      ppd_free(string);
+      _cupsStrFree(string);
       string = NULL;
     }
     else if (option != NULL &&
@@ -1878,9 +1888,12 @@ ppdOpen2(cups_file_t *fp)                /* I - File to read from */
         (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING))
       ppd_add_attr(ppd, keyword, name, text, string);
     else
-      ppd_free(string);
+      _cupsStrFree(string);
   }
 
+  if (line.buffer)
+    free(line.buffer);
+
  /*
   * Reset language preferences...
   */
@@ -1959,7 +1972,10 @@ ppdOpen2(cups_file_t *fp)                /* I - File to read from */
 
   error:
 
-  ppd_free(string);
+  if (line.buffer)
+    free(line.buffer);
+
+  _cupsStrFree(string);
 
   ppdClose(ppd);
 
@@ -2418,7 +2434,7 @@ ppd_free_option(ppd_option_t *option)     /* I - Option to free */
          i > 0;
          i --, choice ++)
     {
-      ppd_free(choice->code);
+      _cupsStrFree(choice->code);
     }
 
     ppd_free(option->choices);
@@ -2636,6 +2652,7 @@ ppd_hash_option(ppd_option_t *option)     /* I - Option */
 
 static int                             /* O - Bitmask of fields read */
 ppd_read(cups_file_t    *fp,           /* I - File to read from */
+         _ppd_line_t    *line,         /* I - Line buffer */
          char           *keyword,      /* O - Keyword from line */
         char           *option,        /* O - Option from line */
          char           *text,         /* O - Human-readable text from line */
@@ -2654,16 +2671,8 @@ ppd_read(cups_file_t    *fp,             /* I - File to read from */
                *optptr,                /* Option pointer */
                *textptr,               /* Text pointer */
                *strptr,                /* Pointer into string */
-               *lineptr,               /* Current position in line buffer */
-               *line;                  /* Line buffer */
-  int          linesize;               /* Current size of line buffer */
-
- /*
-  * Range check everything...
-  */
+               *lineptr;               /* Current position in line buffer */
 
-  if (!fp || !keyword || !option || !text || !string)
-    return (0);
 
  /*
   * Now loop until we have a valid line...
@@ -2672,11 +2681,15 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
   *string   = NULL;
   col       = 0;
   startline = cg->ppd_line + 1;
-  linesize  = 1024;
-  line      = malloc(linesize);
 
-  if (!line)
-    return (0);
+  if (!line->buffer)
+  {
+    line->bufsize = 1024;
+    line->buffer  = malloc(1024);
+
+    if (!line->buffer)
+      return (0);
+  }
 
   do
   {
@@ -2684,13 +2697,13 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
     * Read the line...
     */
 
-    lineptr  = line;
+    lineptr  = line->buffer;
     endquote = 0;
     colon    = 0;
 
     while ((ch = cupsFileGetChar(fp)) != EOF)
     {
-      if (lineptr >= (line + linesize - 1))
+      if (lineptr >= (line->buffer + line->bufsize - 1))
       {
        /*
         * Expand the line buffer...
@@ -2699,8 +2712,8 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
         char *temp;                    /* Temporary line pointer */
 
 
-        linesize += 1024;
-       if (linesize > 262144)
+        line->bufsize += 1024;
+       if (line->bufsize > 262144)
        {
         /*
          * Don't allow lines longer than 256k!
@@ -2709,24 +2722,20 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
           cg->ppd_line   = startline;
           cg->ppd_status = PPD_LINE_TOO_LONG;
 
-         free(line);
-
          return (0);
        }
 
-        temp = realloc(line, linesize);
+        temp = realloc(line->buffer, line->bufsize);
        if (!temp)
        {
           cg->ppd_line   = startline;
           cg->ppd_status = PPD_LINE_TOO_LONG;
 
-         free(line);
-
          return (0);
        }
 
-        lineptr = temp + (lineptr - line);
-       line    = temp;
+        lineptr      = temp + (lineptr - line->buffer);
+       line->buffer = temp;
       }
 
       if (ch == '\r' || ch == '\n')
@@ -2754,7 +2763,7 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
            cupsFileGetChar(fp);
        }
 
-       if (lineptr == line && ignoreblank)
+       if (lineptr == line->buffer && ignoreblank)
           continue;                    /* Skip blank lines */
 
        ch = '\n';
@@ -2773,8 +2782,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
         cg->ppd_line   = startline;
         cg->ppd_status = PPD_ILLEGAL_CHARACTER;
 
-        free(line);
-
         return (0);
       }
       else if (ch != 0x1a)
@@ -2795,12 +2802,10 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
           cg->ppd_line   = startline;
           cg->ppd_status = PPD_LINE_TOO_LONG;
 
-          free(line);
-
           return (0);
        }
 
-       if (ch == ':' && strncmp(line, "*%", 2) != 0)
+       if (ch == ':' && strncmp(line->buffer, "*%", 2) != 0)
          colon = 1;
 
        if (ch == '\"' && colon)
@@ -2845,8 +2850,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
           cg->ppd_line   = startline;
           cg->ppd_status = PPD_ILLEGAL_CHARACTER;
 
-          free(line);
-
           return (0);
        }
        else if (ch != 0x1a)
@@ -2862,8 +2865,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
             cg->ppd_line   = startline;
             cg->ppd_status = PPD_LINE_TOO_LONG;
 
-            free(line);
-
             return (0);
          }
        }
@@ -2908,8 +2909,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
           cg->ppd_line   = startline;
           cg->ppd_status = PPD_ILLEGAL_CHARACTER;
 
-          free(line);
-
           return (0);
        }
        else if (ch != 0x1a)
@@ -2925,14 +2924,12 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
             cg->ppd_line   = startline;
             cg->ppd_status = PPD_LINE_TOO_LONG;
 
-            free(line);
-
             return (0);
          }
        }
     }
 
-    if (lineptr > line && lineptr[-1] == '\n')
+    if (lineptr > line->buffer && lineptr[-1] == '\n')
       lineptr --;
 
     *lineptr = '\0';
@@ -2946,40 +2943,34 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
     * reading the PPD when we get to the start of this data.
     */
 
-    if (!strcmp(line, "*%APLWORKSET START"))
-    {
-      free(line);
+    if (!strcmp(line->buffer, "*%APLWORKSET START"))
       return (0);
-    }
 
-    if (ch == EOF && lineptr == line)
-    {
-      free(line);
+    if (ch == EOF && lineptr == line->buffer)
       return (0);
-    }
 
    /*
     * Now parse it...
     */
 
     mask    = 0;
-    lineptr = line + 1;
+    lineptr = line->buffer + 1;
 
     keyword[0] = '\0';
     option[0]  = '\0';
     text[0]    = '\0';
     *string    = NULL;
 
-    if ((!line[0] ||                   /* Blank line */
-         !strncmp(line, "*%", 2) ||    /* Comment line */
-         !strcmp(line, "*End")) &&     /* End of multi-line string */
+    if ((!line->buffer[0] ||           /* Blank line */
+         !strncmp(line->buffer, "*%", 2) || /* Comment line */
+         !strcmp(line->buffer, "*End")) && /* End of multi-line string */
         ignoreblank)                   /* Ignore these? */
     {
       startline = cg->ppd_line + 1;
       continue;
     }
 
-    if (!strcmp(line, "*"))            /* (Bad) comment line */
+    if (!strcmp(line->buffer, "*"))    /* (Bad) comment line */
     {
       if (cg->ppd_conform == PPD_CONFORM_RELAXED)
       {
@@ -2991,34 +2982,29 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
         cg->ppd_line   = startline;
         cg->ppd_status = PPD_ILLEGAL_MAIN_KEYWORD;
 
-        free(line);
         return (0);
       }
     }
 
-    if (line[0] != '*')                        /* All lines start with an asterisk */
+    if (line->buffer[0] != '*')                /* All lines start with an asterisk */
     {
      /*
       * Allow lines consisting of just whitespace...
       */
 
-      for (lineptr = line; *lineptr; lineptr ++)
+      for (lineptr = line->buffer; *lineptr; lineptr ++)
         if (!isspace(*lineptr & 255))
          break;
 
       if (*lineptr)
       {
         cg->ppd_status = PPD_MISSING_ASTERISK;
-        free(line);
         return (0);
       }
       else if (ignoreblank)
         continue;
       else
-      {
-        free(line);
         return (0);
-      }
     }
 
    /*
@@ -3033,7 +3019,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
           (keyptr - keyword) >= (PPD_MAX_NAME - 1))
       {
         cg->ppd_status = PPD_ILLEGAL_MAIN_KEYWORD;
-        free(line);
        return (0);
       }
 
@@ -3067,7 +3052,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
            (optptr - option) >= (PPD_MAX_NAME - 1))
         {
           cg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD;
-          free(line);
          return (0);
        }
 
@@ -3079,7 +3063,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
       if (isspace(*lineptr & 255) && cg->ppd_conform == PPD_CONFORM_STRICT)
       {
         cg->ppd_status = PPD_ILLEGAL_WHITESPACE;
-        free(line);
        return (0);
       }
 
@@ -3106,7 +3089,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
              (textptr - text) >= (PPD_MAX_LINE - 1))
          {
            cg->ppd_status = PPD_ILLEGAL_TRANSLATION;
-            free(line);
            return (0);
          }
 
@@ -3119,7 +3101,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
        if (textlen > PPD_MAX_TEXT && cg->ppd_conform == PPD_CONFORM_STRICT)
        {
          cg->ppd_status = PPD_ILLEGAL_TRANSLATION;
-          free(line);
          return (0);
        }
            
@@ -3132,7 +3113,6 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
     if (isspace(*lineptr & 255) && cg->ppd_conform == PPD_CONFORM_STRICT)
     {
       cg->ppd_status = PPD_ILLEGAL_WHITESPACE;
-      free(line);
       return (0);
     }
 
@@ -3156,21 +3136,14 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
       if (*strptr == '\"')
       {
        /*
-        * Quoted string by itself...
+        * Quoted string by itself, remove quotes...
        */
 
-       *string = malloc(strlen(lineptr) + 1);
-
-       strptr = *string;
-
-       for (; *lineptr != '\0'; lineptr ++)
-         if (*lineptr != '\"')
-           *strptr++ = *lineptr;
-
-       *strptr = '\0';
+        *strptr = '\0';
+       lineptr ++;
       }
-      else
-        *string = strdup(lineptr);
+
+      *string = _cupsStrAlloc(lineptr);
 
 /*      DEBUG_printf(("string = \"%s\", lineptr = \"%s\"\n", *string, lineptr));*/
 
@@ -3179,12 +3152,10 @@ ppd_read(cups_file_t    *fp,            /* I - File to read from */
   }
   while (mask == 0);
 
-  free(line);
-
   return (mask);
 }
 
 
 /*
- * End of "$Id: ppd.c 6942 2007-09-10 22:55:00Z mike $".
+ * End of "$Id: ppd.c 6937 2007-09-10 21:13:31Z mike $".
  */
index cee2436873f8437d1bf17002f92c2409b77bfcd9..14741e95c801d011fb17e20b65ead2f102e86c3e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: request.c 6712 2007-07-24 00:13:05Z mike $"
+ * "$Id: request.c 6879 2007-08-29 20:26:50Z mike $"
  *
  *   IPP utilities for the Common UNIX Printing System (CUPS).
  *
@@ -17,6 +17,7 @@
  * Contents:
  *
  *   cupsDoFileRequest() - Do an IPP request with a file.
+ *   cupsDoIORequest()   - Do an IPP request with file descriptors.
  *   cupsDoRequest()     - Do an IPP request.
  *   _cupsSetError()     - Set the last IPP status code and status-message.
  *   _cupsSetHTTPError() - Set the last error using the HTTP status.
@@ -552,5 +553,5 @@ _cupsSetHTTPError(http_status_t status)     /* I - HTTP status code */
 
 
 /*
- * End of "$Id: request.c 6712 2007-07-24 00:13:05Z mike $".
+ * End of "$Id: request.c 6879 2007-08-29 20:26:50Z mike $".
  */
index 0add09e97ece842385aa55566ded798eeab580b9..77d42ecfcb3e2ab0c9e528f80537af2736ade23d 100644 (file)
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: test.ppd 6799 2007-08-15 19:33:36Z mike $"
+*% "$Id: test.ppd 6795 2007-08-15 18:02:26Z mike $"
 *%
 *% Test PPD file for the Common UNIX Printing System (CUPS).
 *%
@@ -199,5 +199,5 @@ help:anchor='foo'%20bookID=Vendor%20Help
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: test.ppd 6799 2007-08-15 19:33:36Z mike $".
+*% End of "$Id: test.ppd 6795 2007-08-15 18:02:26Z mike $".
 *%
index db78a2cf7e0665f127431e5f0d385b57d5ea8e34..6a0bd9057b7f01a7b90ba8f89590157b32328ed2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: testfile.c 6963 2007-09-17 20:35:54Z mike $"
+ * "$Id: testfile.c 6962 2007-09-17 20:35:47Z mike $"
  *
  *   File test program for the Common UNIX Printing System (CUPS).
  *
@@ -496,5 +496,5 @@ read_write_tests(int compression)   /* I - Use compression? */
 
 
 /*
- * End of "$Id: testfile.c 6963 2007-09-17 20:35:54Z mike $".
+ * End of "$Id: testfile.c 6962 2007-09-17 20:35:47Z mike $".
  */
index afb252f48ffb3b012030a5656fc984aa3f8e0208..dcd31d2cfa34f89aa75a022179c18769f0a3e179 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: testppd.c 6799 2007-08-15 19:33:36Z mike $"
+ * "$Id: testppd.c 6936 2007-09-10 18:15:36Z mike $"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -235,8 +235,6 @@ main(int  argc,                             /* I - Number of command-line arguments */
       status ++;
       printf("FAIL (\"%s\" instead of \"Number 1 Foo Reason\")\n", buffer);
     }
-
-    ppdClose(ppd);
   }
   else
   {
@@ -362,15 +360,27 @@ main(int  argc,                           /* I - Number of command-line arguments */
           attr = (ppd_attr_t *)cupsArrayNext(ppd->sorted_attrs))
         printf("    *%s %s/%s: \"%s\"\n", attr->name, attr->spec,
               attr->text, attr->value ? attr->value : "");
-
-      ppdClose(ppd);
     }
   }
 
+#ifdef __APPLE__
+  if (getenv("MallocStackLogging") && getenv("MallocStackLoggingNoCompact"))
+  {
+    char       command[1024];          /* malloc_history command */
+
+    snprintf(command, sizeof(command), "malloc_history %d -all_by_size",
+            getpid());
+    fflush(stdout);
+    system(command);
+  }
+#endif /* __APPLE__ */
+
+  ppdClose(ppd);
+
   return (status);
 }
 
 
 /*
- * End of "$Id: testppd.c 6799 2007-08-15 19:33:36Z mike $".
+ * End of "$Id: testppd.c 6936 2007-09-10 18:15:36Z mike $".
  */
index c6021d15fb7e79aee7d2ce9ac485a09917dfd460..142c70a7af2152ab52ecc3e9b02630227bde0e0d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: util.c 7014 2007-10-10 21:57:43Z mike $"
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
@@ -30,6 +30,8 @@
  *                            server.
  *   cupsGetPPD2()          - Get the PPD file for a printer on the specified
  *                            server.
+ *   cupsGetPPD3()          - Get the PPD file for a printer on the specified
+ *                            server if it has changed.
  *   cupsGetPrinters()      - Get a list of printers from the default server.
  *   cupsGetServerPPD()     - Get an available PPD file from the server.
  *   cupsLastError()        - Return the last IPP status code.
@@ -91,7 +93,6 @@ cupsCancelJob(const char *name,               /* I - Name of printer or class */
                uri[HTTP_MAX_URI];      /* Printer URI */
   ipp_t                *request,               /* IPP request */
                *response;              /* IPP response */
-  cups_lang_t  *language;              /* Language info */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
 
@@ -129,21 +130,7 @@ cupsCancelJob(const char *name,            /* I - Name of printer or class */
   *    [requesting-user-name]
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_CANCEL_JOB;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL,
-               language != NULL ? language->language : "C");
-
-  cupsLangFree(language);
+  request = ippNewRequest(IPP_CANCEL_JOB);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
@@ -205,7 +192,6 @@ cupsGetClasses(char ***classes)             /* O - Classes */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  cups_lang_t  *language;              /* Default language */
   char         **temp;                 /* Temporary pointer */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
@@ -237,20 +223,7 @@ cupsGetClasses(char ***classes)            /* O - Classes */
   *    requested-attributes
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_CLASSES;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  cupsLangFree(language);
+  request = ippNewRequest(CUPS_GET_CLASSES);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", NULL, "printer-name");
@@ -371,7 +344,6 @@ cupsGetDefault2(http_t *http)               /* I - HTTP connection */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  cups_lang_t  *language;              /* Default language */
   const char   *var;                   /* Environment variable */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
@@ -403,20 +375,7 @@ cupsGetDefault2(http_t *http)              /* I - HTTP connection */
   *    attributes-natural-language
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_DEFAULT;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  cupsLangFree(language);
+  request = ippNewRequest(CUPS_GET_DEFAULT);
 
  /*
   * Do the request and get back a response...
@@ -491,7 +450,6 @@ cupsGetJobs2(http_t     *http,              /* I - HTTP connection */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  cups_lang_t  *language;              /* Default language */
   cups_job_t   *temp;                  /* Temporary pointer */
   int          id,                     /* job-id */
                priority,               /* job-priority */
@@ -564,20 +522,7 @@ cupsGetJobs2(http_t     *http,             /* I - HTTP connection */
   *    requested-attributes
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  cupsLangFree(language);
+  request = ippNewRequest(IPP_GET_JOBS);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                "printer-uri", NULL, uri);
@@ -758,6 +703,8 @@ const char *                                /* O - Filename for PPD file */
 cupsGetPPD(const char *name)           /* I - Printer name */
 {
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
+  time_t       modtime = 0;            /* Modification time */
+
 
  /*
   * See if we can connect to the server...
@@ -774,7 +721,13 @@ cupsGetPPD(const char *name)               /* I - Printer name */
   * Return the PPD file...
   */
 
-  return (cupsGetPPD2(cg->http, name));
+  cg->ppd_filename[0] = '\0';
+
+  if (cupsGetPPD3(cg->http, name, &modtime, cg->ppd_filename,
+                  sizeof(cg->ppd_filename)) == HTTP_OK)
+    return (cg->ppd_filename);
+  else
+    return (NULL);
 }
 
 
@@ -790,6 +743,43 @@ cupsGetPPD(const char *name)               /* I - Printer name */
 const char *                           /* O - Filename for PPD file */
 cupsGetPPD2(http_t     *http,          /* I - HTTP connection */
             const char *name)          /* I - Printer name */
+{
+  _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
+  time_t       modtime = 0;            /* Modification time */
+
+
+  cg->ppd_filename[0] = '\0';
+
+  if (cupsGetPPD3(http, name, &modtime, cg->ppd_filename,
+                  sizeof(cg->ppd_filename)) == HTTP_OK)
+    return (cg->ppd_filename);
+  else
+    return (NULL);
+}
+
+
+/*
+ * 'cupsGetPPD3()' - Get the PPD file for a printer on the specified
+ *                   server if it has changed.
+ *
+ * The "modtime" parameter contains the modification time of any
+ * locally-cached content and is updated with the time from the PPD file on
+ * the server.
+ *
+ * The "buffer" parameter contains the local PPD filename.  If it contains
+ * the empty string, a new temporary file is created, otherwise the existing
+ * file will be overwritten as needed.
+ *
+ * On success, HTTP_OK is returned for a new PPD file and HTTP_NOT_MODIFIED
+ * if the existing PPD file is up-to-date.  Any other status is an error.
+ */
+
+http_status_t                          /* O  - HTTP status */
+cupsGetPPD3(http_t     *http,          /* I  - HTTP connection */
+            const char *name,          /* I  - Printer name */
+           time_t     *modtime,        /* IO - Modification time */
+           char       *buffer,         /* I  - Filename buffer */
+           size_t     bufsize)         /* I  - Size of filename buffer */
 {
   int          http_port;              /* Port number */
   char         http_hostname[HTTP_MAX_HOST];
@@ -808,17 +798,32 @@ cupsGetPPD2(http_t     *http,             /* I - HTTP connection */
   * Range check input...
   */
 
-  DEBUG_printf(("cupsGetPPD2(http=%p, name=\"%s\")\n", http,
-                name ? name : "(null)"));
+  DEBUG_printf(("cupsGetPPD3(http=%p, name=\"%s\", modtime=%p(%d), buffer=%p, "
+                "bufsize=%d)\n", http, name ? name : "(null)", modtime,
+               modtime ? *modtime : 0, buffer, (int)bufsize));
 
-  if (!http || !name)
+  if (!http)
   {
-    if (!http)
-      _cupsSetError(IPP_INTERNAL_ERROR, "No HTTP connection!");
-    else
-      _cupsSetError(IPP_INTERNAL_ERROR, "No printer name!");
+    _cupsSetError(IPP_INTERNAL_ERROR, "No HTTP connection!");
+    return (HTTP_NOT_ACCEPTABLE);
+  }
 
-    return (NULL);
+  if (!name)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, "No printer name!");
+    return (HTTP_NOT_ACCEPTABLE);
+  }
+
+  if (!modtime)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, "No modification time!");
+    return (HTTP_NOT_ACCEPTABLE);
+  }
+
+  if (!buffer || bufsize <= 1)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, "Bad filename buffer!");
+    return (HTTP_NOT_ACCEPTABLE);
   }
 
  /*
@@ -827,7 +832,7 @@ cupsGetPPD2(http_t     *http,               /* I - HTTP connection */
 
   if (!cups_get_printer_uri(http, name, hostname, sizeof(hostname), &port,
                             resource, sizeof(resource), 0))
-    return (NULL);
+    return (HTTP_NOT_FOUND);
 
   DEBUG_printf(("Printer hostname=\"%s\", port=%d\n", hostname, port));
 
@@ -872,14 +877,19 @@ cupsGetPPD2(http_t     *http,             /* I - HTTP connection */
   {
     DEBUG_puts("Unable to connect to server!");
 
-    return (NULL);
+    return (HTTP_SERVICE_UNAVAILABLE);
   }
 
  /*
   * Get a temp file...
   */
 
-  if ((fd = cupsTempFd(cg->ppd_filename, sizeof(cg->ppd_filename))) < 0)
+  if (buffer[0])
+    fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+  else
+    fd = cupsTempFd(buffer, bufsize);
+
+  if (fd < 0)
   {
    /*
     * Can't open file; close the server connection and return NULL...
@@ -890,7 +900,7 @@ cupsGetPPD2(http_t     *http,               /* I - HTTP connection */
     if (http2 != http)
       httpClose(http2);
 
-    return (NULL);
+    return (HTTP_SERVER_ERROR);
   }
 
  /*
@@ -899,6 +909,10 @@ cupsGetPPD2(http_t     *http,              /* I - HTTP connection */
 
   strlcat(resource, ".ppd", sizeof(resource));
 
+  if (*modtime > 0)
+    httpSetField(http2, HTTP_FIELD_IF_MODIFIED_SINCE,
+                 httpGetDateString(*modtime));
+
   status = cupsGetFd(http2, resource, fd);
 
   close(fd);
@@ -910,7 +924,9 @@ cupsGetPPD2(http_t     *http,               /* I - HTTP connection */
   * See if we actually got the file or an error...
   */
 
-  if (status != HTTP_OK)
+  if (status == HTTP_OK)
+    *modtime = httpGetDateTime(httpGetField(http2, HTTP_FIELD_DATE));
+  else if (status != HTTP_NOT_MODIFIED)
   {
     switch (status)
     {
@@ -930,15 +946,13 @@ cupsGetPPD2(http_t     *http,             /* I - HTTP connection */
     }
 
     unlink(cg->ppd_filename);
-
-    return (NULL);
   }
 
  /*
   * Return the PPD file...
   */
 
-  return (cg->ppd_filename);
+  return (status);
 }
 
 
@@ -957,7 +971,6 @@ cupsGetPrinters(char ***printers)   /* O - Printers */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  cups_lang_t  *language;              /* Default language */
   char         **temp;                 /* Temporary pointer */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
@@ -989,20 +1002,7 @@ cupsGetPrinters(char ***printers) /* O - Printers */
   *    requested-attributes
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_PRINTERS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  cupsLangFree(language);
+  request = ippNewRequest(CUPS_GET_PRINTERS);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", NULL, "printer-name");
@@ -1270,7 +1270,6 @@ cupsPrintFiles2(http_t        *http,      /* I - HTTP connection */
   ipp_t                *response;              /* IPP response */
   ipp_attribute_t *attr;               /* IPP job-id attribute */
   char         uri[HTTP_MAX_URI];      /* Printer URI */
-  cups_lang_t  *language;              /* Language to use */
   int          jobid;                  /* New job ID */
   const char   *base;                  /* Basename of current filename */
 
@@ -1302,35 +1301,19 @@ cupsPrintFiles2(http_t        *http,    /* I - HTTP connection */
     return (0);
   }
 
- /*
-  * Setup the request data...
-  */
-
-  language = cupsLangDefault();
-
  /*
   * Build a standard CUPS URI for the printer and fill the standard IPP
   * attributes...
   */
 
-  if ((request = ippNew()) == NULL)
+  if ((request = ippNewRequest(num_files == 1 ? IPP_PRINT_JOB :
+                                                IPP_CREATE_JOB)) == NULL)
   {
     _cupsSetError(IPP_INTERNAL_ERROR, NULL);
 
     return (0);
   }
 
-  request->request.op.operation_id = num_files == 1 ? IPP_PRINT_JOB :
-                                                      IPP_CREATE_JOB;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL,
-               language != NULL ? language->language : "C");
-
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
 
@@ -1392,21 +1375,11 @@ cupsPrintFiles2(http_t        *http,    /* I - HTTP connection */
       * attributes...
       */
 
-      if ((request = ippNew()) == NULL)
+      if ((request = ippNewRequest(IPP_SEND_DOCUMENT)) == NULL)
        return (0);
 
-      request->request.op.operation_id = IPP_SEND_DOCUMENT;
-      request->request.op.request_id   = 1;
-
       snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", jobid);
 
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                  "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                  "attributes-natural-language", NULL,
-                  language != NULL ? language->language : "C");
-
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
                   NULL, uri);
 
@@ -1458,8 +1431,6 @@ cupsPrintFiles2(http_t        *http,      /* I - HTTP connection */
        ippDelete(response);
     }
 
-  cupsLangFree(language);
-
   return (jobid);
 }
 
@@ -1728,5 +1699,5 @@ cups_get_printer_uri(
 
 
 /*
- * End of "$Id: util.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: util.c 7014 2007-10-10 21:57:43Z mike $".
  */
index 9b37aed52d8f51acbf93a6535d3e6bb7ef3db0e3..f060e382dd719196ca8b36b30767602d45efaee5 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7014 2007-10-10 21:57:43Z mike $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
@@ -67,31 +67,6 @@ CHARMAPS =   \
                windows-950.txt
 
 CHARSETS =     \
-               windows-874 \
-               windows-1250 \
-               windows-1251 \
-               windows-1252 \
-               windows-1253 \
-               windows-1254 \
-               windows-1255 \
-               windows-1256 \
-               windows-1257 \
-               windows-1258 \
-               koi8-r \
-               koi8-u \
-               iso-8859-1 \
-               iso-8859-2 \
-               iso-8859-3 \
-               iso-8859-4 \
-               iso-8859-5 \
-               iso-8859-6 \
-               iso-8859-7 \
-               iso-8859-8 \
-               iso-8859-9 \
-               iso-8859-10 \
-               iso-8859-13 \
-               iso-8859-14 \
-               iso-8859-15 \
                utf-8
 
 DATAFILES =    \
@@ -171,5 +146,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7014 2007-10-10 21:57:43Z mike $".
 #
index cffc239d64f39209f2cfa73cbf9bdcb705cf35ae..341536d9b81c2ede1951b56f876a86169b30af2d 100644 (file)
Binary files a/desktop/cups-128.png and b/desktop/cups-128.png differ
index a75e8ae192f2dc12ed682eb3dd8fdd4befbfb075..833adac2469c23ed9685ebd6ddfa6ea6a59fc1cd 100644 (file)
Binary files a/desktop/cups-16.png and b/desktop/cups-16.png differ
diff --git a/desktop/cups-256.png b/desktop/cups-256.png
new file mode 100644 (file)
index 0000000..43abffb
Binary files /dev/null and b/desktop/cups-256.png differ
index 30513f3697bf9b972f0541ef7fb0133eecc11216..42e29d3299dbd7e0b460e051309a31cc70599a4d 100644 (file)
Binary files a/desktop/cups-32.png and b/desktop/cups-32.png differ
diff --git a/desktop/cups-512.png b/desktop/cups-512.png
new file mode 100644 (file)
index 0000000..3ba454d
Binary files /dev/null and b/desktop/cups-512.png differ
index b4f764a1f9b34e1935b900f7c79535ba4a2fb730..15a07cbd6bc3f19951d5924d2d990242da13d40e 100644 (file)
Binary files a/desktop/cups-64.png and b/desktop/cups-64.png differ
diff --git a/desktop/cups.icns b/desktop/cups.icns
new file mode 100644 (file)
index 0000000..a61122b
Binary files /dev/null and b/desktop/cups.icns differ
diff --git a/desktop/cups.svg b/desktop/cups.svg
new file mode 100644 (file)
index 0000000..cb1085b
--- /dev/null
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/mike/c/cups-trunk/desktop"
+   sodipodi:docname="cups.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/mike/c/cups-trunk/desktop/cups-test.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4285">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4287" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4289" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4271">
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1;"
+         offset="0"
+         id="stop4273" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:0;"
+         offset="1"
+         id="stop4275" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4261">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4263" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4265" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop3271" />
+      <stop
+         style="stop-color:#007f00;stop-opacity:1;"
+         offset="1"
+         id="stop3273" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3226">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3228" />
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="1"
+         id="stop3230" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3214">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop3216" />
+      <stop
+         style="stop-color:#007f00;stop-opacity:1;"
+         offset="1"
+         id="stop3218" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5228">
+      <stop
+         style="stop-color:#cccc99;stop-opacity:0"
+         offset="0"
+         id="stop5230" />
+      <stop
+         id="stop5236"
+         offset="0.89999998"
+         style="stop-color:#cccc99;stop-opacity:0;" />
+      <stop
+         style="stop-color:#cccc99;stop-opacity:1"
+         offset="1"
+         id="stop5232" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5198">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5200" />
+      <stop
+         style="stop-color:#333333;stop-opacity:0.94117647;"
+         offset="1"
+         id="stop5202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5177">
+      <stop
+         style="stop-color:#cccc99;stop-opacity:1;"
+         offset="0"
+         id="stop5179" />
+      <stop
+         style="stop-color:#cccc99;stop-opacity:0.49803922"
+         offset="1"
+         id="stop5181" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4768">
+      <stop
+         id="stop4770"
+         offset="0"
+         style="stop-color:#e8e8e8;stop-opacity:0.90980393;" />
+      <stop
+         id="stop4772"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3598">
+      <stop
+         id="stop3600"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3602"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2165">
+      <stop
+         style="stop-color:#350000;stop-opacity:1;"
+         offset="0"
+         id="stop2167" />
+      <stop
+         style="stop-color:#ff3333;stop-opacity:1;"
+         offset="1"
+         id="stop2169" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3196">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3198" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3200" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3160">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3162" />
+      <stop
+         id="stop3192"
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.24705882;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3164" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3257">
+      <path
+         transform="matrix(1,0,0,0.9882639,0,5.8678726e-2)"
+         d="M 95 50.534397 A 45 45.534397 0 1 1  5,50.534397 A 45 45.534397 0 1 1  95 50.534397 z"
+         sodipodi:ry="45.534397"
+         sodipodi:rx="45"
+         sodipodi:cy="50.534397"
+         sodipodi:cx="50"
+         id="path3259"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       x="-0.087105347"
+       width="1.1742107"
+       y="-0.18598169"
+       height="1.3719634"
+       id="filter4279">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.9373093"
+         id="feGaussianBlur4281" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4303">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5625"
+         id="feGaussianBlur4305" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.035535272"
+       width="1.0710705"
+       y="-0.10884558"
+       height="1.2176912"
+       id="filter3192">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1845091"
+         id="feGaussianBlur3194" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3269"
+       id="linearGradient2231"
+       gradientUnits="userSpaceOnUse"
+       x1="53.971653"
+       y1="73.40696"
+       x2="49.183048"
+       y2="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4271"
+       id="radialGradient2233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.4683544,0,41.202533)"
+       cx="51.68919"
+       cy="77.5"
+       fx="51.68919"
+       fy="77.5"
+       r="26.68919" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4261"
+       id="linearGradient2235"
+       gradientUnits="userSpaceOnUse"
+       x1="50"
+       y1="10"
+       x2="50"
+       y2="36.117935" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4285"
+       id="linearGradient2237"
+       gradientUnits="userSpaceOnUse"
+       x1="50"
+       y1="100"
+       x2="50"
+       y2="81.396393" />
+    <filter
+       inkscape:collect="always"
+       x="-0.068571429"
+       width="1.1371429"
+       y="-0.48"
+       height="1.96"
+       id="filter3210">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2"
+         id="feGaussianBlur3212" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="1"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.07"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="100px"
+     height="100px"
+     showgrid="true"
+     inkscape:grid-points="true"
+     inkscape:window-width="872"
+     inkscape:window-height="622"
+     inkscape:window-x="792"
+     inkscape:window-y="312"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title>CUPS Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Michael Sweet</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Apple Inc.</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.33300003;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3210)"
+       id="path2239"
+       sodipodi:cx="50"
+       sodipodi:cy="90"
+       sodipodi:rx="35"
+       sodipodi:ry="5"
+       d="M 85 90 A 35 5 0 1 1  15,90 A 35 5 0 1 1  85 90 z"
+       transform="matrix(1.0714286,0,0,1,-3.5714286,0)" />
+    <g
+       id="g2221"
+       transform="matrix(0.9444444,0,0,0.9444444,2.777778,0.2777779)">
+      <path
+         transform="matrix(1.0184902,0,0,1.0241856,-9.2450814e-2,-0.1209281)"
+         d="M 93.366096 48.937347 A 44.183048 43.937347 0 1 1  5,48.937347 A 44.183048 43.937347 0 1 1  93.366096 48.937347 z"
+         sodipodi:ry="43.937347"
+         sodipodi:rx="44.183048"
+         sodipodi:cy="48.937347"
+         sodipodi:cx="49.183048"
+         id="path3267"
+         style="opacity:1;fill:url(#linearGradient2231);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.9367088,0,0,1,1.5822791,0)"
+         d="M 78.37838 77.5 A 26.68919 12.5 0 1 1  25,77.5 A 26.68919 12.5 0 1 1  78.37838 77.5 z"
+         sodipodi:ry="12.5"
+         sodipodi:rx="26.68919"
+         sodipodi:cy="77.5"
+         sodipodi:cx="51.68919"
+         id="path4269"
+         style="opacity:0.75;fill:url(#radialGradient2233);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter4279)"
+         sodipodi:type="arc" />
+      <g
+         style="opacity:0.8"
+         id="g3281">
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 50,5 C 25.16,5 5,25.16 5,50 C 5,74.84 25.16,95 50,95 C 60.487179,95 70.127342,91.396876 77.78125,85.375 C 78.181257,85.060286 78.579829,84.734064 78.96875,84.40625 C 83.665983,80.447043 87.549643,75.552818 90.3125,70 L 75.59375,70 C 69.643319,77.602179 60.395279,82.5 50,82.5 C 32.059999,82.5 17.5,67.94 17.5,50 C 17.5,32.06 32.060001,17.5 50,17.5 C 60.395278,17.5 69.643319,22.397821 75.59375,30 L 90.3125,30 C 87.549643,24.447182 83.665983,19.552957 78.96875,15.59375 C 78.579829,15.265936 78.181257,14.939714 77.78125,14.625 C 70.127342,8.6031239 60.487179,5 50,5 z M 93.3125,37.75 C 93.477886,38.334017 93.639153,38.906614 93.78125,39.5 C 93.640472,38.911539 93.476165,38.329249 93.3125,37.75 z M 93.8125,39.65625 C 93.958484,40.275603 94.067455,40.902325 94.1875,41.53125 C 94.067925,40.904801 93.957786,40.273219 93.8125,39.65625 z M 94.6875,44.8125 C 94.782981,45.64248 94.856683,46.469338 94.90625,47.3125 C 94.856514,46.471022 94.782921,45.640957 94.6875,44.8125 z M 94.90625,47.3125 C 94.958277,48.197515 95,49.101843 95,50 C 95,49.096018 94.958903,48.203339 94.90625,47.3125 z M 95,50 C 95,50.898157 94.958277,51.802485 94.90625,52.6875 C 94.958903,51.796661 95,50.903982 95,50 z M 94.90625,52.6875 C 94.856683,53.530662 94.782981,54.35752 94.6875,55.1875 C 94.782921,54.359043 94.856514,53.528978 94.90625,52.6875 z M 94.1875,58.46875 C 94.067455,59.097675 93.958484,59.724397 93.8125,60.34375 C 93.957786,59.726781 94.067925,59.095199 94.1875,58.46875 z M 93.78125,60.5 C 93.639153,61.093386 93.477886,61.665983 93.3125,62.25 C 93.476165,61.670751 93.640472,61.088461 93.78125,60.5 z "
+           id="path5185" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 40,35 L 60,35 C 62.77,35 70,47.23 70,50 L 70,65 C 70,67.77 67.77,70 65,70 L 35,70 C 32.23,70 30,67.77 30,65 L 30,50 C 30,47.23 37.23,35 40,35 z "
+           id="rect3142"
+           sodipodi:nodetypes="ccccccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 45,30 C 48.9957,30 51.25,30 55,30 C 60.303301,30 60,45 60,45 L 40,45 C 40,45 39.696699,30 45,30 z "
+           id="rect3145"
+           sodipodi:nodetypes="csccs" />
+      </g>
+      <path
+         transform="matrix(0.75,0,0,1.3400753,12.5,-3.4007528)"
+         d="M 90 23.058968 A 40 13.058968 0 1 1  10,23.058968 A 40 13.058968 0 1 1  90 23.058968 z"
+         sodipodi:ry="13.058968"
+         sodipodi:rx="40"
+         sodipodi:cy="23.058968"
+         sodipodi:cx="50"
+         id="path3286"
+         style="opacity:0.6;fill:url(#linearGradient2235);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3192)"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.5,0,0,1.5,-25,-55)"
+         d="M 80 85 A 30 15 0 1 1  20,85 A 30 15 0 1 1  80 85 z"
+         sodipodi:ry="15"
+         sodipodi:rx="30"
+         sodipodi:cy="85"
+         sodipodi:cx="50"
+         id="path4283"
+         style="opacity:0.3333;fill:url(#linearGradient2237);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter4303)"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
index 9b7dd88122be7b6c7490038639bfa9f39bcd42b7..6ce51d17e1ccf08e63255103e9f20bd9d4b4a644 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6824 2007-08-20 22:21:15Z mike $"
+# "$Id: Makefile 6900 2007-08-30 17:17:51Z mike $"
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
@@ -22,84 +22,25 @@ include ../Makedefs
 WEBPAGES       =       \
                        cups.css \
                        cups-printable.css \
-                       favicon.ico \
+                       favicon.png \
                        index.html \
                        robots.txt
-WEBBUTTONS     =       \
-                       images/button-accept-jobs.gif \
-                       images/button-add-class.gif \
-                       images/button-add-printer.gif \
-                       images/button-add-rss-subscription.gif \
-                       images/button-add-this-printer.gif \
-                       images/button-cancel-all-jobs.gif \
-                       images/button-cancel-job.gif \
-                       images/button-cancel-subscription.gif \
-                       images/button-change-settings.gif \
-                       images/button-clean-print-heads.gif \
-                       images/button-clear.gif \
-                       images/button-continue.gif \
-                       images/button-delete-class.gif \
-                       images/button-delete-printer.gif \
-                       images/button-edit-configuration-file.gif \
-                       images/button-export-samba.gif \
-                       images/button-find-new-printers.gif \
-                       images/button-help.gif \
-                       images/button-hold-job.gif \
-                       images/button-manage-classes.gif \
-                       images/button-manage-jobs.gif \
-                       images/button-manage-printers.gif \
-                       images/button-manage-server.gif \
-                       images/button-modify-class.gif \
-                       images/button-modify-printer.gif \
-                       images/button-move-job.gif \
-                       images/button-move-jobs.gif \
-                       images/button-print-self-test-page.gif \
-                       images/button-print-test-page.gif \
-                       images/button-publish-printer.gif \
-                       images/button-reject-jobs.gif \
-                       images/button-release-job.gif \
-                       images/button-restart-job.gif \
-                       images/button-save-changes.gif \
-                       images/button-search.gif \
-                       images/button-set-allowed-users.gif \
-                       images/button-set-as-default.gif \
-                       images/button-set-printer-options.gif \
-                       images/button-show-active.gif \
-                       images/button-show-all.gif \
-                       images/button-show-completed.gif \
-                       images/button-show-next.gif \
-                       images/button-show-previous.gif \
-                       images/button-sort-ascending.gif \
-                       images/button-sort-descending.gif \
-                       images/button-start-class.gif \
-                       images/button-start-printer.gif \
-                       images/button-stop-class.gif \
-                       images/button-stop-printer.gif \
-                       images/button-unpublish-printer.gif \
-                       images/button-use-default-config.gif \
-                       images/button-view-access-log.gif \
-                       images/button-view-error-log.gif \
-                       images/button-view-page-log.gif \
-                       images/button-view-printable-version.gif
 WEBIMAGES      =       \
-                       images/bottom-left.gif \
-                       images/bottom-right.gif \
-                       images/classes.gif \
+                       images/classes.png \
+                       images/cups.png \
                        images/cups-block-diagram.gif \
-                       images/esp-logo.gif \
-                       images/happy.gif \
-                       images/logo.gif \
-                       images/printer-idle.gif \
-                       images/printer-processing.gif \
-                       images/printer-stopped.gif \
+                       images/cups-icon.png \
+                       images/left.gif \
+                       images/printer-idle.png \
+                       images/printer-processing.png \
+                       images/printer-stopped.png \
                        images/raster.png \
-                       images/raster.svg \
+                       images/right.gif \
+                       images/sel.gif \
+                       images/shadow.png \
                        images/smiley.jpg \
-                       images/tab-left.gif \
-                       images/tab-right.gif \
-                       images/top-left.gif \
-                       images/top-middle.gif \
-                       images/top-right.gif \
+                       images/unsel-hover.gif \
+                       images/unsel.gif \
                        images/web-add-this-printer.gif \
                        images/web-password.gif \
                        images/web-printer-driver.gif \
@@ -211,7 +152,7 @@ install:    all $(INSTALL_LANGUAGES)
                $(INSTALL_MAN) $$file $(DOCDIR)/help; \
        done
        $(INSTALL_DIR) -m 755 $(DOCDIR)/images
-       for file in $(WEBIMAGES) $(WEBBUTTONS); do \
+       for file in $(WEBIMAGES); do \
                $(INSTALL_MAN) $$file $(DOCDIR)/images; \
        done
 
@@ -243,7 +184,7 @@ uninstall: $(UNINSTALL_LANGUAGES)
        for file in $(HELPFILES); do \
                $(INSTALL_MAN) $(DOCDIR)/help/$$file; \
        done
-       for file in $(WEBIMAGES) $(WEBBUTTONS); do \
+       for file in $(WEBIMAGES); do \
                $(INSTALL_MAN) $(DOCDIR)/images/$$file; \
        done
        -$(RMDIR) $(DOCDIR)/images
@@ -254,9 +195,6 @@ uninstall-languages:
        -for lang in $(LANGUAGES); do \
                $(RM) $(DOCDIR)/$$lang/index.html; \
                $(RM) $(DOCDIR)/$$lang/cups.css; \
-               for file in $(WEBBUTTONS); do \
-                       $(RM) $(DOCDIR)/$$lang/images/$$file; \
-               done \
                $(RMDIR) $(DOCDIR)/$$lang/images; \
                $(RMDIR) $(DOCDIR)/$$lang; \
        done
index 026042412efa6ad176c780448836df1c2542928b..6d356f6d051d345d337e87ea25342cec4d6aade1 100644 (file)
@@ -1,5 +1,5 @@
 BODY {
-  background: #cccc99;
+  background: #e8e8e8;
   color: #000000;
   font-family: sans-serif;
 }
@@ -39,40 +39,101 @@ P.formula {
 }
 
 BLOCKQUOTE {
-  background: #bbbb88;
-  border: solid thin #999966;
-  padding: 10pt;
+  background: #e1e1e1;
+  border: inset 1px #dddddd;
+  padding: 10px;
+  /* These are not implemented by all browsers, but that's OK */
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+}
+
+A IMG {
+  border: none;
+}
+
+A:link:hover IMG {
+  background: #e0e0e0;
+  border-radius: 10px;
+  -moz-border-radius: 10px;
 }
 
 A:link, A:visited {
   text-decoration: none;
-  font-weight: bold;
-  color: #993300;
+  color: #000099;
 }
 
 A:link:hover, A:visited:hover, A:active {
   text-decoration: underline;
-  font-weight: bold;
-  color: #bb5500;
+  color: #990099;
+}
+
+TABLE.page {
+  border: none;
+  border-collapse: collapse;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+}
+
+TD.body {
+  height: 100%;
+  vertical-align: top;
+}
+
+TD.sel, TD.unsel {
+  border-left: thin solid #aaaaaa;
+  font-size: 120%;
+  padding: 0px 5px;
+  text-align: center;
+  vertical-align: middle;
+  width: 14%;
+}
+
+TD.sel {
+  background: url(images/sel.gif);
 }
 
-A.sel, TR.sel {
-  background-color: #eeeebb;
-  color: #993300;
+TD.unsel {
+  background: url(images/unsel.gif);
 }
 
-TR.sel TD {
-  padding: 4pt;
+TD.sel A, TD.sel A:hover {
+  color: #ffffff;
+  font-weight: normal;
+  text-decoration: none;
 }
 
-A.unsel, A.unsel:visited {
-  background-color: #666633;
-  color: #e8e8b8;
+TD.unsel A, TD.unsel A:visited {
+  color: #333333;
+  font-weight: normal;
 }
 
-A.unsel:link:hover, A.unsel:visited:hover, A.unsel:active {
-  background-color: #999966;
-  color: #663300;
+TD.unsel:hover {
+  background: url(images/unsel-hover.gif);
+  color: #ffffff;
+}
+
+TD.unsel A:link:hover, TD.unsel A:visited:hover, TD.unsel A:active {
+  color: #ffffff;
+  font-weight: normal;
+  text-decoration: none;
+}
+
+TD.trailer {
+  background: #e1e1e1;
+  border: solid thin #cccccc;
+  color: #666666;
+  font-size: 80%;
+  padding: 5px;
+}
+
+TD.trailer A {
+  color: #666699;
+}
+
+FORM {
+  display: inline;
 }
 
 INPUT[TYPE="TEXT"], TEXTAREA {
@@ -89,31 +150,20 @@ SUB, SUP {
   font-size: 50%;
 }
 
-TR.header, TR.header TH, TH.header, TR.trailer, TR.trailer TH, TH.trailer {
-  background-color: #bbbb88;
-}
-
-TR.page, TD.page {
-  background-color: #eeeebb;
-  height: 100%;
-  padding-top: 20pt;
-  padding-bottom: 20pt;
-}
-
 TR.data, TD.data, TR.data TD {
   padding: 5;
-  border-bottom: solid 2pt #000000;
+  border-bottom: solid 1pt #999999;
 }
 
 TR.data TH {
-  border-bottom: solid 2pt #000000;
+  border-bottom: solid 1pt #999999;
   padding-top: 10pt;
   padding-left: 5pt;
   text-align: left;
 }
 
 DIV.table TABLE {
-  border: solid thin #999966;
+  border: solid thin #999999;
   border-spacing: 0;
   margin-left: auto;
   margin-right: auto;
@@ -129,14 +179,14 @@ DIV.table CAPTION {
 }
 
 DIV.table TABLE TD {
-  border: solid thin #bbbb88;
+  border: solid thin #bbbbbb;
   padding-top: 5pt;
 }
 
 DIV.table TABLE TH {
-  background: #bbbb88;
+  background: #bbbbbb;
   border: none;
-  border-bottom: solid thin #999966;
+  border-bottom: solid thin #999999;
 }
 
 DIV.figure TABLE {
@@ -183,27 +233,14 @@ H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
 }
 
 H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-IMG.button {
-  border: none;
-  padding: 2pt;
-  vertical-align: middle;
+  border-bottom: solid 1pt #999999;
 }
 
 DIV.sidebar {
-  background: #ddddaa;
-  border: solid 2px #cccc99;
   float: right;
   min-width: 25%;
-  margin-left: 10pt;
+  margin-left: 10px;
   max-width: 33%;
-  padding: 5pt;
-  /* These are not implemented by all browsers, but that's OK */
-  border-radius: 10pt;
-  -moz-border-radius: 10pt;
-  box-shadow: 5pt 5pt 5pt #cccccc;
 }
 
 DIV.sidebar P.l0 {
@@ -230,15 +267,26 @@ DIV.sidebar P.l2 {
   text-indent: -18pt;
 }
 
-TABLE.pager {
-  background: #cccc99;
-  border: solid thin #999966;
-  margin-top: 10pt;
-  padding: 2pt;
+TABLE.inset {
+  background: #e1e1e1;
+  border: inset 1px #dddddd;
+  padding: 0;
   /* These are not implemented by all browsers, but that's OK */
-  border-radius: 10pt;
-  -moz-border-radius: 10pt;
-  box-shadow: 5pt 5pt 5pt #cccccc;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+}
+
+TABLE.inset CAPTION {
+  caption-side: top;
+  color: #666666;
+  font-size: 80%;
+  margin-left: 10px;
+  margin-bottom: 2px;
+  text-align: left;
+}
+
+TABLE.inset TD {
+  padding: 5px;
 }
 
 DT {
diff --git a/doc/de/images/button-accept-jobs.gif b/doc/de/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index ab57159..0000000
Binary files a/doc/de/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/de/images/button-add-class.gif b/doc/de/images/button-add-class.gif
deleted file mode 100644 (file)
index 3cfd28c..0000000
Binary files a/doc/de/images/button-add-class.gif and /dev/null differ
diff --git a/doc/de/images/button-add-printer.gif b/doc/de/images/button-add-printer.gif
deleted file mode 100644 (file)
index 49b4bcb..0000000
Binary files a/doc/de/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-add-rss-subscription.gif b/doc/de/images/button-add-rss-subscription.gif
deleted file mode 100644 (file)
index 5a4d93c..0000000
Binary files a/doc/de/images/button-add-rss-subscription.gif and /dev/null differ
diff --git a/doc/de/images/button-add-this-printer.gif b/doc/de/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index df9c7c0..0000000
Binary files a/doc/de/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-cancel-all-jobs.gif b/doc/de/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index bb92d20..0000000
Binary files a/doc/de/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/de/images/button-cancel-job.gif b/doc/de/images/button-cancel-job.gif
deleted file mode 100644 (file)
index 48821df..0000000
Binary files a/doc/de/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/de/images/button-cancel-subscription.gif b/doc/de/images/button-cancel-subscription.gif
deleted file mode 100644 (file)
index 29cbf90..0000000
Binary files a/doc/de/images/button-cancel-subscription.gif and /dev/null differ
diff --git a/doc/de/images/button-change-settings.gif b/doc/de/images/button-change-settings.gif
deleted file mode 100644 (file)
index 0c0c4f5..0000000
Binary files a/doc/de/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/de/images/button-clean-print-heads.gif b/doc/de/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 14c6474..0000000
Binary files a/doc/de/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/de/images/button-clear.gif b/doc/de/images/button-clear.gif
deleted file mode 100644 (file)
index 1002f4d..0000000
Binary files a/doc/de/images/button-clear.gif and /dev/null differ
diff --git a/doc/de/images/button-continue.gif b/doc/de/images/button-continue.gif
deleted file mode 100644 (file)
index b8a55bf..0000000
Binary files a/doc/de/images/button-continue.gif and /dev/null differ
diff --git a/doc/de/images/button-delete-class.gif b/doc/de/images/button-delete-class.gif
deleted file mode 100644 (file)
index 6cab405..0000000
Binary files a/doc/de/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/de/images/button-delete-printer.gif b/doc/de/images/button-delete-printer.gif
deleted file mode 100644 (file)
index 1991ba0..0000000
Binary files a/doc/de/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-edit-configuration-file.gif b/doc/de/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index fdba122..0000000
Binary files a/doc/de/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/de/images/button-export-samba.gif b/doc/de/images/button-export-samba.gif
deleted file mode 100644 (file)
index a9f51a9..0000000
Binary files a/doc/de/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/de/images/button-find-new-printers.gif b/doc/de/images/button-find-new-printers.gif
deleted file mode 100644 (file)
index 24a8221..0000000
Binary files a/doc/de/images/button-find-new-printers.gif and /dev/null differ
diff --git a/doc/de/images/button-help.gif b/doc/de/images/button-help.gif
deleted file mode 100644 (file)
index 8079e44..0000000
Binary files a/doc/de/images/button-help.gif and /dev/null differ
diff --git a/doc/de/images/button-hold-job.gif b/doc/de/images/button-hold-job.gif
deleted file mode 100644 (file)
index 955f9a4..0000000
Binary files a/doc/de/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/de/images/button-manage-classes.gif b/doc/de/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 6489ebc..0000000
Binary files a/doc/de/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/de/images/button-manage-jobs.gif b/doc/de/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 4d4e553..0000000
Binary files a/doc/de/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/de/images/button-manage-printers.gif b/doc/de/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 26feda4..0000000
Binary files a/doc/de/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/de/images/button-manage-server.gif b/doc/de/images/button-manage-server.gif
deleted file mode 100644 (file)
index 16a8795..0000000
Binary files a/doc/de/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/de/images/button-modify-class.gif b/doc/de/images/button-modify-class.gif
deleted file mode 100644 (file)
index e163da7..0000000
Binary files a/doc/de/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/de/images/button-modify-printer.gif b/doc/de/images/button-modify-printer.gif
deleted file mode 100644 (file)
index a9ec147..0000000
Binary files a/doc/de/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-move-job.gif b/doc/de/images/button-move-job.gif
deleted file mode 100644 (file)
index 700b9be..0000000
Binary files a/doc/de/images/button-move-job.gif and /dev/null differ
diff --git a/doc/de/images/button-move-jobs.gif b/doc/de/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 5da7788..0000000
Binary files a/doc/de/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/de/images/button-print-self-test-page.gif b/doc/de/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index d5d3aab..0000000
Binary files a/doc/de/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/de/images/button-print-test-page.gif b/doc/de/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 01dc757..0000000
Binary files a/doc/de/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/de/images/button-publish-printer.gif b/doc/de/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 181cb27..0000000
Binary files a/doc/de/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-reject-jobs.gif b/doc/de/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index e23cfca..0000000
Binary files a/doc/de/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/de/images/button-release-job.gif b/doc/de/images/button-release-job.gif
deleted file mode 100644 (file)
index d353700..0000000
Binary files a/doc/de/images/button-release-job.gif and /dev/null differ
diff --git a/doc/de/images/button-restart-job.gif b/doc/de/images/button-restart-job.gif
deleted file mode 100644 (file)
index 97449c1..0000000
Binary files a/doc/de/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/de/images/button-save-changes.gif b/doc/de/images/button-save-changes.gif
deleted file mode 100644 (file)
index 661c590..0000000
Binary files a/doc/de/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/de/images/button-search.gif b/doc/de/images/button-search.gif
deleted file mode 100644 (file)
index 9378f8d..0000000
Binary files a/doc/de/images/button-search.gif and /dev/null differ
diff --git a/doc/de/images/button-set-allowed-users.gif b/doc/de/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index a62eb10..0000000
Binary files a/doc/de/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/de/images/button-set-as-default.gif b/doc/de/images/button-set-as-default.gif
deleted file mode 100644 (file)
index c2a33a9..0000000
Binary files a/doc/de/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/de/images/button-set-printer-options.gif b/doc/de/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index daf8710..0000000
Binary files a/doc/de/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/de/images/button-show-active.gif b/doc/de/images/button-show-active.gif
deleted file mode 100644 (file)
index 4a2270e..0000000
Binary files a/doc/de/images/button-show-active.gif and /dev/null differ
diff --git a/doc/de/images/button-show-all.gif b/doc/de/images/button-show-all.gif
deleted file mode 100644 (file)
index 8564af9..0000000
Binary files a/doc/de/images/button-show-all.gif and /dev/null differ
diff --git a/doc/de/images/button-show-completed.gif b/doc/de/images/button-show-completed.gif
deleted file mode 100644 (file)
index ad03d3e..0000000
Binary files a/doc/de/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/de/images/button-show-next.gif b/doc/de/images/button-show-next.gif
deleted file mode 100644 (file)
index c3a18e9..0000000
Binary files a/doc/de/images/button-show-next.gif and /dev/null differ
diff --git a/doc/de/images/button-show-previous.gif b/doc/de/images/button-show-previous.gif
deleted file mode 100644 (file)
index 426180f..0000000
Binary files a/doc/de/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/de/images/button-sort-ascending.gif b/doc/de/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index a544d2b..0000000
Binary files a/doc/de/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/de/images/button-sort-descending.gif b/doc/de/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 076533d..0000000
Binary files a/doc/de/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/de/images/button-start-class.gif b/doc/de/images/button-start-class.gif
deleted file mode 100644 (file)
index e517034..0000000
Binary files a/doc/de/images/button-start-class.gif and /dev/null differ
diff --git a/doc/de/images/button-start-printer.gif b/doc/de/images/button-start-printer.gif
deleted file mode 100644 (file)
index 4bab122..0000000
Binary files a/doc/de/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-stop-class.gif b/doc/de/images/button-stop-class.gif
deleted file mode 100644 (file)
index 5bce808..0000000
Binary files a/doc/de/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/de/images/button-stop-printer.gif b/doc/de/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 9344860..0000000
Binary files a/doc/de/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-unpublish-printer.gif b/doc/de/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index ecf33fa..0000000
Binary files a/doc/de/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/de/images/button-use-default-config.gif b/doc/de/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 930b294..0000000
Binary files a/doc/de/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/de/images/button-view-access-log.gif b/doc/de/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 82ad70b..0000000
Binary files a/doc/de/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/de/images/button-view-error-log.gif b/doc/de/images/button-view-error-log.gif
deleted file mode 100644 (file)
index c90c0bf..0000000
Binary files a/doc/de/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/de/images/button-view-page-log.gif b/doc/de/images/button-view-page-log.gif
deleted file mode 100644 (file)
index cc7a22f..0000000
Binary files a/doc/de/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/de/images/button-view-printable-version.gif b/doc/de/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index e7b4e9c..0000000
Binary files a/doc/de/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/de/index.html.in b/doc/de/index.html.in
deleted file mode 100644 (file)
index b7c9b22..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Startseite - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Startseite&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Verwaltung&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Klassen&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Dokumentation/Hilfe&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Auftr&auml;ge&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Drucker&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Herzlich Willkommen!</H2>
-
-<P>Auf diesen Seiten k&ouml;nnen Sie Ihre Drucker und Aufträge &uuml;berwachen,
-sowie auch Verwaltungsaufgaben durchzuführen. Klicken Sie auf einen der
-oberen Karteireiter oder eine der Schaltflächen um eine T&auml;tigkeit auszuführen.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Hilfe"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Klasse hinzuf&uuml;gen"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Drucker hinzuf&uuml;gen"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Klassen verwalten"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Auftr&auml;ge verwalten"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Drucker verwalten"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Server verwalten"></A>
-</P>
-
-<P><I>Wenn Sie nach einem Benutzernamen und Passwort gefragt werden,
-geben Sie bitte Ihren Benutzernamen und Ihr Passwort oder
-den Benutzernamen und das Passwort des "root" Benutzers ein.</I></P>
-
-<H2 CLASS="title">&Uuml;ber CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
-
-CUPS stellt eine portierbare Druckerschicht f&uuml;r
-UNIX<SUP>&reg;</SUP>-basierte Betriebssysteme bereit. Es wird entwickelt
-und gepflegt von <A HREF="http://www.apple.com">Apple Inc.</a> um eine Standard Druckerl&ouml;sung zu f&ouml;rdern. CUPS ist das
-Standard Drucksystem welches von MacOS<SUP>&reg;</SUP> X und den meisten
-Linux<SUP>&reg;</SUP> Distributionen verwendet wird.</P>
-
-<P>CUPS benutzt das <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Internet Printing Protocol ("IPP")</A> als
-Basis für die Verwaltung von Druckauftr&auml;ge und Warteschlangen und f&uuml;gt
-Drucker-Browsing und PostScript Printer Description ("PPD") basierte
-Druckeigenschaften hinzu um komplexe Druckumgebungen optimale zu
-unterst&uuml;tzen.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Druckertreiber und Unterst&uuml;tzung</H2>
-
-<P>Besuchen Sie die offizielle CUPS Seite um Druckertreiber und
-Unterst&uuml;tzung zu erhalten:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-eingetragene Warenzeichen der <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc, alle Rechte vorbehalten.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/es/images/button-accept-jobs.gif b/doc/es/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 3e635b7..0000000
Binary files a/doc/es/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/es/images/button-add-class.gif b/doc/es/images/button-add-class.gif
deleted file mode 100644 (file)
index 366dbf9..0000000
Binary files a/doc/es/images/button-add-class.gif and /dev/null differ
diff --git a/doc/es/images/button-add-printer.gif b/doc/es/images/button-add-printer.gif
deleted file mode 100644 (file)
index 44f8d53..0000000
Binary files a/doc/es/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-add-rss-subscription.gif b/doc/es/images/button-add-rss-subscription.gif
deleted file mode 100644 (file)
index 2dbb859..0000000
Binary files a/doc/es/images/button-add-rss-subscription.gif and /dev/null differ
diff --git a/doc/es/images/button-add-this-printer.gif b/doc/es/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 94198d4..0000000
Binary files a/doc/es/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-cancel-all-jobs.gif b/doc/es/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 557c39e..0000000
Binary files a/doc/es/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/es/images/button-cancel-job.gif b/doc/es/images/button-cancel-job.gif
deleted file mode 100644 (file)
index dd29b02..0000000
Binary files a/doc/es/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/es/images/button-cancel-subscription.gif b/doc/es/images/button-cancel-subscription.gif
deleted file mode 100644 (file)
index 5c8a4d6..0000000
Binary files a/doc/es/images/button-cancel-subscription.gif and /dev/null differ
diff --git a/doc/es/images/button-change-settings.gif b/doc/es/images/button-change-settings.gif
deleted file mode 100644 (file)
index c0ea42d..0000000
Binary files a/doc/es/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/es/images/button-clean-print-heads.gif b/doc/es/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 2e833c8..0000000
Binary files a/doc/es/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/es/images/button-clear.gif b/doc/es/images/button-clear.gif
deleted file mode 100644 (file)
index 4476911..0000000
Binary files a/doc/es/images/button-clear.gif and /dev/null differ
diff --git a/doc/es/images/button-continue.gif b/doc/es/images/button-continue.gif
deleted file mode 100644 (file)
index f6c27a6..0000000
Binary files a/doc/es/images/button-continue.gif and /dev/null differ
diff --git a/doc/es/images/button-delete-class.gif b/doc/es/images/button-delete-class.gif
deleted file mode 100644 (file)
index c7de009..0000000
Binary files a/doc/es/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/es/images/button-delete-printer.gif b/doc/es/images/button-delete-printer.gif
deleted file mode 100644 (file)
index e1f4b11..0000000
Binary files a/doc/es/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-edit-configuration-file.gif b/doc/es/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index f12a903..0000000
Binary files a/doc/es/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/es/images/button-export-samba.gif b/doc/es/images/button-export-samba.gif
deleted file mode 100644 (file)
index 42d9d30..0000000
Binary files a/doc/es/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/es/images/button-find-new-printers.gif b/doc/es/images/button-find-new-printers.gif
deleted file mode 100644 (file)
index 301d32e..0000000
Binary files a/doc/es/images/button-find-new-printers.gif and /dev/null differ
diff --git a/doc/es/images/button-help.gif b/doc/es/images/button-help.gif
deleted file mode 100644 (file)
index 37ee0de..0000000
Binary files a/doc/es/images/button-help.gif and /dev/null differ
diff --git a/doc/es/images/button-hold-job.gif b/doc/es/images/button-hold-job.gif
deleted file mode 100644 (file)
index 74ead76..0000000
Binary files a/doc/es/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/es/images/button-manage-classes.gif b/doc/es/images/button-manage-classes.gif
deleted file mode 100644 (file)
index a3d80dc..0000000
Binary files a/doc/es/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/es/images/button-manage-jobs.gif b/doc/es/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 6a2d949..0000000
Binary files a/doc/es/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/es/images/button-manage-printers.gif b/doc/es/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 25008b6..0000000
Binary files a/doc/es/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/es/images/button-manage-server.gif b/doc/es/images/button-manage-server.gif
deleted file mode 100644 (file)
index b53c87a..0000000
Binary files a/doc/es/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/es/images/button-modify-class.gif b/doc/es/images/button-modify-class.gif
deleted file mode 100644 (file)
index b7069e0..0000000
Binary files a/doc/es/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/es/images/button-modify-printer.gif b/doc/es/images/button-modify-printer.gif
deleted file mode 100644 (file)
index ee5a683..0000000
Binary files a/doc/es/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-move-job.gif b/doc/es/images/button-move-job.gif
deleted file mode 100644 (file)
index d5cf9c3..0000000
Binary files a/doc/es/images/button-move-job.gif and /dev/null differ
diff --git a/doc/es/images/button-move-jobs.gif b/doc/es/images/button-move-jobs.gif
deleted file mode 100644 (file)
index b2fd0a3..0000000
Binary files a/doc/es/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/es/images/button-print-self-test-page.gif b/doc/es/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index 9e2d8cb..0000000
Binary files a/doc/es/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/es/images/button-print-test-page.gif b/doc/es/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 0705811..0000000
Binary files a/doc/es/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/es/images/button-publish-printer.gif b/doc/es/images/button-publish-printer.gif
deleted file mode 100644 (file)
index f05a817..0000000
Binary files a/doc/es/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-reject-jobs.gif b/doc/es/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 6ad9fad..0000000
Binary files a/doc/es/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/es/images/button-release-job.gif b/doc/es/images/button-release-job.gif
deleted file mode 100644 (file)
index 0e17928..0000000
Binary files a/doc/es/images/button-release-job.gif and /dev/null differ
diff --git a/doc/es/images/button-restart-job.gif b/doc/es/images/button-restart-job.gif
deleted file mode 100644 (file)
index 8a71691..0000000
Binary files a/doc/es/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/es/images/button-save-changes.gif b/doc/es/images/button-save-changes.gif
deleted file mode 100644 (file)
index 1dc1a38..0000000
Binary files a/doc/es/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/es/images/button-search.gif b/doc/es/images/button-search.gif
deleted file mode 100644 (file)
index d25e745..0000000
Binary files a/doc/es/images/button-search.gif and /dev/null differ
diff --git a/doc/es/images/button-set-allowed-users.gif b/doc/es/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index c61bbed..0000000
Binary files a/doc/es/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/es/images/button-set-as-default.gif b/doc/es/images/button-set-as-default.gif
deleted file mode 100644 (file)
index 6111ada..0000000
Binary files a/doc/es/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/es/images/button-set-printer-options.gif b/doc/es/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index fc3d000..0000000
Binary files a/doc/es/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/es/images/button-show-active.gif b/doc/es/images/button-show-active.gif
deleted file mode 100644 (file)
index c873247..0000000
Binary files a/doc/es/images/button-show-active.gif and /dev/null differ
diff --git a/doc/es/images/button-show-all.gif b/doc/es/images/button-show-all.gif
deleted file mode 100644 (file)
index da63054..0000000
Binary files a/doc/es/images/button-show-all.gif and /dev/null differ
diff --git a/doc/es/images/button-show-completed.gif b/doc/es/images/button-show-completed.gif
deleted file mode 100644 (file)
index 83785d8..0000000
Binary files a/doc/es/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/es/images/button-show-next.gif b/doc/es/images/button-show-next.gif
deleted file mode 100644 (file)
index 9a5f250..0000000
Binary files a/doc/es/images/button-show-next.gif and /dev/null differ
diff --git a/doc/es/images/button-show-previous.gif b/doc/es/images/button-show-previous.gif
deleted file mode 100644 (file)
index 2a338a1..0000000
Binary files a/doc/es/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/es/images/button-sort-ascending.gif b/doc/es/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 0a6c2bf..0000000
Binary files a/doc/es/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/es/images/button-sort-descending.gif b/doc/es/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 0e7466f..0000000
Binary files a/doc/es/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/es/images/button-start-class.gif b/doc/es/images/button-start-class.gif
deleted file mode 100644 (file)
index 79e585b..0000000
Binary files a/doc/es/images/button-start-class.gif and /dev/null differ
diff --git a/doc/es/images/button-start-printer.gif b/doc/es/images/button-start-printer.gif
deleted file mode 100644 (file)
index e0a6a5b..0000000
Binary files a/doc/es/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-stop-class.gif b/doc/es/images/button-stop-class.gif
deleted file mode 100644 (file)
index 6f14662..0000000
Binary files a/doc/es/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/es/images/button-stop-printer.gif b/doc/es/images/button-stop-printer.gif
deleted file mode 100644 (file)
index b057546..0000000
Binary files a/doc/es/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-unpublish-printer.gif b/doc/es/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 8e0772d..0000000
Binary files a/doc/es/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/es/images/button-use-default-config.gif b/doc/es/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 6ccefbb..0000000
Binary files a/doc/es/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/es/images/button-view-access-log.gif b/doc/es/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 202015c..0000000
Binary files a/doc/es/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/es/images/button-view-error-log.gif b/doc/es/images/button-view-error-log.gif
deleted file mode 100644 (file)
index ca93057..0000000
Binary files a/doc/es/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/es/images/button-view-page-log.gif b/doc/es/images/button-view-page-log.gif
deleted file mode 100644 (file)
index b9c078e..0000000
Binary files a/doc/es/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/es/images/button-view-printable-version.gif b/doc/es/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 23e401c..0000000
Binary files a/doc/es/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/es/images/buttons_es.txt b/doc/es/images/buttons_es.txt
deleted file mode 100644 (file)
index 5d78f62..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-button-accept-jobs.gif              green     Aceptar trabajos
-button-add-class.gif               standard  Añadir clase
-button-add-printer.gif                     standard  Añadir impresora
-button-add-rss-subscription.gif     standard  Añadir subscripción RSS
-button-add-this-printer.gif         standard  Añadir esta impresora
-button-cancel-all-jobs.gif         black     Cancelar todos los trabajos
-button-cancel-job.gif              black     Cancelar trabajo
-button-cancel-subscription.gif      standard  Cancelar subscripción
-button-change-settings.gif         standard  Cambiar especificaciones
-button-clean-print-heads.gif       standard  Limpiar cabezales de impresión
-button-clear.gif                   standard  Borrar
-button-continue.gif                standard  Siguiente
-button-delete-class.gif            black     Borrar clase
-button-delete-printer.gif          black     Borrar impresora
-button-edit-configuration-file.gif  standard  Editar archivo configuración
-button-export-samba.gif            standard  Exportar impresoras a Samba
-button-find-new-printers.gif        standard  Encontrar nuevas impresoras
-button-help.gif                    standard  Ayuda
-button-hold-job.gif                red       Retener trabajo
-button-manage-classes.gif          standard  Administrar clases
-button-manage-jobs.gif                     standard  Administrar trabajos
-button-manage-printers.gif         standard  Administrar impresoras
-button-manage-server.gif           standard  Administrar servidor
-button-modify-class.gif            standard  Modificar clase
-button-modify-printer.gif          standard  Modificar impresora
-button-move-job.gif                standard  Mover trabajo
-button-move-jobs.gif               standard  Mover todos los trabajos
-button-print-self-test-page.gif     standard  Imprimir página de auto prueba
-button-print-test-page.gif         standard  Imprimir página de prueba
-button-publish-printer.gif         standard  Publicar impresora
-button-reject-jobs.gif                     red       Rechazar trabajos
-button-release-job.gif                     green     Liberar trabajo
-button-restart-job.gif                     standard  Reimprimir trabajo
-button-save-changes.gif            standard  Guardar cambios
-button-search.gif                  standard  Buscar
-button-set-allowed-users.gif       standard  Cambiar usuarios permitidos
-button-set-as-default.gif          standard  Poner como predeterminada
-button-set-printer-options.gif             standard  Cambiar opciones impresora
-button-show-active.gif                     standard  Mostrar trabajos activos
-button-show-all.gif                standard  Mostrar todos los trabajos
-button-show-completed.gif          standard  Mostrar trabajos completados
-button-show-next.gif               standard  Mostrar siguiente
-button-show-previous.gif           standard  Mostrar anterior
-button-sort-ascending.gif          standard  @UP Orden ascendente @UP
-button-sort-descending.gif         standard  @DOWN Orden descendente @DOWN
-button-start-class.gif                     green     Iniciar clase
-button-start-printer.gif           green     Iniciar impresora
-button-stop-class.gif              red       Detener clase
-button-stop-printer.gif            red       Detener impresora
-button-unpublish-printer.gif       standard  No publicar impresora
-button-use-default-config.gif      standard  Usar archivo de configuración predeterminado
-button-view-access-log.gif         standard  Ver archivo de registro de accesos
-button-view-error-log.gif          standard  Ver archivo de registro de errores
-button-view-page-log.gif           standard  Ver archivo de registro de páginas
-button-view-printable-version.gif   standard  Ver versión imprimible
diff --git a/doc/es/index.html.in b/doc/es/index.html.in
deleted file mode 100644 (file)
index 09c7749..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Inicio - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Inicio&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Administraci&oacute;n&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Clases&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Documentaci&oacute;n/Ayuda&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Trabajos&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Impresoras&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">&iexcl;Bienvenido!</H2>
-
-<P>Estas p&aacute;ginas web permiten monitorizar sus impresoras y trabajos
-as&iacute; como realizar tareas de administraci&oacute;n del sistema.
-Haga clic en cualquiera de las pesta&ntilde;as de la parte superior o en los
-botones de la parte inferior para realizar la tarea correspondiente.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Ayuda"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="A&ntilde;adir clase"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="A&ntilde;adir impresora"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Administrar clases"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Administrar trabajos"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Administrar impresoras"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Administrar servidor"></A>
-</P>
-
-<P><I>Si se le pide un nombre de usuario y contrase&ntilde;a,
-introduzca su nombre de usuario y su contrase&ntilde;a o el usuario y 
-contrase&ntilde;a de "root".</I></P>
-
-<H2 CLASS="title">Acerca de CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Ordenador feliz e impresora">
-
-CUPS proporciona una capa de impresi&oacute;n portable 
-para sistemas operativos basados en
-UNIX<SUP>&reg;</SUP>. Est&aacute; desarrollado y mantenido
-por <A HREF="http://www.apple.com">Apple Inc.</A> para favorecer una soluci&oacute;n de impresi&oacute;n
-estandar. CUPS es el sistema de impresi&oacute;n estandar usado en
-MacOS<SUP>&reg;</SUP> X y la mayor&iacute;a de distribuciones
-Linux<SUP>&reg;</SUP>.</P>
-
-<P>CUPS usa el <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Protocolo de Impresi&oacute;n de Internet ("IPP")</A> como
-base para gestionar los trabajos y colas de impresi&oacute;n y a&ntilde;ade
-b&uacute;squeda de impresoras en red y opciones de impresi&oacute;n
-basadas en archivos de descripci&oacute;n de impresora PostScript ("PPD")
-para soporte de impresi&oacute;n del mundo real.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Para controladores de impresoras y asistencia</H2>
-
-<P>Visite la p&aacute;gina oficial de CUPS para controladores de impresoras
-y asistencia:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS, y el logo de CUPS son
-marcas registradas de <A HREF="http://www.apple.com">Apple Inc.</A>
-Los derechos de copia de CUPS 2007 son de Apple Inc.
-Todos los derechos reservados.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/et/images/button-accept-jobs.gif b/doc/et/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 38521be..0000000
Binary files a/doc/et/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/et/images/button-add-class.gif b/doc/et/images/button-add-class.gif
deleted file mode 100644 (file)
index fc6a4ad..0000000
Binary files a/doc/et/images/button-add-class.gif and /dev/null differ
diff --git a/doc/et/images/button-add-printer.gif b/doc/et/images/button-add-printer.gif
deleted file mode 100644 (file)
index 6c8d04a..0000000
Binary files a/doc/et/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-add-this-printer.gif b/doc/et/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 54f19ff..0000000
Binary files a/doc/et/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-cancel-all-jobs.gif b/doc/et/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 50d31fa..0000000
Binary files a/doc/et/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/et/images/button-cancel-job.gif b/doc/et/images/button-cancel-job.gif
deleted file mode 100644 (file)
index d731ed7..0000000
Binary files a/doc/et/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/et/images/button-change-settings.gif b/doc/et/images/button-change-settings.gif
deleted file mode 100644 (file)
index 8bcc0a2..0000000
Binary files a/doc/et/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/et/images/button-clean-print-heads.gif b/doc/et/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 3b5472c..0000000
Binary files a/doc/et/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/et/images/button-clear.gif b/doc/et/images/button-clear.gif
deleted file mode 100644 (file)
index bff0e60..0000000
Binary files a/doc/et/images/button-clear.gif and /dev/null differ
diff --git a/doc/et/images/button-continue.gif b/doc/et/images/button-continue.gif
deleted file mode 100644 (file)
index fbc1f95..0000000
Binary files a/doc/et/images/button-continue.gif and /dev/null differ
diff --git a/doc/et/images/button-delete-class.gif b/doc/et/images/button-delete-class.gif
deleted file mode 100644 (file)
index ae0d7ca..0000000
Binary files a/doc/et/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/et/images/button-delete-printer.gif b/doc/et/images/button-delete-printer.gif
deleted file mode 100644 (file)
index 00ed5a5..0000000
Binary files a/doc/et/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-edit-configuration-file.gif b/doc/et/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index a846b96..0000000
Binary files a/doc/et/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/et/images/button-export-samba.gif b/doc/et/images/button-export-samba.gif
deleted file mode 100644 (file)
index f595ebb..0000000
Binary files a/doc/et/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/et/images/button-help.gif b/doc/et/images/button-help.gif
deleted file mode 100644 (file)
index 64e5b24..0000000
Binary files a/doc/et/images/button-help.gif and /dev/null differ
diff --git a/doc/et/images/button-hold-job.gif b/doc/et/images/button-hold-job.gif
deleted file mode 100644 (file)
index c364193..0000000
Binary files a/doc/et/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/et/images/button-manage-classes.gif b/doc/et/images/button-manage-classes.gif
deleted file mode 100644 (file)
index e26ed65..0000000
Binary files a/doc/et/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/et/images/button-manage-jobs.gif b/doc/et/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 79841b7..0000000
Binary files a/doc/et/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/et/images/button-manage-printers.gif b/doc/et/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 680db58..0000000
Binary files a/doc/et/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/et/images/button-manage-server.gif b/doc/et/images/button-manage-server.gif
deleted file mode 100644 (file)
index 1909ee7..0000000
Binary files a/doc/et/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/et/images/button-modify-class.gif b/doc/et/images/button-modify-class.gif
deleted file mode 100644 (file)
index b88c3fa..0000000
Binary files a/doc/et/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/et/images/button-modify-printer.gif b/doc/et/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 93483dd..0000000
Binary files a/doc/et/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-move-job.gif b/doc/et/images/button-move-job.gif
deleted file mode 100644 (file)
index 3d55566..0000000
Binary files a/doc/et/images/button-move-job.gif and /dev/null differ
diff --git a/doc/et/images/button-move-jobs.gif b/doc/et/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 49585e3..0000000
Binary files a/doc/et/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/et/images/button-print-self-test-page.gif b/doc/et/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index 17d5b0c..0000000
Binary files a/doc/et/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/et/images/button-print-test-page.gif b/doc/et/images/button-print-test-page.gif
deleted file mode 100644 (file)
index bbe06ed..0000000
Binary files a/doc/et/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/et/images/button-publish-printer.gif b/doc/et/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 8ecd812..0000000
Binary files a/doc/et/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-reject-jobs.gif b/doc/et/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index aaccb43..0000000
Binary files a/doc/et/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/et/images/button-release-job.gif b/doc/et/images/button-release-job.gif
deleted file mode 100644 (file)
index e369f03..0000000
Binary files a/doc/et/images/button-release-job.gif and /dev/null differ
diff --git a/doc/et/images/button-restart-job.gif b/doc/et/images/button-restart-job.gif
deleted file mode 100644 (file)
index beac40a..0000000
Binary files a/doc/et/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/et/images/button-save-changes.gif b/doc/et/images/button-save-changes.gif
deleted file mode 100644 (file)
index 870f8d5..0000000
Binary files a/doc/et/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/et/images/button-search.gif b/doc/et/images/button-search.gif
deleted file mode 100644 (file)
index 43824d5..0000000
Binary files a/doc/et/images/button-search.gif and /dev/null differ
diff --git a/doc/et/images/button-set-allowed-users.gif b/doc/et/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 261c13c..0000000
Binary files a/doc/et/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/et/images/button-set-as-default.gif b/doc/et/images/button-set-as-default.gif
deleted file mode 100644 (file)
index fdc7066..0000000
Binary files a/doc/et/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/et/images/button-set-printer-options.gif b/doc/et/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index 2a0441a..0000000
Binary files a/doc/et/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/et/images/button-show-active.gif b/doc/et/images/button-show-active.gif
deleted file mode 100644 (file)
index 34cc739..0000000
Binary files a/doc/et/images/button-show-active.gif and /dev/null differ
diff --git a/doc/et/images/button-show-all.gif b/doc/et/images/button-show-all.gif
deleted file mode 100644 (file)
index 6128006..0000000
Binary files a/doc/et/images/button-show-all.gif and /dev/null differ
diff --git a/doc/et/images/button-show-completed.gif b/doc/et/images/button-show-completed.gif
deleted file mode 100644 (file)
index 165dbe0..0000000
Binary files a/doc/et/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/et/images/button-show-next.gif b/doc/et/images/button-show-next.gif
deleted file mode 100644 (file)
index 57031e9..0000000
Binary files a/doc/et/images/button-show-next.gif and /dev/null differ
diff --git a/doc/et/images/button-show-previous.gif b/doc/et/images/button-show-previous.gif
deleted file mode 100644 (file)
index d32f7a8..0000000
Binary files a/doc/et/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/et/images/button-sort-ascending.gif b/doc/et/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 0d92546..0000000
Binary files a/doc/et/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/et/images/button-sort-descending.gif b/doc/et/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 0ac534d..0000000
Binary files a/doc/et/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/et/images/button-start-class.gif b/doc/et/images/button-start-class.gif
deleted file mode 100644 (file)
index e13a451..0000000
Binary files a/doc/et/images/button-start-class.gif and /dev/null differ
diff --git a/doc/et/images/button-start-printer.gif b/doc/et/images/button-start-printer.gif
deleted file mode 100644 (file)
index e4a462c..0000000
Binary files a/doc/et/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-stop-class.gif b/doc/et/images/button-stop-class.gif
deleted file mode 100644 (file)
index b395262..0000000
Binary files a/doc/et/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/et/images/button-stop-printer.gif b/doc/et/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 65e69ae..0000000
Binary files a/doc/et/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-unpublish-printer.gif b/doc/et/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index e188323..0000000
Binary files a/doc/et/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/et/images/button-use-default-config.gif b/doc/et/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 00318d5..0000000
Binary files a/doc/et/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/et/images/button-view-access-log.gif b/doc/et/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 36dac05..0000000
Binary files a/doc/et/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/et/images/button-view-error-log.gif b/doc/et/images/button-view-error-log.gif
deleted file mode 100644 (file)
index 8c871ce..0000000
Binary files a/doc/et/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/et/images/button-view-page-log.gif b/doc/et/images/button-view-page-log.gif
deleted file mode 100644 (file)
index 13f2ca7..0000000
Binary files a/doc/et/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/et/images/button-view-printable-version.gif b/doc/et/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 4b8e0c6..0000000
Binary files a/doc/et/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/et/index.html.in b/doc/et/index.html.in
deleted file mode 100644 (file)
index bcf1aae..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Kodu - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Kodu&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Haldus&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Klassid&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Dokumentatsioon/Abi&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Tööd&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Printerid&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Tere tulemast!</H2>
-
-<P>Käesolevad veebileheküljed võimaldavad Teil jälgida oma printereid ja töid
-ning süsteemi hallata. Klõpsake vajalike ülesannete sooritamiseks mõnele
-ülal paiknevale sakile või all asuvale nupule.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Abi"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Lisa klass"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Lisa printer"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Halda klasse"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Halda töid"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Halda printereid"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Halda serverit"></A>
-</P>
-
-<P><I>Kui Teie käest päritakse kasutajanime ja parooli, sisestage enda
-või administraatori (root) kasutajanimi ja parool.</I></P>
-
-<H2 CLASS="title">CUPS-i info</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
-
-CUPS pakub porditavat trükkimiskihti
-UNIX<SUP>&reg;</SUP> põhistele operatsioonisüsteemidele. CUPS-i töötas
-välja ja hooldab <A HREF="http://www.apple.com">Apple Inc</a>,
-selle siht on edendada standardseid trükkimislahendusi. CUPS on
-standardne trükkimissüsteem, mida kasutavad MacOS<SUP>&reg;</SUP> X ja
-suurem osa Linux<SUP>&reg;</SUP> distributsioone.</P>
-
-<P>CUPS kasutab <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Interneti trükkimisprotokolli ("IPP")</A>
-trükitööde ja järjekordade haldamiseks, lisades sellele
-võrguprinterite kasutamise ning PostScript-printerikirjelduste ("PPD")
-põhise trükkimise võimalused trükkimise maksimaalseks hõlbustamiseks.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Printeridraiveritest ja abist</H2>
-
-<P>Printeridraiverite ja muu abi leidmiseks külastage CUPS-i
-ametlikku veebilehekülge:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS ja CUPS-i logo on
-firma <A HREF="http://www.apple.com">Apple Inc.</A> kaubamärgid. CUPS-i autoriõigus 2007: Apple Inc,
-kõik õigused kaitstud.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/favicon.ico b/doc/favicon.ico
deleted file mode 100644 (file)
index f3aa306..0000000
Binary files a/doc/favicon.ico and /dev/null differ
diff --git a/doc/favicon.png b/doc/favicon.png
new file mode 100644 (file)
index 0000000..dda0497
Binary files /dev/null and b/doc/favicon.png differ
diff --git a/doc/fr/images/button-accept-jobs.gif b/doc/fr/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 7659603..0000000
Binary files a/doc/fr/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/fr/images/button-add-class.gif b/doc/fr/images/button-add-class.gif
deleted file mode 100644 (file)
index 4870f31..0000000
Binary files a/doc/fr/images/button-add-class.gif and /dev/null differ
diff --git a/doc/fr/images/button-add-printer.gif b/doc/fr/images/button-add-printer.gif
deleted file mode 100644 (file)
index 813eaf8..0000000
Binary files a/doc/fr/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-add-this-printer.gif b/doc/fr/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 92d3d83..0000000
Binary files a/doc/fr/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-cancel-all-jobs.gif b/doc/fr/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 6ee51b7..0000000
Binary files a/doc/fr/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/fr/images/button-cancel-job.gif b/doc/fr/images/button-cancel-job.gif
deleted file mode 100644 (file)
index bbffe12..0000000
Binary files a/doc/fr/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/fr/images/button-change-settings.gif b/doc/fr/images/button-change-settings.gif
deleted file mode 100644 (file)
index 3d6e59a..0000000
Binary files a/doc/fr/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/fr/images/button-clean-print-heads.gif b/doc/fr/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index da56492..0000000
Binary files a/doc/fr/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/fr/images/button-clear.gif b/doc/fr/images/button-clear.gif
deleted file mode 100644 (file)
index bbf4fe3..0000000
Binary files a/doc/fr/images/button-clear.gif and /dev/null differ
diff --git a/doc/fr/images/button-continue.gif b/doc/fr/images/button-continue.gif
deleted file mode 100644 (file)
index c203ca7..0000000
Binary files a/doc/fr/images/button-continue.gif and /dev/null differ
diff --git a/doc/fr/images/button-delete-class.gif b/doc/fr/images/button-delete-class.gif
deleted file mode 100644 (file)
index bbff5bc..0000000
Binary files a/doc/fr/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/fr/images/button-delete-printer.gif b/doc/fr/images/button-delete-printer.gif
deleted file mode 100644 (file)
index d3328a6..0000000
Binary files a/doc/fr/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-edit-configuration-file.gif b/doc/fr/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 7799409..0000000
Binary files a/doc/fr/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/fr/images/button-export-samba.gif b/doc/fr/images/button-export-samba.gif
deleted file mode 100644 (file)
index 4b63edf..0000000
Binary files a/doc/fr/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/fr/images/button-help.gif b/doc/fr/images/button-help.gif
deleted file mode 100644 (file)
index 5640d38..0000000
Binary files a/doc/fr/images/button-help.gif and /dev/null differ
diff --git a/doc/fr/images/button-hold-job.gif b/doc/fr/images/button-hold-job.gif
deleted file mode 100644 (file)
index bd42ee2..0000000
Binary files a/doc/fr/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/fr/images/button-manage-classes.gif b/doc/fr/images/button-manage-classes.gif
deleted file mode 100644 (file)
index a96ef74..0000000
Binary files a/doc/fr/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/fr/images/button-manage-jobs.gif b/doc/fr/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 66e25ca..0000000
Binary files a/doc/fr/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/fr/images/button-manage-printers.gif b/doc/fr/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 6c0a946..0000000
Binary files a/doc/fr/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/fr/images/button-manage-server.gif b/doc/fr/images/button-manage-server.gif
deleted file mode 100644 (file)
index bcb6e3e..0000000
Binary files a/doc/fr/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/fr/images/button-modify-class.gif b/doc/fr/images/button-modify-class.gif
deleted file mode 100644 (file)
index e9187b9..0000000
Binary files a/doc/fr/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/fr/images/button-modify-printer.gif b/doc/fr/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 4972f8d..0000000
Binary files a/doc/fr/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-move-job.gif b/doc/fr/images/button-move-job.gif
deleted file mode 100644 (file)
index 104d044..0000000
Binary files a/doc/fr/images/button-move-job.gif and /dev/null differ
diff --git a/doc/fr/images/button-move-jobs.gif b/doc/fr/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 5894ce3..0000000
Binary files a/doc/fr/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/fr/images/button-print-self-test-page.gif b/doc/fr/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index dc0b3ce..0000000
Binary files a/doc/fr/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/fr/images/button-print-test-page.gif b/doc/fr/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 6e90992..0000000
Binary files a/doc/fr/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/fr/images/button-publish-printer.gif b/doc/fr/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 51fbc05..0000000
Binary files a/doc/fr/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-reject-jobs.gif b/doc/fr/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 690bbaa..0000000
Binary files a/doc/fr/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/fr/images/button-release-job.gif b/doc/fr/images/button-release-job.gif
deleted file mode 100644 (file)
index dd053b4..0000000
Binary files a/doc/fr/images/button-release-job.gif and /dev/null differ
diff --git a/doc/fr/images/button-restart-job.gif b/doc/fr/images/button-restart-job.gif
deleted file mode 100644 (file)
index 0f111a9..0000000
Binary files a/doc/fr/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/fr/images/button-save-changes.gif b/doc/fr/images/button-save-changes.gif
deleted file mode 100644 (file)
index f13b94d..0000000
Binary files a/doc/fr/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/fr/images/button-search.gif b/doc/fr/images/button-search.gif
deleted file mode 100644 (file)
index 633193e..0000000
Binary files a/doc/fr/images/button-search.gif and /dev/null differ
diff --git a/doc/fr/images/button-set-allowed-users.gif b/doc/fr/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 195460c..0000000
Binary files a/doc/fr/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/fr/images/button-set-as-default.gif b/doc/fr/images/button-set-as-default.gif
deleted file mode 100644 (file)
index c06b56e..0000000
Binary files a/doc/fr/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/fr/images/button-set-printer-options.gif b/doc/fr/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index 5223d3a..0000000
Binary files a/doc/fr/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/fr/images/button-show-active.gif b/doc/fr/images/button-show-active.gif
deleted file mode 100644 (file)
index 0328159..0000000
Binary files a/doc/fr/images/button-show-active.gif and /dev/null differ
diff --git a/doc/fr/images/button-show-all.gif b/doc/fr/images/button-show-all.gif
deleted file mode 100644 (file)
index 4e6c6a8..0000000
Binary files a/doc/fr/images/button-show-all.gif and /dev/null differ
diff --git a/doc/fr/images/button-show-completed.gif b/doc/fr/images/button-show-completed.gif
deleted file mode 100644 (file)
index 7a71e5a..0000000
Binary files a/doc/fr/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/fr/images/button-show-next.gif b/doc/fr/images/button-show-next.gif
deleted file mode 100644 (file)
index 4817478..0000000
Binary files a/doc/fr/images/button-show-next.gif and /dev/null differ
diff --git a/doc/fr/images/button-show-previous.gif b/doc/fr/images/button-show-previous.gif
deleted file mode 100644 (file)
index 1b1ee4b..0000000
Binary files a/doc/fr/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/fr/images/button-sort-ascending.gif b/doc/fr/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 41db4f6..0000000
Binary files a/doc/fr/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/fr/images/button-sort-descending.gif b/doc/fr/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 9bd48d9..0000000
Binary files a/doc/fr/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/fr/images/button-start-class.gif b/doc/fr/images/button-start-class.gif
deleted file mode 100644 (file)
index fa10ce6..0000000
Binary files a/doc/fr/images/button-start-class.gif and /dev/null differ
diff --git a/doc/fr/images/button-start-printer.gif b/doc/fr/images/button-start-printer.gif
deleted file mode 100644 (file)
index cc0f3dd..0000000
Binary files a/doc/fr/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-stop-class.gif b/doc/fr/images/button-stop-class.gif
deleted file mode 100644 (file)
index 913abd0..0000000
Binary files a/doc/fr/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/fr/images/button-stop-printer.gif b/doc/fr/images/button-stop-printer.gif
deleted file mode 100644 (file)
index f4eef6e..0000000
Binary files a/doc/fr/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-unpublish-printer.gif b/doc/fr/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 699cd2d..0000000
Binary files a/doc/fr/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/fr/images/button-use-default-config.gif b/doc/fr/images/button-use-default-config.gif
deleted file mode 100644 (file)
index cfc5659..0000000
Binary files a/doc/fr/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/fr/images/button-view-access-log.gif b/doc/fr/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 195457d..0000000
Binary files a/doc/fr/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/fr/images/button-view-error-log.gif b/doc/fr/images/button-view-error-log.gif
deleted file mode 100644 (file)
index 8f699e0..0000000
Binary files a/doc/fr/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/fr/images/button-view-page-log.gif b/doc/fr/images/button-view-page-log.gif
deleted file mode 100644 (file)
index b7751f4..0000000
Binary files a/doc/fr/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/fr/images/button-view-printable-version.gif b/doc/fr/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 84c5bc9..0000000
Binary files a/doc/fr/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
deleted file mode 100644 (file)
index a10365f..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Accueil - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Accueil&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Classes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Documentation/Aide&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Tâches&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Imprimantes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Bienvenue !</H2>
-
-<P>Ces pages Web vous permettent de gérer vos imprimantes et vos tâches
-d'impression comme d'administrer le système. Cliquez sur les onglets ci-dessus ou
-sur les boutons ci-dessous pour effectuer une action.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Aide"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Ajouter une classe"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Ajouter une imprimante"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Administrer les classes"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Administrer les tâches"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Administrer les imprimantes"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Administrer le serveur"></A>
-</P>
-
-<P><I>Si l'on vous demande de vous identifier, utilisez votre nom d'utilisateur et
-votre mot de passe UNIX ou bien identifiez-vous en tant que "root".</I></P>
-
-<H2 CLASS="title">À propos de CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Ordinateur content et imprimante">
-
-CUPS propose une interface portable pour l'impression sur les systèmes
-UNIX<SUP>&reg;</SUP>. Ce logiciel est développé et maintenu par <A HREF="http://www.apple.com">Apple Inc.</a> afin de promouvoir une solution standard pour l'impression. CUPS
-est le système d'impression standard de MacOS<SUP>&reg;</SUP> X et de la
-plupart des distributions Linux<SUP>&reg;</SUP>.</P>
-
-<P>CUPS repose sur le protocole <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank">IPP ( Internet Printing Protocol )</A> pour la gestion des tâches
-d'impression et, pour être utilisable en pratique, y ajoute la détection
-d'imprimantes en réseau et des options d'impression fondées sur le format PPD (
-PostScript Printer Description ).<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Pilotes d'imprimante et Assistance</H2>
-
-<P>Visitez le site officiel de CUPS pour avoir des pilotes d'imprimante ou toute
-autre assistance:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Le logiciel CUPS ( Common UNIX Printing System ) et son logo sont
-propriété commerciale de <A HREF="http://www.apple.com">Apple Inc.</A> CUPS
-est sous copyright 2007 par Apple Inc, Tous
-Droits Réservés.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/he/cups.css b/doc/he/cups.css
deleted file mode 100644 (file)
index 705f6f1..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-BODY {
-  background: #cccc99;
-  color: #000000;
-  font-family: sans-serif;
-  direction: rtl;
-}
-
-H1, H2, H3, H4, H5, H6, P, TD, TH {
-  font-family: sans-serif;
-}
-
-KBD {
-  color: #006600;
-  font-family: monospace;
-  font-weight: bold;
-}
-
-PRE {
-  font-family: monospace;
-}
-
-PRE.command {
-  color: #7f0000;
-  margin-left: 36pt;
-}
-
-PRE.command EM {
-  color: #3f0000;
-}
-
-P.command {
-  color: #7f0000;
-  font-family: monospace;
-  margin-left: 36pt;
-}
-
-P.formula {
-  font-style: italic;
-  margin-left: 36pt;
-}
-
-BLOCKQUOTE {
-  background: #bbbb88;
-  border: solid thin #999966;
-  padding: 10pt;
-}
-
-A:link, A:visited {
-  text-decoration: none;
-  font-weight: bold;
-  color: #993300;
-}
-
-A:link:hover, A:visited:hover, A:active {
-  text-decoration: underline;
-  font-weight: bold;
-  color: #bb5500;
-}
-
-A.sel, TR.sel {
-  background-color: #eeeebb;
-  color: #993300;
-}
-
-TR.sel TD {
-  padding: 4pt;
-}
-
-A.unsel, A.unsel:visited {
-  background-color: #666633;
-  color: #e8e8b8;
-}
-
-A.unsel:link:hover, A.unsel:visited:hover, A.unsel:active {
-  background-color: #999966;
-  color: #663300;
-}
-
-INPUT[TYPE="TEXT"], TEXTAREA {
-  font-family: monospace;
-}
-
-INPUT[TYPE="IMAGE"] {
-  border: none;
-  padding: 2pt;
-  vertical-align: bottom;
-}
-
-SUB, SUP {
-  font-size: 50%;
-}
-
-TR.header, TR.header TH, TH.header, TR.trailer, TR.trailer TH, TH.trailer {
-  background-color: #bbbb88;
-}
-
-TR.page, TD.page {
-  background-color: #eeeebb;
-  height: 100%;
-  padding-top: 20pt;
-  padding-bottom: 20pt;
-}
-
-TR.data, TD.data, TR.data TD {
-  padding: 5;
-  border-bottom: solid 2pt #000000;
-}
-
-TR.data TH {
-  border-bottom: solid 2pt #000000;
-  padding-top: 10pt;
-  padding-right: 5pt;
-  text-align: right;
-}
-
-DIV.table TABLE {
-  border: solid thin #999966;
-  border-spacing: 0;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table CAPTION {
-  caption-side: top;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.table TABLE TD {
-  border: solid thin #bbbb88;
-  padding-top: 5pt;
-}
-
-DIV.table TABLE TH {
-  background: #bbbb88;
-  border: none;
-  border-bottom: solid thin #999966;
-}
-
-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-TH.label {
-  padding-top: 5pt;
-  text-align: right;
-  vertical-align: top;
-}
-
-HR {
-  border: solid thin;
-}
-
-SPAN.info {
-  background: #000000;
-  border: thin solid #000000;
-  color: #ffffff;
-  font-size: 80%;
-  font-style: italic;
-  font-weight: bold;
-  white-space: nowrap;
-}
-
-H2 SPAN.info, H3 SPAN.info {
-  float: right;
-  font-size: 100%;
-}
-
-.conflict {
-  color: red;
-}
-
-H2.title, H3.title {
-  border-bottom: solid 2pt #000000;
-}
-
-IMG.button {
-  border: none;
-  padding: 2pt;
-  vertical-align: middle;
-}
-
-DIV.sidebar {
-  background: #ddddaa;
-  border: solid 2px #cccc99;
-  float: right;
-  margin-left: 10pt;
-  padding: 5pt;
-  width: 25%;
-  /* These are not implemented by all browsers, but that's OK */
-  border-radius: 10pt;
-  -moz-border-radius: 10pt;
-  box-shadow: 5pt 5pt 5pt #cccccc;
-}
-
-DIV.sidebar P.l0 {
-  margin-bottom: 0;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 12pt;
-}
-
-DIV.sidebar P.l1 {
-  margin-bottom: 0;
-  margin-left: 36pt;
-  margin-right: 0;
-  margin-top: 0;
-  text-indent: -18pt;
-}
-
-DIV.sidebar P.l2 {
-  font-style: italic;
-  margin-bottom: 0;
-  margin-left: 54pt;
-  margin-right: 0;
-  margin-top: 0;
-  text-indent: -18pt;
-}
-
-TABLE.pager {
-  background: #cccc99;
-  border: solid thin #999966;
-  margin-top: 10pt;
-  padding: 2pt;
-  /* These are not implemented by all browsers, but that's OK */
-  border-radius: 10pt;
-  -moz-border-radius: 10pt;
-  box-shadow: 5pt 5pt 5pt #cccccc;
-}
-
-DT {
-  margin-left: 36pt;
-  margin-top: 12pt;
-}
-
-DD {
-  margin-left: 54pt;
-}
-
-DL.category DT {
-  font-weight: bold;
-}
-
-P.summary {
-  margin-left: 54pt;
-  font-family: monospace;
-}
-
-SPAN.message {
-  font-style: italic;
-  font-size: smaller;
-}
diff --git a/doc/he/images/button-accept-jobs.gif b/doc/he/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 3fe7ab6..0000000
Binary files a/doc/he/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/he/images/button-add-class.gif b/doc/he/images/button-add-class.gif
deleted file mode 100644 (file)
index 68df2a3..0000000
Binary files a/doc/he/images/button-add-class.gif and /dev/null differ
diff --git a/doc/he/images/button-add-printer.gif b/doc/he/images/button-add-printer.gif
deleted file mode 100644 (file)
index d6bea51..0000000
Binary files a/doc/he/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-add-this-printer.gif b/doc/he/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 2a53369..0000000
Binary files a/doc/he/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-cancel-all-jobs.gif b/doc/he/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index f41b044..0000000
Binary files a/doc/he/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/he/images/button-cancel-job.gif b/doc/he/images/button-cancel-job.gif
deleted file mode 100644 (file)
index f438e6c..0000000
Binary files a/doc/he/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/he/images/button-change-settings.gif b/doc/he/images/button-change-settings.gif
deleted file mode 100644 (file)
index 9c91f42..0000000
Binary files a/doc/he/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/he/images/button-clean-print-heads.gif b/doc/he/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 98a15ec..0000000
Binary files a/doc/he/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/he/images/button-clear.gif b/doc/he/images/button-clear.gif
deleted file mode 100644 (file)
index cb61c9c..0000000
Binary files a/doc/he/images/button-clear.gif and /dev/null differ
diff --git a/doc/he/images/button-continue.gif b/doc/he/images/button-continue.gif
deleted file mode 100644 (file)
index 1026bb8..0000000
Binary files a/doc/he/images/button-continue.gif and /dev/null differ
diff --git a/doc/he/images/button-delete-class.gif b/doc/he/images/button-delete-class.gif
deleted file mode 100644 (file)
index 67590d0..0000000
Binary files a/doc/he/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/he/images/button-delete-printer.gif b/doc/he/images/button-delete-printer.gif
deleted file mode 100644 (file)
index e41fd6c..0000000
Binary files a/doc/he/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-edit-configuration-file.gif b/doc/he/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 6dc7746..0000000
Binary files a/doc/he/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/he/images/button-export-samba.gif b/doc/he/images/button-export-samba.gif
deleted file mode 100644 (file)
index 7de8288..0000000
Binary files a/doc/he/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/he/images/button-help.gif b/doc/he/images/button-help.gif
deleted file mode 100644 (file)
index 7319d65..0000000
Binary files a/doc/he/images/button-help.gif and /dev/null differ
diff --git a/doc/he/images/button-hold-job.gif b/doc/he/images/button-hold-job.gif
deleted file mode 100644 (file)
index 455bf85..0000000
Binary files a/doc/he/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/he/images/button-manage-classes.gif b/doc/he/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 0491eda..0000000
Binary files a/doc/he/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/he/images/button-manage-jobs.gif b/doc/he/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index c245e84..0000000
Binary files a/doc/he/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/he/images/button-manage-printers.gif b/doc/he/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 81e0f27..0000000
Binary files a/doc/he/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/he/images/button-manage-server.gif b/doc/he/images/button-manage-server.gif
deleted file mode 100644 (file)
index 987680b..0000000
Binary files a/doc/he/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/he/images/button-modify-class.gif b/doc/he/images/button-modify-class.gif
deleted file mode 100644 (file)
index 8a57edd..0000000
Binary files a/doc/he/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/he/images/button-modify-printer.gif b/doc/he/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 0e2e272..0000000
Binary files a/doc/he/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-move-job.gif b/doc/he/images/button-move-job.gif
deleted file mode 100644 (file)
index 8ecf2e2..0000000
Binary files a/doc/he/images/button-move-job.gif and /dev/null differ
diff --git a/doc/he/images/button-move-jobs.gif b/doc/he/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 9bd3da1..0000000
Binary files a/doc/he/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/he/images/button-print-self-test-page.gif b/doc/he/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index c0ce8b1..0000000
Binary files a/doc/he/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/he/images/button-print-test-page.gif b/doc/he/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 4776db3..0000000
Binary files a/doc/he/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/he/images/button-publish-printer.gif b/doc/he/images/button-publish-printer.gif
deleted file mode 100644 (file)
index fa87119..0000000
Binary files a/doc/he/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-reject-jobs.gif b/doc/he/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index cd7b223..0000000
Binary files a/doc/he/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/he/images/button-release-job.gif b/doc/he/images/button-release-job.gif
deleted file mode 100644 (file)
index d7a2910..0000000
Binary files a/doc/he/images/button-release-job.gif and /dev/null differ
diff --git a/doc/he/images/button-restart-job.gif b/doc/he/images/button-restart-job.gif
deleted file mode 100644 (file)
index 944684d..0000000
Binary files a/doc/he/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/he/images/button-save-changes.gif b/doc/he/images/button-save-changes.gif
deleted file mode 100644 (file)
index b8a995d..0000000
Binary files a/doc/he/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/he/images/button-search.gif b/doc/he/images/button-search.gif
deleted file mode 100644 (file)
index bb48feb..0000000
Binary files a/doc/he/images/button-search.gif and /dev/null differ
diff --git a/doc/he/images/button-set-allowed-users.gif b/doc/he/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 497449d..0000000
Binary files a/doc/he/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/he/images/button-set-as-default.gif b/doc/he/images/button-set-as-default.gif
deleted file mode 100644 (file)
index c1b0c34..0000000
Binary files a/doc/he/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/he/images/button-set-printer-options.gif b/doc/he/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index 2cd8e38..0000000
Binary files a/doc/he/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/he/images/button-show-active.gif b/doc/he/images/button-show-active.gif
deleted file mode 100644 (file)
index 1fdfa11..0000000
Binary files a/doc/he/images/button-show-active.gif and /dev/null differ
diff --git a/doc/he/images/button-show-all.gif b/doc/he/images/button-show-all.gif
deleted file mode 100644 (file)
index faeac9a..0000000
Binary files a/doc/he/images/button-show-all.gif and /dev/null differ
diff --git a/doc/he/images/button-show-completed.gif b/doc/he/images/button-show-completed.gif
deleted file mode 100644 (file)
index e818e17..0000000
Binary files a/doc/he/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/he/images/button-show-next.gif b/doc/he/images/button-show-next.gif
deleted file mode 100644 (file)
index e2b0e55..0000000
Binary files a/doc/he/images/button-show-next.gif and /dev/null differ
diff --git a/doc/he/images/button-show-previous.gif b/doc/he/images/button-show-previous.gif
deleted file mode 100644 (file)
index cb254be..0000000
Binary files a/doc/he/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/he/images/button-sort-ascending.gif b/doc/he/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 64d11a6..0000000
Binary files a/doc/he/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/he/images/button-sort-descending.gif b/doc/he/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 6f3a47f..0000000
Binary files a/doc/he/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/he/images/button-start-class.gif b/doc/he/images/button-start-class.gif
deleted file mode 100644 (file)
index ae3e5ee..0000000
Binary files a/doc/he/images/button-start-class.gif and /dev/null differ
diff --git a/doc/he/images/button-start-printer.gif b/doc/he/images/button-start-printer.gif
deleted file mode 100644 (file)
index 37a146e..0000000
Binary files a/doc/he/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-stop-class.gif b/doc/he/images/button-stop-class.gif
deleted file mode 100644 (file)
index cccc587..0000000
Binary files a/doc/he/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/he/images/button-stop-printer.gif b/doc/he/images/button-stop-printer.gif
deleted file mode 100644 (file)
index e0811df..0000000
Binary files a/doc/he/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-unpublish-printer.gif b/doc/he/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 4c29397..0000000
Binary files a/doc/he/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/he/images/button-use-default-config.gif b/doc/he/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 2f6986c..0000000
Binary files a/doc/he/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/he/images/button-view-access-log.gif b/doc/he/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 3322c6b..0000000
Binary files a/doc/he/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/he/images/button-view-error-log.gif b/doc/he/images/button-view-error-log.gif
deleted file mode 100644 (file)
index d53beec..0000000
Binary files a/doc/he/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/he/images/button-view-page-log.gif b/doc/he/images/button-view-page-log.gif
deleted file mode 100644 (file)
index e06d156..0000000
Binary files a/doc/he/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/he/images/button-view-printable-version.gif b/doc/he/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 19a5a78..0000000
Binary files a/doc/he/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/he/index.html.in b/doc/he/index.html.in
deleted file mode 100644 (file)
index afb900d..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>דף הבית - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60" dir=ltr><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4"
-ALIGN="TOP" BORDER="0" ALT="">&nbsp;&nbsp;דף הבית&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-right.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;ניהול&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-right.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;מחלקות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-right.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;תיעוד/עזרה&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-right.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;עבודות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-right.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;מדפסות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">ברוכים הבאים!</H2>
-
-<P>דפי אינטרנט אלה מאפשרים לך לנטר את המדפסות והעבודות שלך כמו גם
-לבצע משימות ניהול המערכת. הקלק/י על מי מהלשוניות למעלה או על הלחצנים למטה
-כדי לבצע משימה.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="עזרה"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="הוסף מחלקה"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="הוסף מדפסת"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="נהל מחלקות"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="נהל עבודות"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="נהל מדפסות"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="נהל שרת"></A>
-</P>
-
-<P><I>אם את/ה מתבקש/ת לספק שם משתמש וסיסמה, נא הקלד/י את שם המשתמש והסיסמה
-המשמשים אותך לכניסה או שם המשתמש "root" והסיסמה.</I></P>
-
-<H2 CLASS="title">אודות CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="מחשב ומדפסת שמחים">
-
-CUPS מספקת ממשק הדפסה נייד למערכות הפעלה מבוססות <SUP>&reg;</SUP>UNIX.
-התוכנה מפותחת ומתוחזקת ע"י <A HREF="http://www.apple.com">Apple Inc.</A> כדי לקדם פתרון הדפסה תקני. CUPS היא מערכת ההדפסה התקנית המותקנת
-על MacOS<SUP>&reg;</SUP> X ורוב מערכות ה- <SUP>&reg;</SUP>Linux.</P>
-
-<P>CUPS משתמשת ב <A HREF="http://www.pwg.org/ipp/" TARGET="_blank" 
-dir=ltr>Internet Printing Protocol ("IPP")</A> כבסיס לניהול
-עבודות ותורי הדפסה ומוסיפה אפשרויות לחיפוש מדפסות רשת והדפסה מבוססת על
-<SPAN dir=ltr>PostScript Printer Description ("PPD")</SPAN> כדי לתמוך
-בהדפסות ב"עולם-האמיתי".<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">עבור מנהלי התקני מדפסות וסיוע</H2>
-
-<P>בקרו באתר הרשמי של CUPS עבור מנהלי התקני מדפסות וסיוע:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;" dir=ltr>
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
-
-</TD>
-
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
index 20ba85e95d61f91d904325192a8e74c51d3c4090..aabafd45f76c03090e579d68a948e3f1626d5b64 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>Array API</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
index 2e135cf8669b69a32dd69e504ccce4759e457a19..c95ce89ed80314b74fe8fb02cbac149e9eb2b977 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>CUPS API</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
@@ -160,6 +160,7 @@ CUPS 1.1 or higher.</p>
        <li><a href='#cupsGetOption'><tt>cupsGetOption()</tt></a> </li>
        <li><a href='#cupsGetPPD'><tt>cupsGetPPD()</tt></a> </li>
        <li><a href='#cupsGetPPD2'><tt>cupsGetPPD2()</tt></a> <span class='info'>&nbsp;CUPS 1.1.21&nbsp;</span></li>
+       <li><a href='#cupsGetPPD3'><tt>cupsGetPPD3()</tt></a> </li>
        <li><a href='#cupsGetPassword'><tt>cupsGetPassword()</tt></a> </li>
        <li><a href='#cupsGetPrinters'><tt>cupsGetPrinters()</tt></a> <span class='info'>&nbsp;DEPRECATED&nbsp;</span></li>
        <li><a href='#cupsGetServerPPD'><tt>cupsGetServerPPD()</tt></a> <span class='info'>&nbsp;CUPS 1.3&nbsp;</span></li>
@@ -667,6 +668,41 @@ cupsGetPPD2(
 <h4>Returns</h4>
 <p>Filename for PPD file</p>
 <!-- NEW PAGE -->
+<h3 class='title'><a name='cupsGetPPD3'>cupsGetPPD3()</a></h3>
+<h4>Description</h4>
+<p>Get the PPD file for a printer on the specified
+server if it has changed.
+<p>The &quot;modtime&quot; parameter contains the modification time of any
+locally-cached content and is updated with the time from the PPD file on
+the server.
+<p>The &quot;buffer&quot; parameter contains the local PPD filename.  If it contains
+the empty string, a new temporary file is created, otherwise the existing
+file will be overwritten as needed.
+<p>On success, HTTP_OK is returned for a new PPD file and HTTP_NOT_MODIFIED
+if the existing PPD file is up-to-date.  Any other status is an error.
+<h4>Syntax</h4>
+<p><tt>
+http_status_t<br>
+cupsGetPPD3(
+    http_t * http,
+    const char * name,
+    time_t * modtime,
+    char * buffer,
+    size_t bufsize);
+</tt></p>
+<h4>Arguments</h4>
+<div class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' summary='Arguments'>
+<thead><tr><th>Name</th><th>Description</th></tr></thead>
+<tbody>
+<tr><td><tt>http</tt></td><td>HTTP connection</td></tr>
+<tr><td><tt>name</tt></td><td>Printer name</td></tr>
+<tr><td><tt>modtime</tt></td><td>Modification time</td></tr>
+<tr><td><tt>buffer</tt></td><td>Filename buffer</td></tr>
+<tr><td><tt>bufsize</tt></td><td>Size of filename buffer</td></tr>
+</tbody></table></div>
+<h4>Returns</h4>
+<p>HTTP status</p>
+<!-- NEW PAGE -->
 <h3 class='title'><a name='cupsGetPassword'>cupsGetPassword()</a></h3>
 <h4>Description</h4>
 <p>Get a password from the user.
index e8e765d70eae052c2474ee58584701905337cf0b..b4c6c43ad7f423f592fe40564a771c0e24dff3e7 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>File and Directory APIs</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
index 181356bc0c579cedc1962358efadf61625321a81..492f1b2d499526e083479ac37724acc18b11fef4 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>Filter and Backend APIs</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
index 036d9708275a89c0e6db7b512b2332ba967219c7..3f4e2eee8ecaf31c4215380a5b4e453a60af13ac 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>HTTP and IPP APIs</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
@@ -538,6 +538,8 @@ require CUPS 1.1 or higher.</p>
 </td></tr>
 <tr><td><tt>CUPS_GET_DEVICES</tt> </td><td>Get a list of supported devices
 </td></tr>
+<tr><td><tt>CUPS_GET_DOCUMENT</tt> <span class='info'>&nbsp;CUPS 1.4&nbsp;</span></td><td>Get a document file 
+</td></tr>
 <tr><td><tt>CUPS_GET_PPD</tt> <span class='info'>&nbsp;CUPS 1.3&nbsp;</span></td><td>Get a PPD file 
 </td></tr>
 <tr><td><tt>CUPS_GET_PPDS</tt> </td><td>Get a list of supported drivers
index 44e4513abf3b9f0a014ba1d0a59188ce0cf10323..2fe00be672e2ef176e6730dc235e93cfaa1af520 100644 (file)
@@ -4,7 +4,7 @@
 <head>
        <title>PPD API</title>
        <meta name='keywords' content='Programming'>
-       <meta name='creator' content='Mini-XML v2.3'>
+       <meta name='creator' content='Mini-XML v2.4'>
        <style type='text/css'><!--
        h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
        tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
index a9061796822c90bf6b655f565c9eccec4f788aa8..732c91960d69bcaf04480a029e40260d4a549adf 100644 (file)
@@ -686,7 +686,7 @@ printer's web page, for example
 "http://localhost:631/printers/LaserJet4000", and click on the
 <VAR>Set Printer Options</VAR> button. Scroll down to the bottom
 of the page and choose the desired policy from the pull-down
-list. Click on <VAR>Save Changes</VAR> to change the policy for
+list. Click on <VAR>Set Printer Options</VAR> to change the policy for
 the printer.</P>
 
 </BODY>
index 6c1064368fcbce91fcc7e456846bd43fdb6502a1..30854830e7e33fd428a02131005fb10b49377e26 100644 (file)
@@ -39,7 +39,7 @@ Output-bin Attribute Extension", and "IPP/1.1: finishings
 'fold',' trim', and 'bale' attribute values extension"
 specifications.</p>
 
-<p>CUPS also provides 15 new operations and many new attributes
+<p>CUPS also provides 16 new operations and many new attributes
 to support multiple IPP printers and printer classes on a single
 host.</p>
 
@@ -80,7 +80,7 @@ server also supports normal browser access via
 
 <h3 class='title'><a name='IPP_OPERATIONS'>CUPS IPP Operations</a></h3>
 
-<p>CUPS provides 14 extension operations in addition to most of the
+<p>CUPS provides 16 extension operations in addition to most of the
 standard IPP and registered extension operations:
 
 <div class='table'><table align='center' border='1' width='80%'
@@ -328,6 +328,12 @@ summary='Supported Operations'>
        <td>0x400F</td>
        <td>Get a PPD file.</td>
 </tr>
+<tr>
+       <td><a href='#CUPS_GET_DOCUMENT'>CUPS-Get-Document</a></td>
+       <td>1.4</td>
+       <td>0x4027</td>
+       <td>Get a document file from a job.</td>
+</tr>
 </tbody>
 </table></div>
 
@@ -1786,6 +1792,90 @@ CUPS-Get-PPD Response:
 <p>If the status code is <tt>successful-ok</tt>, the PPD file follows
 the end of the IPP response.</p>
 
+<h3 class='title'><span class='info'>CUPS 1.4</span><a name='CUPS_GET_DOCUMENT'>CUPS-Get-Document Operation</a></h3>
+
+<p>The CUPS-Get-Document operation (0x4027) gets a document file from a
+job on the server. The document file is specified using the
+<tt>document-number</tt> and either the <tt>job-uri</tt> or <tt>printer-uri</tt>
+and <tt>job-id</tt> identifying the job.</p>
+
+<p>If the document file is found, <tt>successful-ok</tt> is returned with
+the document file following the response data.</p>
+
+<p>If the document file does not exist, <tt>client-error-not-found</tt> is
+returned.</p>
+
+<p>If the requesting user does not have access to the document file,
+<tt>client-error-not-authorized</tt> is returned.
+
+<h4>CUPS-Get-Document Request</h4>
+
+<p>The following group of attributes is supplied as part of the
+CUPS-Get-Document request:
+
+<p>Group 1: Operation Attributes
+
+<dl>
+
+       <dt>Natural Language and Character Set:
+
+       <dd>The "attributes-charset" and "attributes-natural-language"
+       attributes as described in section 3.1.4.1 of the IPP Model and
+       Semantics document.
+
+       <dt>"printer-uri" (uri) and "job-id" (integer)
+       <br><i>OR</i>
+       <br>"job-uri" (uri):
+
+       <dd>The client MUST supply a printer URI and job ID or job URI.
+
+       <dt>"document-number" (integer(1:MAX)):
+
+       <dd>The client MUST supply a document number to retrieve. The
+       <tt>document-count</tt> attribute for the job defines the maximum
+       document number that can be specified. In the case of jobs with
+       banners (<tt>job-sheets</tt> is not "none"), document number 1
+       will typically contain the start banner and document number N
+       will typically contain the end banner.
+
+</dl>
+
+<h4>CUPS-Get-Document Response</h4>
+
+<p>The following group of attributes is sent as part of the
+CUPS-Get-Document Response:
+
+<p>Group 1: Operation Attributes
+
+<dl>
+
+       <dt>Status Message:
+
+       <dd>The standard response status message.
+
+       <dt>Natural Language and Character Set:
+
+       <dd>The "attributes-charset" and "attributes-natural-language"
+       attributes as described in section 3.1.4.2 of the IPP Model and
+       Semantics document.
+
+       <dt>"document-format" (mimeType):
+
+       <dd>The format of the document file.
+
+       <dt>"document-number" (integer(1:MAX)):
+
+       <dd>The requested document number.
+
+       <dt>"document-name" (name(MAX)):
+
+       <dd>The name that was supplied with the document, if any.
+
+</dl>
+
+<p>If the status code is <tt>successful-ok</tt>, the document file follows
+the end of the IPP response.</p>
+
 
 <h2 class='title'><a name='ATTRIBUTES'>Attributes</a></h2>
 
@@ -1914,6 +2004,11 @@ printing text files. The default value is 1.
 printing text files. Only the values 10, 12, and 17 are currently
 supported. The default value is 10.
 
+<h4><a name="document-count">document-count (integer(1:MAX))</a></h4>
+
+<p>The document-count attribute specifies the number of documents that
+are present in the job.
+
 <h4><a name="fitplot">fitplot (boolean)</a></h4>
 
 <p>The fitplot attribute specifies whether to scale HP-GL/2 plot files to
index 1e618eebbdcb790bc9b248a36ac5d0b7d85170df..91c65738ba85ba1cd6fa50d73b74ec9001979312 100644 (file)
@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  "$Id: spec-ppd.html 6996 2007-09-28 18:30:31Z mike $"
+  "$Id: spec-ppd.html 6993 2007-09-28 18:05:28Z mike $"
 
   CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
index 6724683eadc2a391f63f45bd0bb312920d2283c2..abc4bbb655bc3b90b6674a0158b4d1a103a18f8e 100644 (file)
@@ -23,15 +23,6 @@ files and directories:</P>
        <LI><VAR>desktop/cups.desktop</VAR> - the GNOME/KDE
        desktop file pointing to the CUPS web interface</LI>
 
-       <LI><VAR>doc/images/button-*.gif</VAR> - the web
-       interface button images</LI>
-
-       <LI><VAR>tools/buttons.txt</VAR> - the English text for the
-       web interface buttons</LI>
-
-       <LI><VAR>tools/makebuttons</VAR> - the shell script we use
-       to generate the web interface button images</LI>
-
        <LI><VAR>doc/index.html</VAR> - the web interface home
        page</LI>
 
@@ -47,7 +38,8 @@ localization files are  placed in subdirectories under the
 <VAR>doc</VAR> and <VAR>templates</VAR> using the locale name.
 Locale names are either <VAR>ll</VAR> or <VAR>ll_CC</VAR>, where
 "ll" is the 2-letter language code and "CC" is the 2-letter
-country code. <em>CUPS does not currently use or support the newer <VAR>ll-region</VAR> syntax for locale names.</em></P>
+country code. <em>CUPS does not currently use or support the newer
+<VAR>ll-region</VAR> syntax for locale names.</em></P>
 
 <P>All non-image files must be encoded using the UTF-8 character
 set.</P>
@@ -56,11 +48,10 @@ set.</P>
 <H2 CLASS="title"><A NAME="SUBMIT">Submitting a Translation for CUPS</A></H2>
 
 <P>To submit a translation for inclusion in CUPS, translate the
-desktop file, all of the button images, template files, the
-<VAR>index.html.in</VAR> file, and the message catalog. Place
-these files in the correct subdirectory in the CUPS source code
-archive and run the following command to create an archive with
-your files:</P>
+desktop file, all of the template files, the <VAR>index.html.in</VAR>
+file, and the message catalog. Place these files in the correct
+subdirectories in the CUPS source code archive and run the following
+command to create an archive with your files:</P>
 
 <PRE CLASS="command">
 tar cvf <I>ll_CC</I>.tar.gz desktop/cups.desktop doc/<I>ll_CC</I> \
@@ -87,265 +78,6 @@ Comment[<I>ll_CC</I>]=<I>Translation of "CUPS Web Interface"</I>
 </PRE>
 
 
-<H2 CLASS="title"><A NAME="IMAGES">Button Images</A></H2>
-
-<P>The web interface button images are used to activate functions on
-the CUPS web pages. Table 1 lists the button images and the English
-text labels for those buttons. Copy the file
-<VAR>tools/buttons.txt</VAR> to <VAR>buttons-ll_CC.txt</VAR>,
-translate the text in that file (use UTF-8 as the text encoding!),
-and then use the supplied <VAR>tools/makebuttons</VAR> script to
-create button images that match the CUPS web interface:</P>
-
-<PRE CLASS="command">
-cp tools/buttons.txt buttons-ll_CC.txt
-vi buttons-ll_CC.txt
-tools/makebuttons ll_CC buttons-ll_CC.txt
-</PRE>
-
-<BLOCKQUOTE><B>Note:</B> The <VAR>tools/makebuttons</VAR> script
-requires at least version 6.2.4 of the ImageMagick software to
-work.</BLOCKQUOTE>
-
-<P>When you have created all of the button images, edit the
-<VAR>Makedefs</VAR> file and add the locale name to the
-<CODE>LANGUAGES</CODE> variable. You can then run "make
-install" in the <VAR>doc</VAR> subdirectory to test the
-translated buttons.</P>
-
-<DIV CLASS="table"><TABLE SUMMARY="Web Interface Buttons">
-<CAPTION>Table 1: Web Interface Buttons</CAPTION>
-<THEAD>
-<TR>
-       <TH>Filename</TH>
-       <TH>Text</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-       <TD>button-accept-jobs.gif</TD>
-       <TD>Accept Jobs</TD>
-</TR>
-<TR>
-       <TD>button-add-class.gif</TD>
-       <TD>Add Class</TD>
-</TR>
-<TR>
-       <TD>button-add-printer.gif</TD>
-       <TD>Add Printer</TD>
-</TR>
-<TR>
-       <TD>button-add-rss-subscription.gif</TD>
-       <TD>Add RSS Subscription</TD>
-</TR>
-<TR>
-       <TD>button-add-this-printer.gif</TD>
-       <TD>Add This Printer</TD>
-</TR>
-<TR>
-       <TD>button-cancel-all-jobs.gif</TD>
-       <TD>Cancel All Jobs</TD>
-</TR>
-<TR>
-       <TD>button-cancel-job.gif</TD>
-       <TD>Cancel Job</TD>
-</TR>
-<TR>
-       <TD>button-cancel-subscription.gif</TD>
-       <TD>Cancel Subscription</TD>
-</TR>
-<TR>
-       <TD>button-change-settings.gif</TD>
-       <TD>Change Settings</TD>
-</TR>
-<TR>
-       <TD>button-clean-print-heads.gif</TD>
-       <TD>Clean Print Heads</TD>
-</TR>
-<TR>
-       <TD>button-clear.gif</TD>
-       <TD>Clear</TD>
-</TR>
-<TR>
-       <TD>button-continue.gif</TD>
-       <TD>Continue</TD>
-</TR>
-<TR>
-       <TD>button-delete-class.gif</TD>
-       <TD>Delete Class</TD>
-</TR>
-<TR>
-       <TD>button-delete-printer.gif</TD>
-       <TD>Delete Printer</TD>
-</TR>
-<TR>
-       <TD>button-edit-configuration-file.gif</TD>
-       <TD>Edit Configuration File</TD>
-</TR>
-<TR>
-       <TD>button-export-samba.gif</TD>
-       <TD>Export Printers to Samba</TD>
-</TR>
-<TR>
-       <TD>button-find-new-printers.gif</TD>
-       <TD>Find New Printers</TD>
-</TR>
-<TR>
-       <TD>button-help.gif</TD>
-       <TD>Help</TD>
-</TR>
-<TR>
-       <TD>button-hold-job.gif</TD>
-       <TD>Hold Job</TD>
-</TR>
-<TR>
-       <TD>button-manage-classes.gif</TD>
-       <TD>Manage Classes</TD>
-</TR>
-<TR>
-       <TD>button-manage-jobs.gif</TD>
-       <TD>Manage Jobs</TD>
-</TR>
-<TR>
-       <TD>button-manage-printers.gif</TD>
-       <TD>Manage Printers</TD>
-</TR>
-<TR>
-       <TD>button-manage-server.gif</TD>
-       <TD>Manage Server</TD>
-</TR>
-<TR>
-       <TD>button-modify-class.gif</TD>
-       <TD>Modify Class</TD>
-</TR>
-<TR>
-       <TD>button-modify-printer.gif</TD>
-       <TD>Modify Printer</TD>
-</TR>
-<TR>
-       <TD>button-move-job.gif</TD>
-       <TD>Move Job</TD>
-</TR>
-<TR>
-       <TD>button-move-jobs.gif</TD>
-       <TD>Move All Jobs</TD>
-</TR>
-<TR>
-       <TD>button-print-self-test-page.gif</TD>
-       <TD>Print Self-Test Page</TD>
-</TR>
-<TR>
-       <TD>button-print-test-page.gif</TD>
-       <TD>Print Test Page</TD>
-</TR>
-<TR>
-       <TD>button-publish-printer.gif</TD>
-       <TD>Publish Printer</TD>
-</TR>
-<TR>
-       <TD>button-reject-jobs.gif</TD>
-       <TD>Reject Jobs</TD>
-</TR>
-<TR>
-       <TD>button-release-job.gif</TD>
-       <TD>Release Job</TD>
-</TR>
-<TR>
-       <TD>button-restart-job.gif</TD>
-       <TD>Reprint Job</TD>
-</TR>
-<TR>
-       <TD>button-save-changes.gif</TD>
-       <TD>Save Changes</TD>
-</TR>
-<TR>
-       <TD>button-search.gif</TD>
-       <TD>Search</TD>
-</TR>
-<TR>
-       <TD>button-set-allowed-users.gif</TD>
-       <TD>Set Allowed Users</TD>
-</TR>
-<TR>
-       <TD>button-set-as-default.gif</TD>
-       <TD>Set As Default</TD>
-</TR>
-<TR>
-       <TD>button-set-printer-options.gif</TD>
-       <TD>Set Printer Options</TD>
-</TR>
-<TR>
-       <TD>button-show-active.gif</TD>
-       <TD>Show Active Jobs</TD>
-</TR>
-<TR>
-       <TD>button-show-all.gif</TD>
-       <TD>Show All Jobs</TD>
-</TR>
-<TR>
-       <TD>button-show-completed.gif</TD>
-       <TD>Show Completed Jobs</TD>
-</TR>
-<TR>
-       <TD>button-show-next.gif</TD>
-       <TD>Show Next</TD>
-</TR>
-<TR>
-       <TD>button-show-previous.gif</TD>
-       <TD>Show Previous</TD>
-</TR>
-<TR>
-       <TD>button-sort-ascending.gif</TD>
-       <TD>Show Ascending</TD>
-</TR>
-<TR>
-       <TD>button-sort-descending.gif</TD>
-       <TD>Show Descending</TD>
-</TR>
-<TR>
-       <TD>button-start-class.gif</TD>
-       <TD>Start Class</TD>
-</TR>
-<TR>
-       <TD>button-start-printer.gif</TD>
-       <TD>Start Printer</TD>
-</TR>
-<TR>
-       <TD>button-stop-class.gif</TD>
-       <TD>Stop Class</TD>
-</TR>
-<TR>
-       <TD>button-stop-printer.gif</TD>
-       <TD>Stop Printer</TD>
-</TR>
-<TR>
-       <TD>button-unpublish-printer.gif</TD>
-       <TD>Unpublish Printer</TD>
-</TR>
-<TR>
-       <TD>button-use-default-config.gif</TD>
-       <TD>Use Default Configuration File</TD>
-</TR>
-<TR>
-       <TD>button-view-access-log.gif</TD>
-       <TD>View Access Log</TD>
-</TR>
-<TR>
-       <TD>button-view-error-log.gif</TD>
-       <TD>View Error Log</TD>
-</TR>
-<TR>
-       <TD>button-view-page-log.gif</TD>
-       <TD>View Page Log</TD>
-</TR>
-<TR>
-       <TD>button-view-printable-version.gif</TD>
-       <TD>View Printable Version</TD>
-</TR>
-</TBODY>
-</TABLE></DIV>
-
-
 <H2 CLASS="title"><A NAME="HOMEPAGE">The Home Page</A></H2>
 
 <P>The <VAR>index.html</VAR> file is a complete HTML file that is
@@ -534,7 +266,7 @@ translated all of the templates, add the locale to the
 </TR>
 <TR>
        <TD>job-cancel.tmpl</TD>
-       <TD>This template shows "job cancelled".</TD>
+       <TD>This template shows "job canceled".</TD>
 </TR>
 <TR>
        <TD>job-hold.tmpl</TD>
@@ -865,7 +597,7 @@ are displayed. Table 4 lists the supported values.</P>
 <CAPTION>Table 4: WHICH_JOBS Values</CAPTION>
 <THEAD>
 <TR>
-       <TH>OP Value</TH>
+       <TH>WHICH_JOBS Value</TH>
        <TH>Description</TH>
 </TR>
 </THEAD>
@@ -1066,7 +798,7 @@ supported <CODE>OP</CODE> values.</P>
 </TR>
 <TR>
        <TD>restart-job</TD>
-       <TD>Restarts/reprints a stopped, cancelled, completed, or aborted
+       <TD>Restarts/reprints a stopped, canceled, completed, or aborted
        print job.</TD>
 </TR>
 </TBODY>
diff --git a/doc/images/bottom-left.gif b/doc/images/bottom-left.gif
deleted file mode 100644 (file)
index b7d1033..0000000
Binary files a/doc/images/bottom-left.gif and /dev/null differ
diff --git a/doc/images/bottom-right.gif b/doc/images/bottom-right.gif
deleted file mode 100644 (file)
index 861db48..0000000
Binary files a/doc/images/bottom-right.gif and /dev/null differ
diff --git a/doc/images/button-accept-jobs.gif b/doc/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index e50ef1b..0000000
Binary files a/doc/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/images/button-add-class.gif b/doc/images/button-add-class.gif
deleted file mode 100644 (file)
index c02d95f..0000000
Binary files a/doc/images/button-add-class.gif and /dev/null differ
diff --git a/doc/images/button-add-printer.gif b/doc/images/button-add-printer.gif
deleted file mode 100644 (file)
index 91fe871..0000000
Binary files a/doc/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/images/button-add-rss-subscription.gif b/doc/images/button-add-rss-subscription.gif
deleted file mode 100644 (file)
index 541f196..0000000
Binary files a/doc/images/button-add-rss-subscription.gif and /dev/null differ
diff --git a/doc/images/button-add-this-printer.gif b/doc/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index fec8943..0000000
Binary files a/doc/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/images/button-cancel-all-jobs.gif b/doc/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 17254fe..0000000
Binary files a/doc/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/images/button-cancel-job.gif b/doc/images/button-cancel-job.gif
deleted file mode 100644 (file)
index cdbd346..0000000
Binary files a/doc/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/images/button-cancel-subscription.gif b/doc/images/button-cancel-subscription.gif
deleted file mode 100644 (file)
index 93a5d1d..0000000
Binary files a/doc/images/button-cancel-subscription.gif and /dev/null differ
diff --git a/doc/images/button-change-settings.gif b/doc/images/button-change-settings.gif
deleted file mode 100644 (file)
index b13ebbf..0000000
Binary files a/doc/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/images/button-clean-print-heads.gif b/doc/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 8218b7f..0000000
Binary files a/doc/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/images/button-clear.gif b/doc/images/button-clear.gif
deleted file mode 100644 (file)
index 381083a..0000000
Binary files a/doc/images/button-clear.gif and /dev/null differ
diff --git a/doc/images/button-continue.gif b/doc/images/button-continue.gif
deleted file mode 100644 (file)
index 6219b3d..0000000
Binary files a/doc/images/button-continue.gif and /dev/null differ
diff --git a/doc/images/button-delete-class.gif b/doc/images/button-delete-class.gif
deleted file mode 100644 (file)
index 2008755..0000000
Binary files a/doc/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/images/button-delete-printer.gif b/doc/images/button-delete-printer.gif
deleted file mode 100644 (file)
index a46c7c7..0000000
Binary files a/doc/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/images/button-edit-configuration-file.gif b/doc/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 9271859..0000000
Binary files a/doc/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/images/button-export-samba.gif b/doc/images/button-export-samba.gif
deleted file mode 100644 (file)
index 7a953f3..0000000
Binary files a/doc/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/images/button-find-new-printers.gif b/doc/images/button-find-new-printers.gif
deleted file mode 100644 (file)
index 7c2fff6..0000000
Binary files a/doc/images/button-find-new-printers.gif and /dev/null differ
diff --git a/doc/images/button-help.gif b/doc/images/button-help.gif
deleted file mode 100644 (file)
index 5a16732..0000000
Binary files a/doc/images/button-help.gif and /dev/null differ
diff --git a/doc/images/button-hold-job.gif b/doc/images/button-hold-job.gif
deleted file mode 100644 (file)
index d128740..0000000
Binary files a/doc/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/images/button-manage-classes.gif b/doc/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 6110a8e..0000000
Binary files a/doc/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/images/button-manage-jobs.gif b/doc/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 4f5bba5..0000000
Binary files a/doc/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/images/button-manage-printers.gif b/doc/images/button-manage-printers.gif
deleted file mode 100644 (file)
index eb1fae6..0000000
Binary files a/doc/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/images/button-manage-server.gif b/doc/images/button-manage-server.gif
deleted file mode 100644 (file)
index 1cd47a5..0000000
Binary files a/doc/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/images/button-modify-class.gif b/doc/images/button-modify-class.gif
deleted file mode 100644 (file)
index 52c4cb6..0000000
Binary files a/doc/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/images/button-modify-printer.gif b/doc/images/button-modify-printer.gif
deleted file mode 100644 (file)
index d654c80..0000000
Binary files a/doc/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/images/button-move-job.gif b/doc/images/button-move-job.gif
deleted file mode 100644 (file)
index 5f4d592..0000000
Binary files a/doc/images/button-move-job.gif and /dev/null differ
diff --git a/doc/images/button-move-jobs.gif b/doc/images/button-move-jobs.gif
deleted file mode 100644 (file)
index e5415e4..0000000
Binary files a/doc/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/images/button-print-self-test-page.gif b/doc/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index d8c59ad..0000000
Binary files a/doc/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/images/button-print-test-page.gif b/doc/images/button-print-test-page.gif
deleted file mode 100644 (file)
index faea1b3..0000000
Binary files a/doc/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/images/button-publish-printer.gif b/doc/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 7b20e02..0000000
Binary files a/doc/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/images/button-reject-jobs.gif b/doc/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 093bfc9..0000000
Binary files a/doc/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/images/button-release-job.gif b/doc/images/button-release-job.gif
deleted file mode 100644 (file)
index ca9ef14..0000000
Binary files a/doc/images/button-release-job.gif and /dev/null differ
diff --git a/doc/images/button-restart-job.gif b/doc/images/button-restart-job.gif
deleted file mode 100644 (file)
index bd319ca..0000000
Binary files a/doc/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/images/button-save-changes.gif b/doc/images/button-save-changes.gif
deleted file mode 100644 (file)
index b23a824..0000000
Binary files a/doc/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/images/button-search.gif b/doc/images/button-search.gif
deleted file mode 100644 (file)
index a3f7f89..0000000
Binary files a/doc/images/button-search.gif and /dev/null differ
diff --git a/doc/images/button-set-allowed-users.gif b/doc/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 768f34c..0000000
Binary files a/doc/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/images/button-set-as-default.gif b/doc/images/button-set-as-default.gif
deleted file mode 100644 (file)
index ec976a0..0000000
Binary files a/doc/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/images/button-set-printer-options.gif b/doc/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index 174cfde..0000000
Binary files a/doc/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/images/button-show-active.gif b/doc/images/button-show-active.gif
deleted file mode 100644 (file)
index 99cb9c6..0000000
Binary files a/doc/images/button-show-active.gif and /dev/null differ
diff --git a/doc/images/button-show-all.gif b/doc/images/button-show-all.gif
deleted file mode 100644 (file)
index fca881d..0000000
Binary files a/doc/images/button-show-all.gif and /dev/null differ
diff --git a/doc/images/button-show-completed.gif b/doc/images/button-show-completed.gif
deleted file mode 100644 (file)
index c93f1d4..0000000
Binary files a/doc/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/images/button-show-next.gif b/doc/images/button-show-next.gif
deleted file mode 100644 (file)
index bc1576a..0000000
Binary files a/doc/images/button-show-next.gif and /dev/null differ
diff --git a/doc/images/button-show-previous.gif b/doc/images/button-show-previous.gif
deleted file mode 100644 (file)
index 823f428..0000000
Binary files a/doc/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/images/button-sort-ascending.gif b/doc/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index bc90aa4..0000000
Binary files a/doc/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/images/button-sort-descending.gif b/doc/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 12ff5f4..0000000
Binary files a/doc/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/images/button-start-class.gif b/doc/images/button-start-class.gif
deleted file mode 100644 (file)
index 8022c64..0000000
Binary files a/doc/images/button-start-class.gif and /dev/null differ
diff --git a/doc/images/button-start-printer.gif b/doc/images/button-start-printer.gif
deleted file mode 100644 (file)
index 34acfa2..0000000
Binary files a/doc/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/images/button-stop-class.gif b/doc/images/button-stop-class.gif
deleted file mode 100644 (file)
index 794cbe6..0000000
Binary files a/doc/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/images/button-stop-printer.gif b/doc/images/button-stop-printer.gif
deleted file mode 100644 (file)
index c0cac7e..0000000
Binary files a/doc/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/images/button-unpublish-printer.gif b/doc/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index e2d1af3..0000000
Binary files a/doc/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/images/button-use-default-config.gif b/doc/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 0e3a90d..0000000
Binary files a/doc/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/images/button-view-access-log.gif b/doc/images/button-view-access-log.gif
deleted file mode 100644 (file)
index b27a13d..0000000
Binary files a/doc/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/images/button-view-error-log.gif b/doc/images/button-view-error-log.gif
deleted file mode 100644 (file)
index ae62813..0000000
Binary files a/doc/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/images/button-view-page-log.gif b/doc/images/button-view-page-log.gif
deleted file mode 100644 (file)
index c3291b1..0000000
Binary files a/doc/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/images/button-view-printable-version.gif b/doc/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 903a51a..0000000
Binary files a/doc/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/images/classes.gif b/doc/images/classes.gif
deleted file mode 100644 (file)
index 0ac1197..0000000
Binary files a/doc/images/classes.gif and /dev/null differ
diff --git a/doc/images/classes.png b/doc/images/classes.png
new file mode 100644 (file)
index 0000000..f038897
Binary files /dev/null and b/doc/images/classes.png differ
index 227d1b06bba8c0ca101772041247ce38c7d39696..1bc790d5ad1c960813c879486bf5151b0bdff5e8 100644 (file)
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"
-       "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
-<svg width="50pt" height="50pt" viewBox="0 0 50 50" xml:space="preserve">
-<g transform="scale(0.5)">
-       <g id="Path_0" style="fill-rule:nonzero;clip-rule:nonzero;fill:#C0C0C0;stroke:none;stroke-miterlimit:4;">
-               <path d="M47.82 29.53L2.89 53.69L20.58 65.42L78.83 38.67z"/>
-       </g>
-       <g id="Path_0" style="fill-rule:nonzero;clip-rule:nonzero;fill:#C0C0C0;stroke:none;stroke-miterlimit:4;">
-               <path d="M64.25 56.78L13.64 83.99L33.57 97.2L99.18 67.07z"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M98.25 44.84L73.75 55.73L73.75 73.43L98.25 61.17z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M54.69 62.54L54.69 47.56L73.75 55.73L73.75 73.43z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M76.47 39.39L54.69 47.56L73.75 55.73L98.25 44.84z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M91.23 64.57L91.24 47.93"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M76.47 41.35L91.41 45.54L73.75 53.01L60.14 47.56z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M86.59 47.58L91.41 45.54L76.47 41.35z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#00fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M92.04 48.87L97.60 46.47L97.64 50.59L92.04 53.12z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M73.75 67.71L91.24 59.1"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M54.69 55.73L70.70 64.11L70.70 54.42L94.87 43.99"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M80.57 19.2L58.82 28.87L58.82 44.58L80.57 33.7z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M41.90 34.91L41.90 21.62L58.82 28.87L58.82 44.58z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M61.24 14.36L41.90 21.62L58.82 28.87L80.57 19.2z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M74.34 36.72L74.35 21.94"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M61.24 16.1L74.50 19.82L58.82 26.45L46.73 21.62z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M70.22 21.63L74.50 19.82L61.24 16.1z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#00fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M75.06 22.78L79.99 20.65L80.03 24.3L75.06 26.55z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M58.82 39.5L74.35 31.86"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M41.90 28.87L56.11 36.31L56.11 27.71L77.57 18.45"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M40.62 33.15L18.87 42.82L18.87 58.53L40.62 47.65z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M1.95 48.86L1.95 35.57L18.87 42.82L18.87 58.53z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M21.29 28.32L1.95 35.57L18.87 42.82L40.62 33.15z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M34.39 50.67L34.40 35.9"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M21.29 30.06L34.55 33.77L18.87 40.4L6.78 35.57z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M30.27 35.58L34.55 33.77L21.29 30.06z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#00fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M35.11 36.73L40.04 34.6L40.08 38.26L35.11 40.5z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M18.87 53.45L34.40 45.82"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M1.95 42.82L16.16 50.26L16.16 41.66L37.62 32.4"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M57.29 60.43L32.79 71.32L32.79 89.02L57.29 76.77z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M13.73 78.13L13.73 63.16L32.79 71.32L32.79 89.02z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M35.51 54.99L13.73 63.16L32.79 71.32L57.29 60.43z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.27 80.17L50.28 63.53"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M35.51 56.95L50.45 61.13L32.79 68.6L19.18 63.16z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M45.63 63.17L50.45 61.13L35.51 56.95z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#00fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M51.09 64.46L56.64 62.07L56.68 66.18L51.09 68.71z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M32.79 83.3L50.28 74.7"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M13.73 71.32L29.74 79.71L29.74 70.02L53.91 59.59"/>
-       </g>
-</g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 50 50"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="classes.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
+   version="1.0"
+   inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/classes.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS class icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
+         rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
+   id="defs37"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3454"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3456" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3458" /></linearGradient><linearGradient
+     id="linearGradient3422"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3424" /><stop
+       style="stop-color:#3f3f3f;stop-opacity:1;"
+       offset="1"
+       id="stop3426" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3378"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3380" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3382" /></linearGradient><linearGradient
+     id="linearGradient3261"><stop
+       style="stop-color:#999999;stop-opacity:1;"
+       offset="0"
+       id="stop3263" /><stop
+       style="stop-color:#e6e6e6;stop-opacity:1"
+       offset="1"
+       id="stop3265" /></linearGradient><linearGradient
+     id="linearGradient3409"><stop
+       style="stop-color:#ffffff;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3411" /><stop
+       style="stop-color:#ffffff;stop-opacity:0.25098041;"
+       offset="1"
+       id="stop3413" /></linearGradient><linearGradient
+     id="linearGradient3392"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3394" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3396" /></linearGradient><linearGradient
+     id="linearGradient3262"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3264" /><stop
+       style="stop-color:#e8e8e8;stop-opacity:1;"
+       offset="1"
+       id="stop3266" /></linearGradient><linearGradient
+     id="linearGradient3254"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3256" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3258" /></linearGradient><linearGradient
+     id="linearGradient3246"><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3248" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="1"
+       id="stop3250" /></linearGradient><linearGradient
+     id="linearGradient3238"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3240" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="1"
+       id="stop3242" /></linearGradient><linearGradient
+     id="linearGradient3230"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3232" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3234" /></linearGradient><linearGradient
+     id="linearGradient3222"><stop
+       style="stop-color:#00bf00;stop-opacity:0.87843138;"
+       offset="0"
+       id="stop3224" /><stop
+       style="stop-color:#000000;stop-opacity:0.87843138;"
+       offset="1"
+       id="stop3226" /></linearGradient><linearGradient
+     id="linearGradient3214"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3216" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3218" /></linearGradient><linearGradient
+     id="linearGradient3200"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3202" /><stop
+       id="stop3212"
+       offset="0.37"
+       style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3204" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3200"
+     id="linearGradient3402"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
+     x1="9.6981544"
+     y1="17.388933"
+     x2="40.301846"
+     y2="17.388933" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient3267"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)" /><filter
+     inkscape:collect="always"
+     x="-0.17068966"
+     width="1.3413793"
+     y="-1.2375"
+     height="3.475"
+     id="filter3356"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.578125"
+       id="feGaussianBlur3358" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient3384"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     x="-0.12"
+     width="1.24"
+     y="-0.12"
+     height="1.24"
+     id="filter3418"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.25"
+       id="feGaussianBlur3420" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient3428"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter3430"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.0825"
+       id="feGaussianBlur3432" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient3460"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient4627"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient4629"
+     gradientUnits="userSpaceOnUse"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient4631"
+     gradientUnits="userSpaceOnUse"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient4633"
+     gradientUnits="userSpaceOnUse"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient4657"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient4659"
+     gradientUnits="userSpaceOnUse"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient4661"
+     gradientUnits="userSpaceOnUse"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient4663"
+     gradientUnits="userSpaceOnUse"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient4687"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient4689"
+     gradientUnits="userSpaceOnUse"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient4691"
+     gradientUnits="userSpaceOnUse"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient4693"
+     gradientUnits="userSpaceOnUse"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098" /></defs><sodipodi:namedview
+   inkscape:cy="50"
+   inkscape:cx="50"
+   inkscape:zoom="4.07"
+   inkscape:window-height="622"
+   inkscape:window-width="872"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="true"
+   inkscape:object-bbox="true"
+   inkscape:object-points="true"
+   inkscape:grid-points="true"
+   inkscape:guide-points="true"
+   width="100px"
+   height="100px"
+   inkscape:object-paths="true"
+   inkscape:grid-bbox="true"
+   inkscape:guide-bbox="true"
+   inkscape:object-nodes="true"
+   inkscape:window-x="250"
+   inkscape:window-y="42"
+   inkscape:current-layer="svg2"
+   gridspacingx="0.5px"
+   gridspacingy="0.5px" />
+
+<g
+   id="g4615"
+   transform="matrix(0.64,0,0,0.64,-1.87,17.557087)"><rect
+     transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)"
+     y="41.25"
+     x="6.25"
+     height="5"
+     width="36.25"
+     id="rect3314"
+     style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)" /><path
+     sodipodi:nodetypes="csccccccs"
+     id="rect2276"
+     d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
+     style="opacity:1;fill:url(#linearGradient4627);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" /><rect
+     ry="5"
+     rx="5"
+     y="18.75"
+     x="5"
+     height="25"
+     width="40"
+     id="rect2279"
+     style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)" /><rect
+     y="33.821854"
+     x="10.009353"
+     height="9.9187946"
+     width="29.981295"
+     id="rect3309"
+     style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     transform="translate(1.375,-1.375)"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     sodipodi:ry="2.5"
+     sodipodi:rx="2.5"
+     sodipodi:cy="25"
+     sodipodi:cx="38.75"
+     id="path3366"
+     style="opacity:1;fill:url(#radialGradient4629);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="opacity:0.5;fill:url(#radialGradient4631);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+     id="path3376"
+     sodipodi:cx="38.75"
+     sodipodi:cy="25"
+     sodipodi:rx="2.5"
+     sodipodi:ry="2.5"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     transform="translate(1.375,-1.375)" /><g
+     id="g3469"><path
+       style="opacity:0.6667;fill:url(#linearGradient4633);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+       id="rect3452"
+       sodipodi:nodetypes="ccccc" /><path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 33.75,10 L 35,16.25"
+       id="path3463" /><path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.956628,10 L 15,16.25"
+       id="path3465" /></g></g><g
+   transform="matrix(0.512,0,0,0.512,25.71,5.7956693)"
+   id="g4635"><rect
+     style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
+     id="rect4637"
+     width="36.25"
+     height="5"
+     x="6.25"
+     y="41.25"
+     transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
+     style="opacity:1;fill:url(#linearGradient4657);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+     d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
+     id="path4639"
+     sodipodi:nodetypes="csccccccs" /><rect
+     style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
+     id="rect4641"
+     width="40"
+     height="25"
+     x="5"
+     y="18.75"
+     rx="5"
+     ry="5" /><rect
+     style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4643"
+     width="29.981295"
+     height="9.9187946"
+     x="10.009353"
+     y="33.821854" /><path
+     sodipodi:type="arc"
+     style="opacity:1;fill:url(#radialGradient4659);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4645"
+     sodipodi:cx="38.75"
+     sodipodi:cy="25"
+     sodipodi:rx="2.5"
+     sodipodi:ry="2.5"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     transform="translate(1.375,-1.375)" /><path
+     transform="translate(1.375,-1.375)"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     sodipodi:ry="2.5"
+     sodipodi:rx="2.5"
+     sodipodi:cy="25"
+     sodipodi:cx="38.75"
+     id="path4647"
+     style="opacity:0.5;fill:url(#radialGradient4661);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+     sodipodi:type="arc" /><g
+     id="g4649"><path
+       sodipodi:nodetypes="ccccc"
+       id="path4651"
+       d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+       style="opacity:0.6667;fill:url(#linearGradient4663);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+       id="path4653"
+       d="M 33.75,10 L 35,16.25"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       id="path4655"
+       d="M 15.956628,10 L 15,16.25"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
+   id="g4665"
+   transform="matrix(0.4096,0,0,0.4096,4.202,-1.084)"><rect
+     transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)"
+     y="41.25"
+     x="6.25"
+     height="5"
+     width="36.25"
+     id="rect4667"
+     style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)" /><path
+     sodipodi:nodetypes="csccccccs"
+     id="path4669"
+     d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
+     style="opacity:1;fill:url(#linearGradient4687);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" /><rect
+     ry="5"
+     rx="5"
+     y="18.75"
+     x="5"
+     height="25"
+     width="40"
+     id="rect4671"
+     style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)" /><rect
+     y="33.821854"
+     x="10.009353"
+     height="9.9187946"
+     width="29.981295"
+     id="rect4673"
+     style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     transform="translate(1.375,-1.375)"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     sodipodi:ry="2.5"
+     sodipodi:rx="2.5"
+     sodipodi:cy="25"
+     sodipodi:cx="38.75"
+     id="path4675"
+     style="opacity:1;fill:url(#radialGradient4689);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="opacity:0.5;fill:url(#radialGradient4691);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+     id="path4677"
+     sodipodi:cx="38.75"
+     sodipodi:cy="25"
+     sodipodi:rx="2.5"
+     sodipodi:ry="2.5"
+     d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+     transform="translate(1.375,-1.375)" /><g
+     id="g4679"><path
+       style="opacity:0.6667;fill:url(#linearGradient4693);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+       id="path4681"
+       sodipodi:nodetypes="ccccc" /><path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 33.75,10 L 35,16.25"
+       id="path4683" /><path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.956628,10 L 15,16.25"
+       id="path4685" /></g></g></svg>
\ No newline at end of file
diff --git a/doc/images/cups-black-button-2.2.scm b/doc/images/cups-black-button-2.2.scm
deleted file mode 100644 (file)
index 23cf817..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Black Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-black-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-black-button"
-                   "<Toolbox>/Btns/CUPS Black Button"
-                   "CUPS Black Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(0 0 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-black-button.scm b/doc/images/cups-black-button.scm
deleted file mode 100644 (file)
index 23cf817..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Black Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-black-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-black-button"
-                   "<Toolbox>/Btns/CUPS Black Button"
-                   "CUPS Black Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(0 0 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-green-button-2.2.scm b/doc/images/cups-green-button-2.2.scm
deleted file mode 100644 (file)
index 4993bdd..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Green Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-green-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-green-button"
-                   "<Toolbox>/Btns/CUPS Green Button"
-                   "CUPS Green Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(0 153 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-green-button.scm b/doc/images/cups-green-button.scm
deleted file mode 100644 (file)
index 4993bdd..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Green Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-green-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-green-button"
-                   "<Toolbox>/Btns/CUPS Green Button"
-                   "CUPS Green Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(0 153 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-icon.png b/doc/images/cups-icon.png
new file mode 100644 (file)
index 0000000..341536d
Binary files /dev/null and b/doc/images/cups-icon.png differ
diff --git a/doc/images/cups-large.gif b/doc/images/cups-large.gif
deleted file mode 100644 (file)
index fc66ef0..0000000
Binary files a/doc/images/cups-large.gif and /dev/null differ
diff --git a/doc/images/cups-medium.gif b/doc/images/cups-medium.gif
deleted file mode 100644 (file)
index c45ed6a..0000000
Binary files a/doc/images/cups-medium.gif and /dev/null differ
diff --git a/doc/images/cups-red-button-2.2.scm b/doc/images/cups-red-button-2.2.scm
deleted file mode 100644 (file)
index e608db5..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Red Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-red-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-red-button"
-                   "<Toolbox>/Btns/CUPS Red Button"
-                   "CUPS Red Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(204 0 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-red-button.scm b/doc/images/cups-red-button.scm
deleted file mode 100644 (file)
index e608db5..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Red Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-red-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-red-button"
-                   "<Toolbox>/Btns/CUPS Red Button"
-                   "CUPS Red Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(204 0 0)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-small.gif b/doc/images/cups-small.gif
deleted file mode 100644 (file)
index 6adb4a2..0000000
Binary files a/doc/images/cups-small.gif and /dev/null differ
diff --git a/doc/images/cups-standard-button-2.2.scm b/doc/images/cups-standard-button-2.2.scm
deleted file mode 100644 (file)
index 565c322..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Standard Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-standard-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-standard-button"
-                   "<Toolbox>/Btns/CUPS Standard Button"
-                   "CUPS Standard Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(102 102 51)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups-standard-button.scm b/doc/images/cups-standard-button.scm
deleted file mode 100644 (file)
index 565c322..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-;  CUPS Standard Button
-;  Create a flat rounded button 
-
-(define (script-fu-cups-standard-button text text-color button-height button-color bg-color)
-  (let* (
-       (img (car (gimp-image-new 256 256 RGB)))
-       (old-fg (car (gimp-palette-get-foreground)))
-       (old-bg (car (gimp-palette-get-background)))
-       (font-size (+ (/ (* 3 button-height) 5) 1))
-       (dummy (gimp-palette-set-foreground text-color))
-       (text-layer (car (gimp-text-fontname img -1 0 0 text 0
-                                   TRUE font-size PIXELS
-                                   "Sans L,")))
-       (text-width (car (gimp-drawable-width text-layer)))
-       (text-height (car (gimp-drawable-height text-layer)))
-       (button-width (+ text-width button-height))
-       (bg-layer (car (gimp-layer-new img button-width button-height
-                                      RGBA-IMAGE "Background" 100
-                                      NORMAL-MODE)))
-        )
-
-    ; Disable undo while we do our work...
-    (gimp-image-undo-disable img)
-
-    ; Resize the image as needed...
-    (gimp-image-resize img button-width button-height 0 0)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-layer-set-preserve-trans text-layer TRUE)
-
-    ; Clear the background...
-    (gimp-selection-clear img)
-    (gimp-palette-set-background bg-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Make selections as needed for a rounded box.
-    (gimp-rect-select img (* 0.5 button-height) 0
-                      (- button-width button-height) button-height
-                     REPLACE 0 0)
-    (gimp-ellipse-select img (- button-width button-height) 0
-                         button-height button-height ADD 1 0 0)
-    (gimp-ellipse-select img 0 0 button-height button-height ADD 1 0 0)
-
-    ; Fill in the background...
-    (gimp-palette-set-background button-color)
-    (gimp-edit-fill bg-layer 1)
-
-    ; Clear the border around the button image...
-    (gimp-selection-invert img)
-    (gimp-edit-clear bg-layer)
-    (gimp-selection-clear img)
-
-    ; Restore original colors...
-    (gimp-palette-set-foreground old-fg)
-    (gimp-palette-set-background old-bg)
-
-    ; Translate the text later to center it...
-    (gimp-layer-translate text-layer (* 0.5 button-height)
-                          (- (* 0.5 (- button-height text-height)) 1))
-
-    ; Then flatten the image...
-    (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)
-    (gimp-convert-indexed img 0 0 16 0 1 "")
-    (gimp-image-undo-enable img)
-    (gimp-display-new img)
-  )
-)
-
-(script-fu-register "script-fu-cups-standard-button"
-                   "<Toolbox>/Btns/CUPS Standard Button"
-                   "CUPS Standard Button"
-                   "Michael Sweet <mike@easysw.com>"
-                   "Michael Sweet <mike@easysw.com>"
-                   "2000"
-                   ""
-                   SF-VALUE "Text String" "\"Button\""
-                   SF-COLOR "Text Color" '(255 255 255)
-                   SF-VALUE "Button Size (in pixels)" "20"
-                   SF-COLOR "Button Color" '(102 102 51)
-                   SF-COLOR "Background Color" '(212 212 164)
-)
diff --git a/doc/images/cups.png b/doc/images/cups.png
new file mode 100644 (file)
index 0000000..d61f142
Binary files /dev/null and b/doc/images/cups.png differ
diff --git a/doc/images/cups.svg b/doc/images/cups.svg
new file mode 100644 (file)
index 0000000..3fa4f70
--- /dev/null
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/mike/c/cups-webui/doc/images"
+   sodipodi:docname="cups-v3.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/mike/c/cups-webui/doc/images/cups-v3.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4285">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4287" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4289" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4271">
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1;"
+         offset="0"
+         id="stop4273" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:0;"
+         offset="1"
+         id="stop4275" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4261">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4263" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4265" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop3271" />
+      <stop
+         style="stop-color:#007f00;stop-opacity:1;"
+         offset="1"
+         id="stop3273" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3226">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3228" />
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="1"
+         id="stop3230" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3214">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop3216" />
+      <stop
+         style="stop-color:#007f00;stop-opacity:1;"
+         offset="1"
+         id="stop3218" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5228">
+      <stop
+         style="stop-color:#cccc99;stop-opacity:0"
+         offset="0"
+         id="stop5230" />
+      <stop
+         id="stop5236"
+         offset="0.89999998"
+         style="stop-color:#cccc99;stop-opacity:0;" />
+      <stop
+         style="stop-color:#cccc99;stop-opacity:1"
+         offset="1"
+         id="stop5232" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5198">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5200" />
+      <stop
+         style="stop-color:#333333;stop-opacity:0.94117647;"
+         offset="1"
+         id="stop5202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5177">
+      <stop
+         style="stop-color:#cccc99;stop-opacity:1;"
+         offset="0"
+         id="stop5179" />
+      <stop
+         style="stop-color:#cccc99;stop-opacity:0.49803922"
+         offset="1"
+         id="stop5181" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4768">
+      <stop
+         id="stop4770"
+         offset="0"
+         style="stop-color:#e8e8e8;stop-opacity:0.90980393;" />
+      <stop
+         id="stop4772"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3598">
+      <stop
+         id="stop3600"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3602"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2165">
+      <stop
+         style="stop-color:#350000;stop-opacity:1;"
+         offset="0"
+         id="stop2167" />
+      <stop
+         style="stop-color:#ff3333;stop-opacity:1;"
+         offset="1"
+         id="stop2169" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3196">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3198" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3200" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3160">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3162" />
+      <stop
+         id="stop3192"
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.24705882;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3164" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3257">
+      <path
+         transform="matrix(1,0,0,0.9882639,0,5.8678726e-2)"
+         d="M 95 50.534397 A 45 45.534397 0 1 1  5,50.534397 A 45 45.534397 0 1 1  95 50.534397 z"
+         sodipodi:ry="45.534397"
+         sodipodi:rx="45"
+         sodipodi:cy="50.534397"
+         sodipodi:cx="50"
+         id="path3259"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3269"
+       id="linearGradient3275"
+       x1="53.971653"
+       y1="73.40696"
+       x2="49.183048"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4261"
+       id="linearGradient4267"
+       x1="50"
+       y1="10"
+       x2="50"
+       y2="36.117935"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4271"
+       id="radialGradient4277"
+       cx="51.68919"
+       cy="77.5"
+       fx="51.68919"
+       fy="77.5"
+       r="26.68919"
+       gradientTransform="matrix(1,0,0,0.4683544,0,41.202533)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       x="-0.087105347"
+       width="1.1742107"
+       y="-0.18598169"
+       height="1.3719634"
+       id="filter4279">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.9373093"
+         id="feGaussianBlur4281" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4285"
+       id="linearGradient4291"
+       x1="50"
+       y1="100"
+       x2="50"
+       y2="81.396393"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter4303">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5625"
+         id="feGaussianBlur4305" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.035535272"
+       width="1.0710705"
+       y="-0.10884558"
+       height="1.2176912"
+       id="filter3192">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1845091"
+         id="feGaussianBlur3194" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="1"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="50"
+     inkscape:cy="50"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="100px"
+     height="100px"
+     showgrid="true"
+     inkscape:grid-points="true"
+     inkscape:window-width="872"
+     inkscape:window-height="622"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#linearGradient3275);fill-opacity:1.0;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+       id="path3267"
+       sodipodi:cx="49.183048"
+       sodipodi:cy="48.937347"
+       sodipodi:rx="44.183048"
+       sodipodi:ry="43.937347"
+       d="M 93.366096 48.937347 A 44.183048 43.937347 0 1 1  5,48.937347 A 44.183048 43.937347 0 1 1  93.366096 48.937347 z"
+       transform="matrix(1.0184902,0,0,1.0241856,-9.2450814e-2,-0.1209281)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.75;fill:url(#radialGradient4277);fill-opacity:1.0;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter4279)"
+       id="path4269"
+       sodipodi:cx="51.68919"
+       sodipodi:cy="77.5"
+       sodipodi:rx="26.68919"
+       sodipodi:ry="12.5"
+       d="M 78.37838 77.5 A 26.68919 12.5 0 1 1  25,77.5 A 26.68919 12.5 0 1 1  78.37838 77.5 z"
+       transform="matrix(0.9367088,0,0,1,1.5822791,0)" />
+    <g
+       id="g3281"
+       style="opacity:0.8">
+      <path
+         id="path5185"
+         d="M 50 5 C 25.16 5 5 25.16 5 50 C 5 74.84 25.16 95 50 95 C 60.487179 95 70.127342 91.396876 77.78125 85.375 C 78.181257 85.060286 78.579829 84.734064 78.96875 84.40625 C 83.665983 80.447043 87.549643 75.552818 90.3125 70 L 75.59375 70 C 69.643319 77.602179 60.395279 82.5 50 82.5 C 32.059999 82.5 17.5 67.94 17.5 50 C 17.5 32.06 32.060001 17.5 50 17.5 C 60.395278 17.5 69.643319 22.397821 75.59375 30 L 90.3125 30 C 87.549643 24.447182 83.665983 19.552957 78.96875 15.59375 C 78.579829 15.265936 78.181257 14.939714 77.78125 14.625 C 70.127342 8.6031239 60.487179 5 50 5 z M 93.3125 37.75 C 93.477886 38.334017 93.639153 38.906614 93.78125 39.5 C 93.640472 38.911539 93.476165 38.329249 93.3125 37.75 z M 93.8125 39.65625 C 93.958484 40.275603 94.067455 40.902325 94.1875 41.53125 C 94.067925 40.904801 93.957786 40.273219 93.8125 39.65625 z M 94.6875 44.8125 C 94.782981 45.64248 94.856683 46.469338 94.90625 47.3125 C 94.856514 46.471022 94.782921 45.640957 94.6875 44.8125 z M 94.90625 47.3125 C 94.958277 48.197515 95 49.101843 95 50 C 95 49.096018 94.958903 48.203339 94.90625 47.3125 z M 95 50 C 95 50.898157 94.958277 51.802485 94.90625 52.6875 C 94.958903 51.796661 95 50.903982 95 50 z M 94.90625 52.6875 C 94.856683 53.530662 94.782981 54.35752 94.6875 55.1875 C 94.782921 54.359043 94.856514 53.528978 94.90625 52.6875 z M 94.1875 58.46875 C 94.067455 59.097675 93.958484 59.724397 93.8125 60.34375 C 93.957786 59.726781 94.067925 59.095199 94.1875 58.46875 z M 93.78125 60.5 C 93.639153 61.093386 93.477886 61.665983 93.3125 62.25 C 93.476165 61.670751 93.640472 61.088461 93.78125 60.5 z "
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect3142"
+         d="M 40,35 L 60,35 C 62.77,35 70,47.23 70,50 L 70,65 C 70,67.77 67.77,70 65,70 L 35,70 C 32.23,70 30,67.77 30,65 L 30,50 C 30,47.23 37.23,35 40,35 z "
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccs"
+         id="rect3145"
+         d="M 45,30 C 48.9957,30 51.25,30 55,30 C 60.303301,30 60,45 60,45 L 40,45 C 40,45 39.696699,30 45,30 z "
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.6;fill:url(#linearGradient4267);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3192)"
+       id="path3286"
+       sodipodi:cx="50"
+       sodipodi:cy="23.058968"
+       sodipodi:rx="40"
+       sodipodi:ry="13.058968"
+       d="M 90 23.058968 A 40 13.058968 0 1 1  10,23.058968 A 40 13.058968 0 1 1  90 23.058968 z"
+       transform="matrix(0.75,0,0,1.3400753,12.5,-3.4007528)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.3333;fill:url(#linearGradient4291);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter4303)"
+       id="path4283"
+       sodipodi:cx="50"
+       sodipodi:cy="85"
+       sodipodi:rx="30"
+       sodipodi:ry="15"
+       d="M 80 85 A 30 15 0 1 1  20,85 A 30 15 0 1 1  80 85 z"
+       transform="matrix(1.5,0,0,1.5,-25,-55)" />
+  </g>
+</svg>
diff --git a/doc/images/draft.gif b/doc/images/draft.gif
deleted file mode 100644 (file)
index 77d9716..0000000
Binary files a/doc/images/draft.gif and /dev/null differ
diff --git a/doc/images/esp-logo.gif b/doc/images/esp-logo.gif
deleted file mode 100644 (file)
index 8a879b1..0000000
Binary files a/doc/images/esp-logo.gif and /dev/null differ
diff --git a/doc/images/happy.gif b/doc/images/happy.gif
deleted file mode 100644 (file)
index c69ac01..0000000
Binary files a/doc/images/happy.gif and /dev/null differ
diff --git a/doc/images/left.gif b/doc/images/left.gif
new file mode 100644 (file)
index 0000000..68fdf4c
Binary files /dev/null and b/doc/images/left.gif differ
diff --git a/doc/images/logo.gif b/doc/images/logo.gif
deleted file mode 100644 (file)
index 9999795..0000000
Binary files a/doc/images/logo.gif and /dev/null differ
diff --git a/doc/images/printer-idle.gif b/doc/images/printer-idle.gif
deleted file mode 100644 (file)
index 61e6c5d..0000000
Binary files a/doc/images/printer-idle.gif and /dev/null differ
diff --git a/doc/images/printer-idle.png b/doc/images/printer-idle.png
new file mode 100644 (file)
index 0000000..4cab928
Binary files /dev/null and b/doc/images/printer-idle.png differ
index c6530078470e1d5be5281f47b37f12f78ffe3144..af62b63a86e639dc83fa082a767f6e55686a098d 100644 (file)
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"
-       "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
-<svg width="50pt" height="50pt" viewBox="0 0 50 50" xml:space="preserve">
-<g transform="scale(0.5)">
-       <g id="Path_0" style="fill-rule:nonzero;clip-rule:nonzero;fill:#C0C0C0;stroke:none;stroke-miterlimit:4;">
-               <path d="M50.00 54L10.00 77.5L45.00 97.5L90.00 75z"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M90.00 35L45.00 55L45.00 87.5L90.00 65z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 67.5L10.00 40L45.00 55L45.00 87.5z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 25L10.00 40L45.00 55L90.00 35z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M77.11 71.24L77.13 40.68"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 28.6L77.44 36.28L45.00 50L20.00 40z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M68.58 40.03L77.44 36.28L50.00 28.6z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#00fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M78.60 42.4L88.80 38L88.88 45.56L78.60 50.2z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M45.00 77L77.12 61.2"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 55L39.40 70.4L39.40 52.6L83.79 33.45"/>
-       </g>
-</g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 50 50"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="printer-idle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
+   version="1.0"
+   inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/printer-idle.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS idle printer icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
+         rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
+   id="defs37"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3454"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3456" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3458" /></linearGradient><linearGradient
+     id="linearGradient3422"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3424" /><stop
+       style="stop-color:#3f3f3f;stop-opacity:1;"
+       offset="1"
+       id="stop3426" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3378"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3380" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3382" /></linearGradient><linearGradient
+     id="linearGradient3261"><stop
+       style="stop-color:#999999;stop-opacity:1;"
+       offset="0"
+       id="stop3263" /><stop
+       style="stop-color:#e6e6e6;stop-opacity:1"
+       offset="1"
+       id="stop3265" /></linearGradient><linearGradient
+     id="linearGradient3409"><stop
+       style="stop-color:#ffffff;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3411" /><stop
+       style="stop-color:#ffffff;stop-opacity:0.25098041;"
+       offset="1"
+       id="stop3413" /></linearGradient><linearGradient
+     id="linearGradient3392"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3394" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3396" /></linearGradient><linearGradient
+     id="linearGradient3262"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3264" /><stop
+       style="stop-color:#e8e8e8;stop-opacity:1;"
+       offset="1"
+       id="stop3266" /></linearGradient><linearGradient
+     id="linearGradient3254"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3256" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3258" /></linearGradient><linearGradient
+     id="linearGradient3246"><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3248" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="1"
+       id="stop3250" /></linearGradient><linearGradient
+     id="linearGradient3238"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3240" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="1"
+       id="stop3242" /></linearGradient><linearGradient
+     id="linearGradient3230"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3232" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3234" /></linearGradient><linearGradient
+     id="linearGradient3222"><stop
+       style="stop-color:#00bf00;stop-opacity:0.87843138;"
+       offset="0"
+       id="stop3224" /><stop
+       style="stop-color:#000000;stop-opacity:0.87843138;"
+       offset="1"
+       id="stop3226" /></linearGradient><linearGradient
+     id="linearGradient3214"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3216" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3218" /></linearGradient><linearGradient
+     id="linearGradient3200"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3202" /><stop
+       id="stop3212"
+       offset="0.37"
+       style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3204" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3200"
+     id="linearGradient3402"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
+     x1="9.6981544"
+     y1="17.388933"
+     x2="40.301846"
+     y2="17.388933" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient3267"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)" /><filter
+     inkscape:collect="always"
+     x="-0.17068966"
+     width="1.3413793"
+     y="-1.2375"
+     height="3.475"
+     id="filter3356"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.578125"
+       id="feGaussianBlur3358" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient3384"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     x="-0.12"
+     width="1.24"
+     y="-0.12"
+     height="1.24"
+     id="filter3418"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.25"
+       id="feGaussianBlur3420" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient3428"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter3430"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.0825"
+       id="feGaussianBlur3432" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient3460"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:cy="50"
+   inkscape:cx="50"
+   inkscape:zoom="4.07"
+   inkscape:window-height="622"
+   inkscape:window-width="872"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="true"
+   inkscape:object-bbox="true"
+   inkscape:object-points="true"
+   inkscape:grid-points="true"
+   inkscape:guide-points="true"
+   width="100px"
+   height="100px"
+   inkscape:object-paths="true"
+   inkscape:grid-bbox="true"
+   inkscape:guide-bbox="true"
+   inkscape:object-nodes="true"
+   inkscape:window-x="168"
+   inkscape:window-y="216"
+   inkscape:current-layer="svg2"
+   gridspacingx="0.5px"
+   gridspacingy="0.5px" />
+
+<rect
+   style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
+   id="rect3314"
+   width="36.25"
+   height="5"
+   x="6.25"
+   y="41.25"
+   transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
+   style="opacity:1;fill:url(#linearGradient3267);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+   d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
+   id="rect2276"
+   sodipodi:nodetypes="csccccccs" /><rect
+   style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
+   id="rect2279"
+   width="40"
+   height="25"
+   x="5"
+   y="18.75"
+   rx="5"
+   ry="5" /><rect
+   style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="rect3309"
+   width="29.981295"
+   height="9.9187946"
+   x="10.009353"
+   y="33.821854" /><path
+   sodipodi:type="arc"
+   style="opacity:1;fill:url(#radialGradient3428);fill-opacity:1.0;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="path3366"
+   sodipodi:cx="38.75"
+   sodipodi:cy="25"
+   sodipodi:rx="2.5"
+   sodipodi:ry="2.5"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   transform="translate(1.375,-1.375)" /><path
+   transform="translate(1.375,-1.375)"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   sodipodi:ry="2.5"
+   sodipodi:rx="2.5"
+   sodipodi:cy="25"
+   sodipodi:cx="38.75"
+   id="path3376"
+   style="opacity:0.5;fill:url(#radialGradient3384);fill-opacity:1.0;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+   sodipodi:type="arc" /><g
+   id="g3469"><path
+     sodipodi:nodetypes="ccccc"
+     id="rect3452"
+     d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+     style="opacity:0.6667;fill:url(#linearGradient3460);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+     id="path3463"
+     d="M 33.75,10 L 35,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
+     id="path3465"
+     d="M 15.956628,10 L 15,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/doc/images/printer-processing.gif b/doc/images/printer-processing.gif
deleted file mode 100644 (file)
index 073be26..0000000
Binary files a/doc/images/printer-processing.gif and /dev/null differ
diff --git a/doc/images/printer-processing.png b/doc/images/printer-processing.png
new file mode 100644 (file)
index 0000000..042d1a2
Binary files /dev/null and b/doc/images/printer-processing.png differ
index e4e2e55941fc01be2f0d4949590d0649ad7f7464..77ab490db8234880033cf4a589980f83c864bab2 100644 (file)
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"
-       "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
-<svg width="50pt" height="50pt" viewBox="0 0 50 50" xml:space="preserve">
-<g transform="scale(0.5)">
-       <g id="Path_0" style="fill-rule:nonzero;clip-rule:nonzero;fill:#C0C0C0;stroke:none;stroke-miterlimit:4;">
-               <path d="M50.00 54L10.00 77.5L45.00 97.5L90.00 75z"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M90.00 35L45.00 55L45.00 87.5L90.00 65z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 67.5L10.00 40L45.00 55L45.00 87.5z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 25L10.00 40L45.00 55L90.00 35z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M77.11 71.24L77.13 40.68"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 28.6L77.44 36.28L45.00 50L20.00 40z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M68.58 40.03L77.44 36.28L50.00 28.6z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#f8fc00;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M78.60 42.4L88.80 38L88.88 45.56L78.60 50.2z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M45.00 77L77.12 61.2"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 55L39.40 70.4L39.40 52.6L83.79 33.45"/>
-       </g>
-       <g id="Path_10" style="fill-rule:none;clip-rule:nonzero;fill:#f8fcf8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M45.20 50L36.60 46.4L18.80 35.2L43.20 26L67.00 40.8z"/>
-       </g>
-       <g id="Path_11" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#0000f8;stroke-miterlimit:4;">
-               <path d="M39.67 40.77L35.00 42.5L25.67 35.97L30.33 34.23"/>
-       </g>
-       <g id="Path_12" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#0000f8;stroke-miterlimit:4;">
-               <path d="M30.18 39.13L32.95 38.26"/>
-       </g>
-       <g id="Path_13" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#0000f8;stroke-miterlimit:4;">
-               <path d="M41.83 39.96L46.50 38.23L41.83 34.96L37.17 36.7L32.50 33.43L37.17 31.7"/>
-       </g>
-       <g id="Path_14" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#0000f8;stroke-miterlimit:4;">
-               <path d="M44.33 34.03L48.85 32.2L44.18 28.93L39.52 30.66L48.85 37.2"/>
-       </g>
-</g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 50 50"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="printer-processing.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
+   version="1.0"
+   inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/printer-processing.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS processing printer icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
+         rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
+   id="defs37"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3474"><stop
+       style="stop-color:#3f3f3f;stop-opacity:1;"
+       offset="0"
+       id="stop3476" /><stop
+       style="stop-color:#3f3f3f;stop-opacity:0;"
+       offset="1"
+       id="stop3478" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3454"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3456" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3458" /></linearGradient><linearGradient
+     id="linearGradient3422"><stop
+       style="stop-color:#00ff00;stop-opacity:1;"
+       offset="0"
+       id="stop3424" /><stop
+       style="stop-color:#007f00;stop-opacity:1;"
+       offset="1"
+       id="stop3426" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3378"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3380" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3382" /></linearGradient><linearGradient
+     id="linearGradient3261"><stop
+       style="stop-color:#999999;stop-opacity:1;"
+       offset="0"
+       id="stop3263" /><stop
+       style="stop-color:#e6e6e6;stop-opacity:1"
+       offset="1"
+       id="stop3265" /></linearGradient><linearGradient
+     id="linearGradient3409"><stop
+       style="stop-color:#ffffff;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3411" /><stop
+       style="stop-color:#ffffff;stop-opacity:0.25098041;"
+       offset="1"
+       id="stop3413" /></linearGradient><linearGradient
+     id="linearGradient3392"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3394" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3396" /></linearGradient><linearGradient
+     id="linearGradient3262"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3264" /><stop
+       style="stop-color:#e8e8e8;stop-opacity:1;"
+       offset="1"
+       id="stop3266" /></linearGradient><linearGradient
+     id="linearGradient3254"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3256" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3258" /></linearGradient><linearGradient
+     id="linearGradient3246"><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3248" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="1"
+       id="stop3250" /></linearGradient><linearGradient
+     id="linearGradient3238"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3240" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="1"
+       id="stop3242" /></linearGradient><linearGradient
+     id="linearGradient3230"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3232" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3234" /></linearGradient><linearGradient
+     id="linearGradient3222"><stop
+       style="stop-color:#00bf00;stop-opacity:0.87843138;"
+       offset="0"
+       id="stop3224" /><stop
+       style="stop-color:#000000;stop-opacity:0.87843138;"
+       offset="1"
+       id="stop3226" /></linearGradient><linearGradient
+     id="linearGradient3214"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3216" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3218" /></linearGradient><linearGradient
+     id="linearGradient3200"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3202" /><stop
+       id="stop3212"
+       offset="0.37"
+       style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3204" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3200"
+     id="linearGradient3402"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
+     x1="9.6981544"
+     y1="17.388933"
+     x2="40.301846"
+     y2="17.388933" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient3267"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-1.25)" /><filter
+     inkscape:collect="always"
+     x="-0.17068966"
+     width="1.3413793"
+     y="-1.2375"
+     height="3.475"
+     id="filter3356"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.578125"
+       id="feGaussianBlur3358" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient3384"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     x="-0.12"
+     width="1.24"
+     y="-0.12"
+     height="1.24"
+     id="filter3418"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.25"
+       id="feGaussianBlur3420" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient3428"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter3430"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.0825"
+       id="feGaussianBlur3432" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient3460"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3474"
+     id="linearGradient3480"
+     x1="25.311939"
+     y1="15.734048"
+     x2="25.311939"
+     y2="16.375"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.9655774,0,0,1.0002916,0.5572142,-0.1254361)" /></defs><sodipodi:namedview
+   inkscape:cy="50"
+   inkscape:cx="50"
+   inkscape:zoom="4.07"
+   inkscape:window-height="622"
+   inkscape:window-width="872"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="true"
+   inkscape:object-bbox="true"
+   inkscape:object-points="true"
+   inkscape:grid-points="true"
+   inkscape:guide-points="true"
+   width="100px"
+   height="100px"
+   inkscape:object-paths="true"
+   inkscape:grid-bbox="true"
+   inkscape:guide-bbox="true"
+   inkscape:object-nodes="true"
+   inkscape:window-x="120"
+   inkscape:window-y="168"
+   inkscape:current-layer="svg2"
+   gridspacingx="0.5px"
+   gridspacingy="0.5px" />
+
+<rect
+   style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
+   id="rect3314"
+   width="36.25"
+   height="5"
+   x="6.25"
+   y="41.25"
+   transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
+   style="opacity:1;fill:url(#linearGradient3267);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+   d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
+   id="rect2276"
+   sodipodi:nodetypes="csccccccs" /><rect
+   style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
+   id="rect2279"
+   width="40"
+   height="25"
+   x="5"
+   y="18.75"
+   rx="5"
+   ry="5" /><rect
+   style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="rect3309"
+   width="29.981295"
+   height="9.9187946"
+   x="10.009353"
+   y="33.821854" /><path
+   sodipodi:type="arc"
+   style="opacity:1;fill:url(#radialGradient3428);fill-opacity:1.0;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="path3366"
+   sodipodi:cx="38.75"
+   sodipodi:cy="25"
+   sodipodi:rx="2.5"
+   sodipodi:ry="2.5"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   transform="translate(1.375,-1.375)" /><path
+   transform="translate(1.375,-1.375)"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   sodipodi:ry="2.5"
+   sodipodi:rx="2.5"
+   sodipodi:cy="25"
+   sodipodi:cx="38.75"
+   id="path3376"
+   style="opacity:0.6667;fill:url(#radialGradient3384);fill-opacity:1.0;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+   sodipodi:type="arc" /><g
+   id="g3469"><path
+     sodipodi:nodetypes="ccccc"
+     id="rect3452"
+     d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+     style="opacity:0.6667;fill:url(#linearGradient3460);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+     id="path3463"
+     d="M 33.75,10 L 35,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
+     id="path3465"
+     d="M 15.956628,10 L 15,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /></g><path
+   style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient3480);stroke-width:0.24569531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 20.598421,1.3621917 C 25.247456,1.3621917 24.748269,1.3621917 29.397305,1.3621917 C 32.696885,1.3621917 33.747879,16.129302 33.747879,16.129302 L 16.247847,16.129302 C 16.247847,16.129302 16.198978,1.3621917 20.598421,1.3621917 z "
+   id="rect3311"
+   sodipodi:nodetypes="csccs" /></svg>
\ No newline at end of file
diff --git a/doc/images/printer-stopped.gif b/doc/images/printer-stopped.gif
deleted file mode 100644 (file)
index f29f5b1..0000000
Binary files a/doc/images/printer-stopped.gif and /dev/null differ
diff --git a/doc/images/printer-stopped.png b/doc/images/printer-stopped.png
new file mode 100644 (file)
index 0000000..f59317c
Binary files /dev/null and b/doc/images/printer-stopped.png differ
index 07c03ce6a3e7d3963d25b21f813dc2b28b1176c6..8895ba7579b2b0cb05c61bb4bbab31b069427f03 100644 (file)
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"
-       "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
-<svg width="50pt" height="50pt" viewBox="0 0 50 50" xml:space="preserve">
-<g transform="scale(0.5)">
-       <g id="Path_0" style="fill-rule:nonzero;clip-rule:nonzero;fill:#C0C0C0;stroke:none;stroke-miterlimit:4;">
-               <path d="M50.00 54L10.00 77.5L45.00 97.5L90.00 75z"/>
-       </g>
-       <g id="Path_1" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M90.00 35L45.00 55L45.00 87.5L90.00 65z"/>
-       </g>
-       <g id="Path_2" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 67.5L10.00 40L45.00 55L45.00 87.5z"/>
-       </g>
-       <g id="Path_3" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 25L10.00 40L45.00 55L90.00 35z"/>
-       </g>
-       <g id="Path_4" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M77.11 71.24L77.13 40.68"/>
-       </g>
-       <g id="Path_5" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M50.00 28.6L77.44 36.28L45.00 50L20.00 40z"/>
-       </g>
-       <g id="Path_6" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M68.58 40.03L77.44 36.28L50.00 28.6z"/>
-       </g>
-       <g id="Path_7" style="fill-rule:none;clip-rule:nonzero;fill:#f80000;stroke:#505450;stroke-miterlimit:4;">
-               <path d="M78.60 42.4L88.80 38L88.88 45.56L78.60 50.2z"/>
-       </g>
-       <g id="Path_8" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M45.00 77L77.12 61.2"/>
-       </g>
-       <g id="Path_9" style="fill-rule:none;clip-rule:nonzero;fill:none;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M10.00 55L39.40 70.4L39.40 52.6L83.79 33.45"/>
-       </g>
-       <g id="Path_10" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M65.00 98.8L65.04 87.48L45.00 77L45.00 87.5z"/>
-       </g>
-       <g id="Path_11" style="fill-rule:none;clip-rule:nonzero;fill:#a8a8a8;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M96.64 81.68L96.60 70.6L77.12 61.2L66.51 66.42z"/>
-       </g>
-       <g id="Path_12" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M96.64 81.68L65.00 98.8L65.04 87.48L96.60 70.6z"/>
-       </g>
-       <g id="Path_13" style="fill-rule:none;clip-rule:nonzero;fill:#f80000;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M66.51 66.42L46.45 76.29L65.00 85.6L84.53 75.54z"/>
-       </g>
-       <g id="Path_14" style="fill-rule:none;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-               <path d="M75.58 61.96L77.12 61.2L96.60 70.6L65.04 87.48L45.00 77L46.45 76.29L65.00 85.6L93.60 70.6z"/>
-       </g>
-</g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 50 50"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="printer-stopped.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
+   version="1.0"
+   inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/printer-stopped.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS stopped printer icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
+         rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
+   id="defs37"><linearGradient
+     id="linearGradient3808"><stop
+       style="stop-color:#d8d8d8;stop-opacity:1;"
+       offset="0"
+       id="stop3810" /><stop
+       style="stop-color:#aaaaaa;stop-opacity:1;"
+       offset="1"
+       id="stop3812" /></linearGradient><linearGradient
+     id="linearGradient3793"><stop
+       style="stop-color:#cccccc;stop-opacity:1;"
+       offset="0"
+       id="stop3795" /><stop
+       style="stop-color:#e6e6e6;stop-opacity:1;"
+       offset="1"
+       id="stop3797" /></linearGradient><linearGradient
+     id="linearGradient3780"><stop
+       style="stop-color:#999999;stop-opacity:1;"
+       offset="0"
+       id="stop3782" /><stop
+       style="stop-color:#cccccc;stop-opacity:1;"
+       offset="1"
+       id="stop3784" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3454"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3456" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3458" /></linearGradient><linearGradient
+     id="linearGradient3422"><stop
+       style="stop-color:#ff0000;stop-opacity:1;"
+       offset="0"
+       id="stop3424" /><stop
+       style="stop-color:#7f0000;stop-opacity:1;"
+       offset="1"
+       id="stop3426" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient3378"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop3380" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop3382" /></linearGradient><linearGradient
+     id="linearGradient3261"><stop
+       style="stop-color:#999999;stop-opacity:1;"
+       offset="0"
+       id="stop3263" /><stop
+       style="stop-color:#e6e6e6;stop-opacity:1"
+       offset="1"
+       id="stop3265" /></linearGradient><linearGradient
+     id="linearGradient3409"><stop
+       style="stop-color:#ffffff;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3411" /><stop
+       style="stop-color:#ffffff;stop-opacity:0.25098041;"
+       offset="1"
+       id="stop3413" /></linearGradient><linearGradient
+     id="linearGradient3392"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3394" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3396" /></linearGradient><linearGradient
+     id="linearGradient3262"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3264" /><stop
+       style="stop-color:#e8e8e8;stop-opacity:1;"
+       offset="1"
+       id="stop3266" /></linearGradient><linearGradient
+     id="linearGradient3254"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3256" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3258" /></linearGradient><linearGradient
+     id="linearGradient3246"><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="0"
+       id="stop3248" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="1"
+       id="stop3250" /></linearGradient><linearGradient
+     id="linearGradient3238"><stop
+       style="stop-color:#7f7f7f;stop-opacity:1;"
+       offset="0"
+       id="stop3240" /><stop
+       style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
+       offset="1"
+       id="stop3242" /></linearGradient><linearGradient
+     id="linearGradient3230"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop3232" /><stop
+       style="stop-color:#000000;stop-opacity:0.74901962;"
+       offset="1"
+       id="stop3234" /></linearGradient><linearGradient
+     id="linearGradient3222"><stop
+       style="stop-color:#00bf00;stop-opacity:0.87843138;"
+       offset="0"
+       id="stop3224" /><stop
+       style="stop-color:#000000;stop-opacity:0.87843138;"
+       offset="1"
+       id="stop3226" /></linearGradient><linearGradient
+     id="linearGradient3214"><stop
+       style="stop-color:#bfbfbf;stop-opacity:1;"
+       offset="0"
+       id="stop3216" /><stop
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       offset="1"
+       id="stop3218" /></linearGradient><linearGradient
+     id="linearGradient3200"><stop
+       style="stop-color:#d0d0d0;stop-opacity:1;"
+       offset="0"
+       id="stop3202" /><stop
+       id="stop3212"
+       offset="0.37"
+       style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3204" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3200"
+     id="linearGradient3402"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
+     x1="9.6981544"
+     y1="17.388933"
+     x2="40.301846"
+     y2="17.388933" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3261"
+     id="linearGradient3267"
+     x1="5"
+     y1="27.5"
+     x2="45"
+     y2="27.5"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-9.0737146)" /><filter
+     inkscape:collect="always"
+     x="-0.17068966"
+     width="1.3413793"
+     y="-1.2375"
+     height="3.475"
+     id="filter3356"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.578125"
+       id="feGaussianBlur3358" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3378"
+     id="radialGradient3384"
+     cx="37.890049"
+     cy="24.140049"
+     fx="37.890049"
+     fy="24.140049"
+     r="2.5"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     x="-0.12"
+     width="1.24"
+     y="-0.12"
+     height="1.24"
+     id="filter3418"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.25"
+       id="feGaussianBlur3420" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3422"
+     id="radialGradient3428"
+     cx="38.75"
+     cy="25"
+     fx="38.75"
+     fy="25"
+     r="2.625"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter3430"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.0825"
+       id="feGaussianBlur3432" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3454"
+     id="linearGradient3460"
+     x1="36.375"
+     y1="14.967752"
+     x2="13.625"
+     y2="11.405098"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter3772"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.70690554"
+       id="feGaussianBlur3774" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3780"
+     id="linearGradient3786"
+     x1="6.925"
+     y1="34.529284"
+     x2="43.075001"
+     y2="34.529284"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.9705974,0,0,0.9314001,0.7769061,9.714423)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3793"
+     id="linearGradient3799"
+     x1="12.375"
+     y1="37.5"
+     x2="37.625"
+     y2="37.5"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.0036847,0,0,0.3973693,-9.2116831e-2,13.964403)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3808"
+     id="linearGradient3814"
+     x1="39.460381"
+     y1="39.335529"
+     x2="11.52242"
+     y2="37.492779"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-3.5717462)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3780"
+     id="linearGradient3816"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.9711384,0,0,0.7229964,0.7633816,14.588708)"
+     x1="6.925"
+     y1="34.529284"
+     x2="43.075001"
+     y2="34.529284" /></defs><sodipodi:namedview
+   inkscape:cy="50"
+   inkscape:cx="50"
+   inkscape:zoom="4.07"
+   inkscape:window-height="622"
+   inkscape:window-width="872"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="true"
+   inkscape:object-bbox="true"
+   inkscape:object-points="true"
+   inkscape:grid-points="true"
+   inkscape:guide-points="true"
+   width="100px"
+   height="100px"
+   inkscape:object-paths="true"
+   inkscape:grid-bbox="true"
+   inkscape:guide-bbox="true"
+   inkscape:object-nodes="true"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:current-layer="svg2"
+   gridspacingx="0.5px"
+   gridspacingy="0.5px" />
+
+<rect
+   style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
+   id="rect3314"
+   width="36.25"
+   height="5"
+   x="6.25"
+   y="41.25"
+   transform="matrix(0.9655172,0,0,1.6338583,1.4655176,-33.970368)" /><path
+   style="opacity:1;fill:url(#linearGradient3267);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+   d="M 15,0.92628538 C 22.5,0.92628538 30,0.92628538 35,0.92628538 C 37.690077,0.92628538 45,13.156285 45,15.926285 L 45,30.926285 C 45,33.696285 42.77,35.926285 40,35.926285 L 10,35.926285 C 7.23,35.926285 5,33.696285 5,30.926285 L 5,15.926285 C 5,13.156285 12.309923,0.92628538 15,0.92628538 z "
+   id="rect2276"
+   sodipodi:nodetypes="csccccccs" /><rect
+   style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
+   id="rect2279"
+   width="40"
+   height="25"
+   x="5"
+   y="10.926285"
+   rx="5"
+   ry="5" /><rect
+   style="opacity:0.66660001;fill:#000000;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="rect3309"
+   width="29.981295"
+   height="9.9187946"
+   x="10.009353"
+   y="25.998138" /><path
+   sodipodi:type="arc"
+   style="opacity:1;fill:url(#radialGradient3428);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="path3366"
+   sodipodi:cx="38.75"
+   sodipodi:cy="25"
+   sodipodi:rx="2.5"
+   sodipodi:ry="2.5"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   transform="translate(1.375,-9.1987147)" /><path
+   transform="translate(1.375,-9.1987147)"
+   d="M 41.25 25 A 2.5 2.5 0 1 1  36.25,25 A 2.5 2.5 0 1 1  41.25 25 z"
+   sodipodi:ry="2.5"
+   sodipodi:rx="2.5"
+   sodipodi:cy="25"
+   sodipodi:cx="38.75"
+   id="path3376"
+   style="opacity:0.66699997;fill:url(#radialGradient3384);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
+   sodipodi:type="arc" /><g
+   id="g3469"
+   transform="translate(0,-7.8237147)"><path
+     sodipodi:nodetypes="ccccc"
+     id="rect3452"
+     d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
+     style="opacity:0.6667;fill:url(#linearGradient3460);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+     id="path3463"
+     d="M 33.75,10 L 35,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     id="path3465"
+     d="M 15.956628,10 L 15,16.25"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><path
+   style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 37.5,26.428254 L 41.25,35.178254 L 41.25,40.178254 L 37.5,31.428254 L 37.5,26.428254 z "
+   id="rect3788"
+   sodipodi:nodetypes="ccccc" /><rect
+   style="opacity:1;fill:url(#linearGradient3799);fill-opacity:1;stroke:none;stroke-width:0.15788317;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="rect3791"
+   width="25.092117"
+   height="4.9671168"
+   x="12.453941"
+   y="26.382195" /><path
+   sodipodi:nodetypes="ccccc"
+   id="path3801"
+   d="M 12.5,26.428254 L 8.75,35.178254 L 8.8125,40.115754 L 12.5,31.428254 L 12.5,26.428254 z "
+   style="fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+   style="fill:url(#linearGradient3814);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 12.453941,31.349313 L 37.5,31.349313 L 41.25,40.178254 L 8.75,40.178254 L 12.453941,31.349313 z "
+   id="rect3803"
+   sodipodi:nodetypes="ccccc" /><rect
+   y="35.250511"
+   x="7.5722489"
+   height="8.6055031"
+   width="34.939182"
+   id="rect3778"
+   style="opacity:1;fill:url(#linearGradient3816);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.14449847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/doc/images/right.gif b/doc/images/right.gif
new file mode 100644 (file)
index 0000000..b91aff3
Binary files /dev/null and b/doc/images/right.gif differ
diff --git a/doc/images/sel.gif b/doc/images/sel.gif
new file mode 100644 (file)
index 0000000..29494d4
Binary files /dev/null and b/doc/images/sel.gif differ
diff --git a/doc/images/shadow.png b/doc/images/shadow.png
new file mode 100644 (file)
index 0000000..53ae990
Binary files /dev/null and b/doc/images/shadow.png differ
diff --git a/doc/images/tab-left.gif b/doc/images/tab-left.gif
deleted file mode 100644 (file)
index 4f3deeb..0000000
Binary files a/doc/images/tab-left.gif and /dev/null differ
diff --git a/doc/images/tab-right.gif b/doc/images/tab-right.gif
deleted file mode 100644 (file)
index 5930ce2..0000000
Binary files a/doc/images/tab-right.gif and /dev/null differ
diff --git a/doc/images/top-left.gif b/doc/images/top-left.gif
deleted file mode 100644 (file)
index 1af936f..0000000
Binary files a/doc/images/top-left.gif and /dev/null differ
diff --git a/doc/images/top-middle.gif b/doc/images/top-middle.gif
deleted file mode 100644 (file)
index 9eefc0a..0000000
Binary files a/doc/images/top-middle.gif and /dev/null differ
diff --git a/doc/images/top-right.gif b/doc/images/top-right.gif
deleted file mode 100644 (file)
index 2a26863..0000000
Binary files a/doc/images/top-right.gif and /dev/null differ
diff --git a/doc/images/unsel-hover.gif b/doc/images/unsel-hover.gif
new file mode 100644 (file)
index 0000000..da5b8d6
Binary files /dev/null and b/doc/images/unsel-hover.gif differ
diff --git a/doc/images/unsel.gif b/doc/images/unsel.gif
new file mode 100644 (file)
index 0000000..da194b7
Binary files /dev/null and b/doc/images/unsel.gif differ
index dbc4c647fda327c5eba6805401cb952a2b43428e..223f7a2bcad7ea42fca18e274032bf8a262783b2 100644 (file)
@@ -4,59 +4,30 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
        <TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
+       <LINK REL="SHORTCUT ICON" HREF="/favicon.png" TYPE="image/png">
 </HEAD>
 <BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TABLE CLASS="page" SUMMARY="{title}">
+<TR><TD CLASS="body">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
+<TR HEIGHT="32">
+<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
+SRC="/images/left.gif" WIDTH="64" HEIGHT="32" BORDER="0" ALT=""></A></TD>
+<TD CLASS="sel"><A HREF="/">&nbsp;&nbsp;Home&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Online&nbsp;Help&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Jobs&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Printers&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="16" HEIGHT="32" ALT=""></TD>
 </TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Home&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Classes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Documentation/Help&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Jobs&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Printers&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
+</TABLE>
+<IMG SRC="/images/shadow.png" WIDTH="100%" HEIGHT="4" ALT="">
 
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
+<H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1>
 
 <H2 CLASS="title">Welcome!</H2>
 
@@ -65,13 +36,13 @@ as perform system administration tasks. Click on any of the tabs above
 or on the buttons below to perform a task.</P>
 
 <P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Help"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Add Class"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Add Printer"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Manage Classes"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Manage Jobs"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Manage Printers"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Manage Server"></A>
+<FORM METHOD="GET" ACTION="/help/"><INPUT TYPE="submit" VALUE="Help"></FORM>
+<FORM METHOD="POST" ACTION="/admin"><INPUT TYPE="hidden" NAME="OP" VALUE="add-class"><INPUT TYPE="submit" VALUE="Add Class"></FORM>
+<FORM METHOD="POST" ACTION="/admin"><INPUT TYPE="hidden" NAME="OP" VALUE="add-printer"><INPUT TYPE="submit" VALUE="Add Printer"></FORM>
+<FORM METHOD="GET" ACTION="/classes"><INPUT TYPE="submit" VALUE="Manage Classes"></FORM>
+<FORM METHOD="GET" ACTION="/jobs"><INPUT TYPE="submit" VALUE="Manage Jobs"></FORM>
+<FORM METHOD="GET" ACTION="/printers"><INPUT TYPE="submit" VALUE="Manage Printers"></FORM>
+<FORM METHOD="GET" ACTION="/admin"><INPUT TYPE="submit" VALUE="Manage Server"></FORM>
 </P>
 
 <P><I>If you are asked for a username and password, enter your login
@@ -79,9 +50,7 @@ username and password or the "root" username and password.</I></P>
 
 <H2 CLASS="title">About CUPS</H2>
 
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
+<P><IMG SRC="/images/cups-icon.png" ALIGN="LEFT" WIDTH="128" HEIGHT="128" STYLE="padding-right: 10px;" ALT="CUPS Icon">
 
 CUPS provides a portable printing layer for
 UNIX<SUP>&reg;</SUP>-based operating systems. It is developed and
@@ -104,23 +73,12 @@ assistance:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and
+the CUPS logo are the trademark property of
+<A HREF="http://www.apple.com">Apple, Inc.</A> CUPS is copyright 2007 by Apple
+Inc, all rights reserved.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/doc/it/images/button-accept-jobs.gif b/doc/it/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 394ae93..0000000
Binary files a/doc/it/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/it/images/button-add-class.gif b/doc/it/images/button-add-class.gif
deleted file mode 100644 (file)
index 46de12b..0000000
Binary files a/doc/it/images/button-add-class.gif and /dev/null differ
diff --git a/doc/it/images/button-add-printer.gif b/doc/it/images/button-add-printer.gif
deleted file mode 100644 (file)
index ad53491..0000000
Binary files a/doc/it/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-add-this-printer.gif b/doc/it/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 6a526bb..0000000
Binary files a/doc/it/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-cancel-all-jobs.gif b/doc/it/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 3bad563..0000000
Binary files a/doc/it/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/it/images/button-cancel-job.gif b/doc/it/images/button-cancel-job.gif
deleted file mode 100644 (file)
index cb12f3a..0000000
Binary files a/doc/it/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/it/images/button-change-settings.gif b/doc/it/images/button-change-settings.gif
deleted file mode 100644 (file)
index 4aefa00..0000000
Binary files a/doc/it/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/it/images/button-clean-print-heads.gif b/doc/it/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 0ee6b67..0000000
Binary files a/doc/it/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/it/images/button-clear.gif b/doc/it/images/button-clear.gif
deleted file mode 100644 (file)
index c5e0c76..0000000
Binary files a/doc/it/images/button-clear.gif and /dev/null differ
diff --git a/doc/it/images/button-continue.gif b/doc/it/images/button-continue.gif
deleted file mode 100644 (file)
index 5287aa6..0000000
Binary files a/doc/it/images/button-continue.gif and /dev/null differ
diff --git a/doc/it/images/button-delete-class.gif b/doc/it/images/button-delete-class.gif
deleted file mode 100644 (file)
index d5c5a9a..0000000
Binary files a/doc/it/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/it/images/button-delete-printer.gif b/doc/it/images/button-delete-printer.gif
deleted file mode 100644 (file)
index a6f3d63..0000000
Binary files a/doc/it/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-edit-configuration-file.gif b/doc/it/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 27dd668..0000000
Binary files a/doc/it/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/it/images/button-export-samba.gif b/doc/it/images/button-export-samba.gif
deleted file mode 100644 (file)
index 28011fe..0000000
Binary files a/doc/it/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/it/images/button-help.gif b/doc/it/images/button-help.gif
deleted file mode 100644 (file)
index 729e469..0000000
Binary files a/doc/it/images/button-help.gif and /dev/null differ
diff --git a/doc/it/images/button-hold-job.gif b/doc/it/images/button-hold-job.gif
deleted file mode 100644 (file)
index 4f39dd9..0000000
Binary files a/doc/it/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/it/images/button-manage-classes.gif b/doc/it/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 5ced7e0..0000000
Binary files a/doc/it/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/it/images/button-manage-jobs.gif b/doc/it/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 0746c1a..0000000
Binary files a/doc/it/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/it/images/button-manage-printers.gif b/doc/it/images/button-manage-printers.gif
deleted file mode 100644 (file)
index f9fc252..0000000
Binary files a/doc/it/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/it/images/button-manage-server.gif b/doc/it/images/button-manage-server.gif
deleted file mode 100644 (file)
index e3bd612..0000000
Binary files a/doc/it/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/it/images/button-modify-class.gif b/doc/it/images/button-modify-class.gif
deleted file mode 100644 (file)
index 1623871..0000000
Binary files a/doc/it/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/it/images/button-modify-printer.gif b/doc/it/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 0d1faac..0000000
Binary files a/doc/it/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-move-job.gif b/doc/it/images/button-move-job.gif
deleted file mode 100644 (file)
index cfd1a7a..0000000
Binary files a/doc/it/images/button-move-job.gif and /dev/null differ
diff --git a/doc/it/images/button-move-jobs.gif b/doc/it/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 9629190..0000000
Binary files a/doc/it/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/it/images/button-print-self-test-page.gif b/doc/it/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index fac427d..0000000
Binary files a/doc/it/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/it/images/button-print-test-page.gif b/doc/it/images/button-print-test-page.gif
deleted file mode 100644 (file)
index f443cc6..0000000
Binary files a/doc/it/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/it/images/button-publish-printer.gif b/doc/it/images/button-publish-printer.gif
deleted file mode 100644 (file)
index a4c17ba..0000000
Binary files a/doc/it/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-reject-jobs.gif b/doc/it/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 4d624de..0000000
Binary files a/doc/it/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/it/images/button-release-job.gif b/doc/it/images/button-release-job.gif
deleted file mode 100644 (file)
index eba16c7..0000000
Binary files a/doc/it/images/button-release-job.gif and /dev/null differ
diff --git a/doc/it/images/button-restart-job.gif b/doc/it/images/button-restart-job.gif
deleted file mode 100644 (file)
index f096697..0000000
Binary files a/doc/it/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/it/images/button-save-changes.gif b/doc/it/images/button-save-changes.gif
deleted file mode 100644 (file)
index 8253933..0000000
Binary files a/doc/it/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/it/images/button-search.gif b/doc/it/images/button-search.gif
deleted file mode 100644 (file)
index 2e71d39..0000000
Binary files a/doc/it/images/button-search.gif and /dev/null differ
diff --git a/doc/it/images/button-set-allowed-users.gif b/doc/it/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 2a436c0..0000000
Binary files a/doc/it/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/it/images/button-set-as-default.gif b/doc/it/images/button-set-as-default.gif
deleted file mode 100644 (file)
index 96365a1..0000000
Binary files a/doc/it/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/it/images/button-set-printer-options.gif b/doc/it/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index b7246a6..0000000
Binary files a/doc/it/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/it/images/button-show-active.gif b/doc/it/images/button-show-active.gif
deleted file mode 100644 (file)
index 27f1b1b..0000000
Binary files a/doc/it/images/button-show-active.gif and /dev/null differ
diff --git a/doc/it/images/button-show-all.gif b/doc/it/images/button-show-all.gif
deleted file mode 100644 (file)
index a3062db..0000000
Binary files a/doc/it/images/button-show-all.gif and /dev/null differ
diff --git a/doc/it/images/button-show-completed.gif b/doc/it/images/button-show-completed.gif
deleted file mode 100644 (file)
index 19c8b75..0000000
Binary files a/doc/it/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/it/images/button-show-next.gif b/doc/it/images/button-show-next.gif
deleted file mode 100644 (file)
index 0acf764..0000000
Binary files a/doc/it/images/button-show-next.gif and /dev/null differ
diff --git a/doc/it/images/button-show-previous.gif b/doc/it/images/button-show-previous.gif
deleted file mode 100644 (file)
index c07ccec..0000000
Binary files a/doc/it/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/it/images/button-sort-ascending.gif b/doc/it/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 5999f57..0000000
Binary files a/doc/it/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/it/images/button-sort-descending.gif b/doc/it/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 87379e1..0000000
Binary files a/doc/it/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/it/images/button-start-class.gif b/doc/it/images/button-start-class.gif
deleted file mode 100644 (file)
index 1c6d28a..0000000
Binary files a/doc/it/images/button-start-class.gif and /dev/null differ
diff --git a/doc/it/images/button-start-printer.gif b/doc/it/images/button-start-printer.gif
deleted file mode 100644 (file)
index 8e48a07..0000000
Binary files a/doc/it/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-stop-class.gif b/doc/it/images/button-stop-class.gif
deleted file mode 100644 (file)
index 94577a1..0000000
Binary files a/doc/it/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/it/images/button-stop-printer.gif b/doc/it/images/button-stop-printer.gif
deleted file mode 100644 (file)
index ae1d088..0000000
Binary files a/doc/it/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-unpublish-printer.gif b/doc/it/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 797f227..0000000
Binary files a/doc/it/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/it/images/button-use-default-config.gif b/doc/it/images/button-use-default-config.gif
deleted file mode 100644 (file)
index fd86222..0000000
Binary files a/doc/it/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/it/images/button-view-access-log.gif b/doc/it/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 1d67c85..0000000
Binary files a/doc/it/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/it/images/button-view-error-log.gif b/doc/it/images/button-view-error-log.gif
deleted file mode 100644 (file)
index edcc05b..0000000
Binary files a/doc/it/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/it/images/button-view-page-log.gif b/doc/it/images/button-view-page-log.gif
deleted file mode 100644 (file)
index d48d772..0000000
Binary files a/doc/it/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/it/images/button-view-printable-version.gif b/doc/it/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index f01d634..0000000
Binary files a/doc/it/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/it/index.html.in b/doc/it/index.html.in
deleted file mode 100644 (file)
index c53ea11..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Principale&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Amministrazione&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Classi&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Documentazione/Guida&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Operazioni&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Stampanti&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Benvenuto!</H2>
-
-<P>Queste pagine web ti consentono di controllare le stampanti e le operazioni di stampa nonch&eacute; eseguire operazioni di amministrazione del sistema. Fai clic su ognuna delle schede in alto o sui pulsanti seguenti per effettuare un'operazione.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Guida"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Aggiungi classe"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Aggiungi stampante"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Gestione classi"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Gestione operazioni"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Gestione stampanti"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Gestione server"></A>
-</P>
-
-<P><I>Se ti viene richiesto un nome utente o una password, inserisci il nome utente
-e la password di accesso o il nome utente e la password dell'utente "root".</I></P>
-
-<H2 CLASS="title">Informazioni su CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Computer felice e stampante">
-
-CUPS fornisce un sottosistema di stampa portabile per
-i sistemi operativi basati su UNIX<SUP>&reg;</SUP>. Sviluppato e
-gestito da <A HREF="http://www.apple.com">Apple Inc.</a> per promuovere una soluzione di stampa standard. CUPS &egrave; il
-sistema di stampa standard utilizzato su MacOS<SUP>&reg;</SUP> X e sulla
-maggior parte delle distribuzioni Linux<SUP>&reg;</SUP>.</P>
-
-<P>CUPS utilizza l'<A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank">Internet Printing Protocol ("IPP")</A> come base per la
-gestione delle operazioni di stampa e delle code e aggiunge la navigazione delle 
-stampanti di rete e opzioni di stampa basate su PostScript Printer
-Description ("PPD") per supportare tutte le necessit&agrave; di stampa.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Driver di stampa e assistenza</H2>
-
-<P>Visita il sito ufficiale di CUPS per i driver di stampa e assistenza:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS, e il logo CUPS sono
-marchi registrati da <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS &egrave; un copyright 2007 di Apple Inc,
-Tutti i diritti sono riservati.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/ja/images/button-accept-jobs.gif b/doc/ja/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 7ee4db6..0000000
Binary files a/doc/ja/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/ja/images/button-add-class.gif b/doc/ja/images/button-add-class.gif
deleted file mode 100644 (file)
index aa046eb..0000000
Binary files a/doc/ja/images/button-add-class.gif and /dev/null differ
diff --git a/doc/ja/images/button-add-printer.gif b/doc/ja/images/button-add-printer.gif
deleted file mode 100644 (file)
index 19869c6..0000000
Binary files a/doc/ja/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-add-this-printer.gif b/doc/ja/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 75dcf19..0000000
Binary files a/doc/ja/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-cancel-all-jobs.gif b/doc/ja/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 3be5118..0000000
Binary files a/doc/ja/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/ja/images/button-cancel-job.gif b/doc/ja/images/button-cancel-job.gif
deleted file mode 100644 (file)
index c6ce936..0000000
Binary files a/doc/ja/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/ja/images/button-change-settings.gif b/doc/ja/images/button-change-settings.gif
deleted file mode 100644 (file)
index d31acf1..0000000
Binary files a/doc/ja/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/ja/images/button-continue.gif b/doc/ja/images/button-continue.gif
deleted file mode 100644 (file)
index 540aabf..0000000
Binary files a/doc/ja/images/button-continue.gif and /dev/null differ
diff --git a/doc/ja/images/button-delete-class.gif b/doc/ja/images/button-delete-class.gif
deleted file mode 100644 (file)
index a9307db..0000000
Binary files a/doc/ja/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/ja/images/button-delete-printer.gif b/doc/ja/images/button-delete-printer.gif
deleted file mode 100644 (file)
index 5525d10..0000000
Binary files a/doc/ja/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-edit-configuration-file.gif b/doc/ja/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 8b8a879..0000000
Binary files a/doc/ja/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/ja/images/button-export-samba.gif b/doc/ja/images/button-export-samba.gif
deleted file mode 100644 (file)
index a839670..0000000
Binary files a/doc/ja/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/ja/images/button-help.gif b/doc/ja/images/button-help.gif
deleted file mode 100644 (file)
index b0369cf..0000000
Binary files a/doc/ja/images/button-help.gif and /dev/null differ
diff --git a/doc/ja/images/button-hold-job.gif b/doc/ja/images/button-hold-job.gif
deleted file mode 100644 (file)
index 67c5e84..0000000
Binary files a/doc/ja/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/ja/images/button-manage-classes.gif b/doc/ja/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 0643673..0000000
Binary files a/doc/ja/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/ja/images/button-manage-jobs.gif b/doc/ja/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 8054528..0000000
Binary files a/doc/ja/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/ja/images/button-manage-printers.gif b/doc/ja/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 65e824a..0000000
Binary files a/doc/ja/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/ja/images/button-manage-server.gif b/doc/ja/images/button-manage-server.gif
deleted file mode 100644 (file)
index 2b2d235..0000000
Binary files a/doc/ja/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/ja/images/button-modify-class.gif b/doc/ja/images/button-modify-class.gif
deleted file mode 100644 (file)
index 38d40a7..0000000
Binary files a/doc/ja/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/ja/images/button-modify-printer.gif b/doc/ja/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 261b384..0000000
Binary files a/doc/ja/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-move-job.gif b/doc/ja/images/button-move-job.gif
deleted file mode 100644 (file)
index f0d2b54..0000000
Binary files a/doc/ja/images/button-move-job.gif and /dev/null differ
diff --git a/doc/ja/images/button-move-jobs.gif b/doc/ja/images/button-move-jobs.gif
deleted file mode 100644 (file)
index e381fe4..0000000
Binary files a/doc/ja/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/ja/images/button-print-test-page.gif b/doc/ja/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 88995e5..0000000
Binary files a/doc/ja/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/ja/images/button-publish-printer.gif b/doc/ja/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 7c47333..0000000
Binary files a/doc/ja/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-reject-jobs.gif b/doc/ja/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index ed1ac6b..0000000
Binary files a/doc/ja/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/ja/images/button-release-job.gif b/doc/ja/images/button-release-job.gif
deleted file mode 100644 (file)
index 245126e..0000000
Binary files a/doc/ja/images/button-release-job.gif and /dev/null differ
diff --git a/doc/ja/images/button-restart-job.gif b/doc/ja/images/button-restart-job.gif
deleted file mode 100644 (file)
index af27eaa..0000000
Binary files a/doc/ja/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/ja/images/button-save-changes.gif b/doc/ja/images/button-save-changes.gif
deleted file mode 100644 (file)
index 2637b49..0000000
Binary files a/doc/ja/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/ja/images/button-search.gif b/doc/ja/images/button-search.gif
deleted file mode 100644 (file)
index c03e1f5..0000000
Binary files a/doc/ja/images/button-search.gif and /dev/null differ
diff --git a/doc/ja/images/button-set-allowed-users.gif b/doc/ja/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 891c123..0000000
Binary files a/doc/ja/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/ja/images/button-set-as-default.gif b/doc/ja/images/button-set-as-default.gif
deleted file mode 100644 (file)
index 14834a7..0000000
Binary files a/doc/ja/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/ja/images/button-set-printer-options.gif b/doc/ja/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index e218b00..0000000
Binary files a/doc/ja/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/ja/images/button-show-active.gif b/doc/ja/images/button-show-active.gif
deleted file mode 100644 (file)
index 156f79d..0000000
Binary files a/doc/ja/images/button-show-active.gif and /dev/null differ
diff --git a/doc/ja/images/button-show-all.gif b/doc/ja/images/button-show-all.gif
deleted file mode 100644 (file)
index 4178a97..0000000
Binary files a/doc/ja/images/button-show-all.gif and /dev/null differ
diff --git a/doc/ja/images/button-show-completed.gif b/doc/ja/images/button-show-completed.gif
deleted file mode 100644 (file)
index c577842..0000000
Binary files a/doc/ja/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/ja/images/button-show-next.gif b/doc/ja/images/button-show-next.gif
deleted file mode 100644 (file)
index 86cd446..0000000
Binary files a/doc/ja/images/button-show-next.gif and /dev/null differ
diff --git a/doc/ja/images/button-show-previous.gif b/doc/ja/images/button-show-previous.gif
deleted file mode 100644 (file)
index 57ae163..0000000
Binary files a/doc/ja/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/ja/images/button-sort-ascending.gif b/doc/ja/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 075c460..0000000
Binary files a/doc/ja/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/ja/images/button-sort-descending.gif b/doc/ja/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 79fcb4d..0000000
Binary files a/doc/ja/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/ja/images/button-start-class.gif b/doc/ja/images/button-start-class.gif
deleted file mode 100644 (file)
index bd9c619..0000000
Binary files a/doc/ja/images/button-start-class.gif and /dev/null differ
diff --git a/doc/ja/images/button-start-printer.gif b/doc/ja/images/button-start-printer.gif
deleted file mode 100644 (file)
index 222e457..0000000
Binary files a/doc/ja/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-stop-class.gif b/doc/ja/images/button-stop-class.gif
deleted file mode 100644 (file)
index ee44b7c..0000000
Binary files a/doc/ja/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/ja/images/button-stop-printer.gif b/doc/ja/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 7912e9d..0000000
Binary files a/doc/ja/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-unpublish-printer.gif b/doc/ja/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 8ea47aa..0000000
Binary files a/doc/ja/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/ja/images/button-use-default-config.gif b/doc/ja/images/button-use-default-config.gif
deleted file mode 100644 (file)
index ac7c16c..0000000
Binary files a/doc/ja/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/ja/images/button-view-access-log.gif b/doc/ja/images/button-view-access-log.gif
deleted file mode 100644 (file)
index d6e06a9..0000000
Binary files a/doc/ja/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/ja/images/button-view-error-log.gif b/doc/ja/images/button-view-error-log.gif
deleted file mode 100644 (file)
index e16274b..0000000
Binary files a/doc/ja/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/ja/images/button-view-page-log.gif b/doc/ja/images/button-view-page-log.gif
deleted file mode 100644 (file)
index 8416e2d..0000000
Binary files a/doc/ja/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/ja/images/show-all-jobs.gif b/doc/ja/images/show-all-jobs.gif
deleted file mode 100644 (file)
index 4178a97..0000000
Binary files a/doc/ja/images/show-all-jobs.gif and /dev/null differ
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in
deleted file mode 100644 (file)
index 42fa7d3..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>ホーム - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;ホーム&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;管理&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;クラス&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;ドキュメント/ヘルプ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;ジョブ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;プリンタ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">ようこそ!</H2>
-
-<P>この Web ページでは、システム管理作業はもちろん、プリンタやジョブ
-の監視ができます。作業を行うには、上にあるタブをクリックするか、下の
-ボタンをクリックしてください。</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Help"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="クラスの追加"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="プリンタの追加"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="クラスの管理"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="ジョブの管理"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="プリンタの管理"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="サーバの管理"></A>
-</P>
-
-<P><I>ユーザ名とパスワードを尋ねられたら、あなたのユーザ名とパスワード、
-あるいは、ユーザ名 "root" とそのパスワードを入力してください。</I></P>
-
-<H2 CLASS="title">CUPS について</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="ご機嫌なコンピュータとプリンタ">
-
-CUPS は、UNIX<SUP>&reg;</SUP> ベースのオペレーティングシステムのための、
-ポータブルな印刷レイヤを提供します。標準印刷ソリューションを促進する
-ために、<A HREF="http://www.apple.com">Apple Inc.</a> によって開発および保守されています。CUPS は
-MacOS<SUP>&reg;</SUP> X および多くの Linux<SUP>&reg;</SUP>
-ディストリビューションで採用されている標準印刷システムです。</P>
-
-<P>CUPS は
-印刷ジョブとキューの管理に <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank">Internet Printing Protocol ("IPP")</A>
-を基礎として使い、ネットワークプリンタのブラウズ、
-実世界の印刷をサポートするための印刷オプションに基づく
-PostScript Printer Description ("PPD") の機能を追加しています。<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">プリンタドライバと支援</H2>
-
-<P>プリンタドライバと支援については、公式 CUPS サイトを訪れてください:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/pl/images/button-accept-jobs.gif b/doc/pl/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 8013e5d..0000000
Binary files a/doc/pl/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/pl/images/button-add-class.gif b/doc/pl/images/button-add-class.gif
deleted file mode 100644 (file)
index ca9b8c6..0000000
Binary files a/doc/pl/images/button-add-class.gif and /dev/null differ
diff --git a/doc/pl/images/button-add-printer.gif b/doc/pl/images/button-add-printer.gif
deleted file mode 100644 (file)
index 1e099e6..0000000
Binary files a/doc/pl/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-add-this-printer.gif b/doc/pl/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 4fa4e4d..0000000
Binary files a/doc/pl/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-cancel-all-jobs.gif b/doc/pl/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 093b3e7..0000000
Binary files a/doc/pl/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/pl/images/button-cancel-job.gif b/doc/pl/images/button-cancel-job.gif
deleted file mode 100644 (file)
index 1cc3be3..0000000
Binary files a/doc/pl/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/pl/images/button-change-settings.gif b/doc/pl/images/button-change-settings.gif
deleted file mode 100644 (file)
index 8abeb07..0000000
Binary files a/doc/pl/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/pl/images/button-clean-print-heads.gif b/doc/pl/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 0daf9a9..0000000
Binary files a/doc/pl/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/pl/images/button-clear.gif b/doc/pl/images/button-clear.gif
deleted file mode 100644 (file)
index 9e1c36d..0000000
Binary files a/doc/pl/images/button-clear.gif and /dev/null differ
diff --git a/doc/pl/images/button-continue.gif b/doc/pl/images/button-continue.gif
deleted file mode 100644 (file)
index d0d2916..0000000
Binary files a/doc/pl/images/button-continue.gif and /dev/null differ
diff --git a/doc/pl/images/button-delete-class.gif b/doc/pl/images/button-delete-class.gif
deleted file mode 100644 (file)
index 38f69ec..0000000
Binary files a/doc/pl/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/pl/images/button-delete-printer.gif b/doc/pl/images/button-delete-printer.gif
deleted file mode 100644 (file)
index 7e5bf74..0000000
Binary files a/doc/pl/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-edit-configuration-file.gif b/doc/pl/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index e892aa1..0000000
Binary files a/doc/pl/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/pl/images/button-export-samba.gif b/doc/pl/images/button-export-samba.gif
deleted file mode 100644 (file)
index 1fdbf67..0000000
Binary files a/doc/pl/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/pl/images/button-help.gif b/doc/pl/images/button-help.gif
deleted file mode 100644 (file)
index f5e239e..0000000
Binary files a/doc/pl/images/button-help.gif and /dev/null differ
diff --git a/doc/pl/images/button-hold-job.gif b/doc/pl/images/button-hold-job.gif
deleted file mode 100644 (file)
index 5219e68..0000000
Binary files a/doc/pl/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/pl/images/button-manage-classes.gif b/doc/pl/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 63a8f66..0000000
Binary files a/doc/pl/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/pl/images/button-manage-jobs.gif b/doc/pl/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index f8f6f0d..0000000
Binary files a/doc/pl/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/pl/images/button-manage-printers.gif b/doc/pl/images/button-manage-printers.gif
deleted file mode 100644 (file)
index 041efc2..0000000
Binary files a/doc/pl/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/pl/images/button-manage-server.gif b/doc/pl/images/button-manage-server.gif
deleted file mode 100644 (file)
index cb6d760..0000000
Binary files a/doc/pl/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/pl/images/button-modify-class.gif b/doc/pl/images/button-modify-class.gif
deleted file mode 100644 (file)
index 38cce15..0000000
Binary files a/doc/pl/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/pl/images/button-modify-printer.gif b/doc/pl/images/button-modify-printer.gif
deleted file mode 100644 (file)
index acbb6da..0000000
Binary files a/doc/pl/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-move-job.gif b/doc/pl/images/button-move-job.gif
deleted file mode 100644 (file)
index 585f48e..0000000
Binary files a/doc/pl/images/button-move-job.gif and /dev/null differ
diff --git a/doc/pl/images/button-move-jobs.gif b/doc/pl/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 4600b78..0000000
Binary files a/doc/pl/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/pl/images/button-print-self-test-page.gif b/doc/pl/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index 1aa3349..0000000
Binary files a/doc/pl/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/pl/images/button-print-test-page.gif b/doc/pl/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 8eb7ec3..0000000
Binary files a/doc/pl/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/pl/images/button-publish-printer.gif b/doc/pl/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 909702f..0000000
Binary files a/doc/pl/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-reject-jobs.gif b/doc/pl/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index bcff455..0000000
Binary files a/doc/pl/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/pl/images/button-release-job.gif b/doc/pl/images/button-release-job.gif
deleted file mode 100644 (file)
index a3d95ad..0000000
Binary files a/doc/pl/images/button-release-job.gif and /dev/null differ
diff --git a/doc/pl/images/button-restart-job.gif b/doc/pl/images/button-restart-job.gif
deleted file mode 100644 (file)
index 5d5a7c0..0000000
Binary files a/doc/pl/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/pl/images/button-save-changes.gif b/doc/pl/images/button-save-changes.gif
deleted file mode 100644 (file)
index 5056b80..0000000
Binary files a/doc/pl/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/pl/images/button-search.gif b/doc/pl/images/button-search.gif
deleted file mode 100644 (file)
index 5f99760..0000000
Binary files a/doc/pl/images/button-search.gif and /dev/null differ
diff --git a/doc/pl/images/button-set-allowed-users.gif b/doc/pl/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 728ced1..0000000
Binary files a/doc/pl/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/pl/images/button-set-as-default.gif b/doc/pl/images/button-set-as-default.gif
deleted file mode 100644 (file)
index b01c191..0000000
Binary files a/doc/pl/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/pl/images/button-set-printer-options.gif b/doc/pl/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index ed026d5..0000000
Binary files a/doc/pl/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/pl/images/button-show-active.gif b/doc/pl/images/button-show-active.gif
deleted file mode 100644 (file)
index ac9d4e0..0000000
Binary files a/doc/pl/images/button-show-active.gif and /dev/null differ
diff --git a/doc/pl/images/button-show-all.gif b/doc/pl/images/button-show-all.gif
deleted file mode 100644 (file)
index 0bd0388..0000000
Binary files a/doc/pl/images/button-show-all.gif and /dev/null differ
diff --git a/doc/pl/images/button-show-completed.gif b/doc/pl/images/button-show-completed.gif
deleted file mode 100644 (file)
index d27b307..0000000
Binary files a/doc/pl/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/pl/images/button-show-next.gif b/doc/pl/images/button-show-next.gif
deleted file mode 100644 (file)
index a584f88..0000000
Binary files a/doc/pl/images/button-show-next.gif and /dev/null differ
diff --git a/doc/pl/images/button-show-previous.gif b/doc/pl/images/button-show-previous.gif
deleted file mode 100644 (file)
index 64613b9..0000000
Binary files a/doc/pl/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/pl/images/button-sort-ascending.gif b/doc/pl/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 993cf6a..0000000
Binary files a/doc/pl/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/pl/images/button-sort-descending.gif b/doc/pl/images/button-sort-descending.gif
deleted file mode 100644 (file)
index fbc5e96..0000000
Binary files a/doc/pl/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/pl/images/button-start-class.gif b/doc/pl/images/button-start-class.gif
deleted file mode 100644 (file)
index 834f8a1..0000000
Binary files a/doc/pl/images/button-start-class.gif and /dev/null differ
diff --git a/doc/pl/images/button-start-printer.gif b/doc/pl/images/button-start-printer.gif
deleted file mode 100644 (file)
index 7d86be5..0000000
Binary files a/doc/pl/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-stop-class.gif b/doc/pl/images/button-stop-class.gif
deleted file mode 100644 (file)
index c1f96cc..0000000
Binary files a/doc/pl/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/pl/images/button-stop-printer.gif b/doc/pl/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 34bf39d..0000000
Binary files a/doc/pl/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-unpublish-printer.gif b/doc/pl/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index fdb48f3..0000000
Binary files a/doc/pl/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/pl/images/button-use-default-config.gif b/doc/pl/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 578cd05..0000000
Binary files a/doc/pl/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/pl/images/button-view-access-log.gif b/doc/pl/images/button-view-access-log.gif
deleted file mode 100644 (file)
index b6ffd0a..0000000
Binary files a/doc/pl/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/pl/images/button-view-error-log.gif b/doc/pl/images/button-view-error-log.gif
deleted file mode 100644 (file)
index bbdd548..0000000
Binary files a/doc/pl/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/pl/images/button-view-page-log.gif b/doc/pl/images/button-view-page-log.gif
deleted file mode 100644 (file)
index 30b3a7e..0000000
Binary files a/doc/pl/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/pl/images/button-view-printable-version.gif b/doc/pl/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 726cd3a..0000000
Binary files a/doc/pl/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in
deleted file mode 100644 (file)
index 54b07af..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Strona domowa - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Strona domowa&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Administracja&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Klasy&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Dokumentacja/pomoc&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Zadania&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Drukarki&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Witaj!</H2>
-
-<P>Te strony WWW pozwalają na monitorowanie drukarek i zadań oraz 
-przeprowadzanie zadań administracyjnych systemu. Naciśnij na dowolną
-powyższą kartę lub poniższy przycisk, aby przeprowadzić zadanie.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Pomoc"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Dodaj klasę"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Dodaj drkarkę"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Zarządzaj klasami"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Zarządzaj zadaniami"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Zarządzaj drukarkami"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Zarządzaj serwerem"></A>
-</P>
-
-<P><I>Jeśli zostaniesz poproszony o nazwę użytkownika i hasło, podaj
-swój login i hasło lub nazwę użytkownika "root" i hasło.</I></P>
-
-<H2 CLASS="title">Informacje o CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Szczęśliwy komputer i drukarka">
-
-CUPS dostarcza przenośną warstwę drukowania dla systemów
-operacyjnych opartych na Uniksie<SUP>&reg;</SUP>. Został napisany
-i utrzymywany przez <A HREF="http://www.apple.com">Apple Inc</a>, aby wypromować standardowe rozwiązanie drukowania.
-CUPS jest standardowym systemem drukowania używanym na MacOS-ie
-<SUP>&reg;</SUP> X i większości dystrybucji Linuksa<SUP>&reg;</SUP>.</P>
-
-<P>CUPS używa <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Internetowego protokołu drukowania ("IPP")</A>
-jako podstawę zarządzania zadaniami drukowania i kolejkami oraz
-dodaje sieciowe przeglądanie drukarek, a także oparte na
-PostScriptowym opisie drukarek ("PPD") opcje drukowania do
-obsługi prawdziwego drukowania.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">Sterowniki drukarek i pomoc techniczna</H2>
-
-<P>Odwiedź oficjalną stronę CUPS, aby uzyskać sterowniki drukarek i pomoc techniczną:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS i logo CUPS są
-zarejestrowanymi znakami towarowymi <A HREF="http://www.apple.com">Apple Inc.</A>
-Copyright 2007 Apple Inc, wszelkie prawa zastrzeżone.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/sv/images/button-accept-jobs.gif b/doc/sv/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index 06f7e5a..0000000
Binary files a/doc/sv/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/sv/images/button-add-class.gif b/doc/sv/images/button-add-class.gif
deleted file mode 100644 (file)
index f398d69..0000000
Binary files a/doc/sv/images/button-add-class.gif and /dev/null differ
diff --git a/doc/sv/images/button-add-printer.gif b/doc/sv/images/button-add-printer.gif
deleted file mode 100644 (file)
index 6a6cc15..0000000
Binary files a/doc/sv/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-add-this-printer.gif b/doc/sv/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 5e26153..0000000
Binary files a/doc/sv/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-cancel-all-jobs.gif b/doc/sv/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index d09a578..0000000
Binary files a/doc/sv/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/sv/images/button-cancel-job.gif b/doc/sv/images/button-cancel-job.gif
deleted file mode 100644 (file)
index 4a24ac6..0000000
Binary files a/doc/sv/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/sv/images/button-change-settings.gif b/doc/sv/images/button-change-settings.gif
deleted file mode 100644 (file)
index 93ba0ab..0000000
Binary files a/doc/sv/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/sv/images/button-clean-print-heads.gif b/doc/sv/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 188c1c0..0000000
Binary files a/doc/sv/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/sv/images/button-clear.gif b/doc/sv/images/button-clear.gif
deleted file mode 100644 (file)
index 98baad8..0000000
Binary files a/doc/sv/images/button-clear.gif and /dev/null differ
diff --git a/doc/sv/images/button-continue.gif b/doc/sv/images/button-continue.gif
deleted file mode 100644 (file)
index 0910b3d..0000000
Binary files a/doc/sv/images/button-continue.gif and /dev/null differ
diff --git a/doc/sv/images/button-delete-class.gif b/doc/sv/images/button-delete-class.gif
deleted file mode 100644 (file)
index 7290222..0000000
Binary files a/doc/sv/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/sv/images/button-delete-printer.gif b/doc/sv/images/button-delete-printer.gif
deleted file mode 100644 (file)
index bbf5163..0000000
Binary files a/doc/sv/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-edit-configuration-file.gif b/doc/sv/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 5f6e50b..0000000
Binary files a/doc/sv/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/sv/images/button-export-samba.gif b/doc/sv/images/button-export-samba.gif
deleted file mode 100644 (file)
index ab7e0d6..0000000
Binary files a/doc/sv/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/sv/images/button-help.gif b/doc/sv/images/button-help.gif
deleted file mode 100644 (file)
index d418800..0000000
Binary files a/doc/sv/images/button-help.gif and /dev/null differ
diff --git a/doc/sv/images/button-hold-job.gif b/doc/sv/images/button-hold-job.gif
deleted file mode 100644 (file)
index ed2f5e0..0000000
Binary files a/doc/sv/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/sv/images/button-manage-classes.gif b/doc/sv/images/button-manage-classes.gif
deleted file mode 100644 (file)
index 20062fe..0000000
Binary files a/doc/sv/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/sv/images/button-manage-jobs.gif b/doc/sv/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 50b5f65..0000000
Binary files a/doc/sv/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/sv/images/button-manage-printers.gif b/doc/sv/images/button-manage-printers.gif
deleted file mode 100644 (file)
index e0e2a60..0000000
Binary files a/doc/sv/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/sv/images/button-manage-server.gif b/doc/sv/images/button-manage-server.gif
deleted file mode 100644 (file)
index f564983..0000000
Binary files a/doc/sv/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/sv/images/button-modify-class.gif b/doc/sv/images/button-modify-class.gif
deleted file mode 100644 (file)
index 5494ddd..0000000
Binary files a/doc/sv/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/sv/images/button-modify-printer.gif b/doc/sv/images/button-modify-printer.gif
deleted file mode 100644 (file)
index c4d4556..0000000
Binary files a/doc/sv/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-move-job.gif b/doc/sv/images/button-move-job.gif
deleted file mode 100644 (file)
index 047a02a..0000000
Binary files a/doc/sv/images/button-move-job.gif and /dev/null differ
diff --git a/doc/sv/images/button-move-jobs.gif b/doc/sv/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 836fdb6..0000000
Binary files a/doc/sv/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/sv/images/button-print-self-test-page.gif b/doc/sv/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index e3c11e6..0000000
Binary files a/doc/sv/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/sv/images/button-print-test-page.gif b/doc/sv/images/button-print-test-page.gif
deleted file mode 100644 (file)
index 4e7cd70..0000000
Binary files a/doc/sv/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/sv/images/button-publish-printer.gif b/doc/sv/images/button-publish-printer.gif
deleted file mode 100644 (file)
index ad0d162..0000000
Binary files a/doc/sv/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-reject-jobs.gif b/doc/sv/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 54025f4..0000000
Binary files a/doc/sv/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/sv/images/button-release-job.gif b/doc/sv/images/button-release-job.gif
deleted file mode 100644 (file)
index 029cc8c..0000000
Binary files a/doc/sv/images/button-release-job.gif and /dev/null differ
diff --git a/doc/sv/images/button-restart-job.gif b/doc/sv/images/button-restart-job.gif
deleted file mode 100644 (file)
index d4fa713..0000000
Binary files a/doc/sv/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/sv/images/button-save-changes.gif b/doc/sv/images/button-save-changes.gif
deleted file mode 100644 (file)
index b33ab6e..0000000
Binary files a/doc/sv/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/sv/images/button-search.gif b/doc/sv/images/button-search.gif
deleted file mode 100644 (file)
index e248dce..0000000
Binary files a/doc/sv/images/button-search.gif and /dev/null differ
diff --git a/doc/sv/images/button-set-allowed-users.gif b/doc/sv/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index c547b06..0000000
Binary files a/doc/sv/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/sv/images/button-set-as-default.gif b/doc/sv/images/button-set-as-default.gif
deleted file mode 100644 (file)
index 85f162e..0000000
Binary files a/doc/sv/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/sv/images/button-set-printer-options.gif b/doc/sv/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index 85d7021..0000000
Binary files a/doc/sv/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/sv/images/button-show-active.gif b/doc/sv/images/button-show-active.gif
deleted file mode 100644 (file)
index 08db0e1..0000000
Binary files a/doc/sv/images/button-show-active.gif and /dev/null differ
diff --git a/doc/sv/images/button-show-all.gif b/doc/sv/images/button-show-all.gif
deleted file mode 100644 (file)
index 981ad03..0000000
Binary files a/doc/sv/images/button-show-all.gif and /dev/null differ
diff --git a/doc/sv/images/button-show-completed.gif b/doc/sv/images/button-show-completed.gif
deleted file mode 100644 (file)
index c248692..0000000
Binary files a/doc/sv/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/sv/images/button-show-next.gif b/doc/sv/images/button-show-next.gif
deleted file mode 100644 (file)
index 47ea52c..0000000
Binary files a/doc/sv/images/button-show-next.gif and /dev/null differ
diff --git a/doc/sv/images/button-show-previous.gif b/doc/sv/images/button-show-previous.gif
deleted file mode 100644 (file)
index 92f5a9b..0000000
Binary files a/doc/sv/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/sv/images/button-sort-ascending.gif b/doc/sv/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index 161b358..0000000
Binary files a/doc/sv/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/sv/images/button-sort-descending.gif b/doc/sv/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 789bd32..0000000
Binary files a/doc/sv/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/sv/images/button-start-class.gif b/doc/sv/images/button-start-class.gif
deleted file mode 100644 (file)
index 7aa12e8..0000000
Binary files a/doc/sv/images/button-start-class.gif and /dev/null differ
diff --git a/doc/sv/images/button-start-printer.gif b/doc/sv/images/button-start-printer.gif
deleted file mode 100644 (file)
index ace2849..0000000
Binary files a/doc/sv/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-stop-class.gif b/doc/sv/images/button-stop-class.gif
deleted file mode 100644 (file)
index 151320f..0000000
Binary files a/doc/sv/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/sv/images/button-stop-printer.gif b/doc/sv/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 3ace126..0000000
Binary files a/doc/sv/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-unpublish-printer.gif b/doc/sv/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 4511829..0000000
Binary files a/doc/sv/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/sv/images/button-use-default-config.gif b/doc/sv/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 8d5f684..0000000
Binary files a/doc/sv/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/sv/images/button-view-access-log.gif b/doc/sv/images/button-view-access-log.gif
deleted file mode 100644 (file)
index 4fa9a55..0000000
Binary files a/doc/sv/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/sv/images/button-view-error-log.gif b/doc/sv/images/button-view-error-log.gif
deleted file mode 100644 (file)
index 966edf2..0000000
Binary files a/doc/sv/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/sv/images/button-view-page-log.gif b/doc/sv/images/button-view-page-log.gif
deleted file mode 100644 (file)
index 29d5465..0000000
Binary files a/doc/sv/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/sv/images/button-view-printable-version.gif b/doc/sv/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index 343cbea..0000000
Binary files a/doc/sv/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/sv/index.html.in b/doc/sv/index.html.in
deleted file mode 100644 (file)
index 6f3c2f2..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Hem&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Klasser&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Dokumentation/Hjälp&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Jobb&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Skrivare&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">Välkommen!</H2>
-
-<P>Dessa webbsidor låter dig övervaka dina skrivare och jobb så väl som 
-genomföra systemadministrativa uppgifter. Klicka på någon av flikarna 
-ovan eller knapparna nedan för att genomföra en uppgift.</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Hjälp"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Lägg till klass"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Lägg till skrivare"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Hantera klasser"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Hantera jobb"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Hantera skrivare"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Hantera server"></A>
-</P>
-
-<P><I>Om du blir frågad efter ett användarnamn och lösenord, ange ditt 
-inloggningsnamn och lösenord eller "root"-användarens användarnamn och 
-lösenord.</I></P>
-
-<H2 CLASS="title">Om CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Glad dator och skrivare">
-
-CUPS tillhandahåller ett portabelt skrivarlager för UNIX<SUP>&reg;</SUP>-baserade operativsystem. Det har utvecklats och 
-underhålls av <A HREF="http://www.apple.com">Apple Inc.</a> för att erbjuda en standardiserad utskriftslösning. 
-CUPS är det utskriftssystemet som är standard på MacOS<SUP>&reg;</SUP> X och de flesta Linux<SUP>&reg;</SUP>-distributioner.</P>
-
-<P>CUPS använder <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Internet Printing Protocol ("IPP")</A> som bas 
-för att hantera utskriftsjobb, köer, bläddring för nätverksskrivare 
-och PostScript Printer Description-baserade ("PPD") utskriftsalternativ för att ge stöd för utskrifter i den riktiga världen.<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">För skrivardrivrutiner och hjälp</H2>
-
-<P>Besök den officiella CUPS-webbplatsen för skrivardrivrutiner och hjälp:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, och CUPS-logotypen är  varumärken för <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS är copyright 2007 Apple Inc, Alla rättigheter reserverade.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/doc/zh_TW/images/button-accept-jobs.gif b/doc/zh_TW/images/button-accept-jobs.gif
deleted file mode 100644 (file)
index f5c3e2f..0000000
Binary files a/doc/zh_TW/images/button-accept-jobs.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-add-class.gif b/doc/zh_TW/images/button-add-class.gif
deleted file mode 100644 (file)
index 2c91089..0000000
Binary files a/doc/zh_TW/images/button-add-class.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-add-printer.gif b/doc/zh_TW/images/button-add-printer.gif
deleted file mode 100644 (file)
index 43b9bf3..0000000
Binary files a/doc/zh_TW/images/button-add-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-add-this-printer.gif b/doc/zh_TW/images/button-add-this-printer.gif
deleted file mode 100644 (file)
index 98ca9a1..0000000
Binary files a/doc/zh_TW/images/button-add-this-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-cancel-all-jobs.gif b/doc/zh_TW/images/button-cancel-all-jobs.gif
deleted file mode 100644 (file)
index 33445a8..0000000
Binary files a/doc/zh_TW/images/button-cancel-all-jobs.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-cancel-job.gif b/doc/zh_TW/images/button-cancel-job.gif
deleted file mode 100644 (file)
index d588cab..0000000
Binary files a/doc/zh_TW/images/button-cancel-job.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-change-settings.gif b/doc/zh_TW/images/button-change-settings.gif
deleted file mode 100644 (file)
index 9071f67..0000000
Binary files a/doc/zh_TW/images/button-change-settings.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-clean-print-heads.gif b/doc/zh_TW/images/button-clean-print-heads.gif
deleted file mode 100644 (file)
index 821bea2..0000000
Binary files a/doc/zh_TW/images/button-clean-print-heads.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-clear.gif b/doc/zh_TW/images/button-clear.gif
deleted file mode 100644 (file)
index 8fa8102..0000000
Binary files a/doc/zh_TW/images/button-clear.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-continue.gif b/doc/zh_TW/images/button-continue.gif
deleted file mode 100644 (file)
index c6b943f..0000000
Binary files a/doc/zh_TW/images/button-continue.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-delete-class.gif b/doc/zh_TW/images/button-delete-class.gif
deleted file mode 100644 (file)
index 830313c..0000000
Binary files a/doc/zh_TW/images/button-delete-class.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-delete-printer.gif b/doc/zh_TW/images/button-delete-printer.gif
deleted file mode 100644 (file)
index cecaf34..0000000
Binary files a/doc/zh_TW/images/button-delete-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-edit-configuration-file.gif b/doc/zh_TW/images/button-edit-configuration-file.gif
deleted file mode 100644 (file)
index 610f8d4..0000000
Binary files a/doc/zh_TW/images/button-edit-configuration-file.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-export-samba.gif b/doc/zh_TW/images/button-export-samba.gif
deleted file mode 100644 (file)
index 1572bcb..0000000
Binary files a/doc/zh_TW/images/button-export-samba.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-help.gif b/doc/zh_TW/images/button-help.gif
deleted file mode 100644 (file)
index bfb0b75..0000000
Binary files a/doc/zh_TW/images/button-help.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-hold-job.gif b/doc/zh_TW/images/button-hold-job.gif
deleted file mode 100644 (file)
index 2e1e87a..0000000
Binary files a/doc/zh_TW/images/button-hold-job.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-manage-classes.gif b/doc/zh_TW/images/button-manage-classes.gif
deleted file mode 100644 (file)
index a41bc71..0000000
Binary files a/doc/zh_TW/images/button-manage-classes.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-manage-jobs.gif b/doc/zh_TW/images/button-manage-jobs.gif
deleted file mode 100644 (file)
index 71fed91..0000000
Binary files a/doc/zh_TW/images/button-manage-jobs.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-manage-printers.gif b/doc/zh_TW/images/button-manage-printers.gif
deleted file mode 100644 (file)
index de3042d..0000000
Binary files a/doc/zh_TW/images/button-manage-printers.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-manage-server.gif b/doc/zh_TW/images/button-manage-server.gif
deleted file mode 100644 (file)
index 6d54dbe..0000000
Binary files a/doc/zh_TW/images/button-manage-server.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-modify-class.gif b/doc/zh_TW/images/button-modify-class.gif
deleted file mode 100644 (file)
index ce8c339..0000000
Binary files a/doc/zh_TW/images/button-modify-class.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-modify-printer.gif b/doc/zh_TW/images/button-modify-printer.gif
deleted file mode 100644 (file)
index 91cb2b1..0000000
Binary files a/doc/zh_TW/images/button-modify-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-move-job.gif b/doc/zh_TW/images/button-move-job.gif
deleted file mode 100644 (file)
index e1b63d5..0000000
Binary files a/doc/zh_TW/images/button-move-job.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-move-jobs.gif b/doc/zh_TW/images/button-move-jobs.gif
deleted file mode 100644 (file)
index 0434bc6..0000000
Binary files a/doc/zh_TW/images/button-move-jobs.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-print-self-test-page.gif b/doc/zh_TW/images/button-print-self-test-page.gif
deleted file mode 100644 (file)
index 5ebfb42..0000000
Binary files a/doc/zh_TW/images/button-print-self-test-page.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-print-test-page.gif b/doc/zh_TW/images/button-print-test-page.gif
deleted file mode 100644 (file)
index f5d0a70..0000000
Binary files a/doc/zh_TW/images/button-print-test-page.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-publish-printer.gif b/doc/zh_TW/images/button-publish-printer.gif
deleted file mode 100644 (file)
index 39ed520..0000000
Binary files a/doc/zh_TW/images/button-publish-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-reject-jobs.gif b/doc/zh_TW/images/button-reject-jobs.gif
deleted file mode 100644 (file)
index 1520d49..0000000
Binary files a/doc/zh_TW/images/button-reject-jobs.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-release-job.gif b/doc/zh_TW/images/button-release-job.gif
deleted file mode 100644 (file)
index c8fbece..0000000
Binary files a/doc/zh_TW/images/button-release-job.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-restart-job.gif b/doc/zh_TW/images/button-restart-job.gif
deleted file mode 100644 (file)
index 7b39b22..0000000
Binary files a/doc/zh_TW/images/button-restart-job.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-save-changes.gif b/doc/zh_TW/images/button-save-changes.gif
deleted file mode 100644 (file)
index cb870d7..0000000
Binary files a/doc/zh_TW/images/button-save-changes.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-search.gif b/doc/zh_TW/images/button-search.gif
deleted file mode 100644 (file)
index 7f2c4ea..0000000
Binary files a/doc/zh_TW/images/button-search.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-set-allowed-users.gif b/doc/zh_TW/images/button-set-allowed-users.gif
deleted file mode 100644 (file)
index 09efc50..0000000
Binary files a/doc/zh_TW/images/button-set-allowed-users.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-set-as-default.gif b/doc/zh_TW/images/button-set-as-default.gif
deleted file mode 100644 (file)
index 0ccecfa..0000000
Binary files a/doc/zh_TW/images/button-set-as-default.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-set-printer-options.gif b/doc/zh_TW/images/button-set-printer-options.gif
deleted file mode 100644 (file)
index cbd25f3..0000000
Binary files a/doc/zh_TW/images/button-set-printer-options.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-show-active.gif b/doc/zh_TW/images/button-show-active.gif
deleted file mode 100644 (file)
index 448df4b..0000000
Binary files a/doc/zh_TW/images/button-show-active.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-show-all.gif b/doc/zh_TW/images/button-show-all.gif
deleted file mode 100644 (file)
index a41159b..0000000
Binary files a/doc/zh_TW/images/button-show-all.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-show-completed.gif b/doc/zh_TW/images/button-show-completed.gif
deleted file mode 100644 (file)
index 8f01cd3..0000000
Binary files a/doc/zh_TW/images/button-show-completed.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-show-next.gif b/doc/zh_TW/images/button-show-next.gif
deleted file mode 100644 (file)
index 3021bea..0000000
Binary files a/doc/zh_TW/images/button-show-next.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-show-previous.gif b/doc/zh_TW/images/button-show-previous.gif
deleted file mode 100644 (file)
index afa5975..0000000
Binary files a/doc/zh_TW/images/button-show-previous.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-sort-ascending.gif b/doc/zh_TW/images/button-sort-ascending.gif
deleted file mode 100644 (file)
index aa9a704..0000000
Binary files a/doc/zh_TW/images/button-sort-ascending.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-sort-descending.gif b/doc/zh_TW/images/button-sort-descending.gif
deleted file mode 100644 (file)
index 8634f03..0000000
Binary files a/doc/zh_TW/images/button-sort-descending.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-start-class.gif b/doc/zh_TW/images/button-start-class.gif
deleted file mode 100644 (file)
index 21decdc..0000000
Binary files a/doc/zh_TW/images/button-start-class.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-start-printer.gif b/doc/zh_TW/images/button-start-printer.gif
deleted file mode 100644 (file)
index 0118d79..0000000
Binary files a/doc/zh_TW/images/button-start-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-stop-class.gif b/doc/zh_TW/images/button-stop-class.gif
deleted file mode 100644 (file)
index 4f1aafb..0000000
Binary files a/doc/zh_TW/images/button-stop-class.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-stop-printer.gif b/doc/zh_TW/images/button-stop-printer.gif
deleted file mode 100644 (file)
index 22fd1fa..0000000
Binary files a/doc/zh_TW/images/button-stop-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-unpublish-printer.gif b/doc/zh_TW/images/button-unpublish-printer.gif
deleted file mode 100644 (file)
index 12d4c62..0000000
Binary files a/doc/zh_TW/images/button-unpublish-printer.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-use-default-config.gif b/doc/zh_TW/images/button-use-default-config.gif
deleted file mode 100644 (file)
index 835d714..0000000
Binary files a/doc/zh_TW/images/button-use-default-config.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-view-access-log.gif b/doc/zh_TW/images/button-view-access-log.gif
deleted file mode 100644 (file)
index ce41e85..0000000
Binary files a/doc/zh_TW/images/button-view-access-log.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-view-error-log.gif b/doc/zh_TW/images/button-view-error-log.gif
deleted file mode 100644 (file)
index 92128f1..0000000
Binary files a/doc/zh_TW/images/button-view-error-log.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-view-page-log.gif b/doc/zh_TW/images/button-view-page-log.gif
deleted file mode 100644 (file)
index 4efe78e..0000000
Binary files a/doc/zh_TW/images/button-view-page-log.gif and /dev/null differ
diff --git a/doc/zh_TW/images/button-view-printable-version.gif b/doc/zh_TW/images/button-view-printable-version.gif
deleted file mode 100644 (file)
index b558666..0000000
Binary files a/doc/zh_TW/images/button-view-printable-version.gif and /dev/null differ
diff --git a/doc/zh_TW/index.html.in b/doc/zh_TW/index.html.in
deleted file mode 100644 (file)
index edddd41..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>首頁 - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="Common UNIX Printing System @CUPS_VERSION@">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>Common UNIX Printing System @CUPS_VERSION@@CUPS_REVISION@</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;首頁&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/admin/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;管理&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;分類&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;文件/求助&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;工作&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="unsel" HREF="/printers/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
-HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;印表機&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" VALIGN="TOP" CLASS="page">
-
-<H2 CLASS="title">歡迎!</H2>
-
-<P>此處的網頁讓您監看您的印表機和工作,以及
-進行系統管理任務。按下上方任何的分頁頁標或是
-下方的按鈕,以執行某個作業。</P>
-
-<P>
-<A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="求助"></A>
-<A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="增加分類"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="增加印表機"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="管理分類"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="管理工作"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="管理印表機"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="管理伺服器"></A>
-</P>
-
-<P><I>如果向您要求使用者名稱與密碼,請輸入
-您的使用者名稱與密碼,或是 "root" 的使用者名稱與密碼。</I></P>
-
-<H2 CLASS="title">關於 CUPS</H2>
-
-<P>
-<IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="快樂的電腦與印表機">
-
-CUPS 提供以 UNIX<SUP>&reg;</SUP> 為基礎的作業系統 
-一層具有可攜性的列印介面。它是由 <A HREF="http://www.apple.com">Apple Inc.</a> 為了推動一個標準的列印解決方案所開發與維護。CUPS 是目前用於
-MacOS<SUP>&reg;</SUP> X 與大部份 Linux<SUP>&reg;</SUP> 發行版本的標準列印系統。</P>
-
-<P>CUPS 使用 <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Internet Printing Protocol ("IPP")</A> 做為
-管理列印工作與佇列的基礎,並且加入瀏覽網路印表機和基於
-PostScript Printer Description ("PPD") 的列印選項,
-以支援真實世界中的列印。<BR CLEAR="ALL"></P>
-
-<H2 CLASS="title">印表機驅動程式與協助</H2>
-
-<P>造訪 CUPS 的官方網站以獲得印表機驅動程式與協助:</P>
-
-<PRE>
-    <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
-</PRE>
-
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="header">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
index 0b0844aeda26447f723e2c1ab7557cb04af8ea09..964df186719d13cc453700e66d66a1ef87079ac5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 6759 2007-08-02 04:10:23Z mike $"
+ * "$Id: pstops.c 7006 2007-10-04 17:43:38Z mike $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -947,7 +947,12 @@ copy_dsc(cups_file_t  *fp,         /* I - File to read from */
     * Make the copies...
     */
 
-    for (copy = !doc->slow_order; copy < doc->copies; copy ++)
+    if (doc->slow_collate)
+      copy = !doc->slow_order;
+    else
+      copy = doc->copies - 1;
+
+    for (; copy < doc->copies; copy ++)
     {
       if (JobCanceled)
        break;
@@ -1011,7 +1016,8 @@ copy_dsc(cups_file_t  *fp,                /* I - File to read from */
         number ++;
 
        if (!ppd || !ppd->num_filters)
-         fprintf(stderr, "PAGE: %d 1\n", number);
+         fprintf(stderr, "PAGE: %d %d\n", number,
+                 doc->slow_collate ? 1 : doc->copies);
 
        if (doc->number_up > 1)
        {
@@ -3351,5 +3357,5 @@ write_labels(pstops_doc_t *doc,           /* I - Document information */
 
 
 /*
- * End of "$Id: pstops.c 6759 2007-08-02 04:10:23Z mike $".
+ * End of "$Id: pstops.c 7006 2007-10-04 17:43:38Z mike $".
  */
index dbddf812fed52659d8005c9add11f65b5b244f95..26a254f9a5e89111a565d949969d7c2ed4e2cb3b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertolabel.c 6820 2007-08-20 21:15:28Z mike $"
+ * "$Id: rastertolabel.c 6819 2007-08-20 21:11:57Z mike $"
  *
  *   Label printer filter for the Common UNIX Printing System (CUPS).
  *
@@ -1300,5 +1300,5 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertolabel.c 6820 2007-08-20 21:15:28Z mike $".
+ * End of "$Id: rastertolabel.c 6819 2007-08-20 21:11:57Z mike $".
  */
index bf7e80a5b23ebb02fdb4d2a13479c81a8698042c..05fbba754e233e192a712cb5f7aa9098114068a5 100644 (file)
@@ -1,5 +1,6 @@
 service printer
 {
+       disable = yes
        socket_type = stream
        protocol = tcp
        wait = no
index 4a4a7dab0f7d22c5ab4829aa0b479b73d904fc8b..f7cbc8913dbf54613e152e15505067956db1289b 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6996 2007-09-28 18:30:31Z mike $"
+# "$Id: Makefile 6993 2007-09-28 18:05:28Z mike $"
 #
 #   Locale file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -151,5 +151,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6996 2007-09-28 18:30:31Z mike $".
+# End of "$Id: Makefile 6993 2007-09-28 18:05:28Z mike $".
 #
index 2ac66273346702680d4e1bac5cb8ea8765be17ac..ea41a32980a70c0f87d5f6206eff22e3d07fa58c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: checkpo.c 6926 2007-09-06 14:34:31Z mike $"
+ * "$Id: checkpo.c 6922 2007-09-06 14:18:02Z mike $"
  *
  * Verify that translations in the .po file have the same number and type of
  * printf-style format strings.
@@ -339,5 +339,5 @@ free_formats(cups_array_t *fmts)    /* I - Array of format strings */
 
 
 /*
- * End of "$Id: checkpo.c 6926 2007-09-06 14:34:31Z mike $".
+ * End of "$Id: checkpo.c 6922 2007-09-06 14:18:02Z mike $".
  */
index 493332773c625bce91adb64f7a07529d1423dd6b..647d3dc9d222fd19cda4c76e2cec385c387856d8 100644 (file)
@@ -17,90 +17,90 @@ msgstr ""
 "Project-Id-Version: CUPS 1.3\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
 "POT-Creation-Date: 2007-07-27 14:55-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2007-10-04 21:17+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "\t\t(all)\n"
-msgstr "\t\t(すべて)\n"
+msgstr "\t\t(すべて)\n"
 
 msgid "\t\t(none)\n"
-msgstr "\t\t(なし)\n"
+msgstr "\t\t(なし)\n"
 
 #, c-format
 msgid "\t%d entries\n"
 msgstr "\t%d エントリ\n"
 
 msgid "\tAfter fault: continue\n"
-msgstr "\t失敗後継続\n"
+msgstr "\t失敗後継続\n"
 
 msgid "\tAlerts:"
-msgstr "\tアラート"
+msgstr "\tアラート:"
 
 msgid "\tBanner required\n"
 msgstr "\tバナーが必要\n"
 
 msgid "\tCharset sets:\n"
-msgstr "\t文字セット\n"
+msgstr "\t文字セット:\n"
 
 msgid "\tConnection: direct\n"
-msgstr "\t接続直結\n"
+msgstr "\t接続直結\n"
 
 msgid "\tConnection: remote\n"
-msgstr "\t接続リモート\n"
+msgstr "\t接続リモート\n"
 
 msgid "\tDefault page size:\n"
-msgstr "\tデフォルト用紙サイズ\n"
+msgstr "\tデフォルト用紙サイズ:\n"
 
 msgid "\tDefault pitch:\n"
-msgstr "\tデフォルトピッチ\n"
+msgstr "\tデフォルトピッチ:\n"
 
 msgid "\tDefault port settings:\n"
-msgstr "\tデフォルトポート設定\n"
+msgstr "\tデフォルトポート設定:\n"
 
 #, c-format
 msgid "\tDescription: %s\n"
-msgstr "\t説明%s\n"
+msgstr "\t説明:%s\n"
 
 msgid ""
 "\tForm mounted:\n"
 "\tContent types: any\n"
 "\tPrinter types: unknown\n"
 msgstr ""
-"\t用紙台\n"
-"\t内容形式すべて\n"
-"\tプリンタ形式未知\n"
+"\t用紙台:\n"
+"\t内容形式すべて\n"
+"\tプリンタ形式未知\n"
 
 msgid "\tForms allowed:\n"
-msgstr "\t許可されている用紙\n"
+msgstr "\t許可されている用紙:\n"
 
 #, c-format
 msgid "\tInterface: %s.ppd\n"
-msgstr "\tインターフェイス%s.ppd\n"
+msgstr "\tインターフェイス%s.ppd\n"
 
 #, c-format
 msgid "\tInterface: %s/interfaces/%s\n"
-msgstr "\tインターフェイス%s/interfaces/%s\n"
+msgstr "\tインターフェイス%s/interfaces/%s\n"
 
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd\n"
-msgstr "\tインターフェイス%s/ppd/%s.ppd\n"
+msgstr "\tインターフェイス%s/ppd/%s.ppd\n"
 
 #, c-format
 msgid "\tLocation: %s\n"
-msgstr "\t場所%s\n"
+msgstr "\t場所%s\n"
 
 msgid "\tOn fault: no alert\n"
-msgstr "\t失敗時警告なし\n"
+msgstr "\t失敗時警告なし\n"
 
 msgid "\tUsers allowed:\n"
-msgstr "\t許可されているユーザ\n"
+msgstr "\t許可されているユーザ:\n"
 
 msgid "\tUsers denied:\n"
-msgstr "\t拒否されているユーザ\n"
+msgstr "\t拒否されているユーザ:\n"
 
 msgid "\tdaemon present\n"
 msgstr "\tデーモンは提供されています\n"
@@ -139,37 +139,37 @@ msgstr ""
 "    適合テスト結果詳細\n"
 
 msgid "                REF: Page 15, section 3.1.\n"
-msgstr "                REF15 ページ、セクション 3.1。\n"
+msgstr "                REF15 ページ、セクション 3.1。\n"
 
 msgid "                REF: Page 15, section 3.2.\n"
-msgstr "                REF15 ページ、セクション 3.2。\n"
+msgstr "                REF15 ページ、セクション 3.2。\n"
 
 msgid "                REF: Page 19, section 3.3.\n"
-msgstr "                REF19 ページ、セクション 3.3。\n"
+msgstr "                REF19 ページ、セクション 3.3。\n"
 
 msgid "                REF: Page 20, section 3.4.\n"
-msgstr "                REF20 ページ、セクション 3.4。\n"
+msgstr "                REF20 ページ、セクション 3.4。\n"
 
 msgid "                REF: Page 27, section 3.5.\n"
-msgstr "                REF27 ページ、セクション 3.5。\n"
+msgstr "                REF27 ページ、セクション 3.5。\n"
 
 msgid "                REF: Page 42, section 5.2.\n"
-msgstr "                REF42 ページ、セクション 5.2。\n"
+msgstr "                REF42 ページ、セクション 5.2。\n"
 
 msgid "                REF: Pages 16-17, section 3.2.\n"
-msgstr "                REF16-17 ページ、セクション 3.2。\n"
+msgstr "                REF16-17 ページ、セクション 3.2。\n"
 
 msgid "                REF: Pages 42-45, section 5.2.\n"
-msgstr "                REF42-45 ページ、セクション 5.2。\n"
+msgstr "                REF42-45 ページ、セクション 5.2。\n"
 
 msgid "                REF: Pages 45-46, section 5.2.\n"
-msgstr "                REF45-46 ページ、セクション 5.2。\n"
+msgstr "                REF45-46 ページ、セクション 5.2。\n"
 
 msgid "                REF: Pages 48-49, section 5.2.\n"
-msgstr "                REF48-49 ページ、セクション 5.2。\n"
+msgstr "                REF48-49 ページ、セクション 5.2。\n"
 
 msgid "                REF: Pages 52-54, section 5.2.\n"
-msgstr "                REF52-54 ページ、セクション 5.2。\n"
+msgstr "                REF52-54 ページ、セクション 5.2。\n"
 
 #, c-format
 msgid "        %-39.39s %.0f bytes\n"
@@ -230,11 +230,11 @@ msgid ""
 "                (constraint=\"%s %s %s %s\")\n"
 msgstr ""
 "        警告    \"%s %s\" は \"%s %s\" と衝突します\n"
-"                (constraint=\"%s %s %s %s\")\n"
+"                (constraint=\"%s %s %s %s\")\n"
 
 #, c-format
 msgid "        WARN    %s has no corresponding options!\n"
-msgstr "        警告    %s は相当するオプションがありません\n"
+msgstr "        警告    %s は相当するオプションがありません!\n"
 
 #, c-format
 msgid ""
@@ -242,10 +242,10 @@ msgid ""
 "                REF: Page 15, section 3.2.\n"
 msgstr ""
 "        警告    %s は %s と一般プリフィクスを共有します。\n"
-"                REF15 ページ、セクション 3.2。\n"
+"                REF15 ページ、セクション 3.2。\n"
 
 msgid "        WARN    Default choices conflicting!\n"
-msgstr "        警告    デフォルトの選択肢が衝突しています\n"
+msgstr "        警告    デフォルトの選択肢が衝突しています!\n"
 
 #, c-format
 msgid ""
@@ -254,31 +254,31 @@ msgid ""
 "                REF: Page 122, section 5.17\n"
 msgstr ""
 "        警告    複式オプションキーワード %s は Duplex あるいは JCLDuplex とい"
-"う名前であるべきです\n"
-"                REF122 ページ、セクション 5.17\n"
+"う名前であるべきです!\n"
+"                REF122 ページ、セクション 5.17\n"
 
 msgid ""
 "        WARN    File contains a mix of CR, LF, and CR LF line endings!\n"
 msgstr ""
-"        警告    ファイルが CR、LF、CR LF の行末を混在して含んでいます\n"
+"        警告    ファイルが CR、LF、CR LF の行末を混在して含んでいます!\n"
 
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3.\n"
 msgstr ""
 "        警告    LanguageEncoding は PPD 4.3 仕様で必須です。\n"
-"                REF56-57 ページ、セクション 5.3。\n"
+"                REF56-57 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid "        WARN    Line %d only contains whitespace!\n"
-msgstr "        警告    %d 行が空白だけです\n"
+msgstr "        警告    %d 行が空白だけです!\n"
 
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3.\n"
 msgstr ""
 "        警告    Manufacturer は PPD 4.3 仕様で必須です。\n"
-"                REF58-59 ページ、セクション 5.3。\n"
+"                REF58-59 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid "        WARN    Missing APDialogExtension file \"%s\"\n"
@@ -297,22 +297,22 @@ msgid ""
 "not CR LF!\n"
 msgstr ""
 "        警告    非 Windows PPD ファイルは、CR LF でなく LF のみを行末に使うべ"
-"きです\n"
+"きです!\n"
 
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f!\n"
 "                REF: Page 42, section 5.2.\n"
 msgstr ""
-"        警告    PPD バージョン %.1f は時代遅れです\n"
-"                REF42 ページ、セクション 5.2。\n"
+"        警告    PPD バージョン %.1f は時代遅れです!\n"
+"                REF42 ページ、セクション 5.2。\n"
 
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3.\n"
 msgstr ""
 "        警告    8.3 文字より長い PCFileName は PPD 仕様違反です。\n"
-"                REF61-62 ページ、セクション 5.3。\n"
+"                REF61-62 ページ、セクション 5.3。\n"
 
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
@@ -320,7 +320,7 @@ msgid ""
 msgstr ""
 "        警告    プロトコルが PJL を含んでいますが JCL 属性が設定されていませ"
 "ん。\n"
-"                REF78-79 ページ、セクション 5.7。\n"
+"                REF78-79 ページ、セクション 5.7。\n"
 
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
@@ -328,80 +328,79 @@ msgid ""
 msgstr ""
 "        警告    プロトコルが PJL と BCP の両方を含んでいます; TBCP を予測しま"
 "す。\n"
-"                REF78-79 ページ、セクション 5.7。\n"
+"                REF78-79 ページ、セクション 5.7。\n"
 
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3.\n"
 msgstr ""
 "        警告    ShortNickName は PPD 4.3 仕様で必須です。\n"
-"                REF64-65 ページ、セクション 5.3。\n"
+"                REF64-65 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid "      %s  %s %s does not exist!\n"
-msgstr "      %s  %s %s が存在しません\n"
+msgstr "      %s  %s %s が存在しません!\n"
 
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s!\n"
-msgstr "      %s  不正な UTF-8 \"%s\" 翻訳文字列(オプション %s 用)!\n"
+msgstr "      %s  不正な UTF-8 \"%s\" 翻訳文字列 (オプション %s 用)!\n"
 
 #, c-format
 msgid ""
 "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s!\n"
-msgstr ""
-"      %s  不正な UTF-8 \"%s\" 翻訳文字列(オプション %s 、選択 %s)!\n"
+msgstr "      %s  不正な UTF-8 \"%s\" 翻訳文字列 (オプション %s 、選択 %s)!\n"
 
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"!\n"
-msgstr "      %s  不正な cupsFilter 値 \"%s\"\n"
+msgstr "      %s  不正な cupsFilter 値 \"%s\"!\n"
 
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"!\n"
-msgstr "      %s  不正な cupsPreFilter 値 \"%s\"\n"
+msgstr "      %s  不正な cupsPreFilter 値 \"%s\"!\n"
 
 #, c-format
 msgid "      %s  Bad language \"%s\"!\n"
-msgstr "      %s  無効な言語 \"%s\"\n"
+msgstr "      %s  無効な言語 \"%s\"!\n"
 
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s!\n"
-msgstr "      %s  \"%s\" 翻訳文字列(オプション %s 用)が見つかりません!\n"
+msgstr "      %s  \"%s\" 翻訳文字列 (オプション %s 用) が見つかりません!\n"
 
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s!\n"
 msgstr ""
-"      %s  \"%s\" 翻訳文字列(オプション %s 、選択 %s)が見つかりません!\n"
+"      %s  \"%s\" 翻訳文字列 (オプション %s 、選択 %s) が見つかりません!\n"
 
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraint \"*%s %s *%s %s\"!\n"
 msgstr ""
-"      %s 選択 *UIConstraint 内の %s %s \"*%s %s *%s %s が見つかりません\"\n"
+"      %s 選択 *UIConstraint 内の %s %s \"*%s %s *%s %s が見つかりません\"!\n"
 
 #, c-format
 msgid "      %s  Missing cupsFilter file \"%s\"\n"
-msgstr "      %s  cupsFilter ファイル \"%s\" が見つかりません\n"
+msgstr "      %s  cupsFilter ファイル \"%s\" が見つかりません!\n"
 
 #, c-format
 msgid "      %s  Missing cupsPreFilter file \"%s\"\n"
-msgstr "      %s  cupsPreFilter ファイル \"%s\" が見つかりません\n"
+msgstr "      %s  cupsPreFilter ファイル \"%s\" が見つかりません!\n"
 
 #, c-format
 msgid "      %s  Missing option %s in UIConstraint \"*%s %s *%s %s\"!\n"
 msgstr ""
 "      %s オプション *UIConstraint 内の %s \"*%s %s *%s %s\" が見つかりませ"
-"ん\n"
+"ん!\n"
 
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file!\n"
-msgstr "      %s  ファイルにベース翻訳文字列 \"%s\" がありません\n"
+msgstr "      %s  ファイルにベース翻訳文字列 \"%s\" がありません!\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID!\n"
 "                REF: Page 72, section 5.5\n"
 msgstr ""
-"      **FAIL**  %s は 1284DeviceID でなければなりません\n"
-"                REF72 ページ、セクション 5.5\n"
+"      **FAIL**  %s は 1284DeviceID でなければなりません!\n"
+"                REF72 ページ、セクション 5.5\n"
 
 #, c-format
 msgid ""
@@ -409,44 +408,44 @@ msgid ""
 "                REF: Page 40, section 4.5.\n"
 msgstr ""
 "      **失敗**  %2$s は不正な Default%1$s\n"
-"                REF40 ページ、セクション 4.5。\n"
+"                REF40 ページ、セクション 4.5。\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  BAD DefaultImageableArea %s!\n"
 "                REF: Page 102, section 5.15.\n"
 msgstr ""
-"      **失敗**  %s は不正な DefaultImageableArea です\n"
-"                REF102 ページ、セクション 5.15。\n"
+"      **失敗**  %s は不正な DefaultImageableArea です!\n"
+"                REF102 ページ、セクション 5.15。\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  BAD DefaultPaperDimension %s!\n"
 "                REF: Page 103, section 5.15.\n"
 msgstr ""
-"      **失敗**  %s は不正な DefaultPaperDimension です\n"
-"                REF103 ページ、セクション 5.15。\n"
+"      **失敗**  %s は不正な DefaultPaperDimension です!\n"
+"                REF103 ページ、セクション 5.15。\n"
 
 msgid ""
 "      **FAIL**  BAD JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4.\n"
 msgstr ""
 "      **失敗**  ファイルに不正な JobPatchFile 属性があります\n"
-"                REF24 ページ、セクション 3.4。\n"
+"                REF24 ページ、セクション 3.4。\n"
 
 msgid ""
 "      **FAIL**  BAD Manufacturer (should be \"HP\")\n"
 "                REF: Page 211, table D.1.\n"
 msgstr ""
-"      **失敗**  不正な Manufacturer(\"HP\" でなければなりません)\n"
-"                REF211 ページ、表 D.1。\n"
+"      **失敗**  不正な Manufacturer (\"HP\" でなければなりません)\n"
+"                REF211 ページ、表 D.1。\n"
 
 msgid ""
 "      **FAIL**  BAD Manufacturer (should be \"Oki\")\n"
 "                REF: Page 211, table D.1.\n"
 msgstr ""
-"      **失敗**  不正な Manufacturer(\"Oki\" でなければなりません)\n"
-"                REF211 ページ、表 D.1。\n"
+"      **失敗**  不正な Manufacturer (\"Oki\" でなければなりません)\n"
+"                REF211 ページ、表 D.1。\n"
 
 #, c-format
 msgid ""
@@ -454,67 +453,67 @@ msgid ""
 "                REF: Pages 59-60, section 5.3.\n"
 msgstr ""
 "      **失敗**  不正な ModelName - 文字列に \"%c\" は許可されていません。\n"
-"                REF59-60 ページ、セクション 5.3。\n"
+"                REF59-60 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  BAD PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3.\n"
 msgstr ""
-"      **失敗**  不正な PSVersion - \"(文字列)整数\" ではありません。\n"
-"                REF62-64 ページ、セクション 5.3。\n"
+"      **失敗**  不正な PSVersion - \"(文字列) 整数\" ではありません。\n"
+"                REF62-64 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  BAD Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3.\n"
 msgstr ""
-"      **失敗**  不正な Product - \"(文字列)\" ではありません。\n"
-"                REF62 ページ、セクション 5.3。\n"
+"      **失敗**  不正な Product - \"(文字列)\" ではありません。\n"
+"                REF62 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  BAD ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3.\n"
 msgstr ""
 "      **失敗**  不正な ShortNickName - 31 文字を超えています。\n"
-"                REF64-65 ページ、セクション 5.3。\n"
+"                REF64-65 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  Bad %s choice %s!\n"
 "                REF: Page 122, section 5.17\n"
 msgstr ""
-"      **FAIL**  不正な %s が %s を選んでいます\n"
-"                REF122 ページ、セクション 5.17\n"
+"      **FAIL**  不正な %s が %s を選んでいます!\n"
+"                REF122 ページ、セクション 5.17\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  Bad %s choice %s!\n"
 "                REF: Page 84, section 5.9\n"
 msgstr ""
-"      **失敗**  不正な %s が %s を選んでいます\n"
-"                REF84 ページ、セクション 5.9\n"
+"      **失敗**  不正な %s が %s を選んでいます!\n"
+"                REF84 ページ、セクション 5.9\n"
 
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1!\n"
 msgstr ""
 "      **失敗**  無効な LanguageEncoding %s - ISOLatin1 でなければなりませ"
-"ん\n"
+"ん!\n"
 
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English!\n"
 msgstr ""
-"      **失敗**  無効な LanguageVersion %s - English でなければなりません\n"
+"      **失敗**  無効な LanguageVersion %s - English でなければなりません!\n"
 
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s\n"
-msgstr "      **失敗**  デフォルトのオプションコードが解釈できません:s: %s\n"
+msgstr "      **失敗**  デフォルトのオプションコードが解釈できません: %s\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  Default translation string for option %s choice %s contains "
 "8-bit characters!\n"
 msgstr ""
-"      **失敗**  オプション %s、選択 %s のデフォルトの翻訳文字列が8ビット文字"
-"を含んでいます!\n"
+"      **失敗**  オプション %s、選択 %s のデフォルトの翻訳文字列が 8 ビット文"
+"字を含んでいます!\n"
 
 #, c-format
 msgid ""
@@ -522,15 +521,15 @@ msgid ""
 "characters!\n"
 msgstr ""
 "      **失敗**  オプション %s のデフォルトの翻訳文字列が 8 ビット文字を含んで"
-"います\n"
+"います!\n"
 
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED %s does not define choice None!\n"
 "                REF: Page 122, section 5.17\n"
 msgstr ""
-"      **失敗**  必須の %s が選択肢 None を定義していません\n"
-"                REF122 ページ、セクション 5.17\n"
+"      **失敗**  必須の %s が選択肢 None を定義していません!\n"
+"                REF122 ページ、セクション 5.17\n"
 
 #, c-format
 msgid ""
@@ -538,35 +537,35 @@ msgid ""
 "                REF: Page 40, section 4.5.\n"
 msgstr ""
 "      **失敗**  Default%s は必須\n"
-"                REF40 ページ、セクション 4.5。\n"
+"                REF40 ページ、セクション 4.5。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15.\n"
 msgstr ""
 "      **失敗**  DefaultImageableArea が必須\n"
-"                REF102 ページ、セクション 5.15。\n"
+"                REF102 ページ、セクション 5.15。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15.\n"
 msgstr ""
 "      **失敗**  DefaultPaperDimension は必須\n"
-"                REF103 ページ、セクション 5.15。\n"
+"                REF103 ページ、セクション 5.15。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3.\n"
 msgstr ""
 "      **失敗**  FileVersion は必須\n"
-"                REF56 ページ、セクション 5.3。\n"
+"                REF56 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3.\n"
 msgstr ""
 "      **失敗**  FormatVersion は必須\n"
-"                REF56 ページ、セクション 5.3。\n"
+"                REF56 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid ""
@@ -575,64 +574,64 @@ msgid ""
 "                REF: Page 102, section 5.15.\n"
 msgstr ""
 "      **失敗**  PageSize %s に ImageableArea は必須\n"
-"                REF41 ページ、セクション 5。\n"
-"                REF102 ページ、セクション 5.15。\n"
+"                REF41 ページ、セクション 5。\n"
+"                REF102 ページ、セクション 5.15。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3.\n"
 msgstr ""
 "      **失敗**  LanguageEncoding は必須\n"
-"                REF56-57 ページ、セクション 5.3。\n"
+"                REF56-57 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3.\n"
 msgstr ""
 "      **失敗**  LanguageVersion は必須\n"
-"                REF57-58 ページ、セクション 5.3。\n"
+"                REF57-58 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3.\n"
 msgstr ""
 "      **失敗**  Manufacturer は必須\n"
-"                REF58-59 ページ、セクション 5.3。\n"
+"                REF58-59 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3.\n"
 msgstr ""
 "      **失敗**  ModelName は必須\n"
-"                REF59-60 ページ、セクション 5.3。\n"
+"                REF59-60 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3.\n"
 msgstr ""
 "      **失敗**  NickName は必須\n"
-"                REF60 ページ、セクション 5.3。\n"
+"                REF60 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3.\n"
 msgstr ""
 "      **失敗**  PCFileName は必須\n"
-"                REF61-62 ページ、セクション 5.3。\n"
+"                REF61-62 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3.\n"
 msgstr ""
 "      **失敗**  PSVersion は必須\n"
-"                REF62-64 ページ、セクション 5.3。\n"
+"                REF62-64 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14.\n"
 msgstr ""
 "      **失敗**  PageRegion は必須\n"
-"                REF100 ページ、セクション 5.14。\n"
+"                REF100 ページ、セクション 5.14。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
@@ -640,15 +639,15 @@ msgid ""
 "                REF: Page 99, section 5.14.\n"
 msgstr ""
 "      **失敗**  PageSize は必須\n"
-"                REF41 ページ、セクション 5。\n"
-"                REF99 ページ、セクション 5.14。\n"
+"                REF41 ページ、セクション 5。\n"
+"                REF99 ページ、セクション 5.14。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14.\n"
 msgstr ""
 "      **失敗**  PageSize は必須\n"
-"                REF99-100 ページ、セクション 5.14。\n"
+"                REF99-100 ページ、セクション 5.14。\n"
 
 #, c-format
 msgid ""
@@ -657,22 +656,22 @@ msgid ""
 "                REF: Page 103, section 5.15.\n"
 msgstr ""
 "      **失敗**  PageSize %s に PaperDimension は必須\n"
-"                REF41 ページ、セクション 5。\n"
-"                REF103 ページ、セクション 5.15。\n"
+"                REF41 ページ、セクション 5。\n"
+"                REF103 ページ、セクション 5.15。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3.\n"
 msgstr ""
 "      **失敗**  Product は必須\n"
-"                REF62 ページ、セクション 5.3。\n"
+"                REF62 ページ、セクション 5.3。\n"
 
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3.\n"
 msgstr ""
 "      **失敗**  ShortNickName は必須\n"
-"                REF64-65 ページ、セクション 5.3。\n"
+"                REF64-65 ページ、セクション 5.3。\n"
 
 #, c-format
 msgid "    %d ERRORS FOUND\n"
@@ -683,97 +682,97 @@ msgid ""
 "    Bad %%%%BoundingBox: on line %d!\n"
 "        REF: Page 39, %%%%BoundingBox:\n"
 msgstr ""
-"    不正な %%%%BoundingBox:(%d 行)!\n"
-"        REF39 ページ、%%%%BoundingBox:\n"
+"    不正な %%%%BoundingBox: (%d 行)!\n"
+"        REF39 ページ、%%%%BoundingBox:\n"
 
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d!\n"
 "        REF: Page 53, %%%%Page:\n"
 msgstr ""
-"    不正な %%%%Page:(%d 行)!\n"
-"        REF53 ページ、%%%%Page:\n"
+"    不正な %%%%Page: (%d 行)!\n"
+"        REF53 ページ、%%%%Page:\n"
 
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d!\n"
 "        REF: Page 43, %%%%Pages:\n"
 msgstr ""
-"    不正な %%%%Pages:(%d 行)!\n"
-"        REF43 ページ、%%%%Pages:\n"
+"    不正な %%%%Pages: (%d 行)!\n"
+"        REF43 ページ、%%%%Pages:\n"
 
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d)!\n"
 "        REF: Page 25, Line Length\n"
 msgstr ""
-"    %d 行が 255文字より長くなっています(%d)!\n"
-"        REF25 ページ、Line Length\n"
+"    %d 行が 255文字より長くなっています (%d)!\n"
+"        REF25 ページ、Line Length\n"
 
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line!\n"
 "        REF: Page 17, 3.1 Conforming Documents\n"
 msgstr ""
-"    先頭行に %!PS-Adobe-3.0 がありません\n"
-"        REF17 ページ、3.1 Conforming Documents\n"
+"    先頭行に %!PS-Adobe-3.0 がありません!\n"
+"        REF17 ページ、3.1 Conforming Documents\n"
 
 #, c-format
 msgid ""
 "    Missing %%EndComments comment!\n"
 "        REF: Page 41, %%EndComments\n"
 msgstr ""
-"    %%EndComments コメントが見つかりません\n"
-"        REF41 ページ、%%EndComments\n"
+"    %%EndComments コメントが見つかりません!\n"
+"        REF41 ページ、%%EndComments\n"
 
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment!\n"
 "        REF: Page 39, %%BoundingBox:\n"
 msgstr ""
-"    %%BoundingBox: コメントが見つからないか不正です\n"
-"        REF39 ページ、%%BoundingBox:\n"
+"    %%BoundingBox: コメントが見つからないか不正です!\n"
+"        REF39 ページ、%%BoundingBox:\n"
 
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments!\n"
 "        REF: Page 53, %%Page:\n"
 msgstr ""
-"    %%Page: コメントが見つからないか不正です\n"
-"        REF53 ページ、%%Page:\n"
+"    %%Page: コメントが見つからないか不正です!\n"
+"        REF53 ページ、%%Page:\n"
 
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment!\n"
 "        REF: Page 43, %%Pages:\n"
 msgstr ""
-"    %%Pages: コメントが見つからないか不正です\n"
-"        REF43 ページ、%%Pages:\n"
+"    %%Pages: コメントが見つからないか不正です!\n"
+"        REF43 ページ、%%Pages:\n"
 
 msgid "    NO ERRORS FOUND\n"
 msgstr "    エラーは見つかりませんでした\n"
 
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters!\n"
-msgstr "    255文字を超える %d 行が見つかりました\n"
+msgstr "    255文字を超える %d 行が見つかりました!\n"
 
 #, c-format
 msgid "    Too many %%BeginDocument comments!\n"
-msgstr "    %%BeginDocument コメントが多すぎます\n"
+msgstr "    %%BeginDocument コメントが多すぎます!\n"
 
 #, c-format
 msgid "    Too many %%EndDocument comments!\n"
-msgstr "    %%EndDocument コメントが多すぎます\n"
+msgstr "    %%EndDocument コメントが多すぎます!\n"
 
 msgid "    Warning: file contains binary data!\n"
-msgstr "    警告:ファイルにバイナリデータが含まれています!\n"
+msgstr "    警告: ファイルにバイナリデータが含まれています!\n"
 
 #, c-format
 msgid "    Warning: no %%EndComments comment in file!\n"
-msgstr "    警告:ファイルに %%EndComments コメントがありません!\n"
+msgstr "    警告: ファイルに %%EndComments コメントがありません!\n"
 
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file!\n"
-msgstr "    警告:ファイルは時代遅れの DSC バージョン %.1f です!\n"
+msgstr "    警告: ファイルは時代遅れの DSC バージョン %.1f です!\n"
 
 msgid " FAIL\n"
 msgstr " 失敗\n"
@@ -792,7 +791,7 @@ msgid ""
 "      **FAIL**  Unable to open PPD file - %s on line %d.\n"
 msgstr ""
 " 失敗\n"
-"      **失敗**  PPD ファイルを開くことができません - %2$d 行の %1$s。\n"
+"      **失敗**  PPD ファイルを開くことができません - %s (%d 行)。\n"
 
 msgid " PASS\n"
 msgstr " 合格\n"
@@ -839,7 +838,7 @@ msgstr ""
 
 #, c-format
 msgid "%s not supported!"
-msgstr "%s はサポートされていません"
+msgstr "%s はサポートされていません!"
 
 #, c-format
 msgid "%s/%s accepting requests since %s\n"
@@ -855,232 +854,232 @@ msgstr ""
 
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]\n"
-msgstr "%s%-33.33s [ジョブ %d localhost]\n"
+msgstr "%s:%-33.33s [ジョブ %d localhost]\n"
 
 #, c-format
 msgid "%s: %s failed: %s\n"
-msgstr "%s%s 失敗しました: %s\n"
+msgstr "%s%s 失敗しました: %s\n"
 
 #, c-format
 msgid "%s: Don't know what to do!\n"
-msgstr "%s:何が起きているか不明です!\n"
+msgstr "%s: 何が起きているか不明です!\n"
 
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"!\n"
-msgstr "%s:エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
+msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
 
 #, c-format
 msgid "%s: Error - bad job ID!\n"
-msgstr "%s:エラー - 不正なジョブ ID です!\n"
+msgstr "%s: エラー - 不正なジョブ ID です!\n"
 
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously!\n"
 msgstr ""
-"%s:エラー - ファイルを印刷できず、ジョブを同時に変えることができません!\n"
+"%s: エラー - ファイルを印刷できず、ジョブを同時に変えることができません!\n"
 
 #, c-format
 msgid ""
 "%s: Error - cannot print from stdin if files or a job ID are provided!\n"
 msgstr ""
-"%sエラー - ファイルまたはジョブ ID が提供されている場合、標準入力から印刷で"
+"%sエラー - ファイルまたはジョブ ID が提供されている場合、標準入力から印刷で"
 "きません。 \n"
 
 #, c-format
 msgid "%s: Error - expected character set after '-S' option!\n"
-msgstr "%s:エラー - '-S' オプションのあとには文字セットが必要です!\n"
+msgstr "%s: エラー - '-S' オプションのあとには文字セットが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected content type after '-T' option!\n"
-msgstr "%s:エラー - '-T' オプションのあとにはコンテンツタイプが必要です!\n"
+msgstr "%s: エラー - '-T' オプションのあとにはコンテンツタイプが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected copies after '-n' option!\n"
-msgstr "%s:エラー - '-n' オプションのあとにはコピー数が必要です!\n"
+msgstr "%s: エラー - '-n' オプションのあとにはコピー数が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected copy count after '-#' option!\n"
-msgstr "%s:エラー - '-#' オプションのあとにはコピー数が必要です!\n"
+msgstr "%s: エラー - '-#' オプションのあとにはコピー数が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected destination after '-P' option!\n"
-msgstr "%s:エラー - '-P' オプションのあとには宛先が必要です!\n"
+msgstr "%s: エラー - '-P' オプションのあとには宛先が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected destination after '-b' option!\n"
-msgstr "%s:エラー - '-b' オプションのあとに宛先を指定する必要があります!\n"
+msgstr "%s: エラー - '-b' オプションのあとに宛先を指定する必要があります!\n"
 
 #, c-format
 msgid "%s: Error - expected destination after '-d' option!\n"
-msgstr "%s:'-d' オプションのあとにはプリンタ名が必要です!\n"
+msgstr "%s: エラー - '-d' オプションのあとにはプリンタ名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected form after '-f' option!\n"
-msgstr "%s:エラー - '-f' オプションのあとには用紙名が必要です!\n"
+msgstr "%s: エラー - '-f' オプションのあとには用紙名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected hold name after '-H' option!\n"
-msgstr "%s:エラー - '-H' オプションのあとにはホールド名が必要です!\n"
+msgstr "%s: エラー - '-H' オプションのあとにはホールド名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected hostname after '-H' option!\n"
-msgstr "%s:エラー - '-H' オプションのあとにはホスト名が必要です!\n"
+msgstr "%s: エラー - '-H' オプションのあとにはホスト名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected hostname after '-h' option!\n"
-msgstr "%s:エラー -  '-h' オプションのあとにはホスト名が必要です!\n"
+msgstr "%s: エラー -  '-h' オプションのあとにはホスト名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected mode list after '-y' option!\n"
-msgstr "%s:エラー - '-y' オプションのあとにはモードリストが必要です!\n"
+msgstr "%s: エラー - '-y' オプションのあとにはモードリストが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected name after '-%c' option!\n"
-msgstr "%s:エラー - '-%c' オプションのあとには名前が必要です!\n"
+msgstr "%s: エラー - '-%c' オプションのあとには名前が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected option string after '-o' option!\n"
-msgstr "%s:エラー - '-o' オプションのあとには文字列が必要です!\n"
+msgstr "%s: エラー - '-o' オプションのあとには文字列が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected page list after '-P' option!\n"
-msgstr "%s:'-P' オプションのあとにはページリストが必要です!\n"
+msgstr "%s: エラー - '-P' オプションのあとにはページリストが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected priority after '-%c' option!\n"
-msgstr "%s:エラー - '-%c' オプションのあとには優先度が必要です!\n"
+msgstr "%s: エラー - '-%c' オプションのあとには優先度が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected reason text after '-r' option!\n"
-msgstr "%s:-r のあとには理由のテキストが必要です!\n"
+msgstr "%s: エラー - '-r' のあとには理由のテキストが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected title after '-t' option!\n"
-msgstr "%s:エラー - '-t' オプションのあとにはタイトルが必要です!\n"
+msgstr "%s: エラー - '-t' オプションのあとにはタイトルが必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected username after '-U' option!\n"
-msgstr "%s:エラー - '-U' オプションのあとにはユーザ名が必要です!\n"
+msgstr "%s: エラー - '-U' オプションのあとにはユーザ名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected username after '-u' option!\n"
-msgstr "%s:エラー - '-u' オプションのあとにはユーザ名が必要です!\n"
+msgstr "%s: エラー - '-u' オプションのあとにはユーザ名が必要です!\n"
 
 #, c-format
 msgid "%s: Error - expected value after '-%c' option!\n"
-msgstr "%s:エラー -  '-%c' オプションのあとには値が必要です!\n"
+msgstr "%s: エラー -  '-%c' オプションのあとには値が必要です!\n"
 
 #, c-format
 msgid ""
 "%s: Error - need \"completed\", \"not-completed\", or \"all\" after '-W' "
 "option!\n"
 msgstr ""
-"%sエラー - '-W' オプションのあとには、\"completed\"、\"not-completed\"、"
-"\"all\" のいずれかが必要です\n"
+"%sエラー - '-W' オプションのあとには、\"completed\"、\"not-completed\"、"
+"\"all\" のいずれかが必要です!\n"
 
 #, c-format
 msgid "%s: Error - no default destination available.\n"
-msgstr "%sエラー - 利用可能なデフォルトの宛先がありません。\n"
+msgstr "%sエラー - 利用可能なデフォルトの宛先がありません。\n"
 
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100.\n"
-msgstr "%sエラー - 優先度は 1 から 100 の間である必要があります。\n"
+msgstr "%sエラー - 優先度は 1 から 100 の間である必要があります。\n"
 
 #, c-format
 msgid "%s: Error - scheduler not responding!\n"
-msgstr "%s:エラー - スケジューラが応答していません!\n"
+msgstr "%s: エラー - スケジューラが応答していません!\n"
 
 #, c-format
 msgid "%s: Error - stdin is empty, so no job has been sent.\n"
-msgstr "%sエラー - 標準入力が空なので、ジョブは送られていません。\n"
+msgstr "%sエラー - 標準入力が空なので、ジョブは送られていません。\n"
 
 #, c-format
 msgid "%s: Error - too many files - \"%s\"\n"
-msgstr "%sエラー - ファイルが多すぎます - \"%s\"\n"
+msgstr "%sエラー - ファイルが多すぎます - \"%s\"\n"
 
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s\n"
-msgstr "%sエラー - \"%s\" にアクセスできません - %s\n"
+msgstr "%sエラー - \"%s\" にアクセスできません - %s\n"
 
 #, c-format
 msgid "%s: Error - unable to create temporary file \"%s\" - %s\n"
-msgstr "%sエラー - テンポラリファイル \"%s\" を作成できません - %s\n"
+msgstr "%sエラー - テンポラリファイル \"%s\" を作成できません - %s\n"
 
 #, c-format
 msgid "%s: Error - unable to write to temporary file \"%s\" - %s\n"
-msgstr "%sエラー - テンポラリファイル \"%s\" に書き込みできません - %s\n"
+msgstr "%sエラー - テンポラリファイル \"%s\" に書き込みできません - %s\n"
 
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"!\n"
-msgstr "%s:エラー - \"%s\" は未知の宛先です!\n"
+msgstr "%s: エラー - \"%s\" は未知の宛先です!\n"
 
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"!\n"
-msgstr "%s:エラー - \"%s/%s\" は未知の宛先です!\n"
+msgstr "%s: エラー - \"%s/%s\" は未知の宛先です!\n"
 
 #, c-format
 msgid "%s: Error - unknown option '%c'!\n"
-msgstr "%s:エラー - '%c' は未知のオプションです!\n"
+msgstr "%s: エラー - '%c' は未知のオプションです!\n"
 
 #, c-format
 msgid "%s: Expected job ID after '-i' option!\n"
-msgstr "%s:'-i' オプションのあとにはジョブ ID が必要です!\n"
+msgstr "%s: '-i' オプションのあとにはジョブ ID が必要です!\n"
 
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"!\n"
-msgstr "%s:リスト \"%s\" に無効な宛先名があります!\n"
+msgstr "%s: リスト \"%s\" に無効な宛先名があります!\n"
 
 #, c-format
 msgid "%s: Need job ID ('-i jobid') before '-H restart'!\n"
-msgstr "%s:'-H restart' の前にはジョブ ID('-i ジョブID')が必要です!\n"
+msgstr "%s: '-H restart' の前にはジョブ ID ('-i ジョブID') が必要です!\n"
 
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s!\n"
-msgstr ""
+msgstr "%s: %s/%s から %s/%s に変換するフィルタがありません!\n"
 
 #, c-format
 msgid "%s: Operation failed: %s\n"
-msgstr "%s操作に失敗しました: %s\n"
+msgstr "%s操作に失敗しました: %s\n"
 
 #, c-format
 msgid "%s: Sorry, no encryption support compiled in!\n"
-msgstr "%s:すみません、暗号化サポートはコンパイル時に組み込まれていません!\n"
+msgstr "%s: すみません、暗号化サポートはコンパイル時に組み込まれていません!\n"
 
 #, c-format
 msgid "%s: Unable to connect to server\n"
-msgstr "%sサーバに接続できません\n"
+msgstr "%sサーバに接続できません\n"
 
 #, c-format
 msgid "%s: Unable to connect to server: %s\n"
-msgstr "%sサーバに接続できません: %s\n"
+msgstr "%sサーバに接続できません: %s\n"
 
 #, c-format
 msgid "%s: Unable to contact server!\n"
-msgstr "%s:サーバに連絡できません!\n"
+msgstr "%s: サーバに連絡できません!\n"
 
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"!\n"
-msgstr ""
+msgstr "%s: \"%s\" の MIME タイプを判別できません!\n"
 
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\"!\n"
-msgstr ""
+msgstr "%s: \"%s\" から MIME データベースを読み取ることができません!\n"
 
 #, c-format
 msgid "%s: Unknown destination \"%s\"!\n"
-msgstr "%s:\"%s\" は未知の宛先です!\n"
+msgstr "%s: \"%s\" は未知の宛先です!\n"
 
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s!\n"
-msgstr ""
+msgstr "%s: %s/%s は未知の宛先 MIME タイプです!\n"
 
 #, c-format
 msgid "%s: Unknown option '%c'!\n"
-msgstr "%s:'%c' は未知のオプションです!\n"
+msgstr "%s: '%c' は未知のオプションです!\n"
 
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s!\n"
-msgstr ""
+msgstr "%s: %s/%s は未知のソース MIME タイプです!\n"
 
 #, c-format
 msgid ""
@@ -1088,53 +1087,53 @@ msgid ""
 "correct!\n"
 msgstr ""
 "%s: 警告 - '%c' 形式修飾子はサポートされていません - 出力は正しくないものにな"
-"るかもしれません\n"
+"るかもしれません!\n"
 
 #, c-format
 msgid "%s: Warning - character set option ignored!\n"
-msgstr "%s:警告 - 文字セットオプションは無視されます!\n"
+msgstr "%s: 警告 - 文字セットオプションは無視されます!\n"
 
 #, c-format
 msgid "%s: Warning - content type option ignored!\n"
-msgstr "%s:警告 - コンテンツタイプオプションは無視されます!\n"
+msgstr "%s: 警告 - コンテンツタイプオプションは無視されます!\n"
 
 #, c-format
 msgid "%s: Warning - form option ignored!\n"
-msgstr "%s:警告 - 用紙オプションは無視されます!\n"
+msgstr "%s: 警告 - 用紙オプションは無視されます!\n"
 
 #, c-format
 msgid "%s: Warning - mode option ignored!\n"
-msgstr "%s:警告 - モードオプションは無視されます!\n"
+msgstr "%s: 警告 - モードオプションは無視されます!\n"
 
 #, c-format
 msgid ""
 "%s: error - %s environment variable names non-existent destination \"%s\"!\n"
-msgstr "%s:エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
+msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
 
 #, c-format
 msgid "%s: error - expected option=value after '-o' option!\n"
-msgstr "%s:'-o' オプションのあとには オプション=値 が必要です!\n"
+msgstr "%s: エラー - '-o' オプションのあとには オプション=値 が必要です!\n"
 
 #, c-format
 msgid "%s: error - no default destination available.\n"
-msgstr "%sエラー - 利用可能なデフォルトの宛先がありません。\n"
+msgstr "%sエラー - 利用可能なデフォルトの宛先がありません。\n"
 
 msgid "?Invalid help command unknown\n"
 msgstr "?無効なヘルプコマンドです\n"
 
 msgid "A Samba password is required to export printer drivers!"
-msgstr "プリンタドライバをエキスポートするには Samba のパスワードが必要です"
+msgstr "プリンタドライバをエキスポートするには Samba のパスワードが必要です!"
 
 msgid "A Samba username is required to export printer drivers!"
-msgstr "プリンタドライバをエキスポートするには、Samba のユーザ名が必要です"
+msgstr "プリンタドライバをエキスポートするには、Samba のユーザ名が必要です!"
 
 #, c-format
 msgid "A class named \"%s\" already exists!"
-msgstr "クラス名 \"%s\" はすでに存在します"
+msgstr "クラス名 \"%s\" はすでに存在します!"
 
 #, c-format
 msgid "A printer named \"%s\" already exists!"
-msgstr "プリンタ名 \"%s\" はすでに存在します"
+msgstr "プリンタ名 \"%s\" はすでに存在します!"
 
 msgid "Accept Jobs"
 msgstr "ジョブの受け付け"
@@ -1153,11 +1152,11 @@ msgstr "管理"
 
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d!"
-msgstr "%s printer-state に 不正な値 %d を設定しようとしています"
+msgstr "%s printer-state に 不正な値 %d を設定しようとしています!"
 
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)!"
-msgstr "属性グループは範囲外です(%x < %x)!"
+msgstr "属性グループは範囲外です (%x < %x)!"
 
 msgid "Bad OpenGroup"
 msgstr "不正な OpenGroup"
@@ -1180,29 +1179,29 @@ msgstr "不正なカスタムパラメータ"
 
 #, c-format
 msgid "Bad device-uri \"%s\"!"
-msgstr "\"%s\" は無効な device-uri です"
+msgstr "\"%s\" は無効な device-uri です!"
 
 #, c-format
 msgid "Bad document-format \"%s\"!"
-msgstr "\"%s\" は不正な document-format です"
+msgstr "\"%s\" は不正な document-format です!"
 
 msgid "Bad job-priority value!"
-msgstr "不正な job-priority 値です"
+msgstr "不正な job-priority 値です!"
 
 msgid "Bad job-state value!"
-msgstr "不正な job-state 値です"
+msgstr "不正な job-state 値です!"
 
 #, c-format
 msgid "Bad job-uri attribute \"%s\"!"
-msgstr "\"%s\" は無効な job-uri 属性です"
+msgstr "\"%s\" は無効な job-uri 属性です!"
 
 #, c-format
 msgid "Bad notify-pull-method \"%s\"!"
-msgstr "\"%s\" は無効な notify-pull-method です"
+msgstr "\"%s\" は無効な notify-pull-method です!"
 
 #, c-format
 msgid "Bad notify-recipient-uri URI \"%s\"!"
-msgstr "URI \"%s\" は不正な notify-recipient-uri です"
+msgstr "URI \"%s\" は不正な notify-recipient-uri です!"
 
 #, c-format
 msgid "Bad number-up value %d."
@@ -1210,7 +1209,7 @@ msgstr "%d は不正な number-up 値です。"
 
 #, c-format
 msgid "Bad option + choice on line %d!"
-msgstr "%d 行に不正なオプションと選択があります"
+msgstr "%d 行に不正なオプションと選択があります!"
 
 #, c-format
 msgid "Bad page-ranges values %d-%d."
@@ -1218,18 +1217,18 @@ msgstr "%d-%d は不正な page-ranges 値です。"
 
 #, c-format
 msgid "Bad port-monitor \"%s\"!"
-msgstr "\"%s\" は無効な port-monitor です"
+msgstr "\"%s\" は無効な port-monitor です!"
 
 #, c-format
 msgid "Bad printer-state value %d!"
-msgstr "%d は無効な printer-state 値です"
+msgstr "%d は無効な printer-state 値です!"
 
 #, c-format
 msgid "Bad request version number %d.%d!"
-msgstr "バージョン番号 %d.%d は無効なリクエストです"
+msgstr "バージョン番号 %d.%d は無効なリクエストです!"
 
 msgid "Bad subscription ID!"
-msgstr "不正な照会 ID です"
+msgstr "不正な照会 ID です!"
 
 msgid "Banners"
 msgstr "バナー"
@@ -1242,7 +1241,7 @@ msgstr "設定の変更"
 
 #, c-format
 msgid "Character set \"%s\" not supported!"
-msgstr "文字セット \"%s\" はサポートされていません"
+msgstr "文字セット \"%s\" はサポートされていません!"
 
 msgid "Classes"
 msgstr "クラス"
@@ -1258,7 +1257,7 @@ msgstr ""
 
 #, c-format
 msgid "Could not scan type \"%s\"!"
-msgstr "タイプ \"%s\" を検査できませんでした"
+msgstr "タイプ \"%s\" を検査できませんでした!"
 
 msgid "Cover open."
 msgstr "カバーが開いています。"
@@ -1280,7 +1279,7 @@ msgid "Developer almost empty."
 msgstr "現像剤が無くなりかけています。"
 
 msgid "Developer empty!"
-msgstr "現像剤が無くなりました"
+msgstr "現像剤が無くなりました!"
 
 #, c-format
 msgid ""
@@ -1290,7 +1289,7 @@ msgid ""
 "        make-and-model = %s\n"
 "        device-id = %s\n"
 msgstr ""
-"デバイスuri = %s\n"
+"デバイスuri = %s\n"
 "          class = %s\n"
 "          info = %s\n"
 "          make-and-model = %s\n"
@@ -1301,35 +1300,35 @@ msgstr "ドアが開いています。"
 
 #, c-format
 msgid "EMERG: Unable to allocate memory for page info: %s\n"
-msgstr "EMERG: ページ情報のメモリ割り当てができません%s\n"
+msgstr "EMERG: ページ情報のメモリ割り当てができません%s\n"
 
 #, c-format
 msgid "EMERG: Unable to allocate memory for pages array: %s\n"
-msgstr "EMERG: ページアレイのメモリ割り当てができません%s\n"
+msgstr "EMERG: ページアレイのメモリ割り当てができません%s\n"
 
 #, c-format
 msgid "ERROR: %ld: (canceled:%ld)\n"
-msgstr "ERROR: %ld:(キャンセルされました:%ld)\n"
+msgstr "ERROR: %ld: (キャンセルされました:%ld)\n"
 
 #, c-format
 msgid "ERROR: Bad %%BoundingBox: comment seen!\n"
-msgstr "ERROR: 不正な %%BoundingBox: コメントがあります\n"
+msgstr "ERROR: 不正な %%BoundingBox: コメントがあります!\n"
 
 #, c-format
 msgid "ERROR: Bad %%IncludeFeature: comment!\n"
-msgstr "ERROR: 不正な %%IncludeFeature: コメントです\n"
+msgstr "ERROR: 不正な %%IncludeFeature: コメントです!\n"
 
 #, c-format
 msgid "ERROR: Bad %%Page: comment in file!\n"
-msgstr "ERROR: 不正な %%Page: コメントがファイルにあります\n"
+msgstr "ERROR: 不正な %%Page: コメントがファイルにあります!\n"
 
 #, c-format
 msgid "ERROR: Bad %%PageBoundingBox: comment in file!\n"
-msgstr "ERROR: 不正な %%PageBoundingBox: コメントがファイルにあります\n"
+msgstr "ERROR: 不正な %%PageBoundingBox: コメントがファイルにあります!\n"
 
 #, c-format
 msgid "ERROR: Bad SCSI device file \"%s\"!\n"
-msgstr "ERROR: 不正な SCSI デバイスファイル \"%s\" です\n"
+msgstr "ERROR: 不正な SCSI デバイスファイル \"%s\" です!\n"
 
 #, c-format
 msgid "ERROR: Bad charset file %s\n"
@@ -1341,10 +1340,10 @@ msgstr "ERROR: 不正な charset タイプ %s です\n"
 
 #, c-format
 msgid "ERROR: Bad font description line: %s\n"
-msgstr "ERROR: 不正なフォント記述行 %s\n"
+msgstr "ERROR: 不正なフォント記述行: %s\n"
 
 msgid "ERROR: Bad page setup!\n"
-msgstr "ERROR: 不正なページ設定です\n"
+msgstr "ERROR: 不正なページ設定です!\n"
 
 #, c-format
 msgid "ERROR: Bad text direction %s\n"
@@ -1355,84 +1354,87 @@ msgid "ERROR: Bad text width %s\n"
 msgstr "ERROR: 不正な テキスト幅 %s です\n"
 
 msgid "ERROR: Destination printer does not exist!\n"
-msgstr "ERROR: 送信先のプリンタが存在しません\n"
+msgstr "ERROR: 送信先のプリンタが存在しません!\n"
 
 #, c-format
 msgid "ERROR: Duplicate %%BoundingBox: comment seen!\n"
-msgstr "ERROR: 重複した %%BoundingBox: コメントがあります\n"
+msgstr "ERROR: 重複した %%BoundingBox: コメントがあります!\n"
 
 #, c-format
 msgid "ERROR: Duplicate %%Pages: comment seen!\n"
-msgstr "ERROR: 重複した %%Pages: コメントがあります\n"
+msgstr "ERROR: 重複した %%Pages: コメントがあります!\n"
 
 msgid "ERROR: Empty print file!\n"
-msgstr "ERROR: 空のプリントファイルです\n"
+msgstr "ERROR: 空のプリントファイルです!\n"
 
 msgid "ERROR: Invalid HP-GL/2 command seen, unable to print file!\n"
-msgstr "ERROR: 無効な HP-GL/2 コマンドがあり、ファイルをプリントできません\n"
+msgstr "ERROR: 無効な HP-GL/2 コマンドがあり、ファイルをプリントできません!\n"
 
 #, c-format
 msgid "ERROR: Missing %%EndProlog!\n"
-msgstr "ERROR: %%EndProlog が見つかりません\n"
+msgstr "ERROR: %%EndProlog が見つかりません!\n"
 
 #, c-format
 msgid "ERROR: Missing %%EndSetup!\n"
-msgstr "ERROR: %%EndSetup が見つかりません\n"
+msgstr "ERROR: %%EndSetup が見つかりません!\n"
 
 msgid ""
 "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
 "variable!\n"
-msgstr "ERROR: コマンドラインのデバイス URI が見つからず、DEVICE_URI 環境変数"
+msgstr ""
+"ERROR: コマンドラインのデバイス URI が見つからず、DEVICE_URI 環境変数もありま"
+"せん!\n"
 
 #, c-format
 msgid "ERROR: No %%BoundingBox: comment in header!\n"
-msgstr "ERROR: %%BoundingBox: コメントがありません\n"
+msgstr "ERROR: %%BoundingBox: コメントがありません!\n"
 
 #, c-format
 msgid "ERROR: No %%Pages: comment in header!\n"
-msgstr "ERROR: %%Pages: コメントがありません\n"
+msgstr "ERROR: %%Pages: コメントがありません!\n"
 
 msgid ""
 "ERROR: No device URI found in argv[0] or in DEVICE_URI environment "
 "variable!\n"
-msgstr "ERROR: argv[0] または DEVICE_URI 環境変数にデバイス URI がありま"
+msgstr ""
+"ERROR: argv[0] または DEVICE_URI 環境変数にデバイス URI がありません!\n"
 
 msgid "ERROR: No pages found!\n"
-msgstr "ERROR: ページが見つかりません\n"
+msgstr "ERROR: ページが見つかりません!\n"
 
 msgid "ERROR: Out of paper!\n"
-msgstr "ERROR: 用紙切れです\n"
+msgstr "ERROR: 用紙切れです!\n"
 
 msgid "ERROR: PRINTER environment variable not defined!\n"
-msgstr "ERROR: PRINTER 環境変数が定義されていません\n"
+msgstr "ERROR: PRINTER 環境変数が定義されていません!\n"
 
 #, c-format
 msgid "ERROR: Print file was not accepted (%s)!\n"
-msgstr "ERROR: プリントファイルが受け付けられませんでした(%s)!\n"
+msgstr "ERROR: プリントファイルが受け付けられませんでした (%s)!\n"
 
 msgid "ERROR: Printer not responding!\n"
-msgstr "ERROR: プリンタが応答していません\n"
+msgstr "ERROR: プリンタが応答していません!\n"
 
 #, c-format
 msgid "ERROR: Remote host did not accept control file (%d)\n"
 msgstr ""
-"ERROR: リモートホストがコントロールファイルを受け付けませんでした(%d)\n"
+"ERROR: リモートホストがコントロールファイルを受け付けませんでした (%d)\n"
 
 #, c-format
 msgid "ERROR: Remote host did not accept data file (%d)\n"
-msgstr "ERROR: リモートホストがデータファイルを受け付けませんでした(%d)\n"
+msgstr "ERROR: リモートホストがデータファイルを受け付けませんでした (%d)\n"
 
 #, c-format
 msgid "ERROR: Unable to add file %d to job: %s\n"
-msgstr "ERROR: ファイル %d をジョブに追加できません%s\n"
+msgstr "ERROR: ファイル %d をジョブに追加できません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to cancel job %d: %s\n"
-msgstr "ERROR: ジョブ %d をキャンセルできません%s\n"
+msgstr "ERROR: ジョブ %d をキャンセルできません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to create temporary compressed print file: %s\n"
-msgstr "ERROR: テンポラリ圧縮プリントファイルを作成できません%s\n"
+msgstr "ERROR: テンポラリ圧縮プリントファイルを作成できません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to create temporary file - %s.\n"
@@ -1456,15 +1458,15 @@ msgstr "ERROR: プリンタ \"%s\" の PPD を取得できません - %s\n"
 
 #, c-format
 msgid "ERROR: Unable to get job %d attributes (%s)!\n"
-msgstr "ERROR: ジョブ %d の属性(%s)を取得できません!\n"
+msgstr "ERROR: ジョブ %d の属性 (%s) を取得できません!\n"
 
 #, c-format
 msgid "ERROR: Unable to get printer status (%s)!\n"
-msgstr "ERROR: プリンタ状況(%s)を取得できません!\n"
+msgstr "ERROR: プリンタ状況 (%s) を取得できません!\n"
 
 #, c-format
 msgid "ERROR: Unable to locate printer '%s'!\n"
-msgstr "ERROR: プリンタ '%s' の所在を確認できません\n"
+msgstr "ERROR: プリンタ '%s' の所在を確認できません!\n"
 
 #, c-format
 msgid "ERROR: Unable to open \"%s\" - %s\n"
@@ -1472,11 +1474,11 @@ msgstr "ERROR: \"%s\" を開くことができません - %s\n"
 
 #, c-format
 msgid "ERROR: Unable to open %s: %s\n"
-msgstr "ERROR: %s を開くことができません%s\n"
+msgstr "ERROR: %s を開くことができません:%s\n"
 
 #, c-format
 msgid "ERROR: Unable to open device file \"%s\": %s\n"
-msgstr "ERROR: デバイスファイル \"%s\" を開くことができません%s\n"
+msgstr "ERROR: デバイスファイル \"%s\" を開くことができません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to open file \"%s\" - %s\n"
@@ -1484,14 +1486,14 @@ msgstr "ERROR: ファイル \"%s\" を開くことができません - %s\n"
 
 #, c-format
 msgid "ERROR: Unable to open file \"%s\": %s\n"
-msgstr "ERROR: ファイル \"%s\" を開くことができません%s\n"
+msgstr "ERROR: ファイル \"%s\" を開くことができません%s\n"
 
 msgid "ERROR: Unable to open image file for printing!\n"
-msgstr "ERROR: プリントするイメージファイルを開くことができません\n"
+msgstr "ERROR: プリントするイメージファイルを開くことができません!\n"
 
 #, c-format
 msgid "ERROR: Unable to open print file \"%s\": %s\n"
-msgstr "ERROR: プリントファイル \"%s\" を開くことができません%s\n"
+msgstr "ERROR: プリントファイル \"%s\" を開くことができません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to open print file %s - %s\n"
@@ -1499,11 +1501,11 @@ msgstr "ERROR: プリントファイル %s を開くことができません - %
 
 #, c-format
 msgid "ERROR: Unable to open print file %s: %s\n"
-msgstr "ERROR: プリントファイル %s を開くことができません%s\n"
+msgstr "ERROR: プリントファイル %s を開くことができません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to open temporary compressed print file: %s\n"
-msgstr "ERROR: テンポラリ圧縮プリントファイルを開くことができません%s\n"
+msgstr "ERROR: テンポラリ圧縮プリントファイルを開くことができません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to seek to offset %ld in file - %s\n"
@@ -1515,7 +1517,7 @@ msgstr "ERROR: ファイルでのオフセット %lld を位置決めできま
 
 #, c-format
 msgid "ERROR: Unable to send print data (%d)\n"
-msgstr "ERROR: プリントデータ(%d)を送信できません\n"
+msgstr "ERROR: プリントデータ (%d) を送信できません\n"
 
 #, c-format
 msgid "ERROR: Unable to wait for pictwpstops: %s\n"
@@ -1523,89 +1525,89 @@ msgstr "ERROR: pictwpstops を待つことができません: %s\n"
 
 #, c-format
 msgid "ERROR: Unable to write %d bytes to \"%s\": %s\n"
-msgstr "ERROR: %d バイトを \"%s\" に書き込めません%s\n"
+msgstr "ERROR: %d バイトを \"%s\" に書き込めません%s\n"
 
 #, c-format
 msgid "ERROR: Unable to write print data: %s\n"
-msgstr "ERROR: プリントデータ %s を書き込めません:\n"
+msgstr "ERROR: プリントデータを書き込めません: %s\n"
 
 msgid "ERROR: Unable to write raster data to driver!\n"
-msgstr "ERROR: ラスターデータをドライバに書き込めません\n"
+msgstr "ERROR: ラスターデータをドライバに書き込めません!\n"
 
 #, c-format
 msgid "ERROR: Unable to write uncompressed document data: %s\n"
-msgstr "ERROR: 非圧縮ドキュメントデータを書き込めません%s\n"
+msgstr "ERROR: 非圧縮ドキュメントデータを書き込めません%s\n"
 
 #, c-format
 msgid "ERROR: Unknown encryption option value \"%s\"!\n"
-msgstr "ERROR: \"%s\" は未知の暗号化オプション値です\n"
+msgstr "ERROR: \"%s\" は未知の暗号化オプション値です!\n"
 
 #, c-format
 msgid "ERROR: Unknown file order \"%s\"\n"
-msgstr "ERROR: \"%s\" は未知のファイルオーダーです\n"
+msgstr "ERROR: \"%s\" は未知のファイルオーダーです!\n"
 
 #, c-format
 msgid "ERROR: Unknown format character \"%c\"\n"
-msgstr "ERROR: \"%c\" は未知の書式文字です\n"
+msgstr "ERROR: \"%c\" は未知の書式文字です!\n"
 
 #, c-format
 msgid "ERROR: Unknown option \"%s\" with value \"%s\"!\n"
-msgstr "ERROR: \"%s\"(値 \"%s\")は未知のオプションです!\n"
+msgstr "ERROR: \"%s\" (値 \"%s\") は未知のオプションです!\n"
 
 #, c-format
 msgid "ERROR: Unknown print mode \"%s\"\n"
-msgstr "ERROR: \"%s\" は未知のプリントモードです\n"
+msgstr "ERROR: \"%s\" は未知のプリントモードです!\n"
 
 #, c-format
 msgid "ERROR: Unknown version option value \"%s\"!\n"
-msgstr "ERROR: \"%s\" は未知のバージョンオプション値です\n"
+msgstr "ERROR: \"%s\" は未知のバージョンオプション値です!\n"
 
 #, c-format
 msgid "ERROR: Unsupported brightness value %s, using brightness=100!\n"
 msgstr ""
-"ERROR: %s はサポートされていない輝度値です。brightness=100 を使用します\n"
+"ERROR: %s はサポートされていない輝度値です。brightness=100 を使用します!\n"
 
 #, c-format
 msgid "ERROR: Unsupported gamma value %s, using gamma=1000!\n"
 msgstr ""
-"ERROR: %s はサポートされていないガンマ値です。gamma=100 を使用します\n"
+"ERROR: %s はサポートされていないガンマ値です。gamma=100 を使用します!\n"
 
 #, c-format
 msgid "ERROR: Unsupported number-up value %d, using number-up=1!\n"
 msgstr ""
 "ERROR: %d はサポートされていない number-up 値です。number-up=1 を使用しま"
-"す\n"
+"す!\n"
 
 #, c-format
 msgid ""
 "ERROR: Unsupported number-up-layout value %s, using number-up-layout=lrtb!\n"
 msgstr ""
 "ERROR: %s はサポートされていない number-up-layout 値です。number-up-"
-"layout=lrtb を使用します\n"
+"layout=lrtb を使用します!\n"
 
 #, c-format
 msgid "ERROR: Unsupported page-border value %s, using page-border=none!\n"
 msgstr ""
 "ERROR: %s はサポートされていない page-border 値です。page-border=none を使用"
-"します\n"
+"します!\n"
 
 #, c-format
 msgid "ERROR: doc_printf overflow (%d bytes) detected, aborting!\n"
-msgstr "ERROR: doc_printf オーバーフロー(%d バイト)、停止します!\n"
+msgstr "ERROR: doc_printf オーバーフロー (%d バイト)、停止します!\n"
 
 #, c-format
 msgid "ERROR: pictwpstops exited on signal %d!\n"
-msgstr "ERROR: pictwpstops はシグナル %d で終了しました\n"
+msgstr "ERROR: pictwpstops はシグナル %d で終了しました!\n"
 
 #, c-format
 msgid "ERROR: pictwpstops exited with status %d!\n"
-msgstr "ERROR: pictwpstops は状態 %d で終了しました\n"
+msgstr "ERROR: pictwpstops は状態 %d で終了しました!\n"
 
 msgid ""
 "ERROR: recoverable: Unable to connect to printer; will retry in 30 "
 "seconds...\n"
 msgstr ""
-"ERROR: 回復可能:プリンタに接続できません(30 秒間以内に再試行します...) \n"
+"ERROR: 回復可能:プリンタに接続できません (30 秒間以内に再試行します...)\n"
 
 #, c-format
 msgid "ERROR: select() returned %d\n"
@@ -1615,7 +1617,7 @@ msgid "Edit Configuration File"
 msgstr "設定ファイルの編集"
 
 msgid "Empty PPD file!"
-msgstr "PPD ファイルが空です"
+msgstr "PPD ファイルが空です!"
 
 msgid "Ending Banner"
 msgstr "終了バナー"
@@ -1642,7 +1644,7 @@ msgid "Error Policy"
 msgstr "エラーポリシー"
 
 msgid "Error: need hostname after '-h' option!\n"
-msgstr "Error: '-h' オプションのあとにはホスト名が必要です\n"
+msgstr "Error: '-h' オプションのあとにはホスト名が必要です!\n"
 
 msgid "Export Printers to Samba"
 msgstr "プリンタを Samba にエキスポート"
@@ -1663,27 +1665,27 @@ msgstr ""
 "\" の FileDevice ディレクティブを確認してください。"
 
 msgid "Fuser temperature high!"
-msgstr "定着器の温度が上がっています"
+msgstr "定着器の温度が上がっています!"
 
 msgid "Fuser temperature low!"
-msgstr "定着器の温度が下がっています"
+msgstr "定着器の温度が下がっています!"
 
 msgid "General"
 msgstr "一般"
 
 msgid "Got a printer-uri attribute but no job-id!"
-msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした"
+msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした!"
 
 msgid "Help"
 msgstr "ヘルプ"
 
 #, c-format
 msgid "INFO: Attempting to connect to host %s for printer %s\n"
-msgstr "INFO: ホスト %s(プリンタ %s)への接続を試みています\n"
+msgstr "INFO: ホスト %s (プリンタ %s) への接続を試みています\n"
 
 #, c-format
 msgid "INFO: Attempting to connect to host %s on port %d\n"
-msgstr "INFO: ホスト %s(ポート %d)への接続を試みています\n"
+msgstr "INFO: ホスト %s (ポート %d) への接続を試みています\n"
 
 msgid "INFO: Canceling print job...\n"
 msgstr "INFO: プリントジョブをキャンセル中...\n"
@@ -1694,7 +1696,7 @@ msgstr "INFO: %s に接続中...\n"
 
 #, c-format
 msgid "INFO: Connecting to %s on port %d...\n"
-msgstr "INFO: %s(ポート %d 使用)への接続中...\n"
+msgstr "INFO: %s (ポート %d を使用) への接続中...\n"
 
 msgid "INFO: Control file sent successfully\n"
 msgstr "INFO: コントロールファイルが正常に送信されました\n"
@@ -1715,23 +1717,23 @@ msgstr ""
 
 #, c-format
 msgid "INFO: Printer busy (status:0x%08x)\n"
-msgstr "INFO: プリンタがビジー状態(状況:0x%08x)\n"
+msgstr "INFO: プリンタがビジー状態 (状況:0x%08x)\n"
 
 msgid "INFO: Printer busy; will retry in 10 seconds...\n"
-msgstr "INFO: プリンタがビジー状態(10 秒間以内に再試行します...)\n"
+msgstr "INFO: プリンタがビジー状態 (10 秒間以内に再試行します...)\n"
 
 msgid "INFO: Printer busy; will retry in 30 seconds...\n"
-msgstr "INFO: プリンタがビジー状態(30 秒間以内に再試行します...)\n"
+msgstr "INFO: プリンタがビジー状態 (30 秒間以内に再試行します...)\n"
 
 msgid "INFO: Printer busy; will retry in 5 seconds...\n"
-msgstr "INFO: プリンタがビジー状態(5 秒間以内に再試行します...)\n"
+msgstr "INFO: プリンタがビジー状態 (5 秒間以内に再試行します...)\n"
 
 msgid "INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n"
 msgstr ""
 "INFO: プリンタが IPP/1.1 をサポートしていません。IPP/1.0 を試します...\n"
 
 msgid "INFO: Printer is busy; will retry in 5 seconds...\n"
-msgstr "INFO: プリンタがビジー状態(5 秒間以内に再試行します...)\n"
+msgstr "INFO: プリンタがビジー状態 (5 秒間以内に再試行します...)\n"
 
 msgid "INFO: Printer is currently off-line.\n"
 msgstr "INFO: プリンタは現在オフラインです。\n"
@@ -1740,7 +1742,7 @@ msgid "INFO: Printer is now on-line.\n"
 msgstr "INFO: プリンタは現在オンラインです。\n"
 
 msgid "INFO: Printer not connected; will retry in 30 seconds...\n"
-msgstr "INFO: プリンタと接続されません(30 秒間以内に再試行します...)\n"
+msgstr "INFO: プリンタと接続されません (30 秒間以内に再試行します...)\n"
 
 #, c-format
 msgid "INFO: Printing page %d, %d%% complete...\n"
@@ -1748,29 +1750,29 @@ msgstr "INFO: ページ %d をプリント中、%d%% 完了しました...\n"
 
 #, c-format
 msgid "INFO: Printing page %d...\n"
-msgstr "INFO: ページ %d プリント中...\n"
+msgstr "INFO: ã\83\9aã\83¼ã\82¸ %d ã\82\92ã\83\97ã\83ªã\83³ã\83\88中...\n"
 
 msgid "INFO: Ready to print.\n"
 msgstr "INFO: プリントの準備ができています\n"
 
 #, c-format
 msgid "INFO: Sending control file (%lu bytes)\n"
-msgstr "INFO: コントロールファイルを送信中(%lu バイト)\n"
+msgstr "INFO: コントロールファイルを送信中 (%lu バイト)\n"
 
 #, c-format
 msgid "INFO: Sending control file (%u bytes)\n"
-msgstr "INFO: コントロールファイルを送信中(%u バイト)\n"
+msgstr "INFO: コントロールファイルを送信中 (%u バイト)\n"
 
 msgid "INFO: Sending data\n"
 msgstr "INFO: データを送信中\n"
 
 #, c-format
 msgid "INFO: Sending data file (%ld bytes)\n"
-msgstr "INFO: データファイルを送信中(%ld バイト)\n"
+msgstr "INFO: データファイルを送信中 (%ld バイト)\n"
 
 #, c-format
 msgid "INFO: Sending data file (%lld bytes)\n"
-msgstr "INFO: データファイルを送信中(%lld バイト)\n"
+msgstr "INFO: データファイルを送信中 (%lld バイト)\n"
 
 #, c-format
 msgid "INFO: Sent print file, %ld bytes...\n"
@@ -1810,13 +1812,13 @@ msgid "Ink/toner almost empty."
 msgstr "インクまたはトナーが無くなりかけています。"
 
 msgid "Ink/toner empty!"
-msgstr "インクまたはトナーが無くなりました"
+msgstr "インクまたはトナーが無くなりました!"
 
 msgid "Ink/toner waste bin almost full."
 msgstr "廃インクまたは廃トナーの容器が一杯になりかけています。"
 
 msgid "Ink/toner waste bin full!"
-msgstr "å»\83ã\82¤ã\83³ã\82¯ã\81¾ã\81\9fã\81¯å»\83ã\83\88ã\83\8aã\83¼ã\81®å®¹å\99¨ã\81\8cä¸\80æ\9d¯ã\81ªã\82\8aã\81¾ã\81\97ã\81\9fï¼\81"
+msgstr "å»\83ã\82¤ã\83³ã\82¯ã\81¾ã\81\9fã\81¯å»\83ã\83\88ã\83\8aã\83¼ã\81®å®¹å\99¨ã\81\8cä¸\80æ\9d¯ã\81«ã\81ªã\82\8aã\81¾ã\81\97ã\81\9f!"
 
 msgid "Interlock open."
 msgstr "インターロックが開いています。"
@@ -1829,11 +1831,11 @@ msgstr "JCL"
 
 #, c-format
 msgid "Job #%d cannot be restarted - no files!"
-msgstr "ジョブ #%d は再起動できません - ファイルがありません"
+msgstr "ジョブ #%d は再起動できません - ファイルがありません!"
 
 #, c-format
 msgid "Job #%d does not exist!"
-msgstr "ジョブ #%d は存在しません"
+msgstr "ジョブ #%d は存在しません!"
 
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
@@ -1849,27 +1851,27 @@ msgstr "ジョブ #%d はすでに完了しています - キャンセルでき
 
 #, c-format
 msgid "Job #%d is finished and cannot be altered!"
-msgstr "ジョブ #%d は完了し、変更することはできません"
+msgstr "ジョブ #%d は完了し、変更することはできません!"
 
 #, c-format
 msgid "Job #%d is not complete!"
-msgstr "ジョブ #%d は完結していません"
+msgstr "ジョブ #%d は完結していません!"
 
 #, c-format
 msgid "Job #%d is not held for authentication!"
-msgstr "ジョブ #%d は認証が行われていません"
+msgstr "ジョブ #%d は認証が行われていません!"
 
 #, c-format
 msgid "Job #%d is not held!"
-msgstr "ジョブ #%d はホールドされていません"
+msgstr "ジョブ #%d はホールドされていません!"
 
 #, c-format
 msgid "Job #%s does not exist!"
-msgstr "ジョブ #%s は存在しません"
+msgstr "ジョブ #%s は存在しません!"
 
 #, c-format
 msgid "Job %d not found!"
-msgstr "ジョブ %d は見つかりません"
+msgstr "ジョブ %d は見つかりません!"
 
 msgid "Job Completed"
 msgstr "ジョブ完了"
@@ -1893,17 +1895,17 @@ msgid "Job state cannot be changed."
 msgstr "ジョブの状態を変更できません。"
 
 msgid "Job subscriptions cannot be renewed!"
-msgstr "ジョブ照会が更新されていません"
+msgstr "ジョブ照会が更新されていません!"
 
 msgid "Jobs"
 msgstr "ジョブ"
 
 #, c-format
 msgid "Language \"%s\" not supported!"
-msgstr "言語 \"%s\" はサポートされていません"
+msgstr "言語 \"%s\" はサポートされていません!"
 
 msgid "Line longer than the maximum allowed (255 characters)"
-msgstr "1 行が最大許可値(255 文字)を超えています"
+msgstr "1 行が最大許可値 (255 文字) を超えています"
 
 msgid "List Available Printers"
 msgstr "使用可能なプリンタをリスト化"
@@ -1918,16 +1920,16 @@ msgid "Media Type"
 msgstr "用紙形式"
 
 msgid "Media jam!"
-msgstr "紙詰まりです"
+msgstr "紙詰まりです!"
 
 msgid "Media tray almost empty."
 msgstr "用紙トレイが空になりかけています。"
 
 msgid "Media tray empty!"
-msgstr "用紙トレイが空になりました"
+msgstr "用紙トレイが空になりました!"
 
 msgid "Media tray missing!"
-msgstr "用紙トレイが見つかりません"
+msgstr "用紙トレイが見つかりません!"
 
 msgid "Media tray needs to be filled."
 msgstr "メディアトレイに補充が必要です。"
@@ -1943,23 +1945,23 @@ msgstr "1 列目にアスタリスクがありません"
 
 #, c-format
 msgid "Missing double quote on line %d!"
-msgstr "%d 行に二重引用符がありません"
+msgstr "%d 行に二重引用符がありません!"
 
 msgid "Missing form variable!"
-msgstr "フォームの値がありません"
+msgstr "フォームの値がありません!"
 
 msgid "Missing notify-subscription-ids attribute!"
-msgstr "notify-subscription-ids 属性がありません"
+msgstr "notify-subscription-ids 属性がありません!"
 
 msgid "Missing requesting-user-name attribute!"
-msgstr "requesting-user-name 属性が設定されていません"
+msgstr "requesting-user-name 属性が設定されていません!"
 
 msgid "Missing required attributes!"
-msgstr "必須の属性が設定されていません"
+msgstr "必須の属性が設定されていません!"
 
 #, c-format
 msgid "Missing value on line %d!"
-msgstr "%d 行に値がありません"
+msgstr "%d 行に値がありません!"
 
 msgid "Missing value string"
 msgstr "値文字列がありません"
@@ -1971,10 +1973,10 @@ msgid ""
 "        make-and-model = %s\n"
 "        device-id = %s\n"
 msgstr ""
-"モデル:  name = %s\n"
-"         natural_language = %s\n"
-"         make-and-model = %s\n"
-"         device-id = %s\n"
+"モデル: name = %s\n"
+"        natural_language = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s\n"
 
 msgid "Modify Class"
 msgstr "クラスの変更"
@@ -1990,10 +1992,10 @@ msgstr "ジョブの移動"
 
 #, c-format
 msgid "NOTICE: Print file accepted - job ID %d.\n"
-msgstr "NOTICE: プリントファイルを受け付けました - ジョブ ID %d\n"
+msgstr "NOTICE: プリントファイルを受け付けました - ジョブ ID %d\n"
 
 msgid "NOTICE: Print file accepted - job ID unknown.\n"
-msgstr "NOTICE: プリントファイルを受け付けました - ジョブ ID 不明\n"
+msgstr "NOTICE: プリントファイルを受け付けました - ジョブ ID 不明\n"
 
 msgid "NULL PPD file pointer"
 msgstr "NULL PPD ファイルポインタ"
@@ -2002,17 +2004,17 @@ msgid "No"
 msgstr "いいえ"
 
 msgid "No Windows printer drivers are installed!"
-msgstr "Windows プリンタドライバがインストールされていません"
+msgstr "Windows プリンタドライバがインストールされていません!"
 
 #, c-format
 msgid "No active jobs on %s!"
-msgstr "%s にはアクティブなジョブはありません"
+msgstr "%s にはアクティブなジョブはありません!"
 
 msgid "No attributes in request!"
-msgstr "リクエストに属性がありません"
+msgstr "リクエストに属性がありません!"
 
 msgid "No authentication information provided!"
-msgstr "認証情報が提供されていません"
+msgstr "認証情報が提供されていません!"
 
 msgid "No default printer"
 msgstr "デフォルトプリンタはありません"
@@ -2021,10 +2023,10 @@ msgid "No destinations added."
 msgstr "追加された宛先はありません。"
 
 msgid "No file!?!"
-msgstr "ファイルがありません!?!"
+msgstr "ファイルがありません!?!"
 
 msgid "No subscription attributes in request!"
-msgstr "リクエストに照会属性がありません"
+msgstr "リクエストに照会属性がありません!"
 
 msgid "No subscriptions found."
 msgstr "照会先が見つかりません。"
@@ -2042,7 +2044,7 @@ msgid "OPC almost at end-of-life."
 msgstr "OPC はもうすぐ交換が必要になります。"
 
 msgid "OPC at end-of-life!"
-msgstr "OPC は交換時期です"
+msgstr "OPC は交換時期です!"
 
 msgid "OpenGroup without a CloseGroup first"
 msgstr "最初の CloseGroup なしの OpenGroup"
@@ -2057,7 +2059,7 @@ msgid "Options Installed"
 msgstr "インストールされたオプション"
 
 msgid "Out of toner!"
-msgstr "トナー切れです"
+msgstr "トナー切れです!"
 
 msgid "Output Mode"
 msgstr "出力モード"
@@ -2066,7 +2068,7 @@ msgid "Output bin almost full."
 msgstr "排紙トレイがほとんど一杯です。"
 
 msgid "Output bin full!"
-msgstr "排紙トレイが一杯です"
+msgstr "排紙トレイが一杯です!"
 
 #, c-format
 msgid "Output for printer %s is sent to %s\n"
@@ -2074,7 +2076,7 @@ msgstr "プリンタ %s の出力は %s に送られます\n"
 
 #, c-format
 msgid "Output for printer %s is sent to remote printer %s on %s\n"
-msgstr "プリンタ %1$s の出力は、%3$s のリモートプリンタ %2$s に送られます\n"
+msgstr "プリンタ %s の出力は、リモートプリンタ %s (%s 上) に送られます\n"
 
 #, c-format
 msgid "Output for printer %s/%s is sent to %s\n"
@@ -2082,11 +2084,10 @@ msgstr "プリンタ %s/%s の出力は %s に送られます\n"
 
 #, c-format
 msgid "Output for printer %s/%s is sent to remote printer %s on %s\n"
-msgstr ""
-"プリンタ %1$s/%2$s の出力は、%4$s のリモートプリンタ %3$s に送られます\n"
+msgstr "プリンタ %s/%s の出力は、リモートプリンタ %s (%s 上) に送られます\n"
 
 msgid "Output tray missing!"
-msgstr "排紙トレイが見つかりません"
+msgstr "排紙トレイが見つかりません!"
 
 msgid "PASS\n"
 msgstr "合格\n"
@@ -2096,11 +2097,11 @@ msgstr "PS バイナリプロトコル"
 
 #, c-format
 msgid "Password for %s on %s? "
-msgstr "%s のパスワード(%s 上)? "
+msgstr "%s のパスワード (%s 上)? "
 
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
-msgstr "SAMBA 経由で %2$s にアクセスするのに必要な %1$s のパスワード:"
+msgstr "%s のパスワード (SAMBA 経由で %s にアクセスするのに必要):"
 
 msgid "Policies"
 msgstr "ポリシー"
@@ -2142,7 +2143,7 @@ msgid "Quota limit reached."
 msgstr "Quota の制限に達しました。"
 
 msgid "Rank    Owner   Job     File(s)                         Total Size\n"
-msgstr "\"ランク  所有者  ジョブ  ファイル                        合計サイズ\n"
+msgstr "ランク  所有者  ジョブ  ファイル                        合計サイズ\n"
 
 msgid ""
 "Rank   Owner      Pri  Job        Files                       Total Size\n"
@@ -2157,7 +2158,7 @@ msgstr "解像度"
 
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'\n"
-msgstr "コマンドを実行中%s %s -N -A %s -c '%s'\n"
+msgstr "コマンドを実行中%s %s -N -A %s -c '%s'\n"
 
 msgid "Server Restarted"
 msgstr "再起動されたサーバ"
@@ -2207,14 +2208,14 @@ msgstr "PPD ファイル \"%s\" が見つかりません。"
 
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
-msgstr "PPD ファイル \"%s\" が開きませんでした%s"
+msgstr "PPD ファイル \"%s\" が開きませんでした%s"
 
 msgid ""
 "The class name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
-"クラス名は 127 文字以内の表示可能文字から成り、空白、スラッシュ(/)、ポンド"
-"記\"号(#)を含んではなりません。"
+"クラス名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ポンド記"
+"号 (#) を含んではなりません。"
 
 msgid ""
 "The notify-lease-duration attribute cannot be used with job subscriptions."
@@ -2222,17 +2223,17 @@ msgstr "notify-lease-duration 属性は、ジョブ照会と一緒に使うこ
 
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)!"
-msgstr "notify-user-data 値が大きすぎます(%d > 63 オクテット)!"
+msgstr "notify-user-data 値が大きすぎます (%d > 63 オクテット)!"
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
-"プリンタ名は 127 文字以内の表示可能文字から成り、空白、スラッシュ(/)、ポン"
-"ド記号(#)を含んではなりません。"
+"プリンタ名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ポンド"
+"記号 (#) を含んではなりません。"
 
 msgid "The printer or class is not shared!"
-msgstr "プリンタまたはクラスは共有できません"
+msgstr "プリンタまたはクラスは共有できません!"
 
 msgid "The printer or class was not found."
 msgstr "プリンタまたはクラスが見つかりませんでした。"
@@ -2242,7 +2243,7 @@ msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr "printer-uri \"%s\" には、無効な文字が含まれています。"
 
 msgid "The printer-uri attribute is required!"
-msgstr "printer-uri 属性は必須です"
+msgstr "printer-uri 属性は必須です!"
 
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
@@ -2260,8 +2261,8 @@ msgid ""
 "The subscription name may not contain spaces, slashes (/), question marks "
 "(?), or the pound sign (#)."
 msgstr ""
-"照会名には、スペース、スラッシュ(/)、疑問府(?)、ポンド記号(#)を使用しな"
-"ã\81\84ã\81§ã\81\8fã\81 ã\81\95ã\81\84ã\80\82"
+"照会名には、スペース、スラッシュ (/)、疑問府 (?)、ポンド記号 (#) を使用しない"
+"でください。"
 
 msgid "Toner low."
 msgstr "トナーが少なくなっています。"
@@ -2273,23 +2274,23 @@ msgid "Unable to access cupsd.conf file:"
 msgstr "cupsd.conf ファイルにアクセスできません:"
 
 msgid "Unable to add RSS subscription:"
-msgstr " RSS 照会を追加できません"
+msgstr " RSS 照会を追加できません:"
 
 msgid "Unable to add class:"
 msgstr "クラスを追加できません:"
 
 #, c-format
 msgid "Unable to add job for destination \"%s\"!"
-msgstr "宛先 \"%s\" にジョブを追加できません"
+msgstr "宛先 \"%s\" にジョブを追加できません!"
 
 msgid "Unable to add printer:"
 msgstr "プリンタを追加できません:"
 
 msgid "Unable to allocate memory for file types!"
-msgstr "ファイルタイプ用にメモリを割り当てられません"
+msgstr "ファイルタイプ用にメモリを割り当てられません!"
 
 msgid "Unable to cancel RSS subscription:"
-msgstr " RSS 照会をキャンセルできません"
+msgstr " RSS 照会をキャンセルできません:"
 
 msgid "Unable to change printer-is-shared attribute:"
 msgstr "printer-is-shared 属性を変更できません:"
@@ -2302,34 +2303,34 @@ msgstr "サーバの設定を変更できません:"
 
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)!"
-msgstr ""
+msgstr "64 ビットの CUPS プリンタドライバファイルをコピーできません (%d)!"
 
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)!"
-msgstr ""
+msgstr "64 ビットの Windows プリンタドライバファイルをコピーできません (%d)!"
 
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)!"
-msgstr "CUPS プリンタドライバファイルをコピーできません(%d)!"
+msgstr "CUPS プリンタドライバファイルをコピーできません (%d)!"
 
 #, c-format
 msgid "Unable to copy PPD file - %s!"
-msgstr " PPD ファイルをコピーできません - %s!"
+msgstr "PPD ファイルをコピーできません - %s!"
 
 msgid "Unable to copy PPD file!"
-msgstr "PPD ファイルをコピーできません"
+msgstr "PPD ファイルをコピーできません!"
 
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)!"
-msgstr "Windows 2000 プリンタドライバファイルをコピーできません(%d)!"
+msgstr "Windows 2000 プリンタドライバファイルをコピーできません (%d)!"
 
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)!"
-msgstr "Windows 9x プリンタドライバファイルをコピーできません(%d)!"
+msgstr "Windows 9x プリンタドライバファイルをコピーできません (%d)!"
 
 #, c-format
 msgid "Unable to copy interface script - %s!"
-msgstr "インターフェイススクリプトをコピーできません - %s"
+msgstr "インターフェイススクリプトをコピーできません - %s!"
 
 msgid "Unable to create temporary file:"
 msgstr "テンポラリファイルを作成できません:"
@@ -2341,10 +2342,10 @@ msgid "Unable to delete printer:"
 msgstr "プリンタを削除できません:"
 
 msgid "Unable to edit cupsd.conf files larger than 1MB!"
-msgstr "1MB 以上の cupsd.conf ファイルは編集できません"
+msgstr "1MB 以上の cupsd.conf ファイルは編集できません!"
 
 msgid "Unable to find destination for job!"
-msgstr "ジョブの宛先が見つかりません"
+msgstr "ジョブの宛先が見つかりません!"
 
 msgid "Unable to get class list:"
 msgstr "クラスリストを取得できません:"
@@ -2366,11 +2367,11 @@ msgstr "プリンタの状態を取得できません:"
 
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)!"
-msgstr "Windows 2000 プリンタドライバファイルをインストールできません(%d)!"
+msgstr "Windows 2000 プリンタドライバファイルをインストールできません (%d)!"
 
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)!"
-msgstr "Windows 9x プリンタドライバファイルをインストールできません(%d)!"
+msgstr "Windows 9x プリンタドライバファイルをインストールできません (%d)!"
 
 msgid "Unable to modify class:"
 msgstr "クラスを変更できません:"
@@ -2388,7 +2389,7 @@ msgid "Unable to open PPD file"
 msgstr "PPD ファイルを開くことができません"
 
 msgid "Unable to open PPD file:"
-msgstr "PPD ファイルを取得できません:"
+msgstr "PPD ファイルを開くことができません:"
 
 msgid "Unable to open cupsd.conf file:"
 msgstr "cupsd.conf ファイルを開くことができません:"
@@ -2398,14 +2399,14 @@ msgstr "テストページを印刷できません:"
 
 #, c-format
 msgid "Unable to run \"%s\": %s\n"
-msgstr "\"%s\" を実行できません%s\n"
+msgstr "\"%s\" を実行できません%s\n"
 
 msgid "Unable to send maintenance job:"
 msgstr "メンテナンスジョブを送れません:"
 
 #, c-format
 msgid "Unable to set Windows printer driver (%d)!"
-msgstr "Windows プリンタドライバを設定できません(%d)!"
+msgstr "Windows プリンタドライバを設定できません (%d)!"
 
 msgid "Unable to set options:"
 msgstr "オプションを設定できません:"
@@ -2418,7 +2419,7 @@ msgstr "未知"
 
 #, c-format
 msgid "Unknown printer error (%s)!"
-msgstr "未知のプリンタエラー(%s)です!"
+msgstr "未知のプリンタエラー (%s) です!"
 
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
@@ -2430,23 +2431,23 @@ msgstr "\"%s\" は未知の printer-op-policy です。"
 
 #, c-format
 msgid "Unsupported compression \"%s\"!"
-msgstr "\"%s\" はサポートされていない圧縮です"
+msgstr "\"%s\" はサポートされていない圧縮です!"
 
 #, c-format
 msgid "Unsupported compression attribute %s!"
-msgstr "%s はサポートされていない圧縮属性です"
+msgstr "%s はサポートされていない圧縮属性です!"
 
 #, c-format
 msgid "Unsupported format \"%s\"!"
-msgstr "\"%s\" はサポートされていない形式です"
+msgstr "\"%s\" はサポートされていない形式です!"
 
 #, c-format
 msgid "Unsupported format '%s'!"
-msgstr "'%s' はサポートされていない形式です"
+msgstr "'%s' はサポートされていない形式です!"
 
 #, c-format
 msgid "Unsupported format '%s/%s'!"
-msgstr "'%s/%s' はサポートされていない形式です"
+msgstr "'%s/%s' はサポートされていない形式です!"
 
 msgid ""
 "Usage:\n"
@@ -2461,12 +2462,12 @@ msgid ""
 msgstr ""
 "Usage:\n"
 "\n"
-"    lpadmin [-h server] -d destination\n"
-"    lpadmin [-h server] -x destination\n"
-"    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n"
-"                       [-r remove-class] [-v device] [-D description]\n"
-"                       [-P ppd-file] [-o name=value]\n"
-"                       [-u allow:user,user] [-u deny:user,user]\n"
+"    lpadmin [-h サーバ] -d 宛先\n"
+"    lpadmin [-h サーバ] -x 宛先\n"
+"    lpadmin [-h サーバ] -p プリンタ [-c 追加クラス] [-i インターフェイス]\n"
+"                       [-m モデル] [-r 削除クラス] [-v デバイス]\n"
+"                       [-D 宛先] [-P PPDファイル] [-o 名前=値]\n"
+"                       [-u allow:ユーザ,ユーザ] [-u deny:ユーザ,ユーザ]\n"
 "\n"
 
 #, c-format
@@ -2475,7 +2476,7 @@ msgstr "Usage: %s job-id user title copies options [file]\n"
 
 #, c-format
 msgid "Usage: %s job-id user title copies options file\n"
-msgstr "Usage: %s job-id user title copies options file\n"
+msgstr "使い方: %s ジョブID ユーザ タイトル コピー オプション ファイル\n"
 
 msgid ""
 "Usage: convert [ options ]\n"
@@ -2494,6 +2495,22 @@ msgid ""
 "  -u                   Remove the PPD file when finished\n"
 "  -D                   Remove the input file when finished\n"
 msgstr ""
+"使い方: convert [ オプション ]\n"
+"\n"
+"オプション:\n"
+"\n"
+"  -f ファイル名        変換するファイルを指定する (省略すると標準入力)\n"
+"  -o ファイル名        生成されるファイルを指定する (省略すると標準出力)\n"
+"  -i MIME/タイプ       入力 MIME タイプを指定する (省略すると自動設定)\n"
+"  -j MIME/タイプ       出力 MIME タイプを指定する (省略すると application/"
+"pdf)\n"
+"  -P ファイル名.ppd    PPD ファイルを指定する\n"
+"  -a '名前=値 ...'     オプションを指定する\n"
+"  -U ユーザ名          ジョブのユーザ名を指定する\n"
+"  -J タイトル          タイトルを指定する\n"
+"  -c コピー            コピー数を指定する\n"
+"  -u                   完了時に PPD ファイルを削除する\n"
+"  -D                   完了時に入力ファイルを削除する\n"
 
 msgid ""
 "Usage: cupsaddsmb [options] printer1 ... printerN\n"
@@ -2507,16 +2524,16 @@ msgid ""
 "  -h cups-server   Use the named CUPS server\n"
 "  -v               Be verbose (show commands)\n"
 msgstr ""
-"Usage: cupsaddsmb [options] printer1 ... printerN\n"
-"       cupsaddsmb [options] -a\n"
+"使い方: cupsaddsmb [オプション] プリンタ ... プリンタN\n"
+"        cupsaddsmb [オプション] -a\n"
 "\n"
-"Options:\n"
-"  -E               Encrypt the connection to the server\n"
-"  -H samba-server  Use the named SAMBA server\n"
-"  -U samba-user    Authenticate using the named SAMBA user\n"
-"  -a               Export all printers\n"
-"  -h cups-server   Use the named CUPS server\n"
-"  -v               Be verbose (show commands)\n"
+"オプション:\n"
+"  -E               サーバとの接続を暗号化する\n"
+"  -H sambaサーバ   指定の SAMBA サーバを使う\n"
+"  -U sambaユーザ   指定の SAMBA ユーザを使って認証する\n"
+"  -a               すべてのプリンタをエキスポートする\n"
+"  -h cupsサーバ    指定の CUPS サーバを使う\n"
+"  -v               冗長化する (コマンドを表示する)\n"
 
 msgid ""
 "Usage: cupsctl [options] [param=value ... paramN=valueN]\n"
@@ -2534,20 +2551,21 @@ msgid ""
 "    --[no-]share-printers   Turn printer sharing on/off\n"
 "    --[no-]user-cancel-any  Allow/prevent users to cancel any job\n"
 msgstr ""
-"Usage: cupsctl [options] [param=value ... paramN=valueN]\n"
+"使い方: cupsctl [オプション] [パラメータ=値 ... パラメータN=値N]\n"
 "\n"
-"Options:\n"
+"オプション:\n"
 "\n"
-"    -E                      Enable encryption\n"
-"    -U username             Specify username\n"
-"    -h server[:port]        Specify server address\n"
+"    -E                      暗号化を有効にする\n"
+"    -U ユーザ名             ユーザ名を指定する\n"
+"    -h サーバ[:ポート]      サーバアドレスを指定する\n"
 "\n"
-"    --[no-]debug-logging    Turn debug logging on/off\n"
-"    --[no-]remote-admin     Turn remote administration on/off\n"
-"    --[no-]remote-any       Allow/prevent access from the Internet\n"
-"    --[no-]remote-printers  Show/hide remote printers\n"
-"    --[no-]share-printers   Turn printer sharing on/off\n"
-"    --[no-]user-cancel-any  Allow/prevent users to cancel any job\n"
+"    --[no-]debug-logging    デバッグログの有効/無効を切り替える\n"
+"    --[no-]remote-admin     リモート管理の有効/無効を切り替える\n"
+"    --[no-]remote-any       インターネットからのアクセスを許可/禁止する\n"
+"    --[no-]remote-printers  リモートプリンタを表示/非表示にする\n"
+"    --[no-]share-printers   プリンタ共有の有効/無効を切り替える\n"
+"    --[no-]user-cancel-any  あらゆるジョブのキャンセルをユーザに許可/禁止す"
+"る\n"
 
 msgid ""
 "Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
@@ -2558,13 +2576,13 @@ msgid ""
 "-h                  Show this usage message\n"
 "-l                  Run cupsd from launchd(8)\n"
 msgstr ""
-"Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
+"使い方: cupsd [-c 設定ファイル] [-f] [-F] [-h] [-l]\n"
 "\n"
-"-c config-file      Load alternate configuration file\n"
-"-f                  Run in the foreground\n"
-"-F                  Run in the foreground but detach\n"
-"-h                  Show this usage message\n"
-"-l                  Run cupsd from launchd(8)\n"
+"-c 設定ファイル     別の設定ファイルをロードする\n"
+"-f                  フォアグラウンドで実行する\n"
+"-F                  フォアグラウンドで実行するがデタッチする\n"
+"-h                  この使い方を表示する\n"
+"-l                  launchd(8) から cupsd を実行する\n"
 
 msgid ""
 "Usage: cupsfilter -m mime/type [ options ] filename\n"
@@ -2577,6 +2595,15 @@ msgid ""
 "  -p filename.ppd  Set PPD file\n"
 "  -t title         Set title\n"
 msgstr ""
+"使い方: cupsfilter -m MIME/タイプ [ オプション ] ファイル名\n"
+"\n"
+"オプション:\n"
+"\n"
+"  -c cupsd.conf     利用する cupsd.conf ファイルを指定する\n"
+"  -n コピー         コピー数を指定する\n"
+"  -o 名前=値        オプションを指定する\n"
+"  -p ファイル名.ppd PPDファイルを指定する\n"
+"  -t タイトル       タイトルを指定する\n"
 
 msgid ""
 "Usage: cupstestdsc [options] filename.ps [... filename.ps]\n"
@@ -2589,15 +2616,15 @@ msgid ""
 "    Note: this program only validates the DSC comments, not the PostScript "
 "itself.\n"
 msgstr ""
-"Usage: cupstestdsc [options] filename.ps [... filename.ps]\n"
-"       cupstestdsc [options] -\n"
+"使い方: cupstestdsc [オプション] ファイル名.ps [... ファイル名.ps]\n"
+"        cupstestdsc [オプション] -\n"
 "\n"
-"Options:\n"
+"オプション:\n"
 "\n"
-"    -h       Show program usage\n"
+"    -h       プログラムの使い方を表示する\n"
 "\n"
-"    Note: this program only validates the DSC comments, not the PostScript "
-"itself.\n"
+"    注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検"
+"証するものではありません。\n"
 
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
@@ -2613,21 +2640,22 @@ msgid ""
 "    -v                   Be slightly verbose\n"
 "    -vv                  Be very verbose\n"
 msgstr ""
-"Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
-"       program | cupstestppd [options] -\n"
+"使い方: cupstestppd [オプション] ファイル名1.ppd[.gz] [...ファイル名N.ppd[."
+"gz]]\n"
+"       プログラム | cupstestppd [オプション] -\n"
 "\n"
-"Options:\n"
+"オプション:\n"
 "\n"
-"    -R root-directory    Set alternate root\n"
+"    -R ルートディレクトリ 別のルートを指定する\n"
 "    -W {all,none,constraints,defaults,filters,translations}\n"
-"                         Issue warnings instead of errors\n"
-"    -q                   Run silently\n"
-"    -r                   Use 'relaxed' open mode\n"
-"    -v                   Be slightly verbose\n"
-"    -vv                  Be very verbose\n"
+"                          エラーの代わりに警告を発行する\n"
+"    -q                    静かに実行する\n"
+"    -r                    'relaxed' オープンモードを使う\n"
+"    -v                    やや冗長にする\n"
+"    -vv                   とても冗長にする\n"
 
 msgid "Usage: lpmove job/src dest\n"
-msgstr "Usage: lpmove job/src dest\n"
+msgstr "使い方: lpmove ジョブ/ソース 宛先\n"
 
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
@@ -2635,56 +2663,56 @@ msgid ""
 "       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
 "       lpoptions [-h server] [-E] -x printer\n"
 msgstr ""
-"Usage: lpoptions [-h server] [-E] -d printer\n"
-"       lpoptions [-h server] [-E] [-p printer] -l\n"
-"       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
-"       lpoptions [-h server] [-E] -x printer\n"
+"使い方: lpoptions [-h サーバ] [-E] -d プリンタ\n"
+"       lpoptions [-h サーバ] [-E] [-p プリンタ] -l\n"
+"       lpoptions [-h サーバ] [-E] -p プリンタ -o オプション[=値] ...\n"
+"       lpoptions [-h サーバ] [-E] -x プリンタ\n"
 
 msgid "Usage: lppasswd [-g groupname]\n"
-msgstr "Usage: lppasswd [-g groupname]\n"
+msgstr "使い方: lppasswd [-g グループ名]\n"
 
 msgid ""
 "Usage: lppasswd [-g groupname] [username]\n"
 "       lppasswd [-g groupname] -a [username]\n"
 "       lppasswd [-g groupname] -x [username]\n"
 msgstr ""
-"Usage: lppasswd [-g groupname] [username]\n"
-"       lppasswd [-g groupname] -a [username]\n"
-"       lppasswd [-g groupname] -x [username]\n"
+"使い方: lppasswd [-g グループ名] [ユーザ名]\n"
+"        lppasswd [-g グループ名] -a [ユーザ名]\n"
+"        lppasswd [-g グループ名] -x [ユーザ名]\n"
 
 msgid ""
 "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
 msgstr ""
-"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
+"使い方: lpq [-P 宛先] [-U ユーザ名] [-h ホスト名[:ポート]] [-l] [+間隔]\n"
 
 msgid "Usage: snmp [host-or-ip-address]\n"
-msgstr "Usage: snmp [host-or-ip-address]\n"
+msgstr "使い方: snmp [ホストまたはIPアドレス]\n"
 
 #, c-format
 msgid "WARNING: Boolean expected for waiteof option \"%s\"\n"
 msgstr "WARNING: 論理値は、waiteof オプション \"%s\" であるべきです\n"
 
 msgid "WARNING: Couldn't create read channel\n"
-msgstr "WARNING: 読み出しチャンネルを作成できませんでした\n"
+msgstr "WARNING: 読み出しチャンネルを作成できませんでした!\n"
 
 msgid "WARNING: Couldn't create side channel\n"
-msgstr "WARNING: サイドチャンネルを作成できませんでした\n"
+msgstr "WARNING: サイドチャンネルを作成できませんでした!\n"
 
 msgid "WARNING: Failed to read side-channel request!\n"
-msgstr "WARNING: サイドチャンネルの読み出しに失敗しました\n"
+msgstr "WARNING: サイドチャンネルの読み出しに失敗しました!\n"
 
 #, c-format
 msgid "WARNING: Option \"%s\" cannot be included via IncludeFeature!\n"
 msgstr ""
-"WARNING: オプション \"%s\" は IncludeFeature 経由で含めることはできません\n"
+"WARNING: オプション \"%s\" は IncludeFeature 経由で含めることはできません!\n"
 
 #, c-format
 msgid ""
 "WARNING: Remote host did not respond with command status byte after %d "
 "seconds!\n"
 msgstr ""
-"WARNING: リモートホストは %d 秒後にコマンド・ステータス・バイトでの応答をしま"
-"ã\81\9bã\82\93ã\81§ã\81\97ã\81\9fï¼\81\n"
+"WARNING: リモートホストは %d 秒後にコマンド・ステータス・バイトでの応答を返し"
+"ã\81¾ã\81\9bã\82\93ã\81§ã\81\97ã\81\9f!\n"
 
 #, c-format
 msgid ""
@@ -2692,49 +2720,49 @@ msgid ""
 "seconds!\n"
 msgstr ""
 "WARNING: リモートホストは %d 秒後にコントロール・ステータス・バイトでの応答を"
-"しませんでした!\n"
+"返しませんでした!\n"
 
 #, c-format
 msgid ""
 "WARNING: Remote host did not respond with data status byte after %d "
 "seconds!\n"
 msgstr ""
-"WARNING: リモートホストは %d 秒後にデータ・ステータス・バイトでの応答をしませ"
-"ã\82\93ã\81§ã\81\97ã\81\9fï¼\81\n"
+"WARNING: リモートホストは %d 秒後にデータ・ステータス・バイトでの応答を返しま"
+"ã\81\9bã\82\93ã\81§ã\81\97ã\81\9f!\n"
 
 #, c-format
 msgid "WARNING: SCSI command timed out (%d); retrying...\n"
-msgstr "WARNING: SCSI コマンドはタイムアウトしました(%d)。再試行中...\n"
+msgstr "WARNING: SCSI コマンドはタイムアウトしました (%d)。再試行中...\n"
 
 msgid ""
 "WARNING: This document does not conform to the Adobe Document Structuring "
 "Conventions and may not print correctly!\n"
 msgstr ""
 "WARNING: この書類は Adobe Document Structuring Conventions に適合しておらず、"
-"正しくプリントできない可能性があります\n"
+"正しくプリントできない可能性があります!\n"
 
 #, c-format
 msgid "WARNING: Unknown choice \"%s\" for option \"%s\"!\n"
-msgstr "WARNING:  \"%s\"(オプション \"%s\" 用)は未知の設定です!\n"
+msgstr "WARNING:  \"%s\" (オプション \"%s\" 用) は未知の設定です!\n"
 
 #, c-format
 msgid "WARNING: Unknown option \"%s\"!\n"
-msgstr "WARNING: \"%s\" は未知のオプションです\n"
+msgstr "WARNING: \"%s\" は未知のオプションです!\n"
 
 #, c-format
 msgid "WARNING: Unsupported baud rate %s!\n"
-msgstr "WARNING: %s は未知のボーレートです\n"
+msgstr "WARNING: %s は未知のボーレートです!\n"
 
 #, c-format
 msgid ""
 "WARNING: recoverable: Network host '%s' is busy; will retry in %d "
 "seconds...\n"
 msgstr ""
-"WARNING: 回復可能:ネットワークホスト '%s' はビジー状態です(%d 秒以内に再試"
-"行します...\n"
+"WARNING: 回復可能: ネットワークホスト '%s' はビジー状態です (%d 秒以内に再試"
+"行します...)\n"
 
 msgid "Warning, no Windows 2000 printer drivers are installed!"
-msgstr "警告、Windows 2000 プリンタドライバがインストールされていません"
+msgstr "警告、Windows 2000 プリンタドライバがインストールされていません!"
 
 msgid "Yes"
 msgstr "はい"
@@ -2758,6 +2786,7 @@ msgstr "完了"
 
 msgid "convert: Use the -f option to specify a file to convert.\n"
 msgstr ""
+"convert: 変換するファイルを指定するには、-f オプションを使ってください。\n"
 
 msgid "cups-deviced failed to execute."
 msgstr "cups-deviced の実行に失敗しました。"
@@ -2767,48 +2796,48 @@ msgstr "cups-driverd の実行に失敗しました。"
 
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s\n"
-msgstr "cupsaddsmbプリンタ \"%s\" の PPD ファイルがありません - %s\n"
+msgstr "cupsaddsmbプリンタ \"%s\" の PPD ファイルがありません - %s\n"
 
 #, c-format
 msgid "cupsctl: Unknown option \"%s\"!\n"
-msgstr "cupsctl:\"%s\" は未知のオプションです!\n"
+msgstr "cupsctl: \"%s\" は未知のオプションです!\n"
 
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\"!\n"
-msgstr "cupsctl:\"-%c\"は未知のオプションです!\n"
+msgstr "cupsctl: \"-%c\"は未知のオプションです!\n"
 
 msgid "cupsd: Expected config filename after \"-c\" option!\n"
-msgstr "cupsd:-c オプションのあとには設定ファイル名が必要です!\n"
+msgstr "cupsd: -c オプションのあとには設定ファイル名が必要です!\n"
 
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting!\n"
-msgstr "cupsd:\"%s\" は未知の引数です - 停止します!\n"
+msgstr "cupsd: \"%s\" は未知の引数です - 停止します!\n"
 
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting!\n"
-msgstr "cupsd:\"%c\" は未知のオプションです - 停止します!\n"
+msgstr "cupsd: \"%c\" は未知のオプションです - 停止します!\n"
 
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode.\n"
 msgstr ""
-"cupsdlaunchd(8) サポートがコンパイルされていないので、通常モードで動作しま"
+"cupsdlaunchd(8) サポートがコンパイルされていないので、通常モードで動作しま"
 "す。\n"
 
 msgid "cupsfilter: Only one filename can be specified!\n"
-msgstr "cupsfilter:ひとつのファイル名のみを指定できます!\n"
+msgstr "cupsfilter: ひとつのファイル名のみを指定できます!\n"
 
 msgid "cupstestppd: The -q option is incompatible with the -v option.\n"
-msgstr "cupstestppd-q オプションは -v オプションと両立できません。\n"
+msgstr "cupstestppd-q オプションは -v オプションと両立できません。\n"
 
 msgid "cupstestppd: The -v option is incompatible with the -q option.\n"
-msgstr "cupstestppd-v オプションは -q オプションと両立できません。\n"
+msgstr "cupstestppd-v オプションは -q オプションと両立できません。\n"
 
 #, c-format
 msgid "device for %s/%s: %s\n"
-msgstr "%s/%s のデバイス%s\n"
+msgstr "%s/%s のデバイス%s\n"
 
 #, c-format
 msgid "device for %s: %s\n"
-msgstr "%s のデバイス%s\n"
+msgstr "%s のデバイス%s\n"
 
 msgid "held"
 msgstr "ホールド"
@@ -2820,277 +2849,276 @@ msgid "idle"
 msgstr "待機中"
 
 msgid "job-printer-uri attribute missing!"
-msgstr "job-printer-uri 属性がありません"
+msgstr "job-printer-uri 属性がありません!"
 
 msgid "lpadmin: Class name can only contain printable characters!\n"
-msgstr "lpadmin:クラス名は表示可能文字のみで構成されなければなりません!\n"
+msgstr "lpadmin: クラス名は表示可能文字のみで構成されなければなりません!\n"
 
 msgid "lpadmin: Expected PPD after '-P' option!\n"
-msgstr "lpadmin:'-P' オプションのあとに PPD が必要です!\n"
+msgstr "lpadmin: '-P' オプションのあとに PPD が必要です!\n"
 
 msgid "lpadmin: Expected allow/deny:userlist after '-u' option!\n"
 msgstr ""
-"lpadmin:'-u' オプションのあとには allow/deny:ユーザリスト が必要です!\n"
+"lpadmin: '-u' オプションのあとには allow/deny:ユーザリスト が必要です!\n"
 
 msgid "lpadmin: Expected class after '-r' option!\n"
-msgstr "lpadmin:'-r' オプションのあとにはクラス名が必要です!\n"
+msgstr "lpadmin: '-r' オプションのあとにはクラス名が必要です!\n"
 
 msgid "lpadmin: Expected class name after '-c' option!\n"
-msgstr "lpadmin:'-c' オプションのあとにはクラス名が必要です!\n"
+msgstr "lpadmin: '-c' オプションのあとにはクラス名が必要です!\n"
 
 msgid "lpadmin: Expected description after '-D' option!\n"
-msgstr "lpadmin:'-D' オプションのあとに説明が必要です!\n"
+msgstr "lpadmin: '-D' オプションのあとに説明が必要です!\n"
 
 msgid "lpadmin: Expected device URI after '-v' option!\n"
-msgstr "lpadmin:'-v' オプションのあとにはデバイス URI が必要です!\n"
+msgstr "lpadmin: '-v' オプションのあとにはデバイス URI が必要です!\n"
 
 msgid "lpadmin: Expected file type(s) after '-I' option!\n"
-msgstr "lpadmin:'-I' オプションのあとにファイル形式が必要です!\n"
+msgstr "lpadmin: '-I' オプションのあとにファイル形式が必要です!\n"
 
 msgid "lpadmin: Expected hostname after '-h' option!\n"
-msgstr "lpadmin:'-h' オプションのあとにはホスト名が必要です!\n"
+msgstr "lpadmin: '-h' オプションのあとにはホスト名が必要です!\n"
 
 msgid "lpadmin: Expected interface after '-i' option!\n"
-msgstr "lpadmin:'-i' オプションのあとにはインターフェイス名が必要です!\n"
+msgstr "lpadmin: '-i' オプションのあとにはインターフェイス名が必要です!\n"
 
 msgid "lpadmin: Expected location after '-L' option!\n"
-msgstr "lpadmin:'-L' オプションのあとに場所が必要です!\n"
+msgstr "lpadmin: '-L' オプションのあとに場所が必要です!\n"
 
 msgid "lpadmin: Expected model after '-m' option!\n"
-msgstr "lpadmin:'-m' オプションのあとにはモデル名が必要です!\n"
+msgstr "lpadmin: '-m' オプションのあとにはモデル名が必要です!\n"
 
 msgid "lpadmin: Expected name=value after '-o' option!\n"
-msgstr "lpadmin:'-o' オプションのあとには 名前=値 が必要です!\n"
+msgstr "lpadmin: '-o' オプションのあとには 名前=値 が必要です!\n"
 
 msgid "lpadmin: Expected printer after '-p' option!\n"
-msgstr "lpadmin:'-p' オプションのあとにはプリンタ名が必要です!\n"
+msgstr "lpadmin: '-p' オプションのあとにはプリンタ名が必要です!\n"
 
 msgid "lpadmin: Expected printer name after '-d' option!\n"
-msgstr "lpadmin:'-d' オプションのあとにはプリンタ名が必要です!\n"
+msgstr "lpadmin: '-d' オプションのあとにはプリンタ名が必要です!\n"
 
 msgid "lpadmin: Expected printer or class after '-x' option!\n"
 msgstr ""
-"lpadmin:'-x' オプションのあとにはプリンタ名またはクラス名が必要です!\n"
+"lpadmin: '-x' オプションのあとにはプリンタ名またはクラス名が必要です!\n"
 
 msgid "lpadmin: No member names were seen!\n"
-msgstr "lpadmin:メンバー名が見当たりません!\n"
+msgstr "lpadmin: メンバー名が見当たりません!\n"
 
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s.\n"
-msgstr "lpadminプリンタ %s はすでにクラス %s のメンバーです。\n"
+msgstr "lpadminプリンタ %s はすでにクラス %s のメンバーです。\n"
 
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s.\n"
-msgstr "lpadminプリンタ %s はクラス %s のメンバーではありません。\n"
+msgstr "lpadminプリンタ %s はクラス %s のメンバーではありません。\n"
 
 msgid "lpadmin: Printer name can only contain printable characters!\n"
-msgstr "lpadmin:プリンタ名は表示可能文字のみで構成されなければなりません!\n"
+msgstr "lpadmin: プリンタ名は表示可能文字のみで構成されなければなりません!\n"
 
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminクラスにプリンタを追加できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminクラスにプリンタを追加できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s\n"
-msgstr "lpadminサーバに接続できません: %s\n"
+msgstr "lpadminサーバに接続できません: %s\n"
 
 #, c-format
 msgid "lpadmin: Unable to create temporary file - %s\n"
-msgstr "lpadminテンポラリファイルを作成できません - %s\n"
+msgstr "lpadminテンポラリファイルを作成できません - %s\n"
 
 #, c-format
 msgid "lpadmin: Unable to create temporary file: %s\n"
-msgstr "lpadminテンポラリファイルを作成できません: %s\n"
+msgstr "lpadminテンポラリファイルを作成できません: %s\n"
 
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s\n"
-msgstr "lpadminPPD ファイル \"%s\" を開くことができません - %s\n"
+msgstr "lpadminPPD ファイル \"%s\" を開くことができません - %s\n"
 
 #, c-format
 msgid "lpadmin: Unable to open file \"%s\": %s\n"
-msgstr "lpadminファイル \"%s\" を開くことができません: %s\n"
+msgstr "lpadminファイル \"%s\" を開くことができません: %s\n"
 
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminクラスからプリンタを削除できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminクラスからプリンタを削除できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the PPD file:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminPPD ファイルを設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminPPD ファイルを設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the device URI:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminデバイス URI を設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminデバイス URI を設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the interface script or PPD file:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadmin:インターフェイススクリプトまたは PPD ファイルを設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadmin:イ ンターフェイススクリプトまたは PPD ファイルを設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the interface script:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminインターフェイススクリプトを設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminインターフェイススクリプトを設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the printer description:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminプリンタ説明を設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminプリンタ説明を設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the printer location:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminプリンタの場所が設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminプリンタの場所が設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first!\n"
 msgstr ""
-"lpadminプリンタオプションを設定できません:\n"
-"         先にプリンタ名を指定する必要があります\n"
+"lpadminプリンタオプションを設定できません:\n"
+"         先にプリンタ名を指定する必要があります!\n"
 
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"!\n"
-msgstr "lpadmin:\"%s\" は未知の allow/deny オプションです!\n"
+msgstr "lpadmin:\"%s\" は未知の allow/deny オプションです!\n"
 
 #, c-format
 msgid "lpadmin: Unknown argument '%s'!\n"
-msgstr "lpadmin:'%s' は未知の引数です!\n"
+msgstr "lpadmin: '%s' は未知の引数です!\n"
 
 #, c-format
 msgid "lpadmin: Unknown option '%c'!\n"
-msgstr "lpadmin:'%c' は未知のオプションです!\n"
+msgstr "lpadmin: '%c' は未知のオプションです!\n"
 
 msgid "lpadmin: Warning - content type list ignored!\n"
-msgstr "lpadmin:警告 - コンテンツタイプリストは無視されます!\n"
+msgstr "lpadmin: 警告 - コンテンツタイプリストは無視されます!\n"
 
 msgid "lpc> "
 msgstr "lpc> "
 
 #, c-format
 msgid "lpinfo: Unable to connect to server: %s\n"
-msgstr "lpinfoサーバに接続できません: %s\n"
+msgstr "lpinfoサーバに接続できません: %s\n"
 
 #, c-format
 msgid "lpinfo: Unknown argument '%s'!\n"
-msgstr "lpinfo:'%s' は未知の引数です!\n"
+msgstr "lpinfo: '%s' は未知の引数です!\n"
 
 #, c-format
 msgid "lpinfo: Unknown option '%c'!\n"
-msgstr "lpinfo:'%c' は未知のオプションです!\n"
+msgstr "lpinfo: '%c' は未知のオプションです!\n"
 
 #, c-format
 msgid "lpmove: Unable to connect to server: %s\n"
-msgstr "lpmoveサーバに接続できません: %s\n"
+msgstr "lpmoveサーバに接続できません: %s\n"
 
 #, c-format
 msgid "lpmove: Unknown argument '%s'!\n"
-msgstr "lpmove:'%s' は未知の引数です!\n"
+msgstr "lpmove: '%s' は未知の引数です!\n"
 
 #, c-format
 msgid "lpmove: Unknown option '%c'!\n"
-msgstr "lpmove:'%c' は未知のオプションです!\n"
+msgstr "lpmove: '%c' は未知のオプションです!\n"
 
 msgid "lpoptions: No printers!?!\n"
-msgstr "lpoptions:プリンタがありません!?!\n"
+msgstr "lpoptions: プリンタがありません!?!\n"
 
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s\n"
-msgstr "lpoptionsプリンタまたはインスタンスを追加できません: %s\n"
+msgstr "lpoptionsプリンタまたはインスタンスを追加できません: %s\n"
 
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s\n"
-msgstr "lpoptions:%s の PPD ファイルを開くことができません!: %s\n"
+msgstr "lpoptions: %s の PPD ファイルを開くことができません!: %s\n"
 
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s!\n"
-msgstr "lpoptions:%s の PPD ファイルを開くことができません!\n"
+msgstr "lpoptions: %s の PPD ファイルを開くことができません!\n"
 
 msgid "lpoptions: Unknown printer or class!\n"
-msgstr "lpoptions:未知のプリンタまたはクラスです!\n"
+msgstr "lpoptions: 未知のプリンタまたはクラスです!\n"
 
 msgid "lppasswd: Only root can add or delete passwords!\n"
-msgstr "lppasswd:root だけがパスワードの追加と削除を行えます!\n"
+msgstr "lppasswd: root だけがパスワードの追加と削除を行えます!\n"
 
 msgid "lppasswd: Password file busy!\n"
-msgstr "lppasswd:パスワードファイルがビジー状態です!\n"
+msgstr "lppasswd: パスワードファイルがビジー状態です!\n"
 
 msgid "lppasswd: Password file not updated!\n"
-msgstr "lppasswd:パスワードファイルは更新されません!\n"
+msgstr "lppasswd: パスワードファイルは更新されません!\n"
 
 msgid "lppasswd: Sorry, password doesn't match!\n"
-msgstr "lppasswd:すみませんが、パスワードがマッチしません!\n"
+msgstr "lppasswd: すみませんが、パスワードがマッチしません!\n"
 
 msgid ""
 "lppasswd: Sorry, password rejected.\n"
 "Your password must be at least 6 characters long, cannot contain\n"
 "your username, and must contain at least one letter and number.\n"
 msgstr ""
-"lppasswdすみませんが、パスワードは拒否されました。\n"
+"lppasswdすみませんが、パスワードは拒否されました。\n"
 "パスワードは少なくとも 6 文字以上で、あなたのユーザ名を含んではならず、\n"
 "少なくとも 1 つの英字および数値を含んでなければなりません。\n"
 
 msgid "lppasswd: Sorry, passwords don't match!\n"
-msgstr "lppasswd:すみませんが、パスワードがマッチしません!\n"
+msgstr "lppasswd: すみませんが、パスワードがマッチしません!\n"
 
 #, c-format
 msgid "lppasswd: Unable to copy password string: %s\n"
-msgstr "lppasswd:パスワード文字列をコピーできません:%s\n"
+msgstr "lppasswd: パスワード文字列をコピーできません: %s\n"
 
 #, c-format
 msgid "lppasswd: Unable to open password file: %s\n"
-msgstr "lppasswd:パスワードファイルを開くことができません:%s\n"
+msgstr "lppasswd: パスワードファイルを開くことができません: %s\n"
 
 #, c-format
 msgid "lppasswd: Unable to write to password file: %s\n"
-msgstr "lppasswd:パスワードファイルに書き込むことができません:%s\n"
+msgstr "lppasswd: パスワードファイルに書き込むことができません: %s\n"
 
 #, c-format
 msgid "lppasswd: failed to backup old password file: %s\n"
 msgstr ""
-"lppasswd:古いパスワードファイルをバックアップするのに失敗しました:%s\n"
+"lppasswd: 古いパスワードファイルをバックアップするのに失敗しました: %s\n"
 
 #, c-format
 msgid "lppasswd: failed to rename password file: %s\n"
-msgstr "lppasswd:パスワードファイルを名前変更するのに失敗しました:%s\n"
+msgstr "lppasswd: パスワードファイルを名前変更するのに失敗しました: %s\n"
 
 #, c-format
 msgid "lppasswd: user \"%s\" and group \"%s\" do not exist.\n"
-msgstr "lppasswdユーザ \"%s\" およびグループ \"%s\" は存在しません。\n"
+msgstr "lppasswdユーザ \"%s\" およびグループ \"%s\" は存在しません。\n"
 
 msgid "lprm: Unable to contact server!\n"
-msgstr "lprm:サーバと交信できません!\n"
+msgstr "lprm: サーバと交信できません!\n"
 
 #, c-format
 msgid ""
 "lpstat: error - %s environment variable names non-existent destination \"%s"
 "\"!\n"
-msgstr ""
-"lpstat:エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
+msgstr "lpstat: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています!\n"
 
 #, c-format
 msgid "members of class %s:\n"
-msgstr "クラス %s のメンバー\n"
+msgstr "クラス %s のメンバー:\n"
 
 msgid "no entries\n"
 msgstr "エントリがありません\n"
@@ -3103,15 +3131,15 @@ msgstr "notify-events が指定されていません!"
 
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme!"
-msgstr "notify-recipient-uri URI \"%s\" には未知のスキームが使われています"
+msgstr "notify-recipient-uri URI \"%s\" には未知のスキームが使われています!"
 
 #, c-format
 msgid "notify-subscription-id %d no good!"
-msgstr "notify-subscription-id %d は良くありません"
+msgstr "notify-subscription-id %d は良くありません!"
 
 #, c-format
 msgid "open of %s failed: %s"
-msgstr "%s のオープンに失敗しました%s"
+msgstr "%s のオープンに失敗しました%s"
 
 msgid "pending"
 msgstr "保留"
@@ -3145,7 +3173,7 @@ msgstr "処理中"
 
 #, c-format
 msgid "request id is %s-%d (%d file(s))\n"
-msgstr "リクエスト ID は %s-%d です(%d 個のファイル)\n"
+msgstr "リクエスト ID は %s-%d です (%d 個のファイル)\n"
 
 msgid "scheduler is not running\n"
 msgstr "スケジューラは動作していません\n"
@@ -3155,7 +3183,7 @@ msgstr "スケジューラは動作中です\n"
 
 #, c-format
 msgid "stat of %s failed: %s"
-msgstr "%s の状態取得に失敗しました%s"
+msgstr "%s の状態取得に失敗しました:%s"
 
 msgid "status\t\tshow status of daemon and queue\n"
 msgstr "status\t\tデーモンとキューの状態を表示\n"
@@ -3165,47 +3193,14 @@ msgstr "停止"
 
 #, c-format
 msgid "system default destination: %s\n"
-msgstr "システムのデフォルトの宛先%s\n"
+msgstr "システムのデフォルトの宛先%s\n"
 
 #, c-format
 msgid "system default destination: %s/%s\n"
-msgstr "システムのデフォルトの宛先%s/%s\n"
+msgstr "システムのデフォルトの宛先%s/%s\n"
 
 msgid "unknown"
 msgstr "未知"
 
 msgid "untitled"
 msgstr "タイトルなし"
-
-#~ msgid ""
-#~ "Usage: cupsfilter -m mime/type [ options ] filename(s)\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "\n"
-#~ "  -c cupsd.conf    Set cupsd.conf file to use\n"
-#~ "  -n copies        Set number of copies\n"
-#~ "  -o name=value    Set option(s)\n"
-#~ "  -p filename.ppd  Set PPD file\n"
-#~ "  -t title         Set title\n"
-#~ msgstr ""
-#~ "Usage: cupsfilter -m mime/type [ options ] filename(s)\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "\n"
-#~ "  -c cupsd.conf    Set cupsd.conf file to use\n"
-#~ "  -n copies        Set number of copies\n"
-#~ "  -o name=value    Set option(s)\n"
-#~ "  -p filename.ppd  Set PPD file\n"
-#~ "  -t title         Set title\n"
-
-#~ msgid "cupsfilter: No filter to convert from %s/%s to %s/%s!\n"
-#~ msgstr "cupsfilter:%s/%s を %s/%s に変換するフィルタがありません!\n"
-
-#~ msgid "cupsfilter: Unable to determine MIME type of \"%s\"!\n"
-#~ msgstr "cupsfilter:\"%s\" の MIME タイプを決定できません!\n"
-
-#~ msgid "cupsfilter: Unable to read MIME database from \"%s\"!\n"
-#~ msgstr "cupsfilter:\"%s\" から MIME データベースを読み出せません!\n"
-
-#~ msgid "cupsfilter: Unknown destination MIME type %s/%s!\n"
-#~ msgstr "cupsfilter:%s/%s は未知の宛先 MIME タイプです!\n"
index 0431668d8f2ed206842feeef8ec1593e14fccd06..8699687f00601d017ff395441eb1eaa55b42713c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $"
  *
  * Convert GNU gettext .po files to Apple .strings file (UTF-16 BE text file).
  *
@@ -140,5 +140,5 @@ write_string(FILE       *strings,   /* I - .strings file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $".
  */
index 1278c6c55fb32b11798c4973055fe1a53559b019..ab9b09108c4962a2a98a3347222ac643f950df18 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: strings2po.c 6921 2007-09-06 13:38:37Z mike $"
  *
  * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files.
  *
@@ -171,5 +171,5 @@ write_po(FILE       *po,            /* I - .po file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: strings2po.c 6921 2007-09-06 13:38:37Z mike $".
  */
index f5f2001b02c29f456773d6f1cbe523e89a34caa2..6cd767e01aa52dfb6475b0c7c960023560469e28 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: translate.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: translate.c 6921 2007-09-06 13:38:37Z mike $"
  *
  *   HTTP-based translation program for the Common UNIX Printing System (CUPS).
  *
@@ -439,5 +439,5 @@ write_string(cups_file_t *fp,               /* I - File to write to */
 
 
 /*
- * End of "$Id: translate.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: translate.c 6921 2007-09-06 13:38:37Z mike $".
  */
index 2f38f3cb6915b2f512f031378bf0dd8d908b286d..ef2db81ad9d0fb4c7eeb3124f6ef239c0731c732 100644 (file)
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 6649 2007-07-11 21:46:42Z mike $"
+.\" "$Id: cupsd.conf.man.in 7002 2007-10-01 23:07:37Z mike $"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -75,9 +75,9 @@ AuthType BasicDigest
 .TP 5
 AuthType Digest
 .TP 5
-AuthType Kerberos
+AuthType Negotiate
 .br
-Specifies the authentication type (None, Basic, BasicDigest, Digest, Kerberos)
+Specifies the authentication type (None, Basic, BasicDigest, Digest, Negotiate)
 .TP 5
 AutoPurgeJobs Yes
 .TP 5
@@ -214,7 +214,7 @@ DefaultAuthType BasicDigest
 .TP 5
 DefaultAuthType Digest
 .TP 5
-DefaultAuthType Kerberos
+DefaultAuthType Negotiate
 .br
 Specifies the default type of authentication to use.
 .TP 5
@@ -608,5 +608,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 6649 2007-07-11 21:46:42Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 7002 2007-10-01 23:07:37Z mike $".
 .\"
index dde1fc05c294ff5bdaf9ca14cee858c14d9076a6..bdcff0316225a193ab843d5d0bd897e935d24ec7 100644 (file)
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.man.in 6649 2007-07-11 21:46:42Z mike $"
+.\" "$Id: cupsd.man.in 6875 2007-08-27 23:25:06Z mike $"
 .\"
 .\"   cupsd man page for the Common UNIX Printing System (CUPS).
 .\"
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
+.TH cupsd 8 "Common UNIX Printing System" "27 August 2006" "Apple Inc."
 .SH NAME
 cupsd \- common unix printing system daemon
 .SH SYNOPSIS
 .B cupsd
 [ -c
 .I config-file
-] [ -f ] [ -F ] [ -h ] [ -l ]
+] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ]
 .SH DESCRIPTION
 \fIcupsd\fR is the scheduler for the Common UNIX Printing System. It
 implements a printing system based upon the Internet Printing Protocol,
@@ -51,6 +51,10 @@ Shows the program usage.
 .br
 This option is passed to \fIcupsd\fR when it is run from
 \fIlaunchd(8)\fR.
+.TP 5
+-t
+.br
+Test the configuration file for syntax errors.
 .SH COMPATIBILITY
 \fIcupsd\fR implements all of the required IPP/1.1 attributes and
 operations. It also implements several CUPS-specific administration
@@ -65,5 +69,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 6649 2007-07-11 21:46:42Z mike $".
+.\" End of "$Id: cupsd.man.in 6875 2007-08-27 23:25:06Z mike $".
 .\"
index 70930e256d42980df7c3645efc09566c43f05d01..d13973c7b0030ed05fef7f1757fac873a805b81f 100644 (file)
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsfilter 8 "Common UNIX Printing System" "12 July 2007" "Apple Inc."
+.TH cupsfilter 8 "Common UNIX Printing System" "29 August 2007" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
 .B cupsfilter
 [ -c
 .I config-file
-] -m
+] -j
+.I job-id[,N]
+-m
 .I mime/type
 [ -n
 .I copies
@@ -40,6 +42,11 @@ through CUPS.
 .br
 Uses the named cupsd.conf configuration file.
 .TP 5
+-j job-id[,N]
+.br
+Converts document N from the specified job. If N is omitted, document 1 is
+converted.
+.TP 5
 -m mime/type
 .br
 Specifies the destination file type.
index cbb2042a2897097d85c491947883b76ec5c59139..2b58595c2eace79d1984b763d33908d443fe2174 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: bcp.c 6802 2007-08-16 18:44:46Z mike $"
+ * "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
@@ -286,5 +286,5 @@ pswrite(const char *buf,            /* I - Buffer to write */
 
 
 /*
- * End of "$Id: bcp.c 6802 2007-08-16 18:44:46Z mike $".
+ * End of "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $".
  */
index a310d6617ba815424e3a39c00f823e87190aee95..6e4ad14f2805dc518533a97005fdfcc2aada8f1e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: tbcp.c 6802 2007-08-16 18:44:46Z mike $"
+ * "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
@@ -279,5 +279,5 @@ pswrite(const char *buf,            /* I - Buffer to write */
 
 
 /*
- * End of "$Id: tbcp.c 6802 2007-08-16 18:44:46Z mike $".
+ * End of "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $".
  */
index 815522ddf97d2b1f42f98260a12c4b0cc4ed6741..a6205f6a841f832cc6e93d1cd46fbfc2062f46f8 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in 6960 2007-09-14 21:15:04Z mike $"
+# "$Id: cups.list.in 7014 2007-10-10 21:57:43Z mike $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -409,6 +409,7 @@ f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
 %subpackage pt
 f 0644 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
 f 0644 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
+f 0644 root sys $LOCALEDIR/pt_PT/cups_pt_PT.po locale/cups_pt_PT.po
 %subpackage ru
 f 0644 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
 %subpackage sv
@@ -432,29 +433,6 @@ d 0755 root sys $DATADIR/charmaps -
 f 0644 root sys $DATADIR/charmaps data/*.txt
 
 d 0755 root sys $DATADIR/charsets -
-f 0644 root sys $DATADIR/charsets/windows-874 data/windows-874
-f 0644 root sys $DATADIR/charsets/windows-1250 data/windows-1250
-f 0644 root sys $DATADIR/charsets/windows-1251 data/windows-1251
-f 0644 root sys $DATADIR/charsets/windows-1252 data/windows-1252
-f 0644 root sys $DATADIR/charsets/windows-1253 data/windows-1253
-f 0644 root sys $DATADIR/charsets/windows-1254 data/windows-1254
-f 0644 root sys $DATADIR/charsets/windows-1255 data/windows-1255
-f 0644 root sys $DATADIR/charsets/windows-1256 data/windows-1256
-f 0644 root sys $DATADIR/charsets/windows-1257 data/windows-1257
-f 0644 root sys $DATADIR/charsets/windows-1258 data/windows-1258
-f 0644 root sys $DATADIR/charsets/iso-8859-1 data/iso-8859-1
-f 0644 root sys $DATADIR/charsets/iso-8859-2 data/iso-8859-2
-f 0644 root sys $DATADIR/charsets/iso-8859-3 data/iso-8859-3
-f 0644 root sys $DATADIR/charsets/iso-8859-4 data/iso-8859-4
-f 0644 root sys $DATADIR/charsets/iso-8859-5 data/iso-8859-5
-f 0644 root sys $DATADIR/charsets/iso-8859-6 data/iso-8859-6
-f 0644 root sys $DATADIR/charsets/iso-8859-7 data/iso-8859-7
-f 0644 root sys $DATADIR/charsets/iso-8859-8 data/iso-8859-8
-f 0644 root sys $DATADIR/charsets/iso-8859-9 data/iso-8859-9
-f 0644 root sys $DATADIR/charsets/iso-8859-10 data/iso-8859-10
-f 0644 root sys $DATADIR/charsets/iso-8859-13 data/iso-8859-13
-f 0644 root sys $DATADIR/charsets/iso-8859-14 data/iso-8859-14
-f 0644 root sys $DATADIR/charsets/iso-8859-15 data/iso-8859-15
 f 0644 root sys $DATADIR/charsets/utf-8 data/utf-8
 
 d 0755 root sys $DATADIR/data -
@@ -578,54 +556,34 @@ f 0644 root sys $DOCDIR/robots.txt doc/robots.txt
 %subpackage de
 d 0755 root sys $DOCDIR/de
 f 0644 root sys $DOCDIR/de doc/de/*.html
-d 0755 root sys $DOCDIR/de/images -
-f 0644 root sys $DOCDIR/de/images doc/de/images/*.gif
 %subpackage es
 d 0755 root sys $DOCDIR/es
 f 0644 root sys $DOCDIR/es doc/es/*.html
-d 0755 root sys $DOCDIR/es/images -
-f 0644 root sys $DOCDIR/es/images doc/es/images/*.gif
 %subpackage et
 d 0755 root sys $DOCDIR/et
 f 0644 root sys $DOCDIR/et doc/et/*.html
-d 0755 root sys $DOCDIR/et/images -
-f 0644 root sys $DOCDIR/et/images doc/et/images/*.gif
 %subpackage fr
 d 0755 root sys $DOCDIR/fr
 f 0644 root sys $DOCDIR/fr doc/fr/*.html
-d 0755 root sys $DOCDIR/fr/images -
-f 0644 root sys $DOCDIR/fr/images doc/fr/images/*.gif
 %subpackage he
 d 0755 root sys $DOCDIR/he
 f 0644 root sys $DOCDIR/he doc/he/*.html
 f 0644 root sys $DOCDIR/he/cups.css doc/he/cups.css
-d 0755 root sys $DOCDIR/he/images -
-f 0644 root sys $DOCDIR/he/images doc/he/images/*.gif
 %subpackage it
 d 0755 root sys $DOCDIR/it
 f 0644 root sys $DOCDIR/it doc/it/*.html
-d 0755 root sys $DOCDIR/it/images -
-f 0644 root sys $DOCDIR/it/images doc/it/images/*.gif
 %subpackage ja
 d 0755 root sys $DOCDIR/ja
 f 0644 root sys $DOCDIR/ja doc/ja/*.html
-d 0755 root sys $DOCDIR/ja/images -
-f 0644 root sys $DOCDIR/ja/images doc/ja/images/*.gif
 %subpackage pl
 d 0755 root sys $DOCDIR/pl
 f 0644 root sys $DOCDIR/pl doc/pl/*.html
-d 0755 root sys $DOCDIR/pl/images -
-f 0644 root sys $DOCDIR/pl/images doc/pl/images/*.gif
 %subpackage sv
 d 0755 root sys $DOCDIR/sv
 f 0644 root sys $DOCDIR/sv doc/sv/*.html
-d 0755 root sys $DOCDIR/sv/images -
-f 0644 root sys $DOCDIR/sv/images doc/sv/images/*.gif
 %subpackage zh
 d 0755 root sys $DOCDIR/zh_TW
 f 0644 root sys $DOCDIR/zh_TW doc/zh_TW/*.html
-d 0755 root sys $DOCDIR/zh_TW/images -
-f 0644 root sys $DOCDIR/zh_TW/images doc/zh_TW/images/*.gif
 %subpackage
 
 # Man pages
@@ -722,5 +680,5 @@ f 0644 root sys $XINETD/cups-lpd init/cups-lpd
 %subpackage
 
 #
-# End of "$Id: cups.list.in 6960 2007-09-14 21:15:04Z mike $".
+# End of "$Id: cups.list.in 7014 2007-10-10 21:57:43Z mike $".
 #
index 8ccd639f85014274d4114c47623157378f0f0377..bc65635c7b96214077c9608a59b9981fc1d90874 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 6960 2007-09-14 21:15:04Z mike $"
+# "$Id: cups.spec.in 6889 2007-08-29 22:23:35Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -495,8 +495,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/de
 /usr/share/doc/cups/de/index.html
-%dir /usr/share/doc/cups/de/images
-/usr/share/doc/cups/de/images/*
 %dir /usr/share/cups/templates/de
 /usr/share/cups/templates/de/*
 /usr/share/locale/de/cups_de.po
@@ -505,8 +503,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/es
 /usr/share/doc/cups/es/index.html
-%dir /usr/share/doc/cups/es/images
-/usr/share/doc/cups/es/images/*
 %dir /usr/share/cups/templates/es
 /usr/share/cups/templates/es/*
 /usr/share/locale/es/cups_es.po
@@ -515,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/et
 /usr/share/doc/cups/et/index.html
-%dir /usr/share/doc/cups/et/images
-/usr/share/doc/cups/et/images/*
 %dir /usr/share/cups/templates/et
 /usr/share/cups/templates/et/*
 /usr/share/locale/et/cups_et.po
@@ -529,8 +523,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/fr
 /usr/share/doc/cups/fr/index.html
-%dir /usr/share/doc/cups/fr/images
-/usr/share/doc/cups/fr/images/*
 %dir /usr/share/cups/templates/fr
 /usr/share/cups/templates/fr/*
 /usr/share/locale/fr/cups_fr.po
@@ -540,8 +532,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/doc/cups/he
 /usr/share/doc/cups/he/index.html
 /usr/share/doc/cups/he/cups.css
-%dir /usr/share/doc/cups/he/images
-/usr/share/doc/cups/he/images/*
 %dir /usr/share/cups/templates/he
 /usr/share/cups/templates/he/*
 /usr/share/locale/he/cups_he.po
@@ -550,8 +540,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/it
 /usr/share/doc/cups/it/index.html
-%dir /usr/share/doc/cups/it/images
-/usr/share/doc/cups/it/images/*
 %dir /usr/share/cups/templates/it
 /usr/share/cups/templates/it/*
 /usr/share/locale/it/cups_it.po
@@ -560,8 +548,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/ja
 /usr/share/doc/cups/ja/index.html
-%dir /usr/share/doc/cups/ja/images
-/usr/share/doc/cups/ja/images/*
 %dir /usr/share/cups/templates/ja
 /usr/share/cups/templates/ja/*
 /usr/share/locale/ja/cups_ja.po
@@ -582,8 +568,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/pl
 /usr/share/doc/cups/pl/index.html
-%dir /usr/share/doc/cups/pl/images
-/usr/share/doc/cups/pl/images/*
 %dir /usr/share/cups/templates/pl
 /usr/share/cups/templates/pl/*
 /usr/share/locale/pl/cups_pl.po
@@ -592,6 +576,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/share/locale/pt/cups_pt.po
 /usr/share/locale/pt_BR/cups_pt_BR.po
+/usr/share/locale/pt_PT/cups_pt_PT.po
 
 %files ru
 %defattr(-,root,root)
@@ -601,8 +586,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/sv
 /usr/share/doc/cups/sv/index.html
-%dir /usr/share/doc/cups/sv/images
-/usr/share/doc/cups/sv/images/*
 %dir /usr/share/cups/templates/sv
 /usr/share/cups/templates/sv/*
 /usr/share/locale/sv/cups_sv.po
@@ -611,8 +594,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/zh_TW
 /usr/share/doc/cups/zh_TW/index.html
-%dir /usr/share/doc/cups/zh_TW/images
-/usr/share/doc/cups/zh_TW/images/*
 %dir /usr/share/cups/templates/zh_TW
 /usr/share/cups/templates/zh_TW/*
 /usr/share/locale/zh/cups_zh.po
@@ -626,5 +607,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 6960 2007-09-14 21:15:04Z mike $".
+# End of "$Id: cups.spec.in 6889 2007-08-29 22:23:35Z mike $".
 #
index 184803b5cc3f414e95b57261088a250b444bccc4..d092828f531d5e30bd7cd30734fb753635a53369 100644 (file)
Binary files a/packaging/installer.gif and b/packaging/installer.gif differ
index c6d07ab3ec3d8dba3ab0e29647513234dab352b0..70d9005c6a9276ea1e346e108a2a4af6717a57cf 100644 (file)
Binary files a/packaging/installer.tif and b/packaging/installer.tif differ
index 80f8364cb690b3e8325375419b23f77fd6615ce1..44588f1c8bb8e84078421840b90920c745e4534d 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6731 2007-07-26 00:37:48Z mike $"
+# "$Id: Makefile 6813 2007-08-20 17:35:06Z mike $"
 #
 #   PPD file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -19,7 +19,8 @@ include ../Makedefs
 # PPD files...
 #
 
-FILES  =       deskjet.ppd dymo.ppd epson9.ppd epson24.ppd intelbar.ppd \
+FILES  =       deskjet.ppd dymo.ppd epson9.ppd epson24.ppd \
+               generic.ppd generpcl.ppd intelbar.ppd \
                laserjet.ppd okidata9.ppd okidat24.ppd stcolor.ppd \
                stcolor2.ppd stphoto.ppd stphoto2.ppd zebra.ppd \
                zebracpl.ppd zebraep1.ppd zebraep2.ppd
@@ -78,5 +79,5 @@ ppds:
 
 
 #
-# End of "$Id: Makefile 6731 2007-07-26 00:37:48Z mike $".
+# End of "$Id: Makefile 6813 2007-08-20 17:35:06Z mike $".
 #
index 69d4db156ef5aa8c990ce39eb8bb09fc42dc6175..ea6acbe2fe8f294e52f1bb26051a1284e98490f8 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *UIConstraints: *PageSize A3 *InputSlot Envelope
 *UIConstraints: *InputSlot Envelope *PageSize A3
 *UIConstraints: *PageSize A4 *InputSlot Envelope
 *ko.MediaType Special/Special Paper: ""
 *ko.MediaType Transparency/투명 용지: ""
 *ko.MediaType Glossy/광택지: ""
+*nl.Translation Manufacturer/HP: ""
+*nl.Translation ModelName/HP DeskJet Series: ""
+*nl.Translation ShortNickName/HP DeskJet Series: ""
+*nl.Translation NickName/HP DeskJet Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize Executive/Executive - 7.25x10.5in: ""
+*nl.PageSize Tabloid/Tabloid - 11x17in: ""
+*nl.PageSize A3/A3 - 297x420mm: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize A5/A5 - 148x210mm: ""
+*nl.PageSize B5/B5 - 182x257mm: ""
+*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*nl.Translation ColorModel/Kleurenmodus: ""
+*nl.ColorModel Gray/Grayscale: ""
+*nl.ColorModel RGB/Kleur: ""
+*nl.ColorModel CMYK/CMYK: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 150dpi/150dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600 DPI Grayscale: ""
+*nl.Translation InputSlot/Media Source: ""
+*nl.InputSlot Tray/Tray: ""
+*nl.InputSlot Manual/Handmatig: ""
+*nl.InputSlot Envelope/Envelope Feed: ""
+*nl.Translation MediaType/Media Type: ""
+*nl.MediaType Plain/Normaal papier: ""
+*nl.MediaType Bond/Briefpapier: ""
+*nl.MediaType Special/Special Paper: ""
+*nl.MediaType Transparency/Transparency: ""
+*nl.MediaType Glossy/Glanzend papier: ""
 *no.Translation Manufacturer/HP: ""
 *no.Translation ModelName/HP DeskJet Series: ""
 *no.Translation ShortNickName/HP DeskJet Series: ""
 *pt.MediaType Special/Special Paper: ""
 *pt.MediaType Transparency/Transparência: ""
 *pt.MediaType Glossy/Papel acetinado: ""
+*pt_BR.Translation Manufacturer/HP: ""
+*pt_BR.Translation ModelName/HP DeskJet Series: ""
+*pt_BR.Translation ShortNickName/HP DeskJet Series: ""
+*pt_BR.Translation NickName/HP DeskJet Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_BR.PageSize A3/A3 - 297x420mm: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize A5/A5 - 148x210mm: ""
+*pt_BR.PageSize B5/B5 - 182x257mm: ""
+*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_BR.Translation ColorModel/Modo Cor: ""
+*pt_BR.ColorModel Gray/Grayscale: ""
+*pt_BR.ColorModel RGB/Inativo: ""
+*pt_BR.ColorModel CMYK/CMYK: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 150dpi/150dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600 DPI Grayscale: ""
+*pt_BR.Translation InputSlot/Media Source: ""
+*pt_BR.InputSlot Tray/Tray: ""
+*pt_BR.InputSlot Manual/Alimentação Manual: ""
+*pt_BR.InputSlot Envelope/Envelope Feed: ""
+*pt_BR.Translation MediaType/Media Type: ""
+*pt_BR.MediaType Plain/Papel normal: ""
+*pt_BR.MediaType Bond/Papel bond: ""
+*pt_BR.MediaType Special/Special Paper: ""
+*pt_BR.MediaType Transparency/Transparência: ""
+*pt_BR.MediaType Glossy/Papel acetinado: ""
 *pt_PT.Translation Manufacturer/HP: ""
 *pt_PT.Translation ModelName/HP DeskJet Series: ""
 *pt_PT.Translation ShortNickName/HP DeskJet Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DESKJET.PPD, 31445 bytes.
+*% End of DESKJET.PPD, 34458 bytes.
index 0292b1b3072b616400f21495bbad1dbac690ca21..bab653d6f5714890e01d782102b35006928a84fe 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w81h252
 *ko.cupsDarkness Medium/Medium: ""
 *ko.cupsDarkness Normal/Normal: ""
 *ko.cupsDarkness Dark/Dark: ""
+*nl.Translation Manufacturer/Dymo: ""
+*nl.Translation ModelName/Dymo Label Printer: ""
+*nl.Translation ShortNickName/Dymo Label Printer: ""
+*nl.Translation NickName/Dymo Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
+*nl.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
+*nl.PageSize w54h144/Return Address - 3/4x2in: ""
+*nl.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
+*nl.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
+*nl.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
+*nl.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
+*nl.PageSize w41h144/Hanging Folder - 9/16x2in: ""
+*nl.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 136dpi/136dpi: ""
+*nl.Resolution 203dpi/203dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Translation cupsDarkness/Darkness: ""
+*nl.cupsDarkness Light/Light: ""
+*nl.cupsDarkness Medium/Medium: ""
+*nl.cupsDarkness Normal/Normal: ""
+*nl.cupsDarkness Dark/Dark: ""
 *no.Translation Manufacturer/Dymo: ""
 *no.Translation ModelName/Dymo Label Printer: ""
 *no.Translation ShortNickName/Dymo Label Printer: ""
 *pt.cupsDarkness Medium/Medium: ""
 *pt.cupsDarkness Normal/Normal: ""
 *pt.cupsDarkness Dark/Dark: ""
+*pt_BR.Translation Manufacturer/Dymo: ""
+*pt_BR.Translation ModelName/Dymo Label Printer: ""
+*pt_BR.Translation ShortNickName/Dymo Label Printer: ""
+*pt_BR.Translation NickName/Dymo Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
+*pt_BR.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
+*pt_BR.PageSize w54h144/Return Address - 3/4x2in: ""
+*pt_BR.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
+*pt_BR.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
+*pt_BR.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
+*pt_BR.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
+*pt_BR.PageSize w41h144/Hanging Folder - 9/16x2in: ""
+*pt_BR.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 136dpi/136dpi: ""
+*pt_BR.Resolution 203dpi/203dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Translation cupsDarkness/Darkness: ""
+*pt_BR.cupsDarkness Light/Light: ""
+*pt_BR.cupsDarkness Medium/Medium: ""
+*pt_BR.cupsDarkness Normal/Normal: ""
+*pt_BR.cupsDarkness Dark/Dark: ""
 *pt_PT.Translation Manufacturer/Dymo: ""
 *pt_PT.Translation ModelName/Dymo Label Printer: ""
 *pt_PT.Translation ShortNickName/Dymo Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DYMO.PPD, 22651 bytes.
+*% End of DYMO.PPD, 24761 bytes.
index b1fed3230a32d8d3dcc8d374a07ebb341088394e..25b23c55a04bee21f17f24a8d7c33e191ccba167 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson 24-Pin Series: ""
+*nl.Translation ShortNickName/Epson 24-Pin Series: ""
+*nl.Translation NickName/Epson 24-Pin Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 60dpi/60dpi: ""
+*nl.Resolution 120x60dpi/120x60dpi: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360x180dpi/360x180dpi: ""
+*nl.Resolution 360x180dpi/360x180dpi: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson 24-Pin Series: ""
 *no.Translation ShortNickName/Epson 24-Pin Series: ""
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson 24-Pin Series: ""
+*pt_BR.Translation ShortNickName/Epson 24-Pin Series: ""
+*pt_BR.Translation NickName/Epson 24-Pin Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 60dpi/60dpi: ""
+*pt_BR.Resolution 120x60dpi/120x60dpi: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360x180dpi/360x180dpi: ""
+*pt_BR.Resolution 360x180dpi/360x180dpi: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson 24-Pin Series: ""
 *pt_PT.Translation ShortNickName/Epson 24-Pin Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON24.PPD, 15121 bytes.
+*% End of EPSON24.PPD, 16375 bytes.
index 88a48e339242dcb616d0fc6886945abb8a3419c0..f32ce9549af7afd9d6bb3bf422b0563826e9a360 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Resolution 60x720dpi/60x720dpi: ""
 *ko.Resolution 120x72dpi/120x72dpi: ""
 *ko.Resolution 240x72dpi/240x72dpi: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson 9-Pin Series: ""
+*nl.Translation ShortNickName/Epson 9-Pin Series: ""
+*nl.Translation NickName/Epson 9-Pin Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 60x720dpi/60x720dpi: ""
+*nl.Resolution 120x72dpi/120x72dpi: ""
+*nl.Resolution 240x72dpi/240x72dpi: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson 9-Pin Series: ""
 *no.Translation ShortNickName/Epson 9-Pin Series: ""
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson 9-Pin Series: ""
+*pt_BR.Translation ShortNickName/Epson 9-Pin Series: ""
+*pt_BR.Translation NickName/Epson 9-Pin Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 60x720dpi/60x720dpi: ""
+*pt_BR.Resolution 120x72dpi/120x72dpi: ""
+*pt_BR.Resolution 240x72dpi/240x72dpi: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson 9-Pin Series: ""
 *pt_PT.Translation ShortNickName/Epson 9-Pin Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON9.PPD, 13823 bytes.
+*% End of EPSON9.PPD, 14929 bytes.
diff --git a/ppd/generic.ppd b/ppd/generic.ppd
new file mode 100644 (file)
index 0000000..5d55f1b
--- /dev/null
@@ -0,0 +1,637 @@
+*PPD-Adobe: "4.3"
+*% PPD file for PostScript Printer with CUPS.
+*% Created by the CUPS PPD Compiler v1.2.0.
+*% Copyright 2007 by Apple Inc.
+*% Copyright 1997-2007 by Easy Software Products.
+*% 
+*% These coded instructions, statements, and computer programs are the
+*% property of Apple Inc. and are protected by Federal copyright
+*% law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+*% which should have been included with this file.  If this file is
+*% file is missing or damaged, see the license at "http://www.cups.org/".
+*FormatVersion: "4.3"
+*FileVersion: "1.3"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "GENERIC.PPD"
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
+*Manufacturer: "Generic"
+*ModelName: "Generic PostScript Printer"
+*ShortNickName: "Generic PostScript Printer"
+*NickName: "Generic PostScript Printer, 1.3"
+*PSVersion: "(3010.000) 81504"
+*PSVersion: "(3010.000) 860"
+*PSVersion: "(2016.0) 0"
+*LanguageLevel: "3"
+*ColorDevice: False
+*DefaultColorSpace: Gray
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*% Driver-defined attributes...
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
+*UIConstraints: *Duplex *Option1 False
+*UIConstraints: *Option1 False *Duplex
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize Executive/Executive - 7.25x10.5in: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Tabloid/Tabloid - 11x17in: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageSize A3/A3 - 297x420mm: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5 - 148x210mm: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageSize B5/B5 - 182x257mm: "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/#10 Envelope - 4.13x9.5in: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/C5 Envelope - 162x229mm: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize EnvDL/DL Envelope - 110x220mm: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion Executive/Executive - 7.25x10.5in: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Tabloid/Tabloid - 11x17in: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageRegion A3/A3 - 297x420mm: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5 - 148x210mm: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageRegion B5/B5 - 182x257mm: "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/ISOB5 Envelope - 176x250mm: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/#10 Envelope - 4.13x9.5in: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/C5 Envelope - 162x229mm: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvDL/DL Envelope - 110x220mm: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvMonarch/Monarch Envelope - 3.875x7.5in: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+*DefaultImageableArea: Letter
+*ImageableArea Letter/Letter - 8.5x11in: "12.00 12.00 600.00 780.00"
+*ImageableArea Legal/Legal - 8.5x14in: "12.00 12.00 600.00 996.00"
+*ImageableArea Executive/Executive - 7.25x10.5in: "12.00 12.00 510.00 744.00"
+*ImageableArea Tabloid/Tabloid - 11x17in: "12.00 12.00 780.00 1212.00"
+*ImageableArea A3/A3 - 297x420mm: "12.00 12.00 830.00 1179.00"
+*ImageableArea A4/A4 - 210x297mm: "12.00 12.00 583.00 830.00"
+*ImageableArea A5/A5 - 148x210mm: "12.00 12.00 408.00 583.00"
+*ImageableArea B5/B5 - 182x257mm: "12.00 12.00 504.00 717.00"
+*ImageableArea EnvISOB5/ISOB5 Envelope - 176x250mm: "12.00 12.00 487.00 697.00"
+*ImageableArea Env10/#10 Envelope - 4.13x9.5in: "12.00 12.00 285.00 672.00"
+*ImageableArea EnvC5/C5 Envelope - 162x229mm: "12.00 12.00 447.00 637.00"
+*ImageableArea EnvDL/DL Envelope - 110x220mm: "12.00 12.00 300.00 612.00"
+*ImageableArea EnvMonarch/Monarch Envelope - 3.875x7.5in: "12.00 12.00 267.00 528.00"
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
+*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
+*PaperDimension Executive/Executive - 7.25x10.5in: "522.00 756.00"
+*PaperDimension Tabloid/Tabloid - 11x17in: "792.00 1224.00"
+*PaperDimension A3/A3 - 297x420mm: "842.00 1191.00"
+*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
+*PaperDimension A5/A5 - 148x210mm: "420.00 595.00"
+*PaperDimension B5/B5 - 182x257mm: "516.00 729.00"
+*PaperDimension EnvISOB5/ISOB5 Envelope - 176x250mm: "499.00 709.00"
+*PaperDimension Env10/#10 Envelope - 4.13x9.5in: "297.00 684.00"
+*PaperDimension EnvC5/C5 Envelope - 162x229mm: "459.00 649.00"
+*PaperDimension EnvDL/DL Envelope - 110x220mm: "312.00 624.00"
+*PaperDimension EnvMonarch/Monarch Envelope - 3.875x7.5in: "279.00 540.00"
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10.0 AnySetup *InputSlot
+*DefaultInputSlot: Default
+*InputSlot Default/Printer Default: ""
+*InputSlot Tray1/Tray 1: "<</ManualFeed false>>setpagedevice"
+*InputSlot Manual/Manual Feed: "<</ManualFeed true>>setpagedevice"
+*CloseUI: *InputSlot
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10.0 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*OpenGroup: InstallableOptions/Installable Options
+*OpenUI *Option1/Duplexer: Boolean
+*OrderDependency: 10.0 AnySetup *Option1
+*DefaultOption1: False
+*Option1 False/Not Installed: ""
+*Option1 True/Installed: ""
+*CloseUI: *Option1
+*CloseGroup: InstallableOptions
+*da.Translation Manufacturer/Generic: ""
+*da.Translation ModelName/Generic PostScript Printer: ""
+*da.Translation ShortNickName/Generic PostScript Printer: ""
+*da.Translation NickName/Generic PostScript Printer, 1.3: ""
+*da.Translation PageSize/Media Size: ""
+*da.PageSize Letter/Letter - 8.5x11in: ""
+*da.PageSize Legal/Legal - 8.5x14in: ""
+*da.PageSize Executive/Executive - 7.25x10.5in: ""
+*da.PageSize Tabloid/Tabloid - 11x17in: ""
+*da.PageSize A3/A3 - 297x420mm: ""
+*da.PageSize A4/A4 - 210x297mm: ""
+*da.PageSize A5/A5 - 148x210mm: ""
+*da.PageSize B5/B5 - 182x257mm: ""
+*da.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*da.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*da.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*da.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*da.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*da.Translation InputSlot/Media Source: ""
+*da.InputSlot Default/Printerstandard: ""
+*da.InputSlot Tray1/Bakke 1: ""
+*da.InputSlot Manual/Manuel: ""
+*da.Translation Duplex/Dupleks: ""
+*da.Duplex None/Off (1-Sided): ""
+*da.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*da.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*da.Translation InstallableOptions/Installable Options: ""
+*da.Translation Option1/Duplexer: ""
+*da.Option1 False/Ikke installeret: ""
+*da.Option1 True/Installed: ""
+*de.Translation Manufacturer/Generic: ""
+*de.Translation ModelName/Generic PostScript Printer: ""
+*de.Translation ShortNickName/Generic PostScript Printer: ""
+*de.Translation NickName/Generic PostScript Printer, 1.3: ""
+*de.Translation PageSize/Media Size: ""
+*de.PageSize Letter/Letter - 8.5x11in: ""
+*de.PageSize Legal/Legal - 8.5x14in: ""
+*de.PageSize Executive/Executive - 7.25x10.5in: ""
+*de.PageSize Tabloid/Tabloid - 11x17in: ""
+*de.PageSize A3/A3 - 297x420mm: ""
+*de.PageSize A4/A4 - 210x297mm: ""
+*de.PageSize A5/A5 - 148x210mm: ""
+*de.PageSize B5/B5 - 182x257mm: ""
+*de.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*de.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*de.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*de.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*de.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*de.Translation InputSlot/Media Source: ""
+*de.InputSlot Default/Druckerstandard: ""
+*de.InputSlot Tray1/Fach 1: ""
+*de.InputSlot Manual/Manuell: ""
+*de.Translation Duplex/Duplexdruck: ""
+*de.Duplex None/Off (1-Sided): ""
+*de.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*de.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*de.Translation InstallableOptions/Installable Options: ""
+*de.Translation Option1/Duplexer: ""
+*de.Option1 False/Nicht Eingebaut: ""
+*de.Option1 True/Eingebaut: ""
+*es.Translation Manufacturer/Generic: ""
+*es.Translation ModelName/Generic PostScript Printer: ""
+*es.Translation ShortNickName/Generic PostScript Printer: ""
+*es.Translation NickName/Generic PostScript Printer, 1.3: ""
+*es.Translation PageSize/Media Size: ""
+*es.PageSize Letter/Letter - 8.5x11in: ""
+*es.PageSize Legal/Legal - 8.5x14in: ""
+*es.PageSize Executive/Executive - 7.25x10.5in: ""
+*es.PageSize Tabloid/Tabloid - 11x17in: ""
+*es.PageSize A3/A3 - 297x420mm: ""
+*es.PageSize A4/A4 - 210x297mm: ""
+*es.PageSize A5/A5 - 148x210mm: ""
+*es.PageSize B5/B5 - 182x257mm: ""
+*es.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*es.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*es.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*es.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*es.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*es.Translation InputSlot/Media Source: ""
+*es.InputSlot Default/Impresora por defecto: ""
+*es.InputSlot Tray1/Bandeja 1: ""
+*es.InputSlot Manual/Alimentación manual: ""
+*es.Translation Duplex/Dúplex: ""
+*es.Duplex None/Off (1-Sided): ""
+*es.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*es.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*es.Translation InstallableOptions/Installable Options: ""
+*es.Translation Option1/Duplexer: ""
+*es.Option1 False/No Instalado: ""
+*es.Option1 True/Instalada: ""
+*fi.Translation Manufacturer/Generic: ""
+*fi.Translation ModelName/Generic PostScript Printer: ""
+*fi.Translation ShortNickName/Generic PostScript Printer: ""
+*fi.Translation NickName/Generic PostScript Printer, 1.3: ""
+*fi.Translation PageSize/Media Size: ""
+*fi.PageSize Letter/Letter - 8.5x11in: ""
+*fi.PageSize Legal/Legal - 8.5x14in: ""
+*fi.PageSize Executive/Executive - 7.25x10.5in: ""
+*fi.PageSize Tabloid/Tabloid - 11x17in: ""
+*fi.PageSize A3/A3 - 297x420mm: ""
+*fi.PageSize A4/A4 - 210x297mm: ""
+*fi.PageSize A5/A5 - 148x210mm: ""
+*fi.PageSize B5/B5 - 182x257mm: ""
+*fi.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*fi.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*fi.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*fi.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*fi.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*fi.Translation InputSlot/Paperilähde: ""
+*fi.InputSlot Default/Nopea: ""
+*fi.InputSlot Tray1/Kasetti1: ""
+*fi.InputSlot Manual/Käsinsyöttö: ""
+*fi.Translation Duplex/Kaksipuolinen tulostus: ""
+*fi.Duplex None/Off (1-Sided): ""
+*fi.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*fi.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*fi.Translation InstallableOptions/Installable Options: ""
+*fi.Translation Option1/Duplexer: ""
+*fi.Option1 False/Not Installed: ""
+*fi.Option1 True/Installed: ""
+*fr.Translation Manufacturer/Generic: ""
+*fr.Translation ModelName/Generic PostScript Printer: ""
+*fr.Translation ShortNickName/Generic PostScript Printer: ""
+*fr.Translation NickName/Generic PostScript Printer, 1.3: ""
+*fr.Translation PageSize/Media Size: ""
+*fr.PageSize Letter/Letter - 8.5x11in: ""
+*fr.PageSize Legal/Legal - 8.5x14in: ""
+*fr.PageSize Executive/Executive - 7.25x10.5in: ""
+*fr.PageSize Tabloid/Tabloid - 11x17in: ""
+*fr.PageSize A3/A3 - 297x420mm: ""
+*fr.PageSize A4/A4 - 210x297mm: ""
+*fr.PageSize A5/A5 - 148x210mm: ""
+*fr.PageSize B5/B5 - 182x257mm: ""
+*fr.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*fr.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*fr.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*fr.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*fr.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*fr.Translation InputSlot/Media Source: ""
+*fr.InputSlot Default/Imprimante par défaut: ""
+*fr.InputSlot Tray1/Bac 1: ""
+*fr.InputSlot Manual/Manuel: ""
+*fr.Translation Duplex/Impression recto-verso: ""
+*fr.Duplex None/Off (1-Sided): ""
+*fr.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*fr.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*fr.Translation InstallableOptions/Installable Options: ""
+*fr.Translation Option1/Duplexer: ""
+*fr.Option1 False/Non Installée: ""
+*fr.Option1 True/Installée: ""
+*it.Translation Manufacturer/Generic: ""
+*it.Translation ModelName/Generic PostScript Printer: ""
+*it.Translation ShortNickName/Generic PostScript Printer: ""
+*it.Translation NickName/Generic PostScript Printer, 1.3: ""
+*it.Translation PageSize/Media Size: ""
+*it.PageSize Letter/Letter - 8.5x11in: ""
+*it.PageSize Legal/Legal - 8.5x14in: ""
+*it.PageSize Executive/Executive - 7.25x10.5in: ""
+*it.PageSize Tabloid/Tabloid - 11x17in: ""
+*it.PageSize A3/A3 - 297x420mm: ""
+*it.PageSize A4/A4 - 210x297mm: ""
+*it.PageSize A5/A5 - 148x210mm: ""
+*it.PageSize B5/B5 - 182x257mm: ""
+*it.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*it.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*it.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*it.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*it.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*it.Translation InputSlot/Media Source: ""
+*it.InputSlot Default/Impostazioni predefinite stampante: ""
+*it.InputSlot Tray1/Vassoio 1: ""
+*it.InputSlot Manual/Manuale: ""
+*it.Translation Duplex/Fronte-retro: ""
+*it.Duplex None/Off (1-Sided): ""
+*it.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*it.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*it.Translation InstallableOptions/Installable Options: ""
+*it.Translation Option1/Duplexer: ""
+*it.Option1 False/Non Installato: ""
+*it.Option1 True/Installata: ""
+*ja.Translation Manufacturer/Generic: ""
+*ja.Translation ModelName/Generic PostScript Printer: ""
+*ja.Translation ShortNickName/Generic PostScript Printer: ""
+*ja.Translation NickName/Generic PostScript Printer, 1.3: ""
+*ja.Translation PageSize/Media Size: ""
+*ja.PageSize Letter/Letter - 8.5x11in: ""
+*ja.PageSize Legal/Legal - 8.5x14in: ""
+*ja.PageSize Executive/Executive - 7.25x10.5in: ""
+*ja.PageSize Tabloid/Tabloid - 11x17in: ""
+*ja.PageSize A3/A3 - 297x420mm: ""
+*ja.PageSize A4/A4 - 210x297mm: ""
+*ja.PageSize A5/A5 - 148x210mm: ""
+*ja.PageSize B5/B5 - 182x257mm: ""
+*ja.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*ja.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*ja.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*ja.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*ja.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*ja.Translation InputSlot/Media Source: ""
+*ja.InputSlot Default/システムデフォルト: ""
+*ja.InputSlot Tray1/カセット 1: ""
+*ja.InputSlot Manual/手差し: ""
+*ja.Translation Duplex/両面印刷: ""
+*ja.Duplex None/Off (1-Sided): ""
+*ja.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*ja.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*ja.Translation InstallableOptions/Installable Options: ""
+*ja.Translation Option1/Duplexer: ""
+*ja.Option1 False/インストールされていません: ""
+*ja.Option1 True/インストール済み: ""
+*ko.Translation Manufacturer/Generic: ""
+*ko.Translation ModelName/Generic PostScript Printer: ""
+*ko.Translation ShortNickName/Generic PostScript Printer: ""
+*ko.Translation NickName/Generic PostScript Printer, 1.3: ""
+*ko.Translation PageSize/Media Size: ""
+*ko.PageSize Letter/Letter - 8.5x11in: ""
+*ko.PageSize Legal/Legal - 8.5x14in: ""
+*ko.PageSize Executive/Executive - 7.25x10.5in: ""
+*ko.PageSize Tabloid/Tabloid - 11x17in: ""
+*ko.PageSize A3/A3 - 297x420mm: ""
+*ko.PageSize A4/A4 - 210x297mm: ""
+*ko.PageSize A5/A5 - 148x210mm: ""
+*ko.PageSize B5/B5 - 182x257mm: ""
+*ko.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*ko.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*ko.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*ko.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*ko.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*ko.Translation InputSlot/용지함: ""
+*ko.InputSlot Default/빠르게: ""
+*ko.InputSlot Tray1/트레이 1: ""
+*ko.InputSlot Manual/수동: ""
+*ko.Translation Duplex/양면인쇄: ""
+*ko.Duplex None/Off (1-Sided): ""
+*ko.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*ko.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*ko.Translation InstallableOptions/Installable Options: ""
+*ko.Translation Option1/Duplexer: ""
+*ko.Option1 False/설치 안됨: ""
+*ko.Option1 True/설치됨: ""
+*nl.Translation Manufacturer/Generic: ""
+*nl.Translation ModelName/Generic PostScript Printer: ""
+*nl.Translation ShortNickName/Generic PostScript Printer: ""
+*nl.Translation NickName/Generic PostScript Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize Executive/Executive - 7.25x10.5in: ""
+*nl.PageSize Tabloid/Tabloid - 11x17in: ""
+*nl.PageSize A3/A3 - 297x420mm: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize A5/A5 - 148x210mm: ""
+*nl.PageSize B5/B5 - 182x257mm: ""
+*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*nl.Translation InputSlot/Media Source: ""
+*nl.InputSlot Default/Printerstandaard: ""
+*nl.InputSlot Tray1/Lade 1: ""
+*nl.InputSlot Manual/Handmatig: ""
+*nl.Translation Duplex/Dubbelzijdig afdrukken: ""
+*nl.Duplex None/Off (1-Sided): ""
+*nl.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*nl.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*nl.Translation InstallableOptions/Installable Options: ""
+*nl.Translation Option1/Duplexer: ""
+*nl.Option1 False/Niet geïnstalleerd: ""
+*nl.Option1 True/Installed: ""
+*no.Translation Manufacturer/Generic: ""
+*no.Translation ModelName/Generic PostScript Printer: ""
+*no.Translation ShortNickName/Generic PostScript Printer: ""
+*no.Translation NickName/Generic PostScript Printer, 1.3: ""
+*no.Translation PageSize/Media Size: ""
+*no.PageSize Letter/Letter - 8.5x11in: ""
+*no.PageSize Legal/Legal - 8.5x14in: ""
+*no.PageSize Executive/Executive - 7.25x10.5in: ""
+*no.PageSize Tabloid/Tabloid - 11x17in: ""
+*no.PageSize A3/A3 - 297x420mm: ""
+*no.PageSize A4/A4 - 210x297mm: ""
+*no.PageSize A5/A5 - 148x210mm: ""
+*no.PageSize B5/B5 - 182x257mm: ""
+*no.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*no.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*no.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*no.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*no.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*no.Translation InputSlot/Media Source: ""
+*no.InputSlot Default/Skriverstandard: ""
+*no.InputSlot Tray1/Skuff 1: ""
+*no.InputSlot Manual/Handmatig: ""
+*no.Translation Duplex/Tosidig: ""
+*no.Duplex None/Off (1-Sided): ""
+*no.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*no.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*no.Translation InstallableOptions/Installable Options: ""
+*no.Translation Option1/Duplexer: ""
+*no.Option1 False/Not Installed: ""
+*no.Option1 True/Installed: ""
+*pt.Translation Manufacturer/Generic: ""
+*pt.Translation ModelName/Generic PostScript Printer: ""
+*pt.Translation ShortNickName/Generic PostScript Printer: ""
+*pt.Translation NickName/Generic PostScript Printer, 1.3: ""
+*pt.Translation PageSize/Media Size: ""
+*pt.PageSize Letter/Letter - 8.5x11in: ""
+*pt.PageSize Legal/Legal - 8.5x14in: ""
+*pt.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt.PageSize A3/A3 - 297x420mm: ""
+*pt.PageSize A4/A4 - 210x297mm: ""
+*pt.PageSize A5/A5 - 148x210mm: ""
+*pt.PageSize B5/B5 - 182x257mm: ""
+*pt.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt.Translation InputSlot/Media Source: ""
+*pt.InputSlot Default/Rápido: ""
+*pt.InputSlot Tray1/Bandeja 1: ""
+*pt.InputSlot Manual/Alimentação Manual: ""
+*pt.Translation Duplex/Impressão em Frente e Verso: ""
+*pt.Duplex None/Off (1-Sided): ""
+*pt.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt.Translation InstallableOptions/Installable Options: ""
+*pt.Translation Option1/Duplexer: ""
+*pt.Option1 False/Não instalado: ""
+*pt.Option1 True/Instalada: ""
+*pt_BR.Translation Manufacturer/Generic: ""
+*pt_BR.Translation ModelName/Generic PostScript Printer: ""
+*pt_BR.Translation ShortNickName/Generic PostScript Printer: ""
+*pt_BR.Translation NickName/Generic PostScript Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_BR.PageSize A3/A3 - 297x420mm: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize A5/A5 - 148x210mm: ""
+*pt_BR.PageSize B5/B5 - 182x257mm: ""
+*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_BR.Translation InputSlot/Media Source: ""
+*pt_BR.InputSlot Default/Rápido: ""
+*pt_BR.InputSlot Tray1/Bandeja 1: ""
+*pt_BR.InputSlot Manual/Alimentação Manual: ""
+*pt_BR.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_BR.Duplex None/Off (1-Sided): ""
+*pt_BR.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_BR.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_BR.Translation InstallableOptions/Installable Options: ""
+*pt_BR.Translation Option1/Duplexer: ""
+*pt_BR.Option1 False/Não instalado: ""
+*pt_BR.Option1 True/Instalada: ""
+*pt_PT.Translation Manufacturer/Generic: ""
+*pt_PT.Translation ModelName/Generic PostScript Printer: ""
+*pt_PT.Translation ShortNickName/Generic PostScript Printer: ""
+*pt_PT.Translation NickName/Generic PostScript Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_PT.PageSize A3/A3 - 297x420mm: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize A5/A5 - 148x210mm: ""
+*pt_PT.PageSize B5/B5 - 182x257mm: ""
+*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_PT.Translation InputSlot/Media Source: ""
+*pt_PT.InputSlot Default/Rápido: ""
+*pt_PT.InputSlot Tray1/Bandeja 1: ""
+*pt_PT.InputSlot Manual/Alimentação Manual: ""
+*pt_PT.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_PT.Duplex None/Off (1-Sided): ""
+*pt_PT.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_PT.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_PT.Translation InstallableOptions/Installable Options: ""
+*pt_PT.Translation Option1/Duplexer: ""
+*pt_PT.Option1 False/Não instalado: ""
+*pt_PT.Option1 True/Instalada: ""
+*sv.Translation Manufacturer/Generic: ""
+*sv.Translation ModelName/Generic PostScript Printer: ""
+*sv.Translation ShortNickName/Generic PostScript Printer: ""
+*sv.Translation NickName/Generic PostScript Printer, 1.3: ""
+*sv.Translation PageSize/Media Size: ""
+*sv.PageSize Letter/Letter - 8.5x11in: ""
+*sv.PageSize Legal/Legal - 8.5x14in: ""
+*sv.PageSize Executive/Executive - 7.25x10.5in: ""
+*sv.PageSize Tabloid/Tabloid - 11x17in: ""
+*sv.PageSize A3/A3 - 297x420mm: ""
+*sv.PageSize A4/A4 - 210x297mm: ""
+*sv.PageSize A5/A5 - 148x210mm: ""
+*sv.PageSize B5/B5 - 182x257mm: ""
+*sv.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*sv.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*sv.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*sv.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*sv.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*sv.Translation InputSlot/Media Source: ""
+*sv.InputSlot Default/Skrivarstandard: ""
+*sv.InputSlot Tray1/Fack 1: ""
+*sv.InputSlot Manual/Manuell: ""
+*sv.Translation Duplex/Dubbelsidig utskrift: ""
+*sv.Duplex None/Off (1-Sided): ""
+*sv.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*sv.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*sv.Translation InstallableOptions/Installable Options: ""
+*sv.Translation Option1/Duplexer: ""
+*sv.Option1 False/Ej installerad: ""
+*sv.Option1 True/Installed: ""
+*zh.Translation Manufacturer/Generic: ""
+*zh.Translation ModelName/Generic PostScript Printer: ""
+*zh.Translation ShortNickName/Generic PostScript Printer: ""
+*zh.Translation NickName/Generic PostScript Printer, 1.3: ""
+*zh.Translation PageSize/Media Size: ""
+*zh.PageSize Letter/Letter - 8.5x11in: ""
+*zh.PageSize Legal/Legal - 8.5x14in: ""
+*zh.PageSize Executive/Executive - 7.25x10.5in: ""
+*zh.PageSize Tabloid/Tabloid - 11x17in: ""
+*zh.PageSize A3/A3 - 297x420mm: ""
+*zh.PageSize A4/A4 - 210x297mm: ""
+*zh.PageSize A5/A5 - 148x210mm: ""
+*zh.PageSize B5/B5 - 182x257mm: ""
+*zh.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*zh.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*zh.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*zh.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*zh.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*zh.Translation InputSlot/Paper Source: ""
+*zh.InputSlot Default/Printer's Current Setting: ""
+*zh.InputSlot Tray1/Tray 1: ""
+*zh.InputSlot Manual/手动: ""
+*zh.Translation Duplex/2-Sided Printing: ""
+*zh.Duplex None/Off (1-Sided): ""
+*zh.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*zh.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*zh.Translation InstallableOptions/Installable Options: ""
+*zh.Translation Option1/Duplexer: ""
+*zh.Option1 False/Not Installed: ""
+*zh.Option1 True/Installed: ""
+*zh_TW.Translation Manufacturer/Generic: ""
+*zh_TW.Translation ModelName/Generic PostScript Printer: ""
+*zh_TW.Translation ShortNickName/Generic PostScript Printer: ""
+*zh_TW.Translation NickName/Generic PostScript Printer, 1.3: ""
+*zh_TW.Translation PageSize/Media Size: ""
+*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
+*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
+*zh_TW.PageSize Executive/Executive - 7.25x10.5in: ""
+*zh_TW.PageSize Tabloid/Tabloid - 11x17in: ""
+*zh_TW.PageSize A3/A3 - 297x420mm: ""
+*zh_TW.PageSize A4/A4 - 210x297mm: ""
+*zh_TW.PageSize A5/A5 - 148x210mm: ""
+*zh_TW.PageSize B5/B5 - 182x257mm: ""
+*zh_TW.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*zh_TW.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*zh_TW.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*zh_TW.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*zh_TW.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*zh_TW.Translation InputSlot/紙張來源: ""
+*zh_TW.InputSlot Default/快速: ""
+*zh_TW.InputSlot Tray1/裝紙匣 1: ""
+*zh_TW.InputSlot Manual/手動: ""
+*zh_TW.Translation Duplex/雙面列印: ""
+*zh_TW.Duplex None/Off (1-Sided): ""
+*zh_TW.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*zh_TW.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*zh_TW.Translation InstallableOptions/Installable Options: ""
+*zh_TW.Translation Option1/Duplexer: ""
+*zh_TW.Option1 False/未安裝: ""
+*zh_TW.Option1 True/已安裝: ""
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(1.05)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
+*Font AvantGarde-Demi: Standard "(1.05)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(1.05)" Standard ROM
+*Font Bookman-Demi: Standard "(1.05)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(1.05)" Standard ROM
+*Font Bookman-Light: Standard "(1.05)" Standard ROM
+*Font Bookman-LightItalic: Standard "(1.05)" Standard ROM
+*Font Courier: Standard "(1.05)" Standard ROM
+*Font Courier-Bold: Standard "(1.05)" Standard ROM
+*Font Courier-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Courier-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica: Standard "(1.05)" Standard ROM
+*Font Helvetica-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Oblique: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(1.05)" Standard ROM
+*Font Palatino-Bold: Standard "(1.05)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Palatino-Italic: Standard "(1.05)" Standard ROM
+*Font Palatino-Roman: Standard "(1.05)" Standard ROM
+*Font Symbol: Special "(001.005)" Special ROM
+*Font Times-Bold: Standard "(1.05)" Standard ROM
+*Font Times-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Times-Italic: Standard "(1.05)" Standard ROM
+*Font Times-Roman: Standard "(1.05)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
+*Font ZapfDingbats: Special "(001.005)" Special ROM
+*% End of GENERIC.PPD, 30315 bytes.
diff --git a/ppd/generpcl.ppd b/ppd/generpcl.ppd
new file mode 100644 (file)
index 0000000..cf9ba07
--- /dev/null
@@ -0,0 +1,779 @@
+*PPD-Adobe: "4.3"
+*% PPD file for PCL Laser Printer with CUPS.
+*% Created by the CUPS PPD Compiler v1.2.0.
+*% Copyright 2007 by Apple Inc.
+*% Copyright 1997-2007 by Easy Software Products.
+*% 
+*% These coded instructions, statements, and computer programs are the
+*% property of Apple Inc. and are protected by Federal copyright
+*% law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+*% which should have been included with this file.  If this file is
+*% file is missing or damaged, see the license at "http://www.cups.org/".
+*FormatVersion: "4.3"
+*FileVersion: "1.3"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "GENERPCL.PPD"
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
+*Manufacturer: "Generic"
+*ModelName: "Generic PCL Laser Printer"
+*ShortNickName: "Generic PCL Laser Printer"
+*NickName: "Generic PCL Laser Printer, 1.3"
+*PSVersion: "(3010.000) 81504"
+*PSVersion: "(3010.000) 860"
+*LanguageLevel: "3"
+*ColorDevice: False
+*DefaultColorSpace: Gray
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*% Driver-defined attributes...
+*cupsVersion: 1.3
+*cupsModelNumber: 0
+*cupsManualCopies: False
+*cupsFilter: "application/vnd.cups-raster 50 rastertohp"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
+*UIConstraints: *Duplex *Option1 False
+*UIConstraints: *Option1 False *Duplex
+*UIConstraints: *PageSize A3 *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize A3
+*UIConstraints: *PageSize A4 *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize A4
+*UIConstraints: *PageSize A5 *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize A5
+*UIConstraints: *PageSize B5 *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize B5
+*UIConstraints: *PageSize Executive *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize Executive
+*UIConstraints: *PageSize Legal *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize Legal
+*UIConstraints: *PageSize Letter *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize Letter
+*UIConstraints: *PageSize Tabloid *InputSlot Envelope
+*UIConstraints: *InputSlot Envelope *PageSize Tabloid
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize Executive/Executive - 7.25x10.5in: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Tabloid/Tabloid - 11x17in: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageSize A3/A3 - 297x420mm: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5 - 148x210mm: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageSize B5/B5 - 182x257mm: "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/#10 Envelope - 4.13x9.5in: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/C5 Envelope - 162x229mm: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize EnvDL/DL Envelope - 110x220mm: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion Executive/Executive - 7.25x10.5in: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Tabloid/Tabloid - 11x17in: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageRegion A3/A3 - 297x420mm: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5 - 148x210mm: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageRegion B5/B5 - 182x257mm: "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/ISOB5 Envelope - 176x250mm: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/#10 Envelope - 4.13x9.5in: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/C5 Envelope - 162x229mm: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvDL/DL Envelope - 110x220mm: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvMonarch/Monarch Envelope - 3.875x7.5in: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+*DefaultImageableArea: Letter
+*ImageableArea Letter/Letter - 8.5x11in: "18.00 12.00 594.00 780.00"
+*ImageableArea Legal/Legal - 8.5x14in: "18.00 12.00 594.00 996.00"
+*ImageableArea Executive/Executive - 7.25x10.5in: "18.00 12.00 504.00 744.00"
+*ImageableArea Tabloid/Tabloid - 11x17in: "18.00 12.00 774.00 1212.00"
+*ImageableArea A3/A3 - 297x420mm: "18.00 12.00 824.00 1179.00"
+*ImageableArea A4/A4 - 210x297mm: "18.00 12.00 577.00 830.00"
+*ImageableArea A5/A5 - 148x210mm: "18.00 12.00 402.00 583.00"
+*ImageableArea B5/B5 - 182x257mm: "18.00 12.00 498.00 717.00"
+*ImageableArea EnvISOB5/ISOB5 Envelope - 176x250mm: "18.00 12.00 481.00 697.00"
+*ImageableArea Env10/#10 Envelope - 4.13x9.5in: "18.00 12.00 279.00 672.00"
+*ImageableArea EnvC5/C5 Envelope - 162x229mm: "18.00 12.00 441.00 637.00"
+*ImageableArea EnvDL/DL Envelope - 110x220mm: "18.00 12.00 294.00 612.00"
+*ImageableArea EnvMonarch/Monarch Envelope - 3.875x7.5in: "18.00 12.00 261.00 528.00"
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
+*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
+*PaperDimension Executive/Executive - 7.25x10.5in: "522.00 756.00"
+*PaperDimension Tabloid/Tabloid - 11x17in: "792.00 1224.00"
+*PaperDimension A3/A3 - 297x420mm: "842.00 1191.00"
+*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
+*PaperDimension A5/A5 - 148x210mm: "420.00 595.00"
+*PaperDimension B5/B5 - 182x257mm: "516.00 729.00"
+*PaperDimension EnvISOB5/ISOB5 Envelope - 176x250mm: "499.00 709.00"
+*PaperDimension Env10/#10 Envelope - 4.13x9.5in: "297.00 684.00"
+*PaperDimension EnvC5/C5 Envelope - 162x229mm: "459.00 649.00"
+*PaperDimension EnvDL/DL Envelope - 110x220mm: "312.00 624.00"
+*PaperDimension EnvMonarch/Monarch Envelope - 3.875x7.5in: "279.00 540.00"
+*RequiresPageRegion All: True
+*OpenUI *Resolution: PickOne
+*OrderDependency: 10.0 AnySetup *Resolution
+*DefaultResolution: 300dpi
+*Resolution 300dpi: "<</HWResolution[300 300]/cupsBitsPerColor 1/cupsRowCount 0/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
+*Resolution 600dpi: "<</HWResolution[600 600]/cupsBitsPerColor 1/cupsRowCount 0/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
+*CloseUI: *Resolution
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10.0 AnySetup *InputSlot
+*DefaultInputSlot: Default
+*InputSlot Default/Printer Default: "<</MediaPosition 0>>setpagedevice"
+*InputSlot Tray1/Tray 1: "<</MediaPosition 8>>setpagedevice"
+*InputSlot Tray2/Tray 2: "<</MediaPosition 1>>setpagedevice"
+*InputSlot Tray3/Tray 3: "<</MediaPosition 4>>setpagedevice"
+*InputSlot Tray4/Tray 4: "<</MediaPosition 5>>setpagedevice"
+*InputSlot Manual/Manual Feed: "<</MediaPosition 2>>setpagedevice"
+*InputSlot Envelope/Envelope Feed: "<</MediaPosition 3>>setpagedevice"
+*CloseUI: *InputSlot
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10.0 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*OpenGroup: InstallableOptions/Installable Options
+*OpenUI *Option1/Duplexer: Boolean
+*OrderDependency: 10.0 AnySetup *Option1
+*DefaultOption1: False
+*Option1 False/Not Installed: ""
+*Option1 True/Installed: ""
+*CloseUI: *Option1
+*CloseGroup: InstallableOptions
+*da.Translation Manufacturer/Generic: ""
+*da.Translation ModelName/Generic PCL Laser Printer: ""
+*da.Translation ShortNickName/Generic PCL Laser Printer: ""
+*da.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*da.Translation PageSize/Media Size: ""
+*da.PageSize Letter/Letter - 8.5x11in: ""
+*da.PageSize Legal/Legal - 8.5x14in: ""
+*da.PageSize Executive/Executive - 7.25x10.5in: ""
+*da.PageSize Tabloid/Tabloid - 11x17in: ""
+*da.PageSize A3/A3 - 297x420mm: ""
+*da.PageSize A4/A4 - 210x297mm: ""
+*da.PageSize A5/A5 - 148x210mm: ""
+*da.PageSize B5/B5 - 182x257mm: ""
+*da.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*da.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*da.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*da.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*da.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*da.Translation Resolution/Resolution: ""
+*da.Resolution 300dpi/300dpi: ""
+*da.Resolution 600dpi/600dpi: ""
+*da.Translation InputSlot/Media Source: ""
+*da.InputSlot Default/Printerstandard: ""
+*da.InputSlot Tray1/Bakke 1: ""
+*da.InputSlot Tray2/Magasin 2: ""
+*da.InputSlot Tray3/Magasin 3: ""
+*da.InputSlot Tray4/Bakke 4: ""
+*da.InputSlot Manual/Manuel: ""
+*da.InputSlot Envelope/Envelope Feed: ""
+*da.Translation Duplex/Dupleks: ""
+*da.Duplex None/Off (1-Sided): ""
+*da.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*da.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*da.Translation InstallableOptions/Installable Options: ""
+*da.Translation Option1/Duplexer: ""
+*da.Option1 False/Ikke installeret: ""
+*da.Option1 True/Installed: ""
+*de.Translation Manufacturer/Generic: ""
+*de.Translation ModelName/Generic PCL Laser Printer: ""
+*de.Translation ShortNickName/Generic PCL Laser Printer: ""
+*de.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*de.Translation PageSize/Media Size: ""
+*de.PageSize Letter/Letter - 8.5x11in: ""
+*de.PageSize Legal/Legal - 8.5x14in: ""
+*de.PageSize Executive/Executive - 7.25x10.5in: ""
+*de.PageSize Tabloid/Tabloid - 11x17in: ""
+*de.PageSize A3/A3 - 297x420mm: ""
+*de.PageSize A4/A4 - 210x297mm: ""
+*de.PageSize A5/A5 - 148x210mm: ""
+*de.PageSize B5/B5 - 182x257mm: ""
+*de.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*de.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*de.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*de.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*de.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*de.Translation Resolution/Resolution: ""
+*de.Resolution 300dpi/300dpi: ""
+*de.Resolution 600dpi/600dpi: ""
+*de.Translation InputSlot/Media Source: ""
+*de.InputSlot Default/Druckerstandard: ""
+*de.InputSlot Tray1/Fach 1: ""
+*de.InputSlot Tray2/Fach 2: ""
+*de.InputSlot Tray3/Fach 3: ""
+*de.InputSlot Tray4/Zufuhrfach 4: ""
+*de.InputSlot Manual/Manuell: ""
+*de.InputSlot Envelope/Envelope Feed: ""
+*de.Translation Duplex/Duplexdruck: ""
+*de.Duplex None/Off (1-Sided): ""
+*de.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*de.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*de.Translation InstallableOptions/Installable Options: ""
+*de.Translation Option1/Duplexer: ""
+*de.Option1 False/Nicht Eingebaut: ""
+*de.Option1 True/Eingebaut: ""
+*es.Translation Manufacturer/Generic: ""
+*es.Translation ModelName/Generic PCL Laser Printer: ""
+*es.Translation ShortNickName/Generic PCL Laser Printer: ""
+*es.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*es.Translation PageSize/Media Size: ""
+*es.PageSize Letter/Letter - 8.5x11in: ""
+*es.PageSize Legal/Legal - 8.5x14in: ""
+*es.PageSize Executive/Executive - 7.25x10.5in: ""
+*es.PageSize Tabloid/Tabloid - 11x17in: ""
+*es.PageSize A3/A3 - 297x420mm: ""
+*es.PageSize A4/A4 - 210x297mm: ""
+*es.PageSize A5/A5 - 148x210mm: ""
+*es.PageSize B5/B5 - 182x257mm: ""
+*es.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*es.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*es.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*es.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*es.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*es.Translation Resolution/Resolution: ""
+*es.Resolution 300dpi/300dpi: ""
+*es.Resolution 600dpi/600dpi: ""
+*es.Translation InputSlot/Media Source: ""
+*es.InputSlot Default/Impresora por defecto: ""
+*es.InputSlot Tray1/Bandeja 1: ""
+*es.InputSlot Tray2/Bandeja 2: ""
+*es.InputSlot Tray3/Bandeja 3: ""
+*es.InputSlot Tray4/Bandeja 4: ""
+*es.InputSlot Manual/Alimentación manual: ""
+*es.InputSlot Envelope/Envelope Feed: ""
+*es.Translation Duplex/Dúplex: ""
+*es.Duplex None/Off (1-Sided): ""
+*es.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*es.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*es.Translation InstallableOptions/Installable Options: ""
+*es.Translation Option1/Duplexer: ""
+*es.Option1 False/No Instalado: ""
+*es.Option1 True/Instalada: ""
+*fi.Translation Manufacturer/Generic: ""
+*fi.Translation ModelName/Generic PCL Laser Printer: ""
+*fi.Translation ShortNickName/Generic PCL Laser Printer: ""
+*fi.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*fi.Translation PageSize/Media Size: ""
+*fi.PageSize Letter/Letter - 8.5x11in: ""
+*fi.PageSize Legal/Legal - 8.5x14in: ""
+*fi.PageSize Executive/Executive - 7.25x10.5in: ""
+*fi.PageSize Tabloid/Tabloid - 11x17in: ""
+*fi.PageSize A3/A3 - 297x420mm: ""
+*fi.PageSize A4/A4 - 210x297mm: ""
+*fi.PageSize A5/A5 - 148x210mm: ""
+*fi.PageSize B5/B5 - 182x257mm: ""
+*fi.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*fi.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*fi.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*fi.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*fi.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*fi.Translation Resolution/Resolution: ""
+*fi.Resolution 300dpi/300dpi: ""
+*fi.Resolution 600dpi/600dpi: ""
+*fi.Translation InputSlot/Paperilähde: ""
+*fi.InputSlot Default/Nopea: ""
+*fi.InputSlot Tray1/Kasetti1: ""
+*fi.InputSlot Tray2/Kasetti2: ""
+*fi.InputSlot Tray3/Alusta 3: ""
+*fi.InputSlot Tray4/Lokero 4: ""
+*fi.InputSlot Manual/Käsinsyöttö: ""
+*fi.InputSlot Envelope/Envelope Feed: ""
+*fi.Translation Duplex/Kaksipuolinen tulostus: ""
+*fi.Duplex None/Off (1-Sided): ""
+*fi.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*fi.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*fi.Translation InstallableOptions/Installable Options: ""
+*fi.Translation Option1/Duplexer: ""
+*fi.Option1 False/Not Installed: ""
+*fi.Option1 True/Installed: ""
+*fr.Translation Manufacturer/Generic: ""
+*fr.Translation ModelName/Generic PCL Laser Printer: ""
+*fr.Translation ShortNickName/Generic PCL Laser Printer: ""
+*fr.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*fr.Translation PageSize/Media Size: ""
+*fr.PageSize Letter/Letter - 8.5x11in: ""
+*fr.PageSize Legal/Legal - 8.5x14in: ""
+*fr.PageSize Executive/Executive - 7.25x10.5in: ""
+*fr.PageSize Tabloid/Tabloid - 11x17in: ""
+*fr.PageSize A3/A3 - 297x420mm: ""
+*fr.PageSize A4/A4 - 210x297mm: ""
+*fr.PageSize A5/A5 - 148x210mm: ""
+*fr.PageSize B5/B5 - 182x257mm: ""
+*fr.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*fr.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*fr.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*fr.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*fr.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*fr.Translation Resolution/Resolution: ""
+*fr.Resolution 300dpi/300dpi: ""
+*fr.Resolution 600dpi/600dpi: ""
+*fr.Translation InputSlot/Media Source: ""
+*fr.InputSlot Default/Imprimante par défaut: ""
+*fr.InputSlot Tray1/Bac 1: ""
+*fr.InputSlot Tray2/Bac 2: ""
+*fr.InputSlot Tray3/Bac 3: ""
+*fr.InputSlot Tray4/Bac 4: ""
+*fr.InputSlot Manual/Manuel: ""
+*fr.InputSlot Envelope/Envelope Feed: ""
+*fr.Translation Duplex/Impression recto-verso: ""
+*fr.Duplex None/Off (1-Sided): ""
+*fr.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*fr.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*fr.Translation InstallableOptions/Installable Options: ""
+*fr.Translation Option1/Duplexer: ""
+*fr.Option1 False/Non Installée: ""
+*fr.Option1 True/Installée: ""
+*it.Translation Manufacturer/Generic: ""
+*it.Translation ModelName/Generic PCL Laser Printer: ""
+*it.Translation ShortNickName/Generic PCL Laser Printer: ""
+*it.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*it.Translation PageSize/Media Size: ""
+*it.PageSize Letter/Letter - 8.5x11in: ""
+*it.PageSize Legal/Legal - 8.5x14in: ""
+*it.PageSize Executive/Executive - 7.25x10.5in: ""
+*it.PageSize Tabloid/Tabloid - 11x17in: ""
+*it.PageSize A3/A3 - 297x420mm: ""
+*it.PageSize A4/A4 - 210x297mm: ""
+*it.PageSize A5/A5 - 148x210mm: ""
+*it.PageSize B5/B5 - 182x257mm: ""
+*it.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*it.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*it.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*it.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*it.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*it.Translation Resolution/Resolution: ""
+*it.Resolution 300dpi/300dpi: ""
+*it.Resolution 600dpi/600dpi: ""
+*it.Translation InputSlot/Media Source: ""
+*it.InputSlot Default/Impostazioni predefinite stampante: ""
+*it.InputSlot Tray1/Vassoio 1: ""
+*it.InputSlot Tray2/Cassetto 2: ""
+*it.InputSlot Tray3/Cassetto 3: ""
+*it.InputSlot Tray4/Vassoio 4: ""
+*it.InputSlot Manual/Manuale: ""
+*it.InputSlot Envelope/Envelope Feed: ""
+*it.Translation Duplex/Fronte-retro: ""
+*it.Duplex None/Off (1-Sided): ""
+*it.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*it.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*it.Translation InstallableOptions/Installable Options: ""
+*it.Translation Option1/Duplexer: ""
+*it.Option1 False/Non Installato: ""
+*it.Option1 True/Installata: ""
+*ja.Translation Manufacturer/Generic: ""
+*ja.Translation ModelName/Generic PCL Laser Printer: ""
+*ja.Translation ShortNickName/Generic PCL Laser Printer: ""
+*ja.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*ja.Translation PageSize/Media Size: ""
+*ja.PageSize Letter/Letter - 8.5x11in: ""
+*ja.PageSize Legal/Legal - 8.5x14in: ""
+*ja.PageSize Executive/Executive - 7.25x10.5in: ""
+*ja.PageSize Tabloid/Tabloid - 11x17in: ""
+*ja.PageSize A3/A3 - 297x420mm: ""
+*ja.PageSize A4/A4 - 210x297mm: ""
+*ja.PageSize A5/A5 - 148x210mm: ""
+*ja.PageSize B5/B5 - 182x257mm: ""
+*ja.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*ja.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*ja.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*ja.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*ja.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*ja.Translation Resolution/Resolution: ""
+*ja.Resolution 300dpi/300dpi: ""
+*ja.Resolution 600dpi/600dpi: ""
+*ja.Translation InputSlot/Media Source: ""
+*ja.InputSlot Default/システムデフォルト: ""
+*ja.InputSlot Tray1/カセット 1: ""
+*ja.InputSlot Tray2/カセット 2: ""
+*ja.InputSlot Tray3/カセット 3: ""
+*ja.InputSlot Tray4/トレイ 4: ""
+*ja.InputSlot Manual/手差し: ""
+*ja.InputSlot Envelope/Envelope Feed: ""
+*ja.Translation Duplex/両面印刷: ""
+*ja.Duplex None/Off (1-Sided): ""
+*ja.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*ja.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*ja.Translation InstallableOptions/Installable Options: ""
+*ja.Translation Option1/Duplexer: ""
+*ja.Option1 False/インストールされていません: ""
+*ja.Option1 True/インストール済み: ""
+*ko.Translation Manufacturer/Generic: ""
+*ko.Translation ModelName/Generic PCL Laser Printer: ""
+*ko.Translation ShortNickName/Generic PCL Laser Printer: ""
+*ko.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*ko.Translation PageSize/Media Size: ""
+*ko.PageSize Letter/Letter - 8.5x11in: ""
+*ko.PageSize Legal/Legal - 8.5x14in: ""
+*ko.PageSize Executive/Executive - 7.25x10.5in: ""
+*ko.PageSize Tabloid/Tabloid - 11x17in: ""
+*ko.PageSize A3/A3 - 297x420mm: ""
+*ko.PageSize A4/A4 - 210x297mm: ""
+*ko.PageSize A5/A5 - 148x210mm: ""
+*ko.PageSize B5/B5 - 182x257mm: ""
+*ko.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*ko.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*ko.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*ko.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*ko.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*ko.Translation Resolution/Resolution: ""
+*ko.Resolution 300dpi/300dpi: ""
+*ko.Resolution 600dpi/600dpi: ""
+*ko.Translation InputSlot/용지함: ""
+*ko.InputSlot Default/빠르게: ""
+*ko.InputSlot Tray1/트레이 1: ""
+*ko.InputSlot Tray2/용지함 2: ""
+*ko.InputSlot Tray3/용지함 3: ""
+*ko.InputSlot Tray4/용지함 4: ""
+*ko.InputSlot Manual/수동: ""
+*ko.InputSlot Envelope/Envelope Feed: ""
+*ko.Translation Duplex/양면인쇄: ""
+*ko.Duplex None/Off (1-Sided): ""
+*ko.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*ko.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*ko.Translation InstallableOptions/Installable Options: ""
+*ko.Translation Option1/Duplexer: ""
+*ko.Option1 False/설치 안됨: ""
+*ko.Option1 True/설치됨: ""
+*nl.Translation Manufacturer/Generic: ""
+*nl.Translation ModelName/Generic PCL Laser Printer: ""
+*nl.Translation ShortNickName/Generic PCL Laser Printer: ""
+*nl.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize Executive/Executive - 7.25x10.5in: ""
+*nl.PageSize Tabloid/Tabloid - 11x17in: ""
+*nl.PageSize A3/A3 - 297x420mm: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize A5/A5 - 148x210mm: ""
+*nl.PageSize B5/B5 - 182x257mm: ""
+*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600dpi: ""
+*nl.Translation InputSlot/Media Source: ""
+*nl.InputSlot Default/Printerstandaard: ""
+*nl.InputSlot Tray1/Lade 1: ""
+*nl.InputSlot Tray2/Lade 2: ""
+*nl.InputSlot Tray3/Lade 3: ""
+*nl.InputSlot Tray4/Lade 4: ""
+*nl.InputSlot Manual/Handmatig: ""
+*nl.InputSlot Envelope/Envelope Feed: ""
+*nl.Translation Duplex/Dubbelzijdig afdrukken: ""
+*nl.Duplex None/Off (1-Sided): ""
+*nl.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*nl.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*nl.Translation InstallableOptions/Installable Options: ""
+*nl.Translation Option1/Duplexer: ""
+*nl.Option1 False/Niet geïnstalleerd: ""
+*nl.Option1 True/Installed: ""
+*no.Translation Manufacturer/Generic: ""
+*no.Translation ModelName/Generic PCL Laser Printer: ""
+*no.Translation ShortNickName/Generic PCL Laser Printer: ""
+*no.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*no.Translation PageSize/Media Size: ""
+*no.PageSize Letter/Letter - 8.5x11in: ""
+*no.PageSize Legal/Legal - 8.5x14in: ""
+*no.PageSize Executive/Executive - 7.25x10.5in: ""
+*no.PageSize Tabloid/Tabloid - 11x17in: ""
+*no.PageSize A3/A3 - 297x420mm: ""
+*no.PageSize A4/A4 - 210x297mm: ""
+*no.PageSize A5/A5 - 148x210mm: ""
+*no.PageSize B5/B5 - 182x257mm: ""
+*no.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*no.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*no.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*no.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*no.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*no.Translation Resolution/Resolution: ""
+*no.Resolution 300dpi/300dpi: ""
+*no.Resolution 600dpi/600dpi: ""
+*no.Translation InputSlot/Media Source: ""
+*no.InputSlot Default/Skriverstandard: ""
+*no.InputSlot Tray1/Skuff 1: ""
+*no.InputSlot Tray2/Skuff 2: ""
+*no.InputSlot Tray3/Magasin 3: ""
+*no.InputSlot Tray4/Skuff 4: ""
+*no.InputSlot Manual/Handmatig: ""
+*no.InputSlot Envelope/Envelope Feed: ""
+*no.Translation Duplex/Tosidig: ""
+*no.Duplex None/Off (1-Sided): ""
+*no.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*no.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*no.Translation InstallableOptions/Installable Options: ""
+*no.Translation Option1/Duplexer: ""
+*no.Option1 False/Not Installed: ""
+*no.Option1 True/Installed: ""
+*pt.Translation Manufacturer/Generic: ""
+*pt.Translation ModelName/Generic PCL Laser Printer: ""
+*pt.Translation ShortNickName/Generic PCL Laser Printer: ""
+*pt.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*pt.Translation PageSize/Media Size: ""
+*pt.PageSize Letter/Letter - 8.5x11in: ""
+*pt.PageSize Legal/Legal - 8.5x14in: ""
+*pt.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt.PageSize A3/A3 - 297x420mm: ""
+*pt.PageSize A4/A4 - 210x297mm: ""
+*pt.PageSize A5/A5 - 148x210mm: ""
+*pt.PageSize B5/B5 - 182x257mm: ""
+*pt.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt.Translation Resolution/Resolution: ""
+*pt.Resolution 300dpi/300dpi: ""
+*pt.Resolution 600dpi/600dpi: ""
+*pt.Translation InputSlot/Media Source: ""
+*pt.InputSlot Default/Rápido: ""
+*pt.InputSlot Tray1/Bandeja 1: ""
+*pt.InputSlot Tray2/Bandeja 2: ""
+*pt.InputSlot Tray3/Bandeja 3: ""
+*pt.InputSlot Tray4/Bandeja 4: ""
+*pt.InputSlot Manual/Alimentação Manual: ""
+*pt.InputSlot Envelope/Envelope Feed: ""
+*pt.Translation Duplex/Impressão em Frente e Verso: ""
+*pt.Duplex None/Off (1-Sided): ""
+*pt.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt.Translation InstallableOptions/Installable Options: ""
+*pt.Translation Option1/Duplexer: ""
+*pt.Option1 False/Não instalado: ""
+*pt.Option1 True/Instalada: ""
+*pt_BR.Translation Manufacturer/Generic: ""
+*pt_BR.Translation ModelName/Generic PCL Laser Printer: ""
+*pt_BR.Translation ShortNickName/Generic PCL Laser Printer: ""
+*pt_BR.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_BR.PageSize A3/A3 - 297x420mm: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize A5/A5 - 148x210mm: ""
+*pt_BR.PageSize B5/B5 - 182x257mm: ""
+*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600dpi: ""
+*pt_BR.Translation InputSlot/Media Source: ""
+*pt_BR.InputSlot Default/Rápido: ""
+*pt_BR.InputSlot Tray1/Bandeja 1: ""
+*pt_BR.InputSlot Tray2/Bandeja 2: ""
+*pt_BR.InputSlot Tray3/Bandeja 3: ""
+*pt_BR.InputSlot Tray4/Bandeja 4: ""
+*pt_BR.InputSlot Manual/Alimentação Manual: ""
+*pt_BR.InputSlot Envelope/Envelope Feed: ""
+*pt_BR.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_BR.Duplex None/Off (1-Sided): ""
+*pt_BR.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_BR.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_BR.Translation InstallableOptions/Installable Options: ""
+*pt_BR.Translation Option1/Duplexer: ""
+*pt_BR.Option1 False/Não instalado: ""
+*pt_BR.Option1 True/Instalada: ""
+*pt_PT.Translation Manufacturer/Generic: ""
+*pt_PT.Translation ModelName/Generic PCL Laser Printer: ""
+*pt_PT.Translation ShortNickName/Generic PCL Laser Printer: ""
+*pt_PT.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_PT.PageSize A3/A3 - 297x420mm: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize A5/A5 - 148x210mm: ""
+*pt_PT.PageSize B5/B5 - 182x257mm: ""
+*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600dpi: ""
+*pt_PT.Translation InputSlot/Media Source: ""
+*pt_PT.InputSlot Default/Rápido: ""
+*pt_PT.InputSlot Tray1/Bandeja 1: ""
+*pt_PT.InputSlot Tray2/Bandeja 2: ""
+*pt_PT.InputSlot Tray3/Bandeja 3: ""
+*pt_PT.InputSlot Tray4/Bandeja 4: ""
+*pt_PT.InputSlot Manual/Alimentação Manual: ""
+*pt_PT.InputSlot Envelope/Envelope Feed: ""
+*pt_PT.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_PT.Duplex None/Off (1-Sided): ""
+*pt_PT.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_PT.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_PT.Translation InstallableOptions/Installable Options: ""
+*pt_PT.Translation Option1/Duplexer: ""
+*pt_PT.Option1 False/Não instalado: ""
+*pt_PT.Option1 True/Instalada: ""
+*sv.Translation Manufacturer/Generic: ""
+*sv.Translation ModelName/Generic PCL Laser Printer: ""
+*sv.Translation ShortNickName/Generic PCL Laser Printer: ""
+*sv.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*sv.Translation PageSize/Media Size: ""
+*sv.PageSize Letter/Letter - 8.5x11in: ""
+*sv.PageSize Legal/Legal - 8.5x14in: ""
+*sv.PageSize Executive/Executive - 7.25x10.5in: ""
+*sv.PageSize Tabloid/Tabloid - 11x17in: ""
+*sv.PageSize A3/A3 - 297x420mm: ""
+*sv.PageSize A4/A4 - 210x297mm: ""
+*sv.PageSize A5/A5 - 148x210mm: ""
+*sv.PageSize B5/B5 - 182x257mm: ""
+*sv.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*sv.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*sv.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*sv.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*sv.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*sv.Translation Resolution/Resolution: ""
+*sv.Resolution 300dpi/300dpi: ""
+*sv.Resolution 600dpi/600dpi: ""
+*sv.Translation InputSlot/Media Source: ""
+*sv.InputSlot Default/Skrivarstandard: ""
+*sv.InputSlot Tray1/Fack 1: ""
+*sv.InputSlot Tray2/Fack 2: ""
+*sv.InputSlot Tray3/Fack 3: ""
+*sv.InputSlot Tray4/Fack 4: ""
+*sv.InputSlot Manual/Manuell: ""
+*sv.InputSlot Envelope/Envelope Feed: ""
+*sv.Translation Duplex/Dubbelsidig utskrift: ""
+*sv.Duplex None/Off (1-Sided): ""
+*sv.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*sv.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*sv.Translation InstallableOptions/Installable Options: ""
+*sv.Translation Option1/Duplexer: ""
+*sv.Option1 False/Ej installerad: ""
+*sv.Option1 True/Installed: ""
+*zh.Translation Manufacturer/Generic: ""
+*zh.Translation ModelName/Generic PCL Laser Printer: ""
+*zh.Translation ShortNickName/Generic PCL Laser Printer: ""
+*zh.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*zh.Translation PageSize/Media Size: ""
+*zh.PageSize Letter/Letter - 8.5x11in: ""
+*zh.PageSize Legal/Legal - 8.5x14in: ""
+*zh.PageSize Executive/Executive - 7.25x10.5in: ""
+*zh.PageSize Tabloid/Tabloid - 11x17in: ""
+*zh.PageSize A3/A3 - 297x420mm: ""
+*zh.PageSize A4/A4 - 210x297mm: ""
+*zh.PageSize A5/A5 - 148x210mm: ""
+*zh.PageSize B5/B5 - 182x257mm: ""
+*zh.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*zh.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*zh.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*zh.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*zh.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*zh.Translation Resolution/Resolution: ""
+*zh.Resolution 300dpi/300dpi: ""
+*zh.Resolution 600dpi/600dpi: ""
+*zh.Translation InputSlot/Paper Source: ""
+*zh.InputSlot Default/Printer's Current Setting: ""
+*zh.InputSlot Tray1/Tray 1: ""
+*zh.InputSlot Tray2/Tray 2: ""
+*zh.InputSlot Tray3/Tray 3: ""
+*zh.InputSlot Tray4/Tray 4: ""
+*zh.InputSlot Manual/手动: ""
+*zh.InputSlot Envelope/Envelope Feed: ""
+*zh.Translation Duplex/2-Sided Printing: ""
+*zh.Duplex None/Off (1-Sided): ""
+*zh.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*zh.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*zh.Translation InstallableOptions/Installable Options: ""
+*zh.Translation Option1/Duplexer: ""
+*zh.Option1 False/Not Installed: ""
+*zh.Option1 True/Installed: ""
+*zh_TW.Translation Manufacturer/Generic: ""
+*zh_TW.Translation ModelName/Generic PCL Laser Printer: ""
+*zh_TW.Translation ShortNickName/Generic PCL Laser Printer: ""
+*zh_TW.Translation NickName/Generic PCL Laser Printer, 1.3: ""
+*zh_TW.Translation PageSize/Media Size: ""
+*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
+*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
+*zh_TW.PageSize Executive/Executive - 7.25x10.5in: ""
+*zh_TW.PageSize Tabloid/Tabloid - 11x17in: ""
+*zh_TW.PageSize A3/A3 - 297x420mm: ""
+*zh_TW.PageSize A4/A4 - 210x297mm: ""
+*zh_TW.PageSize A5/A5 - 148x210mm: ""
+*zh_TW.PageSize B5/B5 - 182x257mm: ""
+*zh_TW.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*zh_TW.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*zh_TW.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*zh_TW.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*zh_TW.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*zh_TW.Translation Resolution/Resolution: ""
+*zh_TW.Resolution 300dpi/300dpi: ""
+*zh_TW.Resolution 600dpi/600dpi: ""
+*zh_TW.Translation InputSlot/紙張來源: ""
+*zh_TW.InputSlot Default/快速: ""
+*zh_TW.InputSlot Tray1/裝紙匣 1: ""
+*zh_TW.InputSlot Tray2/裝紙匣 2: ""
+*zh_TW.InputSlot Tray3/裝紙匣 3: ""
+*zh_TW.InputSlot Tray4/紙匣4: ""
+*zh_TW.InputSlot Manual/手動: ""
+*zh_TW.InputSlot Envelope/Envelope Feed: ""
+*zh_TW.Translation Duplex/雙面列印: ""
+*zh_TW.Duplex None/Off (1-Sided): ""
+*zh_TW.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*zh_TW.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*zh_TW.Translation InstallableOptions/Installable Options: ""
+*zh_TW.Translation Option1/Duplexer: ""
+*zh_TW.Option1 False/未安裝: ""
+*zh_TW.Option1 True/已安裝: ""
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(1.05)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
+*Font AvantGarde-Demi: Standard "(1.05)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(1.05)" Standard ROM
+*Font Bookman-Demi: Standard "(1.05)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(1.05)" Standard ROM
+*Font Bookman-Light: Standard "(1.05)" Standard ROM
+*Font Bookman-LightItalic: Standard "(1.05)" Standard ROM
+*Font Courier: Standard "(1.05)" Standard ROM
+*Font Courier-Bold: Standard "(1.05)" Standard ROM
+*Font Courier-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Courier-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica: Standard "(1.05)" Standard ROM
+*Font Helvetica-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Oblique: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(1.05)" Standard ROM
+*Font Palatino-Bold: Standard "(1.05)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Palatino-Italic: Standard "(1.05)" Standard ROM
+*Font Palatino-Roman: Standard "(1.05)" Standard ROM
+*Font Symbol: Special "(001.005)" Special ROM
+*Font Times-Bold: Standard "(1.05)" Standard ROM
+*Font Times-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Times-Italic: Standard "(1.05)" Standard ROM
+*Font Times-Roman: Standard "(1.05)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
+*Font ZapfDingbats: Special "(001.005)" Special ROM
+*% End of GENERPCL.PPD, 35952 bytes.
index 6c5d62f47e9a515d1e9f1fb9051da4926c408267..a46f27186e177cb224f0b25f767c3ea86b3ef32d 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *CustominTearInterval True: "<</cupsRowCount 2 1 roll>>setpagedevice"
 *CustominCutInterval True: "<</cupsRowStep 2 1 roll>>setpagedevice"
 *cupsVersion: 1.3
 *cupsModelNumber: 32
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *UIConstraints: *inPrintMode Standard *inCutInterval
 *UIConstraints: *inCutInterval *inPrintMode Standard
 *UIConstraints: *inPrintMode Standard *inTearInterval
 *ko.inCutInterval 8/Every 8 Labels: ""
 *ko.inCutInterval 9/Every 9 Labels: ""
 *ko.inCutInterval 10/Every 10 Labels: ""
+*nl.Translation Manufacturer/Intellitech: ""
+*nl.Translation ModelName/Intellitech IntelliBar Label Printer: ""
+*nl.Translation ShortNickName/Intellibar Label Printer: ""
+*nl.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w288h432/4.00x6.00": ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Translation PrinterSettings/Printer Settings: ""
+*nl.Translation inPrintDensity/Print Density: ""
+*nl.inPrintDensity Default/Printerstandaard: ""
+*nl.inPrintDensity -15/-15: ""
+*nl.inPrintDensity -14/-14: ""
+*nl.inPrintDensity -13/-13: ""
+*nl.inPrintDensity -12/-12: ""
+*nl.inPrintDensity -11/-11: ""
+*nl.inPrintDensity -10/-10: ""
+*nl.inPrintDensity -9/-9: ""
+*nl.inPrintDensity -8/-8: ""
+*nl.inPrintDensity -7/-7: ""
+*nl.inPrintDensity -6/-6: ""
+*nl.inPrintDensity -5/-5: ""
+*nl.inPrintDensity -4/-4: ""
+*nl.inPrintDensity -3/-3: ""
+*nl.inPrintDensity -2/-2: ""
+*nl.inPrintDensity -1/-1: ""
+*nl.inPrintDensity 0/0: ""
+*nl.inPrintDensity 1/1: ""
+*nl.inPrintDensity 2/2: ""
+*nl.inPrintDensity 3/3: ""
+*nl.inPrintDensity 4/4: ""
+*nl.inPrintDensity 5/5: ""
+*nl.inPrintDensity 6/6: ""
+*nl.inPrintDensity 7/7: ""
+*nl.inPrintDensity 8/8: ""
+*nl.inPrintDensity 9/9: ""
+*nl.inPrintDensity 10/10: ""
+*nl.inPrintDensity 11/11: ""
+*nl.inPrintDensity 12/12: ""
+*nl.inPrintDensity 13/13: ""
+*nl.inPrintDensity 14/14: ""
+*nl.inPrintDensity 15/15: ""
+*nl.Translation inPrintRate/Print Speed: ""
+*nl.inPrintRate Default/Printerstandaard: ""
+*nl.inPrintRate 15/15 mm/sec.: ""
+*nl.inPrintRate 20/20 mm/sec.: ""
+*nl.inPrintRate 30/30 mm/sec.: ""
+*nl.inPrintRate 40/40 mm/sec.: ""
+*nl.inPrintRate 60/60 mm/sec.: ""
+*nl.inPrintRate 80/80 mm/sec.: ""
+*nl.inPrintRate 100/100 mm/sec.: ""
+*nl.inPrintRate 120/120 mm/sec.: ""
+*nl.inPrintRate 150/150 mm/sec.: ""
+*nl.inPrintRate 200/200 mm/sec.: ""
+*nl.inPrintRate 250/250 mm/sec.: ""
+*nl.inPrintRate 300/300 mm/sec.: ""
+*nl.Translation inPrintMode/Print Mode: ""
+*nl.inPrintMode Standard/Standard: ""
+*nl.inPrintMode Tear/Tear: ""
+*nl.inPrintMode Cut/Cut: ""
+*nl.Translation inTearInterval/Print and Tear: ""
+*nl.inTearInterval None/Disabled: ""
+*nl.inTearInterval 1/Every Label: ""
+*nl.inTearInterval 2/Every 2 Labels: ""
+*nl.inTearInterval 3/Every 3 Labels: ""
+*nl.inTearInterval 4/Every 4 Labels: ""
+*nl.inTearInterval 5/Every 5 Labels: ""
+*nl.inTearInterval 6/Every 6 Labels: ""
+*nl.inTearInterval 7/Every 7 Labels: ""
+*nl.inTearInterval 8/Every 8 Labels: ""
+*nl.inTearInterval 9/Every 9 Labels: ""
+*nl.inTearInterval 10/Every 10 Labels: ""
+*nl.Translation inCutInterval/Print and Cut: ""
+*nl.inCutInterval None/Disabled: ""
+*nl.inCutInterval 1/Every Label: ""
+*nl.inCutInterval 2/Every 2 Labels: ""
+*nl.inCutInterval 3/Every 3 Labels: ""
+*nl.inCutInterval 4/Every 4 Labels: ""
+*nl.inCutInterval 5/Every 5 Labels: ""
+*nl.inCutInterval 6/Every 6 Labels: ""
+*nl.inCutInterval 7/Every 7 Labels: ""
+*nl.inCutInterval 8/Every 8 Labels: ""
+*nl.inCutInterval 9/Every 9 Labels: ""
+*nl.inCutInterval 10/Every 10 Labels: ""
 *no.Translation Manufacturer/Intellitech: ""
 *no.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *no.Translation ShortNickName/Intellibar Label Printer: ""
 *pt.inCutInterval 8/Every 8 Labels: ""
 *pt.inCutInterval 9/Every 9 Labels: ""
 *pt.inCutInterval 10/Every 10 Labels: ""
+*pt_BR.Translation Manufacturer/Intellitech: ""
+*pt_BR.Translation ModelName/Intellitech IntelliBar Label Printer: ""
+*pt_BR.Translation ShortNickName/Intellibar Label Printer: ""
+*pt_BR.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w288h432/4.00x6.00": ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Translation PrinterSettings/Printer Settings: ""
+*pt_BR.Translation inPrintDensity/Print Density: ""
+*pt_BR.inPrintDensity Default/Rápido: ""
+*pt_BR.inPrintDensity -15/-15: ""
+*pt_BR.inPrintDensity -14/-14: ""
+*pt_BR.inPrintDensity -13/-13: ""
+*pt_BR.inPrintDensity -12/-12: ""
+*pt_BR.inPrintDensity -11/-11: ""
+*pt_BR.inPrintDensity -10/-10: ""
+*pt_BR.inPrintDensity -9/-9: ""
+*pt_BR.inPrintDensity -8/-8: ""
+*pt_BR.inPrintDensity -7/-7: ""
+*pt_BR.inPrintDensity -6/-6: ""
+*pt_BR.inPrintDensity -5/-5: ""
+*pt_BR.inPrintDensity -4/-4: ""
+*pt_BR.inPrintDensity -3/-3: ""
+*pt_BR.inPrintDensity -2/-2: ""
+*pt_BR.inPrintDensity -1/-1: ""
+*pt_BR.inPrintDensity 0/0: ""
+*pt_BR.inPrintDensity 1/1: ""
+*pt_BR.inPrintDensity 2/2: ""
+*pt_BR.inPrintDensity 3/3: ""
+*pt_BR.inPrintDensity 4/4: ""
+*pt_BR.inPrintDensity 5/5: ""
+*pt_BR.inPrintDensity 6/6: ""
+*pt_BR.inPrintDensity 7/7: ""
+*pt_BR.inPrintDensity 8/8: ""
+*pt_BR.inPrintDensity 9/9: ""
+*pt_BR.inPrintDensity 10/10: ""
+*pt_BR.inPrintDensity 11/11: ""
+*pt_BR.inPrintDensity 12/12: ""
+*pt_BR.inPrintDensity 13/13: ""
+*pt_BR.inPrintDensity 14/14: ""
+*pt_BR.inPrintDensity 15/15: ""
+*pt_BR.Translation inPrintRate/Print Speed: ""
+*pt_BR.inPrintRate Default/Rápido: ""
+*pt_BR.inPrintRate 15/15 mm/sec.: ""
+*pt_BR.inPrintRate 20/20 mm/sec.: ""
+*pt_BR.inPrintRate 30/30 mm/sec.: ""
+*pt_BR.inPrintRate 40/40 mm/sec.: ""
+*pt_BR.inPrintRate 60/60 mm/sec.: ""
+*pt_BR.inPrintRate 80/80 mm/sec.: ""
+*pt_BR.inPrintRate 100/100 mm/sec.: ""
+*pt_BR.inPrintRate 120/120 mm/sec.: ""
+*pt_BR.inPrintRate 150/150 mm/sec.: ""
+*pt_BR.inPrintRate 200/200 mm/sec.: ""
+*pt_BR.inPrintRate 250/250 mm/sec.: ""
+*pt_BR.inPrintRate 300/300 mm/sec.: ""
+*pt_BR.Translation inPrintMode/Print Mode: ""
+*pt_BR.inPrintMode Standard/Standard: ""
+*pt_BR.inPrintMode Tear/Tear: ""
+*pt_BR.inPrintMode Cut/Cut: ""
+*pt_BR.Translation inTearInterval/Print and Tear: ""
+*pt_BR.inTearInterval None/Disabled: ""
+*pt_BR.inTearInterval 1/Every Label: ""
+*pt_BR.inTearInterval 2/Every 2 Labels: ""
+*pt_BR.inTearInterval 3/Every 3 Labels: ""
+*pt_BR.inTearInterval 4/Every 4 Labels: ""
+*pt_BR.inTearInterval 5/Every 5 Labels: ""
+*pt_BR.inTearInterval 6/Every 6 Labels: ""
+*pt_BR.inTearInterval 7/Every 7 Labels: ""
+*pt_BR.inTearInterval 8/Every 8 Labels: ""
+*pt_BR.inTearInterval 9/Every 9 Labels: ""
+*pt_BR.inTearInterval 10/Every 10 Labels: ""
+*pt_BR.Translation inCutInterval/Print and Cut: ""
+*pt_BR.inCutInterval None/Disabled: ""
+*pt_BR.inCutInterval 1/Every Label: ""
+*pt_BR.inCutInterval 2/Every 2 Labels: ""
+*pt_BR.inCutInterval 3/Every 3 Labels: ""
+*pt_BR.inCutInterval 4/Every 4 Labels: ""
+*pt_BR.inCutInterval 5/Every 5 Labels: ""
+*pt_BR.inCutInterval 6/Every 6 Labels: ""
+*pt_BR.inCutInterval 7/Every 7 Labels: ""
+*pt_BR.inCutInterval 8/Every 8 Labels: ""
+*pt_BR.inCutInterval 9/Every 9 Labels: ""
+*pt_BR.inCutInterval 10/Every 10 Labels: ""
 *pt_PT.Translation Manufacturer/Intellitech: ""
 *pt_PT.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *pt_PT.Translation ShortNickName/Intellibar Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of INTELBAR.PPD, 53625 bytes.
+*% End of INTELBAR.PPD, 59892 bytes.
index 9a0b4585a24ef17214c136f67954077a71ef0405..5cc204e0bab2d5368262f907e479152820279d95 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *UIConstraints: *Duplex *Option1 False
 *UIConstraints: *Option1 False *Duplex
 *UIConstraints: *PageSize A3 *InputSlot Envelope
 *ko.Translation Option1/Duplexer: ""
 *ko.Option1 False/설치 안됨: ""
 *ko.Option1 True/설치됨: ""
+*nl.Translation Manufacturer/HP: ""
+*nl.Translation ModelName/HP LaserJet Series PCL 4/5: ""
+*nl.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
+*nl.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize Executive/Executive - 7.25x10.5in: ""
+*nl.PageSize Tabloid/Tabloid - 11x17in: ""
+*nl.PageSize A3/A3 - 297x420mm: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize A5/A5 - 148x210mm: ""
+*nl.PageSize B5/B5 - 182x257mm: ""
+*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 150dpi/150dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600dpi: ""
+*nl.Translation InputSlot/Media Source: ""
+*nl.InputSlot Default/Printerstandaard: ""
+*nl.InputSlot Tray1/Lade 1: ""
+*nl.InputSlot Tray2/Lade 2: ""
+*nl.InputSlot Tray3/Lade 3: ""
+*nl.InputSlot Tray4/Lade 4: ""
+*nl.InputSlot Manual/Handmatig: ""
+*nl.InputSlot Envelope/Envelope Feed: ""
+*nl.Translation Duplex/Dubbelzijdig afdrukken: ""
+*nl.Duplex None/Off (1-Sided): ""
+*nl.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*nl.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*nl.Translation InstallableOptions/Installable Options: ""
+*nl.Translation Option1/Duplexer: ""
+*nl.Option1 False/Niet geïnstalleerd: ""
+*nl.Option1 True/Installed: ""
 *no.Translation Manufacturer/HP: ""
 *no.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *no.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
 *pt.Translation Option1/Duplexer: ""
 *pt.Option1 False/Não instalado: ""
 *pt.Option1 True/Instalada: ""
+*pt_BR.Translation Manufacturer/HP: ""
+*pt_BR.Translation ModelName/HP LaserJet Series PCL 4/5: ""
+*pt_BR.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
+*pt_BR.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_BR.PageSize A3/A3 - 297x420mm: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize A5/A5 - 148x210mm: ""
+*pt_BR.PageSize B5/B5 - 182x257mm: ""
+*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 150dpi/150dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600dpi: ""
+*pt_BR.Translation InputSlot/Media Source: ""
+*pt_BR.InputSlot Default/Rápido: ""
+*pt_BR.InputSlot Tray1/Bandeja 1: ""
+*pt_BR.InputSlot Tray2/Bandeja 2: ""
+*pt_BR.InputSlot Tray3/Bandeja 3: ""
+*pt_BR.InputSlot Tray4/Bandeja 4: ""
+*pt_BR.InputSlot Manual/Alimentação Manual: ""
+*pt_BR.InputSlot Envelope/Envelope Feed: ""
+*pt_BR.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_BR.Duplex None/Off (1-Sided): ""
+*pt_BR.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_BR.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_BR.Translation InstallableOptions/Installable Options: ""
+*pt_BR.Translation Option1/Duplexer: ""
+*pt_BR.Option1 False/Não instalado: ""
+*pt_BR.Option1 True/Instalada: ""
 *pt_PT.Translation Manufacturer/HP: ""
 *pt_PT.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *pt_PT.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of LASERJET.PPD, 33308 bytes.
+*% End of LASERJET.PPD, 36602 bytes.
index 23ef6fd84059caa67334b15e43828e21b42a9646..6dbfd063857af9412a229f980a46f1901d15179e 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
 *ko.Resolution 360dpi/360dpi: ""
+*nl.Translation Manufacturer/Oki: ""
+*nl.Translation ModelName/Oki 24-Pin Series: ""
+*nl.Translation ShortNickName/Oki 24-Pin Series: ""
+*nl.Translation NickName/Oki 24-Pin Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 60dpi/60dpi: ""
+*nl.Resolution 120x60dpi/120x60dpi: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360x180dpi/360x180dpi: ""
+*nl.Resolution 360dpi/360dpi: ""
 *no.Translation Manufacturer/Oki: ""
 *no.Translation ModelName/Oki 24-Pin Series: ""
 *no.Translation ShortNickName/Oki 24-Pin Series: ""
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
+*pt_BR.Translation Manufacturer/Oki: ""
+*pt_BR.Translation ModelName/Oki 24-Pin Series: ""
+*pt_BR.Translation ShortNickName/Oki 24-Pin Series: ""
+*pt_BR.Translation NickName/Oki 24-Pin Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 60dpi/60dpi: ""
+*pt_BR.Resolution 120x60dpi/120x60dpi: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360x180dpi/360x180dpi: ""
+*pt_BR.Resolution 360dpi/360dpi: ""
 *pt_PT.Translation Manufacturer/Oki: ""
 *pt_PT.Translation ModelName/Oki 24-Pin Series: ""
 *pt_PT.Translation ShortNickName/Oki 24-Pin Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDAT24.PPD, 14887 bytes.
+*% End of OKIDAT24.PPD, 16109 bytes.
index e884dd7f21bdeab038cb289811548c0014bbda29..1a9bc13243d69d9fa4060e20dc72a445454ff3db 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Resolution 60x720dpi/60x720dpi: ""
 *ko.Resolution 120x72dpi/120x72dpi: ""
 *ko.Resolution 240x72dpi/240x72dpi: ""
+*nl.Translation Manufacturer/Oki: ""
+*nl.Translation ModelName/Oki 9-Pin Series: ""
+*nl.Translation ShortNickName/Oki 9-Pin Series: ""
+*nl.Translation NickName/Oki 9-Pin Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 60x720dpi/60x720dpi: ""
+*nl.Resolution 120x72dpi/120x72dpi: ""
+*nl.Resolution 240x72dpi/240x72dpi: ""
 *no.Translation Manufacturer/Oki: ""
 *no.Translation ModelName/Oki 9-Pin Series: ""
 *no.Translation ShortNickName/Oki 9-Pin Series: ""
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
+*pt_BR.Translation Manufacturer/Oki: ""
+*pt_BR.Translation ModelName/Oki 9-Pin Series: ""
+*pt_BR.Translation ShortNickName/Oki 9-Pin Series: ""
+*pt_BR.Translation NickName/Oki 9-Pin Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 60x720dpi/60x720dpi: ""
+*pt_BR.Resolution 120x72dpi/120x72dpi: ""
+*pt_BR.Resolution 240x72dpi/240x72dpi: ""
 *pt_PT.Translation Manufacturer/Oki: ""
 *pt_PT.Translation ModelName/Oki 9-Pin Series: ""
 *pt_PT.Translation ShortNickName/Oki 9-Pin Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDATA9.PPD, 13707 bytes.
+*% End of OKIDATA9.PPD, 14797 bytes.
index fe6484f85a90fee2c9e8e947599340444c2962ca..76c9a496d11cfb28bafa25d36e431d000436a388 100644 (file)
@@ -257,6 +257,98 @@ Version "1.3"
   }
 }
 
+// Generic drivers
+{
+  Manufacturer "Generic"
+
+  // Generic PCL Laser Printer
+  {
+    DriverType hp
+
+    ModelName "PCL Laser Printer"
+    PCFileName "GENERPCL.PPD"
+    Throughput 8
+    ModelNumber $HP_LASERJET
+    ColorDevice No
+
+    UIConstraints "*Duplex  *Option1 False"
+    UIConstraints "*PageSize A3 *InputSlot Envelope"
+    UIConstraints "*PageSize A4 *InputSlot Envelope"
+    UIConstraints "*PageSize A5 *InputSlot Envelope"
+    UIConstraints "*PageSize B5 *InputSlot Envelope"
+    UIConstraints "*PageSize Executive *InputSlot Envelope"
+    UIConstraints "*PageSize Legal *InputSlot Envelope"
+    UIConstraints "*PageSize Letter *InputSlot Envelope"
+    UIConstraints "*PageSize Tabloid *InputSlot Envelope"
+
+    HWMargins 18 12 18 12
+    *MediaSize Letter
+    MediaSize Legal
+    MediaSize Executive
+    MediaSize Tabloid
+    MediaSize A3
+    MediaSize A4
+    MediaSize A5
+    MediaSize B5
+    MediaSize EnvISOB5
+    MediaSize Env10
+    MediaSize EnvC5
+    MediaSize EnvDL
+    MediaSize EnvMonarch
+
+    *Resolution k 1 0 0 0 300dpi
+    Resolution k 1 0 0 0 600dpi
+
+    *InputSlot 0 "Default/Printer Default"
+    InputSlot 8 "Tray1/Tray 1"
+    InputSlot 1 "Tray2/Tray 2"
+    InputSlot 4 "Tray3/Tray 3"
+    InputSlot 5 "Tray4/Tray 4"
+    InputSlot 2 "Manual/Manual Feed"
+    InputSlot 3 "Envelope/Envelope Feed"
+
+    Duplex Yes
+    Installable "Option1/Duplexer"
+  }
+
+  // Generic PostScript Printer
+  {
+    DriverType ps
+
+    ModelName "PostScript Printer"
+    PCFileName "GENERIC.PPD"
+    Throughput 8
+    ColorDevice No
+    Attribute PSVersion "" "(2016.0) 0"
+    Attribute LanguageLevel "" 2
+
+    UIConstraints "*Duplex  *Option1 False"
+
+    HWMargins 12 12 12 12
+    *MediaSize Letter
+    MediaSize Legal
+    MediaSize Executive
+    MediaSize Tabloid
+    MediaSize A3
+    MediaSize A4
+    MediaSize A5
+    MediaSize B5
+    MediaSize EnvISOB5
+    MediaSize Env10
+    MediaSize EnvC5
+    MediaSize EnvDL
+    MediaSize EnvMonarch
+
+    Option "InputSlot/Media Source" PickOne AnySetup 10
+      *Choice "Default/Printer Default" ""
+      Choice "Tray1/Tray 1" "<</ManualFeed false>>setpagedevice"
+      Choice "Manual/Manual Feed" "<</ManualFeed true>>setpagedevice"
+
+    Duplex Yes
+    Installable "Option1/Duplexer"
+  }
+}
+
 // HP
 {
   Manufacturer "HP"
index 0afb949c7f56c336026d084935e21e25ab27fc48..ca5e7f56e492789ad560e55431454b30d515ccd4 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 2
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson Stylus Color Series: ""
+*nl.Translation ShortNickName/Epson Stylus Color Series: ""
+*nl.Translation NickName/Epson Stylus Color Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360dpi/360dpi: ""
+*nl.Resolution 720dpi/720dpi: ""
+*nl.Translation ColorModel/Kleurenmodus: ""
+*nl.ColorModel CMYK/CMYK: ""
+*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson Stylus Color Series: ""
 *no.Translation ShortNickName/Epson Stylus Color Series: ""
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson Stylus Color Series: ""
+*pt_BR.Translation ShortNickName/Epson Stylus Color Series: ""
+*pt_BR.Translation NickName/Epson Stylus Color Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360dpi/360dpi: ""
+*pt_BR.Resolution 720dpi/720dpi: ""
+*pt_BR.Translation ColorModel/Modo Cor: ""
+*pt_BR.ColorModel CMYK/CMYK: ""
+*pt_BR.ColorModel Gray/Grayscale: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson Stylus Color Series: ""
 *pt_PT.Translation ShortNickName/Epson Stylus Color Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR.PPD, 18258 bytes.
+*% End of STCOLOR.PPD, 19832 bytes.
index 2e9b735aebf4fff0ff95801e7dc827b4497f96ee..284dce455a6b02dd9fb6ba46bf67a0b1915b6e3e 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 4
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson New Stylus Color Series: ""
+*nl.Translation ShortNickName/Epson New Stylus Color Series: ""
+*nl.Translation NickName/Epson New Stylus Color Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360dpi/360dpi: ""
+*nl.Resolution 720dpi/720dpi: ""
+*nl.Translation ColorModel/Kleurenmodus: ""
+*nl.ColorModel CMYK/CMYK: ""
+*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson New Stylus Color Series: ""
 *no.Translation ShortNickName/Epson New Stylus Color Series: ""
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson New Stylus Color Series: ""
+*pt_BR.Translation ShortNickName/Epson New Stylus Color Series: ""
+*pt_BR.Translation NickName/Epson New Stylus Color Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360dpi/360dpi: ""
+*pt_BR.Resolution 720dpi/720dpi: ""
+*pt_BR.Translation ColorModel/Modo Cor: ""
+*pt_BR.ColorModel CMYK/CMYK: ""
+*pt_BR.ColorModel Gray/Grayscale: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson New Stylus Color Series: ""
 *pt_PT.Translation ShortNickName/Epson New Stylus Color Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR2.PPD, 18444 bytes.
+*% End of STCOLOR2.PPD, 20042 bytes.
index bf22dd7c92187765e7e40dd3f2729ada42b970d6..f2f105703214ec92be9c417c9f2f8a289460ed32 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 3
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson Stylus Photo Series: ""
+*nl.Translation ShortNickName/Epson Stylus Photo Series: ""
+*nl.Translation NickName/Epson Stylus Photo Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360dpi/360dpi: ""
+*nl.Resolution 720dpi/720dpi: ""
+*nl.Translation ColorModel/Kleurenmodus: ""
+*nl.ColorModel CMYK/CMYK: ""
+*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson Stylus Photo Series: ""
 *no.Translation ShortNickName/Epson Stylus Photo Series: ""
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson Stylus Photo Series: ""
+*pt_BR.Translation ShortNickName/Epson Stylus Photo Series: ""
+*pt_BR.Translation NickName/Epson Stylus Photo Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360dpi/360dpi: ""
+*pt_BR.Resolution 720dpi/720dpi: ""
+*pt_BR.Translation ColorModel/Modo Cor: ""
+*pt_BR.ColorModel CMYK/CMYK: ""
+*pt_BR.ColorModel Gray/Grayscale: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson Stylus Photo Series: ""
 *pt_PT.Translation ShortNickName/Epson Stylus Photo Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO.PPD, 18259 bytes.
+*% End of STPHOTO.PPD, 19833 bytes.
index 6b3e7ef692203c0641ecad6f89c65a63323a9ed6..1f0c67154c5228391b12187a4324e5f675520fa5 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 5
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
+*nl.Translation Manufacturer/Epson: ""
+*nl.Translation ModelName/Epson New Stylus Photo Series: ""
+*nl.Translation ShortNickName/Epson New Stylus Photo Series: ""
+*nl.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*nl.PageSize Letter/Letter - 8.5x11in: ""
+*nl.PageSize Legal/Legal - 8.5x14in: ""
+*nl.PageSize A4/A4 - 210x297mm: ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 180dpi/180dpi: ""
+*nl.Resolution 360dpi/360dpi: ""
+*nl.Resolution 720dpi/720dpi: ""
+*nl.Translation ColorModel/Kleurenmodus: ""
+*nl.ColorModel CMYK/CMYK: ""
+*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson New Stylus Photo Series: ""
 *no.Translation ShortNickName/Epson New Stylus Photo Series: ""
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
+*pt_BR.Translation Manufacturer/Epson: ""
+*pt_BR.Translation ModelName/Epson New Stylus Photo Series: ""
+*pt_BR.Translation ShortNickName/Epson New Stylus Photo Series: ""
+*pt_BR.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
+*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
+*pt_BR.PageSize A4/A4 - 210x297mm: ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 180dpi/180dpi: ""
+*pt_BR.Resolution 360dpi/360dpi: ""
+*pt_BR.Resolution 720dpi/720dpi: ""
+*pt_BR.Translation ColorModel/Modo Cor: ""
+*pt_BR.ColorModel CMYK/CMYK: ""
+*pt_BR.ColorModel Gray/Grayscale: ""
 *pt_PT.Translation Manufacturer/Epson: ""
 *pt_PT.Translation ModelName/Epson New Stylus Photo Series: ""
 *pt_PT.Translation ShortNickName/Epson New Stylus Photo Series: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO2.PPD, 18445 bytes.
+*% End of STPHOTO2.PPD, 20043 bytes.
index f66cb8318361a4f424a2ed97223cda9082db2c25..6b0d99f848241dd8ffa93aa72af2094176727191 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 18
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
 *ko.zeErrorReprint Saved/빠르게: ""
 *ko.zeErrorReprint Always/Always: ""
 *ko.zeErrorReprint Never/Never: ""
+*nl.Translation Manufacturer/Zebra: ""
+*nl.Translation ModelName/Zebra ZPL Label Printer: ""
+*nl.Translation ShortNickName/Zebra ZPL Label Printer: ""
+*nl.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w90h18/1.25x0.25": ""
+*nl.PageSize w90h162/1.25x2.25": ""
+*nl.PageSize w108h18/1.50x0.25": ""
+*nl.PageSize w108h36/1.50x0.50": ""
+*nl.PageSize w108h72/1.50x1.00": ""
+*nl.PageSize w108h144/1.50x2.00": ""
+*nl.PageSize w144h26/2.00x0.37": ""
+*nl.PageSize w144h36/2.00x0.50": ""
+*nl.PageSize w144h72/2.00x1.00": ""
+*nl.PageSize w144h90/2.00x1.25": ""
+*nl.PageSize w144h288/2.00x4.00": ""
+*nl.PageSize w144h396/2.00x5.50": ""
+*nl.PageSize w162h36/2.25x0.50": ""
+*nl.PageSize w162h90/2.25x1.25": ""
+*nl.PageSize w162h288/2.25x4.00": ""
+*nl.PageSize w162h396/2.25x5.50": ""
+*nl.PageSize w171h396/2.38x5.50": ""
+*nl.PageSize w180h72/2.50x1.00": ""
+*nl.PageSize w180h144/2.50x2.00": ""
+*nl.PageSize w198h90/2.75x1.25": ""
+*nl.PageSize w216h72/3.00x1.00": ""
+*nl.PageSize w216h90/3.00x1.25": ""
+*nl.PageSize w216h144/3.00x2.00": ""
+*nl.PageSize w216h216/3.00x3.00": ""
+*nl.PageSize w216h360/3.00x5.00": ""
+*nl.PageSize w234h144/3.25x2.00": ""
+*nl.PageSize w234h360/3.25x5.00": ""
+*nl.PageSize w234h396/3.25x5.50": ""
+*nl.PageSize w234h419/3.25x5.83": ""
+*nl.PageSize w234h563/3.25x7.83": ""
+*nl.PageSize w252h72/3.50x1.00": ""
+*nl.PageSize w288h72/4.00x1.00": ""
+*nl.PageSize w288h144/4.00x2.00": ""
+*nl.PageSize w288h180/4.00x2.50": ""
+*nl.PageSize w288h216/4.00x3.00": ""
+*nl.PageSize w288h288/4.00x4.00": ""
+*nl.PageSize w288h360/4.00x5.00": ""
+*nl.PageSize w288h432/4.00x6.00": ""
+*nl.PageSize w288h468/4.00x6.50": ""
+*nl.PageSize w288h936/4.00x13.00": ""
+*nl.PageSize w432h72/6.00x1.00": ""
+*nl.PageSize w432h144/6.00x2.00": ""
+*nl.PageSize w432h216/6.00x3.00": ""
+*nl.PageSize w432h288/6.00x4.00": ""
+*nl.PageSize w432h360/6.00x5.00": ""
+*nl.PageSize w432h432/6.00x6.00": ""
+*nl.PageSize w432h468/6.00x6.50": ""
+*nl.PageSize w576h72/8.00x1.00": ""
+*nl.PageSize w576h144/8.00x2.00": ""
+*nl.PageSize w576h216/8.00x3.00": ""
+*nl.PageSize w576h288/8.00x4.00": ""
+*nl.PageSize w576h360/8.00x5.00": ""
+*nl.PageSize w576h432/8.00x6.00": ""
+*nl.PageSize w576h468/8.00x6.50": ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 203dpi/203dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600dpi: ""
+*nl.Translation zeMediaTracking/Media Tracking: ""
+*nl.zeMediaTracking Continuous/Continuous: ""
+*nl.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*nl.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*nl.Translation MediaType/Media Type: ""
+*nl.MediaType Saved/Printerstandaard: ""
+*nl.MediaType Thermal/Thermal Transfer Media: ""
+*nl.MediaType Direct/Direct Thermal Media: ""
+*nl.Translation PrinterSettings/Printer Settings: ""
+*nl.Translation Darkness/Darkness: ""
+*nl.Darkness -1/Printerstandaard: ""
+*nl.Darkness 1/1: ""
+*nl.Darkness 2/2: ""
+*nl.Darkness 3/3: ""
+*nl.Darkness 4/4: ""
+*nl.Darkness 5/5: ""
+*nl.Darkness 6/6: ""
+*nl.Darkness 7/7: ""
+*nl.Darkness 8/8: ""
+*nl.Darkness 9/9: ""
+*nl.Darkness 10/10: ""
+*nl.Darkness 11/11: ""
+*nl.Darkness 12/12: ""
+*nl.Darkness 13/13: ""
+*nl.Darkness 14/14: ""
+*nl.Darkness 15/15: ""
+*nl.Darkness 16/16: ""
+*nl.Darkness 17/17: ""
+*nl.Darkness 18/18: ""
+*nl.Darkness 19/19: ""
+*nl.Darkness 20/20: ""
+*nl.Darkness 21/21: ""
+*nl.Darkness 22/22: ""
+*nl.Darkness 23/23: ""
+*nl.Darkness 24/24: ""
+*nl.Darkness 25/25: ""
+*nl.Darkness 26/26: ""
+*nl.Darkness 27/27: ""
+*nl.Darkness 28/28: ""
+*nl.Darkness 29/29: ""
+*nl.Darkness 30/30: ""
+*nl.Translation zePrintRate/Print Rate: ""
+*nl.zePrintRate Default/Printerstandaard: ""
+*nl.zePrintRate 1/1 inch/sec.: ""
+*nl.zePrintRate 2/2 inches/sec.: ""
+*nl.zePrintRate 3/3 inches/sec.: ""
+*nl.zePrintRate 4/4 inches/sec.: ""
+*nl.zePrintRate 5/5 inches/sec.: ""
+*nl.zePrintRate 6/6 inches/sec.: ""
+*nl.zePrintRate 7/7 inches/sec.: ""
+*nl.zePrintRate 8/8 inches/sec.: ""
+*nl.zePrintRate 9/9 inches/sec.: ""
+*nl.zePrintRate 10/10 inches/sec.: ""
+*nl.zePrintRate 11/11 inches/sec.: ""
+*nl.zePrintRate 12/12 inches/sec.: ""
+*nl.Translation zeLabelTop/Label Top: ""
+*nl.zeLabelTop 200/Printerstandaard: ""
+*nl.zeLabelTop -120/-120: ""
+*nl.zeLabelTop -115/-115: ""
+*nl.zeLabelTop -110/-110: ""
+*nl.zeLabelTop -105/-105: ""
+*nl.zeLabelTop -100/-100: ""
+*nl.zeLabelTop -95/-95: ""
+*nl.zeLabelTop -90/-90: ""
+*nl.zeLabelTop -85/-85: ""
+*nl.zeLabelTop -80/-80: ""
+*nl.zeLabelTop -75/-75: ""
+*nl.zeLabelTop -70/-70: ""
+*nl.zeLabelTop -65/-65: ""
+*nl.zeLabelTop -60/-60: ""
+*nl.zeLabelTop -55/-55: ""
+*nl.zeLabelTop -50/-50: ""
+*nl.zeLabelTop -45/-45: ""
+*nl.zeLabelTop -40/-40: ""
+*nl.zeLabelTop -35/-35: ""
+*nl.zeLabelTop -30/-30: ""
+*nl.zeLabelTop -25/-25: ""
+*nl.zeLabelTop -20/-20: ""
+*nl.zeLabelTop -15/-15: ""
+*nl.zeLabelTop -10/-10: ""
+*nl.zeLabelTop -5/-5: ""
+*nl.zeLabelTop 0/0: ""
+*nl.zeLabelTop 5/5: ""
+*nl.zeLabelTop 10/10: ""
+*nl.zeLabelTop 15/15: ""
+*nl.zeLabelTop 20/20: ""
+*nl.zeLabelTop 25/25: ""
+*nl.zeLabelTop 30/30: ""
+*nl.zeLabelTop 35/35: ""
+*nl.zeLabelTop 40/40: ""
+*nl.zeLabelTop 45/45: ""
+*nl.zeLabelTop 50/50: ""
+*nl.zeLabelTop 55/55: ""
+*nl.zeLabelTop 60/60: ""
+*nl.zeLabelTop 65/65: ""
+*nl.zeLabelTop 70/70: ""
+*nl.zeLabelTop 75/75: ""
+*nl.zeLabelTop 80/80: ""
+*nl.zeLabelTop 85/85: ""
+*nl.zeLabelTop 90/90: ""
+*nl.zeLabelTop 95/95: ""
+*nl.zeLabelTop 100/100: ""
+*nl.zeLabelTop 105/105: ""
+*nl.zeLabelTop 110/110: ""
+*nl.zeLabelTop 115/115: ""
+*nl.zeLabelTop 120/120: ""
+*nl.Translation zePrintMode/Print Mode: ""
+*nl.zePrintMode Saved/Printerstandaard: ""
+*nl.zePrintMode Tear/Tear-Off: ""
+*nl.zePrintMode Peel/Peel-Off: ""
+*nl.zePrintMode Rewind/Rewind: ""
+*nl.zePrintMode Applicator/Applicator: ""
+*nl.zePrintMode Cutter/Cutter: ""
+*nl.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*nl.zeTearOffPosition 1000/Printerstandaard: ""
+*nl.zeTearOffPosition -120/-120: ""
+*nl.zeTearOffPosition -115/-115: ""
+*nl.zeTearOffPosition -110/-110: ""
+*nl.zeTearOffPosition -105/-105: ""
+*nl.zeTearOffPosition -100/-100: ""
+*nl.zeTearOffPosition -95/-95: ""
+*nl.zeTearOffPosition -90/-90: ""
+*nl.zeTearOffPosition -85/-85: ""
+*nl.zeTearOffPosition -80/-80: ""
+*nl.zeTearOffPosition -75/-75: ""
+*nl.zeTearOffPosition -70/-70: ""
+*nl.zeTearOffPosition -65/-65: ""
+*nl.zeTearOffPosition -60/-60: ""
+*nl.zeTearOffPosition -55/-55: ""
+*nl.zeTearOffPosition -50/-50: ""
+*nl.zeTearOffPosition -45/-45: ""
+*nl.zeTearOffPosition -40/-40: ""
+*nl.zeTearOffPosition -35/-35: ""
+*nl.zeTearOffPosition -30/-30: ""
+*nl.zeTearOffPosition -25/-25: ""
+*nl.zeTearOffPosition -20/-20: ""
+*nl.zeTearOffPosition -15/-15: ""
+*nl.zeTearOffPosition -10/-10: ""
+*nl.zeTearOffPosition -5/-5: ""
+*nl.zeTearOffPosition 0/0: ""
+*nl.zeTearOffPosition 5/5: ""
+*nl.zeTearOffPosition 10/10: ""
+*nl.zeTearOffPosition 15/15: ""
+*nl.zeTearOffPosition 20/20: ""
+*nl.zeTearOffPosition 25/25: ""
+*nl.zeTearOffPosition 30/30: ""
+*nl.zeTearOffPosition 35/35: ""
+*nl.zeTearOffPosition 40/40: ""
+*nl.zeTearOffPosition 45/45: ""
+*nl.zeTearOffPosition 50/50: ""
+*nl.zeTearOffPosition 55/55: ""
+*nl.zeTearOffPosition 60/60: ""
+*nl.zeTearOffPosition 65/65: ""
+*nl.zeTearOffPosition 70/70: ""
+*nl.zeTearOffPosition 75/75: ""
+*nl.zeTearOffPosition 80/80: ""
+*nl.zeTearOffPosition 85/85: ""
+*nl.zeTearOffPosition 90/90: ""
+*nl.zeTearOffPosition 95/95: ""
+*nl.zeTearOffPosition 100/100: ""
+*nl.zeTearOffPosition 105/105: ""
+*nl.zeTearOffPosition 110/110: ""
+*nl.zeTearOffPosition 115/115: ""
+*nl.zeTearOffPosition 120/120: ""
+*nl.Translation zeErrorReprint/Reprint After Error: ""
+*nl.zeErrorReprint Saved/Printerstandaard: ""
+*nl.zeErrorReprint Always/Always: ""
+*nl.zeErrorReprint Never/Never: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra ZPL Label Printer: ""
 *no.Translation ShortNickName/Zebra ZPL Label Printer: ""
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
+*pt_BR.Translation Manufacturer/Zebra: ""
+*pt_BR.Translation ModelName/Zebra ZPL Label Printer: ""
+*pt_BR.Translation ShortNickName/Zebra ZPL Label Printer: ""
+*pt_BR.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w90h18/1.25x0.25": ""
+*pt_BR.PageSize w90h162/1.25x2.25": ""
+*pt_BR.PageSize w108h18/1.50x0.25": ""
+*pt_BR.PageSize w108h36/1.50x0.50": ""
+*pt_BR.PageSize w108h72/1.50x1.00": ""
+*pt_BR.PageSize w108h144/1.50x2.00": ""
+*pt_BR.PageSize w144h26/2.00x0.37": ""
+*pt_BR.PageSize w144h36/2.00x0.50": ""
+*pt_BR.PageSize w144h72/2.00x1.00": ""
+*pt_BR.PageSize w144h90/2.00x1.25": ""
+*pt_BR.PageSize w144h288/2.00x4.00": ""
+*pt_BR.PageSize w144h396/2.00x5.50": ""
+*pt_BR.PageSize w162h36/2.25x0.50": ""
+*pt_BR.PageSize w162h90/2.25x1.25": ""
+*pt_BR.PageSize w162h288/2.25x4.00": ""
+*pt_BR.PageSize w162h396/2.25x5.50": ""
+*pt_BR.PageSize w171h396/2.38x5.50": ""
+*pt_BR.PageSize w180h72/2.50x1.00": ""
+*pt_BR.PageSize w180h144/2.50x2.00": ""
+*pt_BR.PageSize w198h90/2.75x1.25": ""
+*pt_BR.PageSize w216h72/3.00x1.00": ""
+*pt_BR.PageSize w216h90/3.00x1.25": ""
+*pt_BR.PageSize w216h144/3.00x2.00": ""
+*pt_BR.PageSize w216h216/3.00x3.00": ""
+*pt_BR.PageSize w216h360/3.00x5.00": ""
+*pt_BR.PageSize w234h144/3.25x2.00": ""
+*pt_BR.PageSize w234h360/3.25x5.00": ""
+*pt_BR.PageSize w234h396/3.25x5.50": ""
+*pt_BR.PageSize w234h419/3.25x5.83": ""
+*pt_BR.PageSize w234h563/3.25x7.83": ""
+*pt_BR.PageSize w252h72/3.50x1.00": ""
+*pt_BR.PageSize w288h72/4.00x1.00": ""
+*pt_BR.PageSize w288h144/4.00x2.00": ""
+*pt_BR.PageSize w288h180/4.00x2.50": ""
+*pt_BR.PageSize w288h216/4.00x3.00": ""
+*pt_BR.PageSize w288h288/4.00x4.00": ""
+*pt_BR.PageSize w288h360/4.00x5.00": ""
+*pt_BR.PageSize w288h432/4.00x6.00": ""
+*pt_BR.PageSize w288h468/4.00x6.50": ""
+*pt_BR.PageSize w288h936/4.00x13.00": ""
+*pt_BR.PageSize w432h72/6.00x1.00": ""
+*pt_BR.PageSize w432h144/6.00x2.00": ""
+*pt_BR.PageSize w432h216/6.00x3.00": ""
+*pt_BR.PageSize w432h288/6.00x4.00": ""
+*pt_BR.PageSize w432h360/6.00x5.00": ""
+*pt_BR.PageSize w432h432/6.00x6.00": ""
+*pt_BR.PageSize w432h468/6.00x6.50": ""
+*pt_BR.PageSize w576h72/8.00x1.00": ""
+*pt_BR.PageSize w576h144/8.00x2.00": ""
+*pt_BR.PageSize w576h216/8.00x3.00": ""
+*pt_BR.PageSize w576h288/8.00x4.00": ""
+*pt_BR.PageSize w576h360/8.00x5.00": ""
+*pt_BR.PageSize w576h432/8.00x6.00": ""
+*pt_BR.PageSize w576h468/8.00x6.50": ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 203dpi/203dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600dpi: ""
+*pt_BR.Translation zeMediaTracking/Media Tracking: ""
+*pt_BR.zeMediaTracking Continuous/Continuous: ""
+*pt_BR.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*pt_BR.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*pt_BR.Translation MediaType/Media Type: ""
+*pt_BR.MediaType Saved/Rápido: ""
+*pt_BR.MediaType Thermal/Thermal Transfer Media: ""
+*pt_BR.MediaType Direct/Direct Thermal Media: ""
+*pt_BR.Translation PrinterSettings/Printer Settings: ""
+*pt_BR.Translation Darkness/Darkness: ""
+*pt_BR.Darkness -1/Rápido: ""
+*pt_BR.Darkness 1/1: ""
+*pt_BR.Darkness 2/2: ""
+*pt_BR.Darkness 3/3: ""
+*pt_BR.Darkness 4/4: ""
+*pt_BR.Darkness 5/5: ""
+*pt_BR.Darkness 6/6: ""
+*pt_BR.Darkness 7/7: ""
+*pt_BR.Darkness 8/8: ""
+*pt_BR.Darkness 9/9: ""
+*pt_BR.Darkness 10/10: ""
+*pt_BR.Darkness 11/11: ""
+*pt_BR.Darkness 12/12: ""
+*pt_BR.Darkness 13/13: ""
+*pt_BR.Darkness 14/14: ""
+*pt_BR.Darkness 15/15: ""
+*pt_BR.Darkness 16/16: ""
+*pt_BR.Darkness 17/17: ""
+*pt_BR.Darkness 18/18: ""
+*pt_BR.Darkness 19/19: ""
+*pt_BR.Darkness 20/20: ""
+*pt_BR.Darkness 21/21: ""
+*pt_BR.Darkness 22/22: ""
+*pt_BR.Darkness 23/23: ""
+*pt_BR.Darkness 24/24: ""
+*pt_BR.Darkness 25/25: ""
+*pt_BR.Darkness 26/26: ""
+*pt_BR.Darkness 27/27: ""
+*pt_BR.Darkness 28/28: ""
+*pt_BR.Darkness 29/29: ""
+*pt_BR.Darkness 30/30: ""
+*pt_BR.Translation zePrintRate/Print Rate: ""
+*pt_BR.zePrintRate Default/Rápido: ""
+*pt_BR.zePrintRate 1/1 inch/sec.: ""
+*pt_BR.zePrintRate 2/2 inches/sec.: ""
+*pt_BR.zePrintRate 3/3 inches/sec.: ""
+*pt_BR.zePrintRate 4/4 inches/sec.: ""
+*pt_BR.zePrintRate 5/5 inches/sec.: ""
+*pt_BR.zePrintRate 6/6 inches/sec.: ""
+*pt_BR.zePrintRate 7/7 inches/sec.: ""
+*pt_BR.zePrintRate 8/8 inches/sec.: ""
+*pt_BR.zePrintRate 9/9 inches/sec.: ""
+*pt_BR.zePrintRate 10/10 inches/sec.: ""
+*pt_BR.zePrintRate 11/11 inches/sec.: ""
+*pt_BR.zePrintRate 12/12 inches/sec.: ""
+*pt_BR.Translation zeLabelTop/Label Top: ""
+*pt_BR.zeLabelTop 200/Rápido: ""
+*pt_BR.zeLabelTop -120/-120: ""
+*pt_BR.zeLabelTop -115/-115: ""
+*pt_BR.zeLabelTop -110/-110: ""
+*pt_BR.zeLabelTop -105/-105: ""
+*pt_BR.zeLabelTop -100/-100: ""
+*pt_BR.zeLabelTop -95/-95: ""
+*pt_BR.zeLabelTop -90/-90: ""
+*pt_BR.zeLabelTop -85/-85: ""
+*pt_BR.zeLabelTop -80/-80: ""
+*pt_BR.zeLabelTop -75/-75: ""
+*pt_BR.zeLabelTop -70/-70: ""
+*pt_BR.zeLabelTop -65/-65: ""
+*pt_BR.zeLabelTop -60/-60: ""
+*pt_BR.zeLabelTop -55/-55: ""
+*pt_BR.zeLabelTop -50/-50: ""
+*pt_BR.zeLabelTop -45/-45: ""
+*pt_BR.zeLabelTop -40/-40: ""
+*pt_BR.zeLabelTop -35/-35: ""
+*pt_BR.zeLabelTop -30/-30: ""
+*pt_BR.zeLabelTop -25/-25: ""
+*pt_BR.zeLabelTop -20/-20: ""
+*pt_BR.zeLabelTop -15/-15: ""
+*pt_BR.zeLabelTop -10/-10: ""
+*pt_BR.zeLabelTop -5/-5: ""
+*pt_BR.zeLabelTop 0/0: ""
+*pt_BR.zeLabelTop 5/5: ""
+*pt_BR.zeLabelTop 10/10: ""
+*pt_BR.zeLabelTop 15/15: ""
+*pt_BR.zeLabelTop 20/20: ""
+*pt_BR.zeLabelTop 25/25: ""
+*pt_BR.zeLabelTop 30/30: ""
+*pt_BR.zeLabelTop 35/35: ""
+*pt_BR.zeLabelTop 40/40: ""
+*pt_BR.zeLabelTop 45/45: ""
+*pt_BR.zeLabelTop 50/50: ""
+*pt_BR.zeLabelTop 55/55: ""
+*pt_BR.zeLabelTop 60/60: ""
+*pt_BR.zeLabelTop 65/65: ""
+*pt_BR.zeLabelTop 70/70: ""
+*pt_BR.zeLabelTop 75/75: ""
+*pt_BR.zeLabelTop 80/80: ""
+*pt_BR.zeLabelTop 85/85: ""
+*pt_BR.zeLabelTop 90/90: ""
+*pt_BR.zeLabelTop 95/95: ""
+*pt_BR.zeLabelTop 100/100: ""
+*pt_BR.zeLabelTop 105/105: ""
+*pt_BR.zeLabelTop 110/110: ""
+*pt_BR.zeLabelTop 115/115: ""
+*pt_BR.zeLabelTop 120/120: ""
+*pt_BR.Translation zePrintMode/Print Mode: ""
+*pt_BR.zePrintMode Saved/Rápido: ""
+*pt_BR.zePrintMode Tear/Tear-Off: ""
+*pt_BR.zePrintMode Peel/Peel-Off: ""
+*pt_BR.zePrintMode Rewind/Rewind: ""
+*pt_BR.zePrintMode Applicator/Applicator: ""
+*pt_BR.zePrintMode Cutter/Cutter: ""
+*pt_BR.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*pt_BR.zeTearOffPosition 1000/Rápido: ""
+*pt_BR.zeTearOffPosition -120/-120: ""
+*pt_BR.zeTearOffPosition -115/-115: ""
+*pt_BR.zeTearOffPosition -110/-110: ""
+*pt_BR.zeTearOffPosition -105/-105: ""
+*pt_BR.zeTearOffPosition -100/-100: ""
+*pt_BR.zeTearOffPosition -95/-95: ""
+*pt_BR.zeTearOffPosition -90/-90: ""
+*pt_BR.zeTearOffPosition -85/-85: ""
+*pt_BR.zeTearOffPosition -80/-80: ""
+*pt_BR.zeTearOffPosition -75/-75: ""
+*pt_BR.zeTearOffPosition -70/-70: ""
+*pt_BR.zeTearOffPosition -65/-65: ""
+*pt_BR.zeTearOffPosition -60/-60: ""
+*pt_BR.zeTearOffPosition -55/-55: ""
+*pt_BR.zeTearOffPosition -50/-50: ""
+*pt_BR.zeTearOffPosition -45/-45: ""
+*pt_BR.zeTearOffPosition -40/-40: ""
+*pt_BR.zeTearOffPosition -35/-35: ""
+*pt_BR.zeTearOffPosition -30/-30: ""
+*pt_BR.zeTearOffPosition -25/-25: ""
+*pt_BR.zeTearOffPosition -20/-20: ""
+*pt_BR.zeTearOffPosition -15/-15: ""
+*pt_BR.zeTearOffPosition -10/-10: ""
+*pt_BR.zeTearOffPosition -5/-5: ""
+*pt_BR.zeTearOffPosition 0/0: ""
+*pt_BR.zeTearOffPosition 5/5: ""
+*pt_BR.zeTearOffPosition 10/10: ""
+*pt_BR.zeTearOffPosition 15/15: ""
+*pt_BR.zeTearOffPosition 20/20: ""
+*pt_BR.zeTearOffPosition 25/25: ""
+*pt_BR.zeTearOffPosition 30/30: ""
+*pt_BR.zeTearOffPosition 35/35: ""
+*pt_BR.zeTearOffPosition 40/40: ""
+*pt_BR.zeTearOffPosition 45/45: ""
+*pt_BR.zeTearOffPosition 50/50: ""
+*pt_BR.zeTearOffPosition 55/55: ""
+*pt_BR.zeTearOffPosition 60/60: ""
+*pt_BR.zeTearOffPosition 65/65: ""
+*pt_BR.zeTearOffPosition 70/70: ""
+*pt_BR.zeTearOffPosition 75/75: ""
+*pt_BR.zeTearOffPosition 80/80: ""
+*pt_BR.zeTearOffPosition 85/85: ""
+*pt_BR.zeTearOffPosition 90/90: ""
+*pt_BR.zeTearOffPosition 95/95: ""
+*pt_BR.zeTearOffPosition 100/100: ""
+*pt_BR.zeTearOffPosition 105/105: ""
+*pt_BR.zeTearOffPosition 110/110: ""
+*pt_BR.zeTearOffPosition 115/115: ""
+*pt_BR.zeTearOffPosition 120/120: ""
+*pt_BR.Translation zeErrorReprint/Reprint After Error: ""
+*pt_BR.zeErrorReprint Saved/Rápido: ""
+*pt_BR.zeErrorReprint Always/Always: ""
+*pt_BR.zeErrorReprint Never/Never: ""
 *pt_PT.Translation Manufacturer/Zebra: ""
 *pt_PT.Translation ModelName/Zebra ZPL Label Printer: ""
 *pt_PT.Translation ShortNickName/Zebra ZPL Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRA.PPD, 138038 bytes.
+*% End of ZEBRA.PPD, 153875 bytes.
index f733876bfebbfa67cee08b3a032fe744cf72c536..f46dbe761b85d12a59a6694484e2eeb169390d54 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 19
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
 *ko.zeErrorReprint Saved/빠르게: ""
 *ko.zeErrorReprint Always/Always: ""
 *ko.zeErrorReprint Never/Never: ""
+*nl.Translation Manufacturer/Zebra: ""
+*nl.Translation ModelName/Zebra CPCL Label Printer: ""
+*nl.Translation ShortNickName/Zebra CPCL Label Printer: ""
+*nl.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w144h72/2.00x1.00": ""
+*nl.PageSize w144h90/2.00x1.25": ""
+*nl.PageSize w144h144/2.00x2.00": ""
+*nl.PageSize w144h216/2.00x3.00": ""
+*nl.PageSize w209h72/2.9 x 1": ""
+*nl.PageSize w288h144/4.00x2.00": ""
+*nl.PageSize w288h216/4.00x3.00": ""
+*nl.PageSize w288h288/4.00x4.00": ""
+*nl.PageSize w288h360/4.00x5.00": ""
+*nl.PageSize w288h432/4.00x6.00": ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 203dpi/203dpi: ""
+*nl.Translation zeMediaTracking/Media Tracking: ""
+*nl.zeMediaTracking Continuous/Continuous: ""
+*nl.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*nl.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*nl.Translation PrinterSettings/Printer Settings: ""
+*nl.Translation Darkness/Darkness: ""
+*nl.Darkness -1/Printerstandaard: ""
+*nl.Darkness 1/1: ""
+*nl.Darkness 2/2: ""
+*nl.Darkness 3/3: ""
+*nl.Darkness 4/4: ""
+*nl.Darkness 5/5: ""
+*nl.Darkness 6/6: ""
+*nl.Darkness 7/7: ""
+*nl.Darkness 8/8: ""
+*nl.Darkness 9/9: ""
+*nl.Darkness 10/10: ""
+*nl.Darkness 11/11: ""
+*nl.Darkness 12/12: ""
+*nl.Darkness 13/13: ""
+*nl.Darkness 14/14: ""
+*nl.Darkness 15/15: ""
+*nl.Darkness 16/16: ""
+*nl.Darkness 17/17: ""
+*nl.Darkness 18/18: ""
+*nl.Darkness 19/19: ""
+*nl.Darkness 20/20: ""
+*nl.Darkness 21/21: ""
+*nl.Darkness 22/22: ""
+*nl.Darkness 23/23: ""
+*nl.Darkness 24/24: ""
+*nl.Darkness 25/25: ""
+*nl.Darkness 26/26: ""
+*nl.Darkness 27/27: ""
+*nl.Darkness 28/28: ""
+*nl.Darkness 29/29: ""
+*nl.Darkness 30/30: ""
+*nl.Translation zePrintRate/Print Rate: ""
+*nl.zePrintRate Default/Printerstandaard: ""
+*nl.zePrintRate 1/1 inch/sec.: ""
+*nl.zePrintRate 2/2 inches/sec.: ""
+*nl.zePrintRate 3/3 inches/sec.: ""
+*nl.zePrintRate 4/4 inches/sec.: ""
+*nl.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*nl.zeTearOffPosition 1000/Printerstandaard: ""
+*nl.zeTearOffPosition -120/-120: ""
+*nl.zeTearOffPosition -115/-115: ""
+*nl.zeTearOffPosition -110/-110: ""
+*nl.zeTearOffPosition -105/-105: ""
+*nl.zeTearOffPosition -100/-100: ""
+*nl.zeTearOffPosition -95/-95: ""
+*nl.zeTearOffPosition -90/-90: ""
+*nl.zeTearOffPosition -85/-85: ""
+*nl.zeTearOffPosition -80/-80: ""
+*nl.zeTearOffPosition -75/-75: ""
+*nl.zeTearOffPosition -70/-70: ""
+*nl.zeTearOffPosition -65/-65: ""
+*nl.zeTearOffPosition -60/-60: ""
+*nl.zeTearOffPosition -55/-55: ""
+*nl.zeTearOffPosition -50/-50: ""
+*nl.zeTearOffPosition -45/-45: ""
+*nl.zeTearOffPosition -40/-40: ""
+*nl.zeTearOffPosition -35/-35: ""
+*nl.zeTearOffPosition -30/-30: ""
+*nl.zeTearOffPosition -25/-25: ""
+*nl.zeTearOffPosition -20/-20: ""
+*nl.zeTearOffPosition -15/-15: ""
+*nl.zeTearOffPosition -10/-10: ""
+*nl.zeTearOffPosition -5/-5: ""
+*nl.zeTearOffPosition 0/0: ""
+*nl.zeTearOffPosition 5/5: ""
+*nl.zeTearOffPosition 10/10: ""
+*nl.zeTearOffPosition 15/15: ""
+*nl.zeTearOffPosition 20/20: ""
+*nl.zeTearOffPosition 25/25: ""
+*nl.zeTearOffPosition 30/30: ""
+*nl.zeTearOffPosition 35/35: ""
+*nl.zeTearOffPosition 40/40: ""
+*nl.zeTearOffPosition 45/45: ""
+*nl.zeTearOffPosition 50/50: ""
+*nl.zeTearOffPosition 55/55: ""
+*nl.zeTearOffPosition 60/60: ""
+*nl.zeTearOffPosition 65/65: ""
+*nl.zeTearOffPosition 70/70: ""
+*nl.zeTearOffPosition 75/75: ""
+*nl.zeTearOffPosition 80/80: ""
+*nl.zeTearOffPosition 85/85: ""
+*nl.zeTearOffPosition 90/90: ""
+*nl.zeTearOffPosition 95/95: ""
+*nl.zeTearOffPosition 100/100: ""
+*nl.zeTearOffPosition 105/105: ""
+*nl.zeTearOffPosition 110/110: ""
+*nl.zeTearOffPosition 115/115: ""
+*nl.zeTearOffPosition 120/120: ""
+*nl.Translation zeErrorReprint/Reprint After Error: ""
+*nl.zeErrorReprint Saved/Printerstandaard: ""
+*nl.zeErrorReprint Always/Always: ""
+*nl.zeErrorReprint Never/Never: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra CPCL Label Printer: ""
 *no.Translation ShortNickName/Zebra CPCL Label Printer: ""
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
+*pt_BR.Translation Manufacturer/Zebra: ""
+*pt_BR.Translation ModelName/Zebra CPCL Label Printer: ""
+*pt_BR.Translation ShortNickName/Zebra CPCL Label Printer: ""
+*pt_BR.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w144h72/2.00x1.00": ""
+*pt_BR.PageSize w144h90/2.00x1.25": ""
+*pt_BR.PageSize w144h144/2.00x2.00": ""
+*pt_BR.PageSize w144h216/2.00x3.00": ""
+*pt_BR.PageSize w209h72/2.9 x 1": ""
+*pt_BR.PageSize w288h144/4.00x2.00": ""
+*pt_BR.PageSize w288h216/4.00x3.00": ""
+*pt_BR.PageSize w288h288/4.00x4.00": ""
+*pt_BR.PageSize w288h360/4.00x5.00": ""
+*pt_BR.PageSize w288h432/4.00x6.00": ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 203dpi/203dpi: ""
+*pt_BR.Translation zeMediaTracking/Media Tracking: ""
+*pt_BR.zeMediaTracking Continuous/Continuous: ""
+*pt_BR.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*pt_BR.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*pt_BR.Translation PrinterSettings/Printer Settings: ""
+*pt_BR.Translation Darkness/Darkness: ""
+*pt_BR.Darkness -1/Rápido: ""
+*pt_BR.Darkness 1/1: ""
+*pt_BR.Darkness 2/2: ""
+*pt_BR.Darkness 3/3: ""
+*pt_BR.Darkness 4/4: ""
+*pt_BR.Darkness 5/5: ""
+*pt_BR.Darkness 6/6: ""
+*pt_BR.Darkness 7/7: ""
+*pt_BR.Darkness 8/8: ""
+*pt_BR.Darkness 9/9: ""
+*pt_BR.Darkness 10/10: ""
+*pt_BR.Darkness 11/11: ""
+*pt_BR.Darkness 12/12: ""
+*pt_BR.Darkness 13/13: ""
+*pt_BR.Darkness 14/14: ""
+*pt_BR.Darkness 15/15: ""
+*pt_BR.Darkness 16/16: ""
+*pt_BR.Darkness 17/17: ""
+*pt_BR.Darkness 18/18: ""
+*pt_BR.Darkness 19/19: ""
+*pt_BR.Darkness 20/20: ""
+*pt_BR.Darkness 21/21: ""
+*pt_BR.Darkness 22/22: ""
+*pt_BR.Darkness 23/23: ""
+*pt_BR.Darkness 24/24: ""
+*pt_BR.Darkness 25/25: ""
+*pt_BR.Darkness 26/26: ""
+*pt_BR.Darkness 27/27: ""
+*pt_BR.Darkness 28/28: ""
+*pt_BR.Darkness 29/29: ""
+*pt_BR.Darkness 30/30: ""
+*pt_BR.Translation zePrintRate/Print Rate: ""
+*pt_BR.zePrintRate Default/Rápido: ""
+*pt_BR.zePrintRate 1/1 inch/sec.: ""
+*pt_BR.zePrintRate 2/2 inches/sec.: ""
+*pt_BR.zePrintRate 3/3 inches/sec.: ""
+*pt_BR.zePrintRate 4/4 inches/sec.: ""
+*pt_BR.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*pt_BR.zeTearOffPosition 1000/Rápido: ""
+*pt_BR.zeTearOffPosition -120/-120: ""
+*pt_BR.zeTearOffPosition -115/-115: ""
+*pt_BR.zeTearOffPosition -110/-110: ""
+*pt_BR.zeTearOffPosition -105/-105: ""
+*pt_BR.zeTearOffPosition -100/-100: ""
+*pt_BR.zeTearOffPosition -95/-95: ""
+*pt_BR.zeTearOffPosition -90/-90: ""
+*pt_BR.zeTearOffPosition -85/-85: ""
+*pt_BR.zeTearOffPosition -80/-80: ""
+*pt_BR.zeTearOffPosition -75/-75: ""
+*pt_BR.zeTearOffPosition -70/-70: ""
+*pt_BR.zeTearOffPosition -65/-65: ""
+*pt_BR.zeTearOffPosition -60/-60: ""
+*pt_BR.zeTearOffPosition -55/-55: ""
+*pt_BR.zeTearOffPosition -50/-50: ""
+*pt_BR.zeTearOffPosition -45/-45: ""
+*pt_BR.zeTearOffPosition -40/-40: ""
+*pt_BR.zeTearOffPosition -35/-35: ""
+*pt_BR.zeTearOffPosition -30/-30: ""
+*pt_BR.zeTearOffPosition -25/-25: ""
+*pt_BR.zeTearOffPosition -20/-20: ""
+*pt_BR.zeTearOffPosition -15/-15: ""
+*pt_BR.zeTearOffPosition -10/-10: ""
+*pt_BR.zeTearOffPosition -5/-5: ""
+*pt_BR.zeTearOffPosition 0/0: ""
+*pt_BR.zeTearOffPosition 5/5: ""
+*pt_BR.zeTearOffPosition 10/10: ""
+*pt_BR.zeTearOffPosition 15/15: ""
+*pt_BR.zeTearOffPosition 20/20: ""
+*pt_BR.zeTearOffPosition 25/25: ""
+*pt_BR.zeTearOffPosition 30/30: ""
+*pt_BR.zeTearOffPosition 35/35: ""
+*pt_BR.zeTearOffPosition 40/40: ""
+*pt_BR.zeTearOffPosition 45/45: ""
+*pt_BR.zeTearOffPosition 50/50: ""
+*pt_BR.zeTearOffPosition 55/55: ""
+*pt_BR.zeTearOffPosition 60/60: ""
+*pt_BR.zeTearOffPosition 65/65: ""
+*pt_BR.zeTearOffPosition 70/70: ""
+*pt_BR.zeTearOffPosition 75/75: ""
+*pt_BR.zeTearOffPosition 80/80: ""
+*pt_BR.zeTearOffPosition 85/85: ""
+*pt_BR.zeTearOffPosition 90/90: ""
+*pt_BR.zeTearOffPosition 95/95: ""
+*pt_BR.zeTearOffPosition 100/100: ""
+*pt_BR.zeTearOffPosition 105/105: ""
+*pt_BR.zeTearOffPosition 110/110: ""
+*pt_BR.zeTearOffPosition 115/115: ""
+*pt_BR.zeTearOffPosition 120/120: ""
+*pt_BR.Translation zeErrorReprint/Reprint After Error: ""
+*pt_BR.zeErrorReprint Saved/Rápido: ""
+*pt_BR.zeErrorReprint Always/Always: ""
+*pt_BR.zeErrorReprint Never/Never: ""
 *pt_PT.Translation Manufacturer/Zebra: ""
 *pt_PT.Translation ModelName/Zebra CPCL Label Printer: ""
 *pt_PT.Translation ShortNickName/Zebra CPCL Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRACPL.PPD, 67894 bytes.
+*% End of ZEBRACPL.PPD, 75850 bytes.
index f652a11c19d8203687a594539fa8421c0cc3c3de..5d87da70922411a9014d4654ab4f4d9d4e134bc1 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 16
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
 *ko.zePrintRate 1.5/1.5 inch/sec.: ""
 *ko.zePrintRate 2/2 inches/sec.: ""
 *ko.zePrintRate 2.5/2.5 inches/sec.: ""
+*nl.Translation Manufacturer/Zebra: ""
+*nl.Translation ModelName/Zebra EPL1 Label Printer: ""
+*nl.Translation ShortNickName/Zebra EPL1 Label Printer: ""
+*nl.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w90h18/1.25x0.25": ""
+*nl.PageSize w90h162/1.25x2.25": ""
+*nl.PageSize w108h18/1.50x0.25": ""
+*nl.PageSize w108h36/1.50x0.50": ""
+*nl.PageSize w108h72/1.50x1.00": ""
+*nl.PageSize w108h144/1.50x2.00": ""
+*nl.PageSize w144h26/2.00x0.37": ""
+*nl.PageSize w144h36/2.00x0.50": ""
+*nl.PageSize w144h72/2.00x1.00": ""
+*nl.PageSize w144h90/2.00x1.25": ""
+*nl.PageSize w144h288/2.00x4.00": ""
+*nl.PageSize w144h396/2.00x5.50": ""
+*nl.PageSize w162h36/2.25x0.50": ""
+*nl.PageSize w162h90/2.25x1.25": ""
+*nl.PageSize w162h288/2.25x4.00": ""
+*nl.PageSize w162h396/2.25x5.50": ""
+*nl.PageSize w171h396/2.38x5.50": ""
+*nl.PageSize w180h72/2.50x1.00": ""
+*nl.PageSize w180h144/2.50x2.00": ""
+*nl.PageSize w198h90/2.75x1.25": ""
+*nl.PageSize w216h72/3.00x1.00": ""
+*nl.PageSize w216h90/3.00x1.25": ""
+*nl.PageSize w216h144/3.00x2.00": ""
+*nl.PageSize w216h216/3.00x3.00": ""
+*nl.PageSize w216h360/3.00x5.00": ""
+*nl.PageSize w234h144/3.25x2.00": ""
+*nl.PageSize w234h360/3.25x5.00": ""
+*nl.PageSize w234h396/3.25x5.50": ""
+*nl.PageSize w234h419/3.25x5.83": ""
+*nl.PageSize w234h563/3.25x7.83": ""
+*nl.PageSize w252h72/3.50x1.00": ""
+*nl.PageSize w288h72/4.00x1.00": ""
+*nl.PageSize w288h144/4.00x2.00": ""
+*nl.PageSize w288h180/4.00x2.50": ""
+*nl.PageSize w288h216/4.00x3.00": ""
+*nl.PageSize w288h288/4.00x4.00": ""
+*nl.PageSize w288h360/4.00x5.00": ""
+*nl.PageSize w288h432/4.00x6.00": ""
+*nl.PageSize w288h468/4.00x6.50": ""
+*nl.PageSize w288h936/4.00x13.00": ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 203dpi/203dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600dpi: ""
+*nl.Translation PrinterSettings/Printer Settings: ""
+*nl.Translation Darkness/Darkness: ""
+*nl.Darkness -1/Printerstandaard: ""
+*nl.Darkness 1/1: ""
+*nl.Darkness 2/2: ""
+*nl.Darkness 3/3: ""
+*nl.Darkness 4/4: ""
+*nl.Darkness 5/5: ""
+*nl.Darkness 6/6: ""
+*nl.Darkness 7/7: ""
+*nl.Darkness 8/8: ""
+*nl.Darkness 9/9: ""
+*nl.Darkness 10/10: ""
+*nl.Darkness 11/11: ""
+*nl.Darkness 12/12: ""
+*nl.Darkness 13/13: ""
+*nl.Darkness 14/14: ""
+*nl.Darkness 15/15: ""
+*nl.Darkness 16/16: ""
+*nl.Darkness 17/17: ""
+*nl.Darkness 18/18: ""
+*nl.Darkness 19/19: ""
+*nl.Darkness 20/20: ""
+*nl.Darkness 21/21: ""
+*nl.Darkness 22/22: ""
+*nl.Darkness 23/23: ""
+*nl.Darkness 24/24: ""
+*nl.Darkness 25/25: ""
+*nl.Darkness 26/26: ""
+*nl.Darkness 27/27: ""
+*nl.Darkness 28/28: ""
+*nl.Darkness 29/29: ""
+*nl.Darkness 30/30: ""
+*nl.Translation zePrintRate/Print Rate: ""
+*nl.zePrintRate Default/Printerstandaard: ""
+*nl.zePrintRate 1/1 inch/sec.: ""
+*nl.zePrintRate 1.5/1.5 inch/sec.: ""
+*nl.zePrintRate 2/2 inches/sec.: ""
+*nl.zePrintRate 2.5/2.5 inches/sec.: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra EPL1 Label Printer: ""
 *no.Translation ShortNickName/Zebra EPL1 Label Printer: ""
 *pt.zePrintRate 1.5/1.5 inch/sec.: ""
 *pt.zePrintRate 2/2 inches/sec.: ""
 *pt.zePrintRate 2.5/2.5 inches/sec.: ""
+*pt_BR.Translation Manufacturer/Zebra: ""
+*pt_BR.Translation ModelName/Zebra EPL1 Label Printer: ""
+*pt_BR.Translation ShortNickName/Zebra EPL1 Label Printer: ""
+*pt_BR.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w90h18/1.25x0.25": ""
+*pt_BR.PageSize w90h162/1.25x2.25": ""
+*pt_BR.PageSize w108h18/1.50x0.25": ""
+*pt_BR.PageSize w108h36/1.50x0.50": ""
+*pt_BR.PageSize w108h72/1.50x1.00": ""
+*pt_BR.PageSize w108h144/1.50x2.00": ""
+*pt_BR.PageSize w144h26/2.00x0.37": ""
+*pt_BR.PageSize w144h36/2.00x0.50": ""
+*pt_BR.PageSize w144h72/2.00x1.00": ""
+*pt_BR.PageSize w144h90/2.00x1.25": ""
+*pt_BR.PageSize w144h288/2.00x4.00": ""
+*pt_BR.PageSize w144h396/2.00x5.50": ""
+*pt_BR.PageSize w162h36/2.25x0.50": ""
+*pt_BR.PageSize w162h90/2.25x1.25": ""
+*pt_BR.PageSize w162h288/2.25x4.00": ""
+*pt_BR.PageSize w162h396/2.25x5.50": ""
+*pt_BR.PageSize w171h396/2.38x5.50": ""
+*pt_BR.PageSize w180h72/2.50x1.00": ""
+*pt_BR.PageSize w180h144/2.50x2.00": ""
+*pt_BR.PageSize w198h90/2.75x1.25": ""
+*pt_BR.PageSize w216h72/3.00x1.00": ""
+*pt_BR.PageSize w216h90/3.00x1.25": ""
+*pt_BR.PageSize w216h144/3.00x2.00": ""
+*pt_BR.PageSize w216h216/3.00x3.00": ""
+*pt_BR.PageSize w216h360/3.00x5.00": ""
+*pt_BR.PageSize w234h144/3.25x2.00": ""
+*pt_BR.PageSize w234h360/3.25x5.00": ""
+*pt_BR.PageSize w234h396/3.25x5.50": ""
+*pt_BR.PageSize w234h419/3.25x5.83": ""
+*pt_BR.PageSize w234h563/3.25x7.83": ""
+*pt_BR.PageSize w252h72/3.50x1.00": ""
+*pt_BR.PageSize w288h72/4.00x1.00": ""
+*pt_BR.PageSize w288h144/4.00x2.00": ""
+*pt_BR.PageSize w288h180/4.00x2.50": ""
+*pt_BR.PageSize w288h216/4.00x3.00": ""
+*pt_BR.PageSize w288h288/4.00x4.00": ""
+*pt_BR.PageSize w288h360/4.00x5.00": ""
+*pt_BR.PageSize w288h432/4.00x6.00": ""
+*pt_BR.PageSize w288h468/4.00x6.50": ""
+*pt_BR.PageSize w288h936/4.00x13.00": ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 203dpi/203dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600dpi: ""
+*pt_BR.Translation PrinterSettings/Printer Settings: ""
+*pt_BR.Translation Darkness/Darkness: ""
+*pt_BR.Darkness -1/Rápido: ""
+*pt_BR.Darkness 1/1: ""
+*pt_BR.Darkness 2/2: ""
+*pt_BR.Darkness 3/3: ""
+*pt_BR.Darkness 4/4: ""
+*pt_BR.Darkness 5/5: ""
+*pt_BR.Darkness 6/6: ""
+*pt_BR.Darkness 7/7: ""
+*pt_BR.Darkness 8/8: ""
+*pt_BR.Darkness 9/9: ""
+*pt_BR.Darkness 10/10: ""
+*pt_BR.Darkness 11/11: ""
+*pt_BR.Darkness 12/12: ""
+*pt_BR.Darkness 13/13: ""
+*pt_BR.Darkness 14/14: ""
+*pt_BR.Darkness 15/15: ""
+*pt_BR.Darkness 16/16: ""
+*pt_BR.Darkness 17/17: ""
+*pt_BR.Darkness 18/18: ""
+*pt_BR.Darkness 19/19: ""
+*pt_BR.Darkness 20/20: ""
+*pt_BR.Darkness 21/21: ""
+*pt_BR.Darkness 22/22: ""
+*pt_BR.Darkness 23/23: ""
+*pt_BR.Darkness 24/24: ""
+*pt_BR.Darkness 25/25: ""
+*pt_BR.Darkness 26/26: ""
+*pt_BR.Darkness 27/27: ""
+*pt_BR.Darkness 28/28: ""
+*pt_BR.Darkness 29/29: ""
+*pt_BR.Darkness 30/30: ""
+*pt_BR.Translation zePrintRate/Print Rate: ""
+*pt_BR.zePrintRate Default/Rápido: ""
+*pt_BR.zePrintRate 1/1 inch/sec.: ""
+*pt_BR.zePrintRate 1.5/1.5 inch/sec.: ""
+*pt_BR.zePrintRate 2/2 inches/sec.: ""
+*pt_BR.zePrintRate 2.5/2.5 inches/sec.: ""
 *pt_PT.Translation Manufacturer/Zebra: ""
 *pt_PT.Translation ModelName/Zebra EPL1 Label Printer: ""
 *pt_PT.Translation ShortNickName/Zebra EPL1 Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP1.PPD, 59283 bytes.
+*% End of ZEBRAEP1.PPD, 65262 bytes.
index 1997831c24a265f4c24b1d9fa625cfa46d51f646..829775a56a4f96e28606ff8263504f0add0dcbaa 100644 (file)
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
-*Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 17
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
 *ko.zePrintRate 4/4 inches/sec.: ""
 *ko.zePrintRate 5/5 inches/sec.: ""
 *ko.zePrintRate 6/6 inches/sec.: ""
+*nl.Translation Manufacturer/Zebra: ""
+*nl.Translation ModelName/Zebra EPL2 Label Printer: ""
+*nl.Translation ShortNickName/Zebra EPL2 Label Printer: ""
+*nl.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
+*nl.Translation PageSize/Media Size: ""
+*nl.PageSize w90h18/1.25x0.25": ""
+*nl.PageSize w90h162/1.25x2.25": ""
+*nl.PageSize w108h18/1.50x0.25": ""
+*nl.PageSize w108h36/1.50x0.50": ""
+*nl.PageSize w108h72/1.50x1.00": ""
+*nl.PageSize w108h144/1.50x2.00": ""
+*nl.PageSize w144h26/2.00x0.37": ""
+*nl.PageSize w144h36/2.00x0.50": ""
+*nl.PageSize w144h72/2.00x1.00": ""
+*nl.PageSize w144h90/2.00x1.25": ""
+*nl.PageSize w144h288/2.00x4.00": ""
+*nl.PageSize w144h396/2.00x5.50": ""
+*nl.PageSize w162h36/2.25x0.50": ""
+*nl.PageSize w162h90/2.25x1.25": ""
+*nl.PageSize w162h288/2.25x4.00": ""
+*nl.PageSize w162h396/2.25x5.50": ""
+*nl.PageSize w171h396/2.38x5.50": ""
+*nl.PageSize w180h72/2.50x1.00": ""
+*nl.PageSize w180h144/2.50x2.00": ""
+*nl.PageSize w198h90/2.75x1.25": ""
+*nl.PageSize w216h72/3.00x1.00": ""
+*nl.PageSize w216h90/3.00x1.25": ""
+*nl.PageSize w216h144/3.00x2.00": ""
+*nl.PageSize w216h216/3.00x3.00": ""
+*nl.PageSize w216h360/3.00x5.00": ""
+*nl.PageSize w234h144/3.25x2.00": ""
+*nl.PageSize w234h360/3.25x5.00": ""
+*nl.PageSize w234h396/3.25x5.50": ""
+*nl.PageSize w234h419/3.25x5.83": ""
+*nl.PageSize w234h563/3.25x7.83": ""
+*nl.PageSize w252h72/3.50x1.00": ""
+*nl.PageSize w288h72/4.00x1.00": ""
+*nl.PageSize w288h144/4.00x2.00": ""
+*nl.PageSize w288h180/4.00x2.50": ""
+*nl.PageSize w288h216/4.00x3.00": ""
+*nl.PageSize w288h288/4.00x4.00": ""
+*nl.PageSize w288h360/4.00x5.00": ""
+*nl.PageSize w288h432/4.00x6.00": ""
+*nl.PageSize w288h468/4.00x6.50": ""
+*nl.PageSize w288h936/4.00x13.00": ""
+*nl.Translation Resolution/Resolution: ""
+*nl.Resolution 203dpi/203dpi: ""
+*nl.Resolution 300dpi/300dpi: ""
+*nl.Resolution 600dpi/600dpi: ""
+*nl.Translation MediaType/Media Type: ""
+*nl.MediaType Saved/Printerstandaard: ""
+*nl.MediaType Thermal/Thermal Transfer Media: ""
+*nl.MediaType Direct/Direct Thermal Media: ""
+*nl.Translation PrinterSettings/Printer Settings: ""
+*nl.Translation Darkness/Darkness: ""
+*nl.Darkness -1/Printerstandaard: ""
+*nl.Darkness 1/1: ""
+*nl.Darkness 2/2: ""
+*nl.Darkness 3/3: ""
+*nl.Darkness 4/4: ""
+*nl.Darkness 5/5: ""
+*nl.Darkness 6/6: ""
+*nl.Darkness 7/7: ""
+*nl.Darkness 8/8: ""
+*nl.Darkness 9/9: ""
+*nl.Darkness 10/10: ""
+*nl.Darkness 11/11: ""
+*nl.Darkness 12/12: ""
+*nl.Darkness 13/13: ""
+*nl.Darkness 14/14: ""
+*nl.Darkness 15/15: ""
+*nl.Darkness 16/16: ""
+*nl.Darkness 17/17: ""
+*nl.Darkness 18/18: ""
+*nl.Darkness 19/19: ""
+*nl.Darkness 20/20: ""
+*nl.Darkness 21/21: ""
+*nl.Darkness 22/22: ""
+*nl.Darkness 23/23: ""
+*nl.Darkness 24/24: ""
+*nl.Darkness 25/25: ""
+*nl.Darkness 26/26: ""
+*nl.Darkness 27/27: ""
+*nl.Darkness 28/28: ""
+*nl.Darkness 29/29: ""
+*nl.Darkness 30/30: ""
+*nl.Translation zePrintRate/Print Rate: ""
+*nl.zePrintRate Default/Printerstandaard: ""
+*nl.zePrintRate 1/1 inch/sec.: ""
+*nl.zePrintRate 1.5/1.5 inch/sec.: ""
+*nl.zePrintRate 2/2 inches/sec.: ""
+*nl.zePrintRate 2.5/2.5 inches/sec.: ""
+*nl.zePrintRate 3/3 inches/sec.: ""
+*nl.zePrintRate 4/4 inches/sec.: ""
+*nl.zePrintRate 5/5 inches/sec.: ""
+*nl.zePrintRate 6/6 inches/sec.: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra EPL2 Label Printer: ""
 *no.Translation ShortNickName/Zebra EPL2 Label Printer: ""
 *pt.zePrintRate 4/4 inches/sec.: ""
 *pt.zePrintRate 5/5 inches/sec.: ""
 *pt.zePrintRate 6/6 inches/sec.: ""
+*pt_BR.Translation Manufacturer/Zebra: ""
+*pt_BR.Translation ModelName/Zebra EPL2 Label Printer: ""
+*pt_BR.Translation ShortNickName/Zebra EPL2 Label Printer: ""
+*pt_BR.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
+*pt_BR.Translation PageSize/Media Size: ""
+*pt_BR.PageSize w90h18/1.25x0.25": ""
+*pt_BR.PageSize w90h162/1.25x2.25": ""
+*pt_BR.PageSize w108h18/1.50x0.25": ""
+*pt_BR.PageSize w108h36/1.50x0.50": ""
+*pt_BR.PageSize w108h72/1.50x1.00": ""
+*pt_BR.PageSize w108h144/1.50x2.00": ""
+*pt_BR.PageSize w144h26/2.00x0.37": ""
+*pt_BR.PageSize w144h36/2.00x0.50": ""
+*pt_BR.PageSize w144h72/2.00x1.00": ""
+*pt_BR.PageSize w144h90/2.00x1.25": ""
+*pt_BR.PageSize w144h288/2.00x4.00": ""
+*pt_BR.PageSize w144h396/2.00x5.50": ""
+*pt_BR.PageSize w162h36/2.25x0.50": ""
+*pt_BR.PageSize w162h90/2.25x1.25": ""
+*pt_BR.PageSize w162h288/2.25x4.00": ""
+*pt_BR.PageSize w162h396/2.25x5.50": ""
+*pt_BR.PageSize w171h396/2.38x5.50": ""
+*pt_BR.PageSize w180h72/2.50x1.00": ""
+*pt_BR.PageSize w180h144/2.50x2.00": ""
+*pt_BR.PageSize w198h90/2.75x1.25": ""
+*pt_BR.PageSize w216h72/3.00x1.00": ""
+*pt_BR.PageSize w216h90/3.00x1.25": ""
+*pt_BR.PageSize w216h144/3.00x2.00": ""
+*pt_BR.PageSize w216h216/3.00x3.00": ""
+*pt_BR.PageSize w216h360/3.00x5.00": ""
+*pt_BR.PageSize w234h144/3.25x2.00": ""
+*pt_BR.PageSize w234h360/3.25x5.00": ""
+*pt_BR.PageSize w234h396/3.25x5.50": ""
+*pt_BR.PageSize w234h419/3.25x5.83": ""
+*pt_BR.PageSize w234h563/3.25x7.83": ""
+*pt_BR.PageSize w252h72/3.50x1.00": ""
+*pt_BR.PageSize w288h72/4.00x1.00": ""
+*pt_BR.PageSize w288h144/4.00x2.00": ""
+*pt_BR.PageSize w288h180/4.00x2.50": ""
+*pt_BR.PageSize w288h216/4.00x3.00": ""
+*pt_BR.PageSize w288h288/4.00x4.00": ""
+*pt_BR.PageSize w288h360/4.00x5.00": ""
+*pt_BR.PageSize w288h432/4.00x6.00": ""
+*pt_BR.PageSize w288h468/4.00x6.50": ""
+*pt_BR.PageSize w288h936/4.00x13.00": ""
+*pt_BR.Translation Resolution/Resolution: ""
+*pt_BR.Resolution 203dpi/203dpi: ""
+*pt_BR.Resolution 300dpi/300dpi: ""
+*pt_BR.Resolution 600dpi/600dpi: ""
+*pt_BR.Translation MediaType/Media Type: ""
+*pt_BR.MediaType Saved/Rápido: ""
+*pt_BR.MediaType Thermal/Thermal Transfer Media: ""
+*pt_BR.MediaType Direct/Direct Thermal Media: ""
+*pt_BR.Translation PrinterSettings/Printer Settings: ""
+*pt_BR.Translation Darkness/Darkness: ""
+*pt_BR.Darkness -1/Rápido: ""
+*pt_BR.Darkness 1/1: ""
+*pt_BR.Darkness 2/2: ""
+*pt_BR.Darkness 3/3: ""
+*pt_BR.Darkness 4/4: ""
+*pt_BR.Darkness 5/5: ""
+*pt_BR.Darkness 6/6: ""
+*pt_BR.Darkness 7/7: ""
+*pt_BR.Darkness 8/8: ""
+*pt_BR.Darkness 9/9: ""
+*pt_BR.Darkness 10/10: ""
+*pt_BR.Darkness 11/11: ""
+*pt_BR.Darkness 12/12: ""
+*pt_BR.Darkness 13/13: ""
+*pt_BR.Darkness 14/14: ""
+*pt_BR.Darkness 15/15: ""
+*pt_BR.Darkness 16/16: ""
+*pt_BR.Darkness 17/17: ""
+*pt_BR.Darkness 18/18: ""
+*pt_BR.Darkness 19/19: ""
+*pt_BR.Darkness 20/20: ""
+*pt_BR.Darkness 21/21: ""
+*pt_BR.Darkness 22/22: ""
+*pt_BR.Darkness 23/23: ""
+*pt_BR.Darkness 24/24: ""
+*pt_BR.Darkness 25/25: ""
+*pt_BR.Darkness 26/26: ""
+*pt_BR.Darkness 27/27: ""
+*pt_BR.Darkness 28/28: ""
+*pt_BR.Darkness 29/29: ""
+*pt_BR.Darkness 30/30: ""
+*pt_BR.Translation zePrintRate/Print Rate: ""
+*pt_BR.zePrintRate Default/Rápido: ""
+*pt_BR.zePrintRate 1/1 inch/sec.: ""
+*pt_BR.zePrintRate 1.5/1.5 inch/sec.: ""
+*pt_BR.zePrintRate 2/2 inches/sec.: ""
+*pt_BR.zePrintRate 2.5/2.5 inches/sec.: ""
+*pt_BR.zePrintRate 3/3 inches/sec.: ""
+*pt_BR.zePrintRate 4/4 inches/sec.: ""
+*pt_BR.zePrintRate 5/5 inches/sec.: ""
+*pt_BR.zePrintRate 6/6 inches/sec.: ""
 *pt_PT.Translation Manufacturer/Zebra: ""
 *pt_PT.Translation ModelName/Zebra EPL2 Label Printer: ""
 *pt_PT.Translation ShortNickName/Zebra EPL2 Label Printer: ""
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP2.PPD, 64281 bytes.
+*% End of ZEBRAEP2.PPD, 70917 bytes.
index 08752d28f009a1999ea861cbf6147cc4930a3825..47e1bd146c6ea70093b6ad8ced2343c2ff56310d 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6802 2007-08-16 18:44:46Z mike $"
+# "$Id: Makefile 6801 2007-08-16 18:42:49Z mike $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -324,5 +324,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6802 2007-08-16 18:44:46Z mike $".
+# End of "$Id: Makefile 6801 2007-08-16 18:42:49Z mike $".
 #
index 3f5f724788078e3a5fa41e0e622b2cf41ec8c602..d77d075d61566d87cc6b38fb6fc677be262bc8d9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 6949 2007-09-12 21:33:23Z mike $"
+ * "$Id: auth.c 6947 2007-09-12 21:09:49Z mike $"
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
@@ -2668,5 +2668,5 @@ to64(char          *s,                    /* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 6949 2007-09-12 21:33:23Z mike $".
+ * End of "$Id: auth.c 6947 2007-09-12 21:09:49Z mike $".
  */
index 933e96eadc4c0e448f830f395ca35b39a5d7f9c5..f6c106a78039455e17ce82e0051f4e45fb00c914 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 7000 2007-09-28 19:47:00Z mike $"
+ * "$Id: client.c 6999 2007-09-28 19:46:53Z mike $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -3245,11 +3245,11 @@ get_file(cupsd_client_t *con,           /* I  - Client connection */
     snprintf(filename, len, "%s%s", ServerRoot, con->uri + 11);
   else if (!strncmp(con->uri, "/admin/log/", 11))
   {
-    if (!strcmp(con->uri + 11, "access_log") && AccessLog[0] == '/')
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
       strlcpy(filename, AccessLog, len);
-    else if (!strcmp(con->uri + 11, "error_log") && ErrorLog[0] == '/')
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
       strlcpy(filename, ErrorLog, len);
-    else if (!strcmp(con->uri + 11, "page_log") && PageLog[0] == '/')
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
       strlcpy(filename, PageLog, len);
     else
       return (NULL);
@@ -4652,5 +4652,5 @@ write_pipe(cupsd_client_t *con)           /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c 7000 2007-09-28 19:47:00Z mike $".
+ * End of "$Id: client.c 6999 2007-09-28 19:46:53Z mike $".
  */
index baeef5f6589b8af57c07fe6eeb284e6a6a721fae..c92a5f02cb9f6e6176d92699d4ddff14fa2e07c0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.h 6949 2007-09-12 21:33:23Z mike $"
+ * "$Id: client.h 6947 2007-09-12 21:09:49Z mike $"
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -131,5 +131,5 @@ extern void cupsdWriteClient(cupsd_client_t *con);
 
 
 /*
- * End of "$Id: client.h 6949 2007-09-12 21:33:23Z mike $".
+ * End of "$Id: client.h 6947 2007-09-12 21:09:49Z mike $".
  */
index b081c3f9d6881f3a01b639703158d7882678878f..f52534caaa781b490df5de3d6320196d42bd2918 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 6783 2007-08-10 19:48:57Z mike $"
+ * "$Id: conf.c 6930 2007-09-08 00:28:06Z mike $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -126,6 +126,7 @@ static cupsd_var_t  variables[] =
   { "LimitRequestBody",                &MaxRequestSize,        CUPSD_VARTYPE_INTEGER },
   { "ListenBackLog",           &ListenBackLog,         CUPSD_VARTYPE_INTEGER },
   { "LogFilePerm",             &LogFilePerm,           CUPSD_VARTYPE_INTEGER },
+  { "LPDConfigFile",           &LPDConfigFile,         CUPSD_VARTYPE_STRING },
   { "MaxActiveJobs",           &MaxActiveJobs,         CUPSD_VARTYPE_INTEGER },
   { "MaxClients",              &MaxClients,            CUPSD_VARTYPE_INTEGER },
   { "MaxClientsPerHost",       &MaxClientsPerHost,     CUPSD_VARTYPE_INTEGER },
@@ -162,6 +163,7 @@ static cupsd_var_t  variables[] =
 #endif /* HAVE_SSL */
   { "ServerName",              &ServerName,            CUPSD_VARTYPE_STRING },
   { "ServerRoot",              &ServerRoot,            CUPSD_VARTYPE_PATHNAME },
+  { "SMBConfigFile",           &SMBConfigFile,         CUPSD_VARTYPE_STRING },
   { "StateDir",                        &StateDir,              CUPSD_VARTYPE_STRING },
 #ifdef HAVE_AUTHORIZATION_H
   { "SystemGroupAuthKey",      &SystemGroupAuthKey,    CUPSD_VARTYPE_STRING },
@@ -349,6 +351,7 @@ cupsdReadConfiguration(void)
                *old_requestroot;       /* Old RequestRoot */
   const char   *tmpdir;                /* TMPDIR environment variable */
   struct stat  tmpinfo;                /* Temporary directory info */
+  cupsd_policy_t *p;                   /* Policy */
 
 
  /*
@@ -546,6 +549,9 @@ cupsdReadConfiguration(void)
   Browsing              = CUPS_DEFAULT_BROWSING;
   DefaultShared         = CUPS_DEFAULT_DEFAULT_SHARED;
 
+  cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+  cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+
   cupsdClearString(&BrowseLocalOptions);
   cupsdClearString(&BrowseRemoteOptions);
 
@@ -930,7 +936,6 @@ cupsdReadConfiguration(void)
 
   if (!DefaultPolicyPtr)
   {
-    cupsd_policy_t     *p;             /* New policy */
     cupsd_location_t   *po;            /* New policy operation */
 
 
@@ -958,7 +963,7 @@ cupsdReadConfiguration(void)
                      "Renew-Subscription Cancel-Subscription "
                      "Get-Notifications Reprocess-Job Cancel-Current-Job "
                      "Suspend-Current-Job Resume-Job CUPS-Move-Job "
-                     "CUPS-Authenticate-Job>");
+                     "CUPS-Authenticate-Job CUPS-Get-Document>");
       cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
 
       po = cupsdAddPolicyOp(p, NULL, IPP_SEND_DOCUMENT);
@@ -986,6 +991,7 @@ cupsdReadConfiguration(void)
       cupsdAddPolicyOp(p, po, IPP_RESUME_JOB);
       cupsdAddPolicyOp(p, po, CUPS_MOVE_JOB);
       cupsdAddPolicyOp(p, po, CUPS_AUTHENTICATE_JOB);
+      cupsdAddPolicyOp(p, po, CUPS_GET_DOCUMENT);
 
       cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
 
@@ -1046,11 +1052,12 @@ cupsdReadConfiguration(void)
   }
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadConfiguration: NumPolicies=%d",
-                  NumPolicies);
-  for (i = 0; i < NumPolicies; i ++)
+                  cupsArrayCount(Policies));
+  for (i = 0, p = (cupsd_policy_t *)cupsArrayFirst(Policies);
+       p;
+       i ++, p = (cupsd_policy_t *)cupsArrayNext(Policies))
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdReadConfiguration: Policies[%d]=\"%s\"", i,
-                    Policies[i]->name);
+                    "cupsdReadConfiguration: Policies[%d]=\"%s\"", i, p->name);
 
  /*
   * If we are doing a full reload or the server root has changed, flush
@@ -2018,6 +2025,10 @@ parse_protocols(const char *s)           /* I - Space-delimited protocols */
       protocols |= BROWSE_LDAP;
     else if (!strcasecmp(valstart, "dnssd") || !strcasecmp(valstart, "bonjour"))
       protocols |= BROWSE_DNSSD;
+    else if (!strcasecmp(valstart, "lpd"))
+      protocols |= BROWSE_LPD;
+    else if (!strcasecmp(valstart, "smb"))
+      protocols |= BROWSE_SMB;
     else if (!strcasecmp(valstart, "all"))
       protocols |= BROWSE_ALL;
     else if (strcasecmp(valstart, "none"))
@@ -3245,6 +3256,30 @@ read_policy(cups_file_t *fp,             /* I - Configuration file */
                        "Missing </Limit> before </Policy> on line %d!",
                        linenum);
 
+     /*
+      * Verify that we have an explicit policy for CUPS-Get-Document
+      * (ensures that upgrades do not introduce new security issues...)
+      */
+
+      if ((op = cupsdFindPolicyOp(pol, CUPS_GET_DOCUMENT)) == NULL ||
+          op->op == IPP_ANY_OPERATION)
+      {
+        if ((op = cupsdFindPolicyOp(pol, IPP_SEND_DOCUMENT)) != NULL &&
+            op->op != IPP_ANY_OPERATION)
+       {
+        /*
+         * Add a new limit for CUPS-Get-Document using the Send-Document
+         * limit as a template...
+         */
+
+          cupsdLogMessage(CUPSD_LOG_WARN,
+                         "No limit for CUPS-Get-Document defined in policy %s "
+                         "- using Send-Document's policy", pol->name);
+
+          cupsdAddPolicyOp(pol, op, CUPS_GET_DOCUMENT);
+       }
+      }
+
       return (linenum);
     }
     else if (!strcasecmp(line, "<Limit") && !op)
@@ -3352,5 +3387,5 @@ read_policy(cups_file_t *fp,              /* I - Configuration file */
 
 
 /*
- * End of "$Id: conf.c 6783 2007-08-10 19:48:57Z mike $".
+ * End of "$Id: conf.c 6930 2007-09-08 00:28:06Z mike $".
  */
index 9a92732b55eb510c174eed0f19ecf7275bbfa388..3cacab3ab93da8a579b48485f05d1600eea95e16 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-deviced.c 6693 2007-07-19 21:02:36Z mike $"
+ * "$Id: cups-deviced.c 7011 2007-10-10 21:13:35Z mike $"
  *
  *   Device scanning mini-daemon for the Common UNIX Printing System (CUPS).
  *
@@ -409,7 +409,8 @@ add_dev(
     const char *device_uri,            /* I - Device URI */
     const char *device_id)             /* I - 1284 device ID */
 {
-  dev_info_t   *dev;                   /* New device */
+  dev_info_t   *dev,                   /* New device */
+               *temp;                  /* Found device */
 
 
  /*
@@ -438,8 +439,18 @@ add_dev(
   * Add the device to the array and return...
   */
 
-  cupsArrayAdd(devs, dev);
+  if ((temp = cupsArrayFind(devs, dev)) != NULL)
+  {
+   /*
+    * Avoid duplicates!
+    */
 
+    free(dev);
+    dev = temp;
+  }
+  else
+    cupsArrayAdd(devs, dev);
+    
   return (dev);
 }
 
@@ -548,5 +559,5 @@ sigalrm_handler(int sig)            /* I - Signal number */
 
 
 /*
- * End of "$Id: cups-deviced.c 6693 2007-07-19 21:02:36Z mike $".
+ * End of "$Id: cups-deviced.c 7011 2007-10-10 21:13:35Z mike $".
  */
index 8666cf877a56497b83602da59a4e43a1bb62d250..a6340be4c10d03266d5e97de68545ea6334afd86 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 6755 2007-08-01 19:02:47Z mike $"
+ * "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -152,6 +152,8 @@ typedef void (*cupsd_selfunc_t)(void *data);
  * Globals...
  */
 
+VAR int                        TestConfigFile  VALUE(0);
+                                       /* Test the cupsd.conf file? */
 VAR int                        MaxFDs;         /* Maximum number of files */
 
 VAR time_t             ReloadTime      VALUE(0);
@@ -226,5 +228,5 @@ extern void cupsdStopSelect(void);
 extern int     cupsdRemoveFile(const char *filename);
 
 /*
- * End of "$Id: cupsd.h 6755 2007-08-01 19:02:47Z mike $".
+ * End of "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $".
  */
index 713a0f1cd36c31e520da0b7a6dd6a5405cec3cfb..4085be18fc4dda9af352bd43fee9035d35d641a8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsfilter.c 6816 2007-08-20 20:16:00Z mike $"
+ * "$Id: cupsfilter.c 6879 2007-08-29 20:26:50Z mike $"
  *
  *   CUPS filtering program for the Common UNIX Printing System (CUPS).
  *
@@ -19,6 +19,7 @@
  *   escape_options()  - Convert an options array to a string.
  *   exec_filter()     - Execute a single filter.
  *   exec_filters()    - Execute filters for the given file and options.
+ *   get_job_file()    - Get the specified job file.
  *   open_pipe()       - Create a pipe which is closed on exec.
  *   read_cupsd_conf() - Read the cupsd.conf file to get the filter settings.
  *   set_string()      - Copy and set a string.
 #include <errno.h>
 #include "mime.h"
 #include <stdlib.h>
+#include <limits.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/wait.h>
 #if defined(__APPLE__)
 #  include <libgen.h>
@@ -64,6 +67,8 @@ static char           *ServerRoot = NULL;
                                        /* CUPS_SERVERROOT environment variable */
 static char            *RIPCache = NULL;
                                        /* RIP_CACHE environment variable */
+static char            TempFile[1024] = "";
+                                       /* Temporary file */
 
 
 /*
@@ -79,9 +84,11 @@ static int   exec_filters(cups_array_t *filters, const char *infile,
                             const char *printer, const char *user,
                             const char *title, int num_options,
                             cups_option_t *options);
+static void    get_job_file(const char *job);
 static int     open_pipe(int *fds);
 static int     read_cupsd_conf(const char *filename);
 static void    set_string(char **s, const char *val);
+static void    sighandler(int sig);
 static void    usage(const char *command, const char *opt);
 
 
@@ -214,7 +221,21 @@ main(int  argc,                            /* I - Number of command-line args */
                usage(command, opt);
              break;
 
-          case 'j' : /* Specify destination MIME type... */
+          case 'j' : /* Get job file or specify destination MIME type... */
+              if (strcmp(command, "convert"))
+             {
+               i ++;
+               if (i < argc)
+               {
+                 get_job_file(argv[i]);
+                 infile = TempFile;
+               }
+               else
+                 usage(command, opt);
+
+                break;
+             }
+
           case 'm' : /* Specify destination MIME type... */
              i ++;
              if (i < argc)
@@ -405,6 +426,9 @@ main(int  argc,                             /* I - Number of command-line args */
   * Remove files as needed, then exit...
   */
 
+  if (TempFile[0])
+    unlink(TempFile);
+
   if (removeppd && ppdfile)
     unlink(ppdfile);
 
@@ -810,11 +834,103 @@ exec_filters(cups_array_t  *filters,     /* I - Array of filters to run */
 }
 
 
+/*
+ * 'get_job_file()' - Get the specified job file.
+ */
+
+static void
+get_job_file(const char *job)          /* I - Job ID */
+{
+  long         jobid,                  /* Job ID */
+               docnum;                 /* Document number */
+  const char   *jobptr;                /* Pointer into job ID string */
+  char         uri[1024];              /* job-uri */
+  http_t       *http;                  /* Connection to server */
+  ipp_t                *request;               /* Request data */
+  int          tempfd;                 /* Temporary file */
+
+
+ /*
+  * Get the job ID and document number, if any...
+  */
+
+  if ((jobptr = strrchr(job, '-')) != NULL)
+    jobptr ++;
+  else
+    jobptr = job;
+
+  jobid = strtol(jobptr, (char **)&jobptr, 10);
+
+  if (*jobptr == ',')
+    docnum = strtol(jobptr + 1, NULL, 10);
+  else
+    docnum = 1;
+
+  if (jobid < 1 || jobid > INT_MAX)
+  {
+    _cupsLangPrintf(stderr, _("cupsfilter: Invalid job ID %d!\n"), (int)jobid);
+    exit(1);
+  }
+
+  if (docnum < 1 || docnum > INT_MAX)
+  {
+    _cupsLangPrintf(stderr, _("cupsfilter: Invalid document number %d!\n"),
+                    (int)docnum);
+    exit(1);
+  }
+
+ /*
+  * Ask the server for the document file...
+  */
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
+                                 cupsEncryption())) == NULL)
+  {
+    _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"),
+                    "cupsfilter");
+    exit(1);
+  }
+
+  request = ippNewRequest(CUPS_GET_DOCUMENT);
+
+  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", (int)jobid);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri);
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "document-number",
+                (int)docnum);
+
+  if ((tempfd = cupsTempFd(TempFile, sizeof(TempFile))) == -1)
+  {
+    _cupsLangPrintf(stderr,
+                    _("cupsfilter: Unable to create temporary file: %s\n"),
+                    strerror(errno));
+    httpClose(http);
+    exit(1);
+  }
+
+  signal(SIGTERM, sighandler);
+
+  ippDelete(cupsDoIORequest(http, request, "/", -1, tempfd));
+
+  close(tempfd);
+
+  httpClose(http);
+
+  if (cupsLastError() != IPP_OK)
+  {
+    _cupsLangPrintf(stderr, _("cupsfilter: Unable to get job file - %s\n"),
+                    cupsLastErrorString());
+    unlink(TempFile);
+    exit(1);
+  }
+}
+
+
 /*
  * 'open_pipe()' - Create a pipe which is closed on exec.
  */
 
-int                                    /* O - 0 on success, -1 on error */
+static int                             /* O - 0 on success, -1 on error */
 open_pipe(int *fds)                    /* O - Pipe file descriptors (2) */
 {
  /*
@@ -947,6 +1063,28 @@ set_string(char       **s,                /* O - Copy of string */
 }
 
 
+/*
+ * 'sighandler()' - Signal catcher for when we print from stdin...
+ */
+
+static void
+sighandler(int s)                      /* I - Signal number */
+{
+ /*
+  * Remove the temporary file we're using to print a job file...
+  */
+
+  if (TempFile[0])
+    unlink(TempFile);
+
+ /*
+  * Exit...
+  */
+
+  exit(s);
+}
+
+
 /*
  * 'usage()' - Show program usage...
  */
@@ -965,6 +1103,7 @@ usage(const char *command,         /* I - Command name */
                    "Options:\n"
                    "\n"
                    "  -c cupsd.conf    Set cupsd.conf file to use\n"
+                   "  -j job-id[,N]    Filter file N from the specified job (default is file 1)\n"
                    "  -n copies        Set number of copies\n"
                    "  -o name=value    Set option(s)\n"
                    "  -p filename.ppd  Set PPD file\n"
@@ -992,5 +1131,5 @@ usage(const char *command,         /* I - Command name */
 
 
 /*
- * End of "$Id: cupsfilter.c 6816 2007-08-20 20:16:00Z mike $".
+ * End of "$Id: cupsfilter.c 6879 2007-08-29 20:26:50Z mike $".
  */
index 3fbd2ae01b9c8f95685b1052425fca83f92a20a4..dd08c4b173fba532ee9acd36659dc56fc16b0028 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 6974 2007-09-18 17:51:32Z mike $"
+ * "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -53,7 +53,9 @@
  *   slp_url_callback()            - SLP service url callback
  *   update_cups_browse()          - Update the browse lists using the CUPS
  *                                   protocol.
+ *   update_lpd()                  - Update the LPD configuration as needed.
  *   update_polling()              - Read status messages from the poll daemons.
+ *   update_smb()                  - Update the SMB configuration as needed.
  */
 
 /*
@@ -98,7 +100,9 @@ static void  send_ldap_browse(cupsd_printer_t *p);
 static void    send_slp_browse(cupsd_printer_t *p);
 #endif /* HAVE_LIBSLP */
 static void    update_cups_browse(void);
+static void    update_lpd(int onoff);
 static void    update_polling(void);
+static void    update_smb(int onoff);
 
 
 #ifdef HAVE_OPENLDAP
@@ -790,6 +794,7 @@ cupsdSendBrowseList(void)
   cupsd_printer_t      *p;             /* Current printer */
   time_t               ut,             /* Minimum update time */
                        to;             /* Timeout time */
+  int                  write_printcap; /* Write the printcap file? */
 
 
   if (!Browsing || !BrowseLocalProtocols || !Printers)
@@ -887,7 +892,7 @@ cupsdSendBrowseList(void)
   * Loop through all of the printers and send local updates as needed...
   */
 
-  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers), write_printcap = 0;
        p;
        p = (cupsd_printer_t *)cupsArrayNext(Printers))
   {
@@ -912,9 +917,13 @@ cupsdSendBrowseList(void)
         cupsArraySave(Printers);
         cupsdDeletePrinter(p, 1);
         cupsArrayRestore(Printers);
+       write_printcap = 1;
       }
     }
   }
+
+  if (write_printcap)
+    cupsdWritePrintcap();
 }
 
 
@@ -1138,6 +1147,16 @@ cupsdStartBrowsing(void)
   }
 #endif /* HAVE_OPENLDAP */
 
+ /*
+  * Enable LPD and SMB printer sharing as needed through external programs...
+  */
+
+  if (BrowseLocalProtocols & BROWSE_LPD)
+    update_lpd(1);
+
+  if (BrowseLocalProtocols & BROWSE_SMB)
+    update_smb(1);
+
  /*
   * Register the individual printers
   */
@@ -1318,6 +1337,16 @@ cupsdStopBrowsing(void)
     BrowseLDAPHandle = NULL;
   }
 #endif /* HAVE_OPENLDAP */
+
+ /*
+  * Disable LPD and SMB printer sharing as needed through external programs...
+  */
+
+  if (BrowseLocalProtocols & BROWSE_LPD)
+    update_lpd(0);
+
+  if (BrowseLocalProtocols & BROWSE_SMB)
+    update_smb(0);
 }
 
 
@@ -3792,6 +3821,90 @@ update_cups_browse(void)
 }
 
 
+/*
+ * 'update_lpd()' - Update the LPD configuration as needed.
+ */
+
+static void
+update_lpd(int onoff)                  /* - 1 = turn on, 0 = turn off */
+{
+  if (!LPDConfigFile)
+    return;
+
+  if (!strncmp(LPDConfigFile, "xinetd:///", 10))
+  {
+   /*
+    * Enable/disable LPD via the xinetd.d config file for cups-lpd...
+    */
+
+    char       newfile[1024];          /* New cups-lpd.N file */
+    cups_file_t        *ofp,                   /* Original file pointer */
+               *nfp;                   /* New file pointer */
+    char       line[1024];             /* Line from file */
+
+
+    snprintf(newfile, sizeof(newfile), "%s.N", LPDConfigFile + 9);
+
+    if ((ofp = cupsFileOpen(LPDConfigFile + 9, "r")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"%s\" - %s",
+                      LPDConfigFile + 9, strerror(errno));
+      return;
+    }
+
+    if ((nfp = cupsFileOpen(newfile, "w")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create \"%s\" - %s",
+                      newfile, strerror(errno));
+      cupsFileClose(ofp);
+      return;
+    }
+
+   /*
+    * Copy all of the lines from the cups-lpd file...
+    */
+
+    while (cupsFileGets(ofp, line, sizeof(line)))
+    {
+      if (line[0] == '{')
+      {
+        cupsFilePrintf(nfp, "%s\n", line);
+        snprintf(line, sizeof(line), "\tdisable = %s",
+                onoff ? "no" : "yes");
+      }
+      else if (strstr(line, "disable ="))
+        continue;
+
+      cupsFilePrintf(nfp, "%s\n", line);
+    }
+
+    cupsFileClose(nfp);
+    cupsFileClose(ofp);
+    rename(newfile, LPDConfigFile + 9);
+  }
+  else if (!strncmp(LPDConfigFile, "launchd:///", 11))
+  {
+   /*
+    * Enable/disable LPD via the launchctl command...
+    */
+
+    char       *argv[5],               /* Arguments for command */
+               *envp[MAX_ENV];         /* Environment for command */
+    int                pid;                    /* Process ID */
+
+
+    cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+    argv[0] = (char *)"launchctl";
+    argv[1] = (char *)(onoff ? "load" : "unload");
+    argv[2] = (char *)"-w";
+    argv[3] = LPDConfigFile + 10;
+    argv[4] = NULL;
+
+    cupsdStartProcess("/bin/launchctl", argv, envp, -1, -1, -1, -1, -1, 1, &pid);
+  }
+}
+
+
 /*
  * 'update_polling()' - Read status messages from the poll daemons.
  */
@@ -3823,5 +3936,90 @@ update_polling(void)
 
 
 /*
- * End of "$Id: dirsvc.c 6974 2007-09-18 17:51:32Z mike $".
+ * 'update_smb()' - Update the SMB configuration as needed.
+ */
+
+static void
+update_smb(int onoff)                  /* I - 1 = turn on, 0 = turn off */
+{
+  if (!SMBConfigFile)
+    return;
+
+  if (!strncmp(SMBConfigFile, "samba:///", 9))
+  {
+   /*
+    * Enable/disable SMB via the specified smb.conf config file...
+    */
+
+    char       newfile[1024];          /* New smb.conf.N file */
+    cups_file_t        *ofp,                   /* Original file pointer */
+               *nfp;                   /* New file pointer */
+    char       line[1024];             /* Line from file */
+    int                in_printers;            /* In [printers] section? */
+
+
+    snprintf(newfile, sizeof(newfile), "%s.N", SMBConfigFile + 8);
+
+    if ((ofp = cupsFileOpen(SMBConfigFile + 8, "r")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"%s\" - %s",
+                      SMBConfigFile + 8, strerror(errno));
+      return;
+    }
+
+    if ((nfp = cupsFileOpen(newfile, "w")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create \"%s\" - %s",
+                      newfile, strerror(errno));
+      cupsFileClose(ofp);
+      return;
+    }
+
+   /*
+    * Copy all of the lines from the smb.conf file...
+    */
+
+    in_printers = 0;
+
+    while (cupsFileGets(ofp, line, sizeof(line)))
+    {
+      if (in_printers && strstr(line, "printable ="))
+        snprintf(line, sizeof(line), "    printable = %s",
+                onoff ? "yes" : "no");
+
+      cupsFilePrintf(nfp, "%s\n", line);
+
+      if (line[0] == '[')
+        in_printers = !strcmp(line, "[printers]");
+    }
+
+    cupsFileClose(nfp);
+    cupsFileClose(ofp);
+    rename(newfile, SMBConfigFile + 8);
+  }
+  else if (!strncmp(SMBConfigFile, "launchd:///", 11))
+  {
+   /*
+    * Enable/disable SMB via the launchctl command...
+    */
+
+    char       *argv[5],               /* Arguments for command */
+               *envp[MAX_ENV];         /* Environment for command */
+    int                pid;                    /* Process ID */
+
+
+    cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+    argv[0] = (char *)"launchctl";
+    argv[1] = (char *)(onoff ? "load" : "unload");
+    argv[2] = (char *)"-w";
+    argv[3] = SMBConfigFile + 10;
+    argv[4] = NULL;
+
+    cupsdStartProcess("/bin/launchctl", argv, envp, -1, -1, -1, -1, -1, 1, &pid);
+  }
+}
+
+
+/*
+ * End of "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $".
  */
index 3a2e5a9735d5cfa2ce515bd07d45ec5b8967678a..5ff06c3eea2e36351df95ca44d7fbd39ee314cd6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: dirsvc.h 6930 2007-09-08 00:28:06Z mike $"
  *
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -37,7 +37,9 @@
 #define        BROWSE_SLP      2               /* SLPv2 */
 #define BROWSE_LDAP    4               /* LDAP */
 #define BROWSE_DNSSD   8               /* DNS Service Discovery (aka Bonjour) */
-#define BROWSE_ALL     15              /* All protocols */
+#define BROWSE_SMB     16              /* SMB/Samba */
+#define BROWSE_LPD     32              /* LPD via xinetd or launchd */
+#define BROWSE_ALL     63              /* All protocols */
 
 
 /*
@@ -150,6 +152,10 @@ VAR char           *BrowseLDAPBindDN VALUE(NULL),
                        *BrowseLDAPCACertFile VALUE(NULL);
                                        /* LDAP CA CERT file to use */
 #endif /* HAVE_LDAP */
+VAR char               *LPDConfigFile  VALUE(NULL),
+                                       /* LPD configuration file */
+                       *SMBConfigFile  VALUE(NULL);
+                                       /* SMB configuration file */
 
 
 /*
@@ -176,5 +182,5 @@ extern void cupsdUpdateSLPBrowse(void);
 
 
 /*
- * End of "$Id: dirsvc.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: dirsvc.h 6930 2007-09-08 00:28:06Z mike $".
  */
index b65fe63066cc876bc5aa1e7d82726e420cfcc7f2..b5a839c0770002cf9b6a108d79b9d6ae4123387c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 6949 2007-09-12 21:33:23Z mike $"
+ * "$Id: ipp.c 7014 2007-10-10 21:57:43Z mike $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -54,6 +54,7 @@
  *   get_default()               - Get the default destination.
  *   get_devices()               - Get the list of available devices on the
  *                                 local system.
+ *   get_document()              - Get a copy of a job file.
  *   get_job_attrs()             - Get job attributes.
  *   get_jobs()                  - Get a list of jobs for the specified printer.
  *   get_notifications()         - Get events for a subscription.
@@ -165,6 +166,7 @@ static void create_subscription(cupsd_client_t *con, ipp_attribute_t *uri);
 static void    delete_printer(cupsd_client_t *con, ipp_attribute_t *uri);
 static void    get_default(cupsd_client_t *con);
 static void    get_devices(cupsd_client_t *con);
+static void    get_document(cupsd_client_t *con, ipp_attribute_t *uri);
 static void    get_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
 static void    get_job_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
 static void    get_notifications(cupsd_client_t *con);
@@ -360,13 +362,31 @@ cupsdProcessIPPRequest(
        ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
                      "attributes-natural-language", NULL, DefaultLanguage);
 
-      if (!charset || !language ||
-         (!uri &&
-          con->request->request.op.operation_id != CUPS_GET_DEFAULT &&
-          con->request->request.op.operation_id != CUPS_GET_PRINTERS &&
-          con->request->request.op.operation_id != CUPS_GET_CLASSES &&
-          con->request->request.op.operation_id != CUPS_GET_DEVICES &&
-          con->request->request.op.operation_id != CUPS_GET_PPDS))
+      if (charset &&
+          strcasecmp(charset->values[0].string.text, "us-ascii") &&
+          strcasecmp(charset->values[0].string.text, "utf-8"))
+      {
+       /*
+        * Bad character set...
+       */
+
+        cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"!",
+                       charset->values[0].string.text);
+       cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
+                     "%04X %s Unsupported attributes-charset value \"%s\"",
+                     IPP_CHARSET, con->http.hostname,
+                     charset->values[0].string.text);
+       send_ipp_status(con, IPP_BAD_REQUEST,
+                       _("Unsupported character set \"%s\"!"),
+                       charset->values[0].string.text);
+      }
+      else if (!charset || !language ||
+              (!uri &&
+               con->request->request.op.operation_id != CUPS_GET_DEFAULT &&
+               con->request->request.op.operation_id != CUPS_GET_PRINTERS &&
+               con->request->request.op.operation_id != CUPS_GET_CLASSES &&
+               con->request->request.op.operation_id != CUPS_GET_DEVICES &&
+               con->request->request.op.operation_id != CUPS_GET_PPDS))
       {
        /*
        * Return an error, since attributes-charset,
@@ -571,6 +591,10 @@ cupsdProcessIPPRequest(
               get_devices(con);
               break;
 
+          case CUPS_GET_DOCUMENT :
+             get_document(con, uri);
+             break;
+
          case CUPS_GET_PPD :
               get_ppd(con, uri);
               break;
@@ -901,16 +925,6 @@ add_class(cupsd_client_t  *con,            /* I - Client connection */
     return;
   }
 
- /*
-  * Check policy...
-  */
-
-  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
-  {
-    send_http_error(con, status, NULL);
-    return;
-  }
-
  /*
   * See if the class already exists; if not, create a new class...
   */
@@ -935,18 +949,31 @@ add_class(cupsd_client_t  *con,           /* I - Client connection */
     }
 
    /*
-    * No, add the pclass...
+    * No, check the default policy and then add the class...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     pclass = cupsdAddClass(resource + 9);
     modify = 0;
   }
   else if (pclass->type & CUPS_PRINTER_IMPLICIT)
   {
    /*
-    * Rename the implicit class to "AnyClass" or remove it...
+    * Check the default policy, then tename the implicit class to "AnyClass"
+    * or remove it...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     if (ImplicitAnyClasses)
     {
       snprintf(newname, sizeof(newname), "Any%s", resource + 9);
@@ -965,9 +992,15 @@ add_class(cupsd_client_t  *con,            /* I - Client connection */
   else if (pclass->type & CUPS_PRINTER_DISCOVERED)
   {
    /*
-    * Rename the remote class to "Class"...
+    * Check the default policy, then rename the remote class to "Class"...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     snprintf(newname, sizeof(newname), "%s@%s", resource + 9, pclass->hostname);
     cupsdRenamePrinter(pclass, newname);
 
@@ -978,6 +1011,12 @@ add_class(cupsd_client_t  *con,           /* I - Client connection */
     pclass = cupsdAddClass(resource + 9);
     modify = 0;
   }
+  else if ((status = cupsdCheckPolicy(pclass->op_policy_ptr, con,
+                                      NULL)) != HTTP_OK)
+  {
+    send_http_error(con, status, NULL);
+    return;
+  }
   else
     modify = 1;
 
@@ -2173,16 +2212,6 @@ add_printer(cupsd_client_t  *con,        /* I - Client connection */
     return;
   }
 
- /*
-  * Check policy...
-  */
-
-  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
-  {
-    send_http_error(con, status, NULL);
-    return;
-  }
-
  /*
   * See if the printer already exists; if not, create a new printer...
   */
@@ -2207,18 +2236,31 @@ add_printer(cupsd_client_t  *con,       /* I - Client connection */
     }
 
    /*
-    * No, add the printer...
+    * No, check the default policy then add the printer...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     printer = cupsdAddPrinter(resource + 10);
     modify  = 0;
   }
   else if (printer->type & CUPS_PRINTER_IMPLICIT)
   {
    /*
-    * Rename the implicit printer to "AnyPrinter" or delete it...
+    * Check the default policy, then rename the implicit printer to
+    * "AnyPrinter" or delete it...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     if (ImplicitAnyClasses)
     {
       snprintf(newname, sizeof(newname), "Any%s", resource + 10);
@@ -2237,9 +2279,16 @@ add_printer(cupsd_client_t  *con,        /* I - Client connection */
   else if (printer->type & CUPS_PRINTER_DISCOVERED)
   {
    /*
-    * Rename the remote printer to "Printer@server"...
+    * Check the default policy, then rename the remote printer to
+    * "Printer@server"...
     */
 
+    if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, NULL);
+      return;
+    }
+
     snprintf(newname, sizeof(newname), "%s@%s", resource + 10,
              printer->hostname);
     cupsdRenamePrinter(printer, newname);
@@ -2251,6 +2300,12 @@ add_printer(cupsd_client_t  *con,        /* I - Client connection */
     printer = cupsdAddPrinter(resource + 10);
     modify  = 0;
   }
+  else if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+                                      NULL)) != HTTP_OK)
+  {
+    send_http_error(con, status, NULL);
+    return;
+  }
   else
     modify = 1;
 
@@ -4531,6 +4586,10 @@ copy_job_attrs(cupsd_client_t *con,      /* I - Client connection */
                    con->servername, con->serverport, "/jobs/%d",
                   job->id);
 
+  if (!ra || cupsArrayFind(ra, "document-count"))
+    ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
+                 "document-count", job->num_files);
+
   if (!ra || cupsArrayFind(ra, "job-more-info"))
     ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
                 "job-more-info", NULL, job_uri);
@@ -5603,6 +5662,150 @@ get_devices(cupsd_client_t *con)        /* I - Client connection */
 }
 
 
+/*
+ * 'get_document()' - Get a copy of a job file.
+ */
+
+static void
+get_document(cupsd_client_t  *con,     /* I - Client connection */
+             ipp_attribute_t *uri)     /* I - Job URI */
+{
+  http_status_t        status;                 /* Policy status */
+  ipp_attribute_t *attr;               /* Current attribute */
+  int          jobid;                  /* Job ID */
+  int          docnum;                 /* Document number */
+  cupsd_job_t  *job;                   /* Current job */
+  char         method[HTTP_MAX_URI],   /* Method portion of URI */
+               username[HTTP_MAX_URI], /* Username portion of URI */
+               host[HTTP_MAX_URI],     /* Host portion of URI */
+               resource[HTTP_MAX_URI]; /* Resource portion of URI */
+  int          port;                   /* Port portion of URI */
+  char         filename[1024],         /* Filename for document */
+               format[1024];           /* Format for document */
+
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_document(%p[%d], %s)", con,
+                  con->http.fd, uri->values[0].string.text);
+
+ /*
+  * See if we have a job URI or a printer URI...
+  */
+
+  if (!strcmp(uri->name, "printer-uri"))
+  {
+   /*
+    * Got a printer URI; see if we also have a job-id attribute...
+    */
+
+    if ((attr = ippFindAttribute(con->request, "job-id",
+                                 IPP_TAG_INTEGER)) == NULL)
+    {
+      send_ipp_status(con, IPP_BAD_REQUEST,
+                      _("Got a printer-uri attribute but no job-id!"));
+      return;
+    }
+
+    jobid = attr->values[0].integer;
+  }
+  else
+  {
+   /*
+    * Got a job URI; parse it to get the job ID...
+    */
+
+    httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+                    sizeof(method), username, sizeof(username), host,
+                   sizeof(host), &port, resource, sizeof(resource));
+
+    if (strncmp(resource, "/jobs/", 6))
+    {
+     /*
+      * Not a valid URI!
+      */
+
+      send_ipp_status(con, IPP_BAD_REQUEST,
+                      _("Bad job-uri attribute \"%s\"!"),
+                      uri->values[0].string.text);
+      return;
+    }
+
+    jobid = atoi(resource + 6);
+  }
+
+ /*
+  * See if the job exists...
+  */
+
+  if ((job = cupsdFindJob(jobid)) == NULL)
+  {
+   /*
+    * Nope - return a "not found" error...
+    */
+
+    send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
+    return;
+  }
+
+ /*
+  * Check policy...
+  */
+
+  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+  {
+    send_http_error(con, status, NULL);
+    return;
+  }
+
+ /*
+  * Get the document number...
+  */
+
+  if ((attr = ippFindAttribute(con->request, "document-number",
+                               IPP_TAG_INTEGER)) == NULL)
+  {
+    send_ipp_status(con, IPP_BAD_REQUEST,
+                    _("Missing document-number attribute!"));
+    return;
+  }
+
+  if ((docnum = attr->values[0].integer) < 1 || docnum > job->num_files ||
+      attr->num_values > 1)
+  {
+    send_ipp_status(con, IPP_NOT_FOUND, _("Document %d not found in job %d."),
+                    docnum, jobid);
+    return;
+  }
+
+  snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, jobid,
+           docnum);
+  if ((con->file = open(filename, O_RDONLY)) == -1)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to open document %d in job %d - %s", docnum, jobid,
+                   strerror(errno));
+    send_ipp_status(con, IPP_NOT_FOUND,
+                    _("Unable to open document %d in job %d!"), docnum, jobid);
+    return;
+  }
+
+  fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
+
+  cupsdLoadJob(job);
+
+  snprintf(format, sizeof(format), "%s/%s", job->filetypes[docnum - 1]->super,
+           job->filetypes[docnum - 1]->type);
+
+  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+               NULL, format);
+  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "document-number",
+                docnum);
+  if ((attr = ippFindAttribute(job->attrs, "document-name",
+                               IPP_TAG_NAME)) != NULL)
+    ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_NAME, "document-name",
+                 NULL, attr->values[0].string.text);
+}
+
+
 /*
  * 'get_job_attrs()' - Get job attributes.
  */
@@ -9929,5 +10132,5 @@ validate_user(cupsd_job_t    *job,       /* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 6949 2007-09-12 21:33:23Z mike $".
+ * End of "$Id: ipp.c 7014 2007-10-10 21:57:43Z mike $".
  */
index 277be5f1de629b868160c316fc561158d903b231..4639b336aed83fbb3d3c2e18287bf7134db1c94c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 7000 2007-09-28 19:47:00Z mike $"
+ * "$Id: job.c 7005 2007-10-01 23:45:48Z mike $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -878,6 +878,7 @@ cupsdHoldJob(cupsd_job_t *job)              /* I - Job data */
 
   job->state->values[0].integer = IPP_JOB_HELD;
   job->state_value              = IPP_JOB_HELD;
+  job->current_file             = 0;
 
   cupsdSaveJob(job);
 
@@ -3789,5 +3790,5 @@ update_job_attrs(cupsd_job_t *job)        /* I - Job to update */
 
 
 /*
- * End of "$Id: job.c 7000 2007-09-28 19:47:00Z mike $".
+ * End of "$Id: job.c 7005 2007-10-01 23:45:48Z mike $".
  */
index 492b68bc25ddbe5043c52a87e5b9fb970ddc92ef..dbe08e7509047d9aa4f5ce852af84b6c8d87b6e5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: log.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: log.c 6875 2007-08-27 23:25:06Z mike $"
  *
  *   Log file routines for the Common UNIX Printing System (CUPS).
  *
@@ -196,6 +196,19 @@ cupsdLogMessage(int        level,  /* I - Log level */
   * See if we want to log this message...
   */
 
+  if (TestConfigFile)
+  {
+    if (level <= CUPSD_LOG_WARN)
+    {
+      va_start(ap, message);
+      vfprintf(stderr, message, ap);
+      putc('\n', stderr);
+      va_end(ap);
+    }
+
+    return (1);
+  }
+
   if (level > LogLevel || !ErrorLog)
     return (1);
 
@@ -607,5 +620,5 @@ check_log_file(cups_file_t **lf,    /* IO - Log file */
 
 
 /*
- * End of "$Id: log.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: log.c 6875 2007-08-27 23:25:06Z mike $".
  */
index 6b4d83993387b2c8edf59ab0ffcf15d36529b280..9cb8439bbe4c663ca79d4d0c94a00a920a01b69a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 6915 2007-09-05 21:05:17Z mike $"
+ * "$Id: main.c 6914 2007-09-05 21:05:04Z mike $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -254,6 +254,11 @@ main(int  argc,                            /* I - Number of command-line args */
              fg             = 1;
              break;
 
+          case 't' : /* Test the cupsd.conf file... */
+             TestConfigFile = 1;
+             fg             = 1;
+             break;
+
          default : /* Unknown option */
               _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
                                        "aborting!\n"), *opt);
@@ -410,10 +415,18 @@ main(int  argc,                           /* I - Number of command-line args */
 
   if (!cupsdReadConfiguration())
   {
-    syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
-           ConfigurationFile);
+    if (TestConfigFile)
+      printf("%s contains errors\n", ConfigurationFile);
+    else
+      syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
+            ConfigurationFile);
     return (1);
   }
+  else if (TestConfigFile)
+  {
+    printf("%s is OK\n", ConfigurationFile);
+    return (0);
+  }
 
   if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
   {
@@ -1892,5 +1905,5 @@ usage(int status)                 /* O - Exit status */
 
 
 /*
- * End of "$Id: main.c 6915 2007-09-05 21:05:17Z mike $".
+ * End of "$Id: main.c 6914 2007-09-05 21:05:04Z mike $".
  */
index 593e38183deb49e48a2ffb54a23ce7536f9ae060..25204ee89a51907dd91d2985a98ecbf8135fdece 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: policy.c 6895 2007-08-30 00:09:27Z mike $"
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
 #include "cupsd.h"
 
 
+/*
+ * Local functions...
+ */
+
+static int     compare_ops(cupsd_location_t *a, cupsd_location_t *b);
+static int     compare_policies(cupsd_policy_t *a, cupsd_policy_t *b);
+static int     hash_op(cupsd_location_t *op);
+
+
 /*
  * 'AddPolicy()' - Add a policy to the system.
  */
 cupsd_policy_t *                       /* O - Policy */
 cupsdAddPolicy(const char *policy)     /* I - Name of policy */
 {
-  cupsd_policy_t       *temp,          /* Pointer to policy */
-                       **tempa;        /* Pointer to policy array */
+  cupsd_policy_t       *temp;          /* Pointer to policy */
 
 
-  if (policy == NULL)
+  if (!policy)
     return (NULL);
 
-  if (NumPolicies == 0)
-    tempa = malloc(sizeof(cupsd_policy_t *));
-  else
-    tempa = realloc(Policies, sizeof(cupsd_policy_t *) * (NumPolicies + 1));
+  if (!Policies)
+    Policies = cupsArrayNew((cups_array_func_t)compare_policies, NULL);
 
-  if (tempa == NULL)
+  if (!Policies)
     return (NULL);
 
-  Policies = tempa;
-  tempa    += NumPolicies;
-
   if ((temp = calloc(1, sizeof(cupsd_policy_t))) != NULL)
   {
-    temp->name = strdup(policy);
-    *tempa     = temp;
-
-    NumPolicies ++;
+    cupsdSetString(&temp->name, policy);
+    cupsArrayAdd(Policies, temp);
   }
 
   return (temp);
@@ -77,36 +78,30 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,       /* I - Policy */
                  ipp_op_t         op)  /* I - IPP operation code */
 {
   int                  i;              /* Looping var */
-  cupsd_location_t     *temp,          /* New policy operation */
-                       **tempa;        /* New policy operation array */
+  cupsd_location_t     *temp;          /* New policy operation */
   char                 name[1024];     /* Interface name */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddPolicyOp(p=%p, po=%p, op=%x(%s))",
                   p, po, op, ippOpString(op));
 
-  if (p == NULL)
+  if (!p)
     return (NULL);
 
-  if (p->num_ops == 0)
-    tempa = malloc(sizeof(cupsd_location_t *));
-  else
-    tempa = realloc(p->ops, sizeof(cupsd_location_t *) * (p->num_ops + 1));
+  if (!p->ops)
+    p->ops = cupsArrayNew2((cups_array_func_t)compare_ops, NULL,
+                           (cups_ahash_func_t)hash_op, 128);
 
-  if (tempa == NULL)
+  if (!p->ops)
     return (NULL);
 
-  p->ops = tempa;
-
   if ((temp = calloc(1, sizeof(cupsd_location_t))) != NULL)
   {
-    p->ops            = tempa;
-    tempa[p->num_ops] = temp;
-    p->num_ops ++;
-
     temp->op    = op;
     temp->limit = AUTH_LIMIT_IPP;
 
+    cupsArrayAdd(p->ops, temp);
+
     if (po)
     {
      /*
@@ -127,7 +122,7 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,       /* I - Policy */
        {
          case AUTH_IP :
              cupsdAllowIP(temp, po->allow[i].mask.ip.address,
-                     po->allow[i].mask.ip.netmask);
+                          po->allow[i].mask.ip.netmask);
              break;
 
           case AUTH_INTERFACE :
@@ -146,7 +141,7 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,       /* I - Policy */
        {
          case AUTH_IP :
              cupsdDenyIP(temp, po->deny[i].mask.ip.address,
-                     po->deny[i].mask.ip.netmask);
+                         po->deny[i].mask.ip.netmask);
              break;
 
           case AUTH_INTERFACE :
@@ -216,29 +211,30 @@ cupsdCheckPolicy(cupsd_policy_t *p,       /* I - Policy */
 void
 cupsdDeleteAllPolicies(void)
 {
-  int                  i, j;           /* Looping vars */
-  cupsd_policy_t       **p;            /* Current policy */
-  cupsd_location_t     **po;           /* Current policy op */
+  cupsd_policy_t       *p;             /* Current policy */
+  cupsd_location_t     *po;            /* Current policy op */
 
 
-  if (NumPolicies == 0)
+  if (!Policies)
     return;
 
-  for (i = NumPolicies, p = Policies; i > 0; i --, p ++)
+  for (p = (cupsd_policy_t *)cupsArrayFirst(Policies);
+       p;
+       p = (cupsd_policy_t *)cupsArrayNext(Policies))
   {
-    for (j = (*p)->num_ops, po = (*p)->ops; j > 0; j --, po ++)
-      cupsdDeleteLocation(*po);
-
-    if ((*p)->num_ops > 0)
-      free((*p)->ops);
-
-    free(*p);
+    for (po = (cupsd_location_t *)cupsArrayFirst(p->ops);
+         po;
+        po = (cupsd_location_t *)cupsArrayNext(p->ops))
+      cupsdDeleteLocation(po);
+
+    cupsArrayDelete(p->ops);
+    cupsdClearString(&p->name);
+    free(p);
   }
 
-  free(Policies);
+  cupsArrayDelete(Policies);
 
-  NumPolicies = 0;
-  Policies    = NULL;
+  Policies = NULL;
 }
 
 
@@ -249,26 +245,22 @@ cupsdDeleteAllPolicies(void)
 cupsd_policy_t *                       /* O - Policy */
 cupsdFindPolicy(const char *policy)    /* I - Name of policy */
 {
-  int                  i;              /* Looping var */
-  cupsd_policy_t       **p;            /* Current policy */
+  cupsd_policy_t       key;            /* Search key */
 
 
  /*
   * Range check...
   */
 
-  if (policy == NULL)
+  if (!policy)
     return (NULL);
 
  /*
-  * Check the operation against the available policies...
+  * Look it up...
   */
 
-  for (i = NumPolicies, p = Policies; i > 0; i --, p ++)
-    if (!strcasecmp(policy, (*p)->name))
-      return (*p);
-
-  return (NULL);
+  key.name = (char *)policy;
+  return ((cupsd_policy_t *)cupsArrayFind(Policies, &key));
 }
 
 
@@ -280,8 +272,8 @@ cupsd_location_t *                  /* O - Policy operation */
 cupsdFindPolicyOp(cupsd_policy_t *p,   /* I - Policy */
                   ipp_op_t       op)   /* I - IPP operation */
 {
-  int                  i;              /* Looping var */
-  cupsd_location_t     **po;           /* Current policy operation */
+  cupsd_location_t     key,            /* Search key... */
+                       *po;            /* Current policy operation */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindPolicyOp(p=%p, op=%x(%s))\n",
@@ -291,28 +283,28 @@ cupsdFindPolicyOp(cupsd_policy_t *p,      /* I - Policy */
   * Range check...
   */
 
-  if (p == NULL)
+  if (!p)
     return (NULL);
 
  /*
   * Check the operation against the available policies...
   */
 
-  for (i = p->num_ops, po = p->ops; i > 0; i --, po ++)
-    if ((*po)->op == op)
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdFindPolicyOp: Found exact match...");
-      return (*po);
-    }
+  key.op = op;
+  if ((po = (cupsd_location_t *)cupsArrayFind(p->ops, &key)) != NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "cupsdFindPolicyOp: Found exact match...");
+    return (po);
+  }
 
-  for (i = p->num_ops, po = p->ops; i > 0; i --, po ++)
-    if ((*po)->op == IPP_ANY_OPERATION)
-    {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "cupsdFindPolicyOp: Found wildcard match...");
-      return (*po);
-    }
+  key.op = IPP_ANY_OPERATION;
+  if ((po = (cupsd_location_t *)cupsArrayFind(p->ops, &key)) != NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "cupsdFindPolicyOp: Found wildcard match...");
+    return (po);
+  }
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindPolicyOp: No match found!");
 
@@ -321,5 +313,40 @@ cupsdFindPolicyOp(cupsd_policy_t *p,       /* I - Policy */
 
 
 /*
- * End of "$Id: policy.c 6649 2007-07-11 21:46:42Z mike $".
+ * 'compare_ops()' - Compare two operations.
+ */
+
+static int                             /* O - Result of comparison */
+compare_ops(cupsd_location_t *a,       /* I - First operation */
+            cupsd_location_t *b)       /* I - Second operation */
+{
+  return (a->op - b->op);
+}
+
+
+/*
+ * 'compare_policies()' - Compare two policies.
+ */
+
+static int                             /* O - Result of comparison */
+compare_policies(cupsd_policy_t *a,    /* I - First policy */
+                 cupsd_policy_t *b)    /* I - Second policy */
+{
+  return (strcasecmp(a->name, b->name));
+}
+
+
+/*
+ * 'hash_op()' - Generate a lookup hash for the operation.
+ */
+
+static int                             /* O - Hash value */
+hash_op(cupsd_location_t *op)          /* I - Operation */
+{
+  return (((op->op >> 6) & 0x40) | (op->op & 0x3f));
+}
+
+
+/*
+ * End of "$Id: policy.c 6895 2007-08-30 00:09:27Z mike $".
  */
index 5531c9e1c8acbc9ff27e543cf754edd8440849e4..d3c0c34b293249d86c395006367f213ee030e336 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $"
  *
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -22,8 +22,7 @@
 typedef struct
 {
   char                 *name;          /* Policy name */
-  int                  num_ops;        /* Number of operations */
-  cupsd_location_t     **ops;          /* Operations */
+  cups_array_t         *ops;           /* Operations */
 } cupsd_policy_t;
 
 
@@ -31,9 +30,7 @@ typedef struct
  * Globals...
  */
 
-VAR int                        NumPolicies     VALUE(0);
-                                       /* Number of policies */
-VAR cupsd_policy_t     **Policies      VALUE(NULL);
+VAR cups_array_t       *Policies       VALUE(NULL);
                                        /* Policies */
 
 
@@ -53,5 +50,5 @@ extern cupsd_location_t       *cupsdFindPolicyOp(cupsd_policy_t *p, ipp_op_t op);
 
 
 /*
- * End of "$Id: policy.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $".
  */
index 3400de54953a89fb0382110ec9e92fbcc5addbbf..4f69babbecaf85c923603b132058a76875effaf1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 6971 2007-09-17 23:59:05Z mike $"
+ * "$Id: printers.c 6970 2007-09-17 23:58:28Z mike $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -257,6 +257,7 @@ cupsdCreateCommonData(void)
   cups_array_t         *notifiers;     /* Notifier array */
   char                 filename[1024], /* Filename */
                        *notifier;      /* Current notifier */
+  cupsd_policy_t       *p;             /* Current policy */
   static const int nups[] =            /* number-up-supported values */
                { 1, 2, 4, 6, 9, 16 };
   static const int orients[4] =/* orientation-requested-supported values */
@@ -321,6 +322,8 @@ cupsdCreateCommonData(void)
                  CUPS_GET_PPDS,
                  CUPS_MOVE_JOB,
                  CUPS_AUTHENTICATE_JOB,
+                 CUPS_GET_PPD,
+                 CUPS_GET_DOCUMENT,
                  IPP_RESTART_JOB
                };
   static const char * const charsets[] =/* charset-supported values */
@@ -562,9 +565,15 @@ cupsdCreateCommonData(void)
 
   /* printer-op-policy-supported */
   attr = ippAddStrings(CommonData, IPP_TAG_PRINTER, IPP_TAG_NAME,
-                       "printer-op-policy-supported", NumPolicies, NULL, NULL);
-  for (i = 0; i < NumPolicies; i ++)
-    attr->values[i].string.text = _cupsStrAlloc(Policies[i]->name);
+                       "printer-op-policy-supported", cupsArrayCount(Policies),
+                      NULL, NULL);
+  for (i = 0, p = (cupsd_policy_t *)cupsArrayFirst(Policies);
+       p;
+       i ++, p = (cupsd_policy_t *)cupsArrayNext(Policies))
+    attr->values[i].string.text = _cupsStrAlloc(p->name);
+
+  ippAddBoolean(CommonData, IPP_TAG_PRINTER, "server-is-sharing-printers",
+                BrowseLocalProtocols != 0 && Browsing);
 }
 
 
@@ -3766,5 +3775,5 @@ write_irix_state(cupsd_printer_t *p)      /* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c 6971 2007-09-17 23:59:05Z mike $".
+ * End of "$Id: printers.c 6970 2007-09-17 23:58:28Z mike $".
  */
index 97c6e5614d08cb4ea308a125c39edb03ad1ea90a..56f748566124426ad33e85fe8848b961653abca9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 6988 2007-09-25 15:44:07Z mike $"
+ * "$Id: process.c 6987 2007-09-25 15:43:44Z mike $"
  *
  *   Process management routines for the Common UNIX Printing System (CUPS).
  *
@@ -350,5 +350,5 @@ compare_procs(cupsd_proc_t *a,              /* I - First process */
 
 
 /*
- * End of "$Id: process.c 6988 2007-09-25 15:44:07Z mike $".
+ * End of "$Id: process.c 6987 2007-09-25 15:43:44Z mike $".
  */
index 2a21d83ddc9926c7681ebe015937c1f65d7d47bc..4286f0e22d13c36b69604490356615360d7d50be 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $"
+ * "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $"
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
@@ -240,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1,     /* I - First quota record */
 
 
 /*
- * End of "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $".
+ * End of "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $".
  */
index 4a44f4e199eaff6a6fad80a0543b69725377f607..55b930a9e4ee9424fd0fb77792effe4d878ffdeb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c 6928 2007-09-07 18:05:14Z mike $"
+ * "$Id: cupstestppd.c 6927 2007-09-07 16:51:00Z mike $"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -2524,5 +2524,5 @@ valid_utf8(const char *s)         /* I - String to check */
 
 
 /*
- * End of "$Id: cupstestppd.c 6928 2007-09-07 18:05:14Z mike $".
+ * End of "$Id: cupstestppd.c 6927 2007-09-07 16:51:00Z mike $".
  */
index 6a77f2d84bce6e05cec20115d732a3fdfbcd05e0..6cec19910ec38029eb9b737f1af94465d65f7a3b 100644 (file)
@@ -1,8 +1,6 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
-<H2 CLASS="title">Add Class</H2>
-
 <TABLE>
 <TR>
 <TH CLASS="label">Name:</TH>
@@ -26,7 +24,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Add Class"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Add Class"></TD>
 </TR>
 </TABLE>
 
index b8c440fe6eb30f9c18ba0e06e40398e4ea921125..1b798b59074ab919f039112d66b4ab8573b65b6a 100644 (file)
@@ -1,28 +1,31 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Add New Printer</H2>
+{?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
+{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
 <TABLE>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
 <SMALL>(May contain any printable characters except "/", "#", and space)</SMALL></TD>
 </TR>
 <TR>
-<TH CLASS="label">Location:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
-</TR>
-<TR>
 <TH CLASS="label">Description:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
 <SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
 </TR>
 <TR>
+<TH CLASS="label">Location:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
+</TR>
+<TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 </TABLE>
 
index 4f92351255c9f6f2f2a0d3669adb6a9841d2b1d1..810fb3a5028749c8abed93d7037f0557ce99569a 100644 (file)
@@ -36,7 +36,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD COLSPAN="5"><INPUT TYPE="IMAGE" SRC="/images/button-add-rss-subscription.gif" ALT="Add RSS Subscription"></TD>
+<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></TD>
 </TR>
 </TABLE>
 
index d6d4a8fe53d7782169c21aa5a7b552a2d4142659..03b9b11fc42dff3e488b9115a650f62b150671de 100644 (file)
@@ -4,32 +4,23 @@
 <H2 CLASS="title">Printers</H2>
 
 <P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Add Printer" CLASS="button"></A>
-<A HREF="/admin?op=find-new-printers"><IMG
-SRC="/images/button-find-new-printers.gif"
-ALT="Find New Printers" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Manage Printers" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Export Printers to Samba"
-CLASS="button"></A>:}
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Add Printer"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Find New Printers"></FORM>
+<FORM ACTION="/printers/" METHOD="POST"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:}
 </P>
 
 <H2 CLASS="title">Classes</H2>
 
 <P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Add Class" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Manage Classes" CLASS="button"></A>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Add Class"></FORM>
+<FORM ACTION="/classes/" METHOD="POST"><INPUT TYPE="SUBMIT" VALUE="Manage Classes"></FORM>
 </P>
 
 <H2 CLASS="title">Jobs</H2>
 
 <P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Manage
-Jobs" CLASS="button"></A>
+<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Jobs"></FORM>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
@@ -37,18 +28,10 @@ Jobs" CLASS="button"></A>
 <H2 CLASS="title">Server</H2>
 
 <P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Edit Configuration
-File" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="View Access Log"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="View Error Log"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="View Page Log"
-CLASS="button"></A>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Edit Configuration File"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Access Log"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Error Log"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Page Log"></FORM>
 </P>
 
 {SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
@@ -60,14 +43,14 @@ CLASS="button"></A>
 
 <P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
 <INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Show printers shared by other systems<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share published printers connected to this system<BR>
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
 <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
 {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
 <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
 <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting</P>
 
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Change Settings"></P>
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Change Settings"></P>
 
 </FORM>}
 
@@ -77,12 +60,12 @@ CLASS="button"></A>
 <H2 CLASS="title">Subscriptions</H2>
 
 <P>
-<A HREF="/admin/?op=add-rss-subscription"><IMG SRC="/images/button-add-rss-subscription.gif" ALT="Add RSS Subscription" CLASS="button"></A>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM>
 </P>
 
 {notify_subscription_id?<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="RSS Subscriptions">
 <THEAD><TR CLASS="data"><TH>ID</TH><TH>Name</TH><TH>Events</TH><TH>Queue</TH></TR></THEAD>
 <TBODY>{[notify_subscription_id]
-<TR><TD><A HREF="{notify_recipient_uri}">{notify_subscription_id}</A></TD><TD NOWRAP><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A> <A HREF="/admin/?op=cancel-subscription&amp;notify_subscription_id={notify_subscription_id}"><IMG SRC="/images/button-cancel-subscription.gif" CLASS="button" ALT="Cancel RSS Subscription"></A>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
+<TR><TD><A HREF="{notify_recipient_uri}">{notify_subscription_id}</A></TD><TD NOWRAP><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
 </TBODY>
 </TABLE>:}
index 6076477e18c3b896157cb0650988734d383973be..52e89e55754970cda6e805d5509ded603ed7d535 100644 (file)
@@ -1,25 +1,37 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Device for {printer_name}</H2>
 
 <TABLE>
+<TH CLASS="label">Local Printers:</TH>
+<TD>
+{[device_uri]{device_class!network?<INPUT TYPE="radio" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+:}}
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Discovered Network Printers:</TH>
+<TD>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="radio" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+:}:}}
+</TD>
+</TR>
+<TR>
 <TR>
-<TH CLASS="label">Device:</TH>
+<TH CLASS="label">Other Network Printers:</TH>
 <TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="radio" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+}:}}
 </TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 </TABLE>
 
index 65e35afdf498491b8865a2273337df3caea80ff7..e50688c7f27665560f3e06bf7c1fe5bd9a83f0d4 100644 (file)
@@ -1,18 +1,28 @@
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
 <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
 <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 
-<H2 CLASS="title">Make/Manufacturer for {printer_name}</H2>
-
 <TABLE>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Name:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Location:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Make:</TH>
 <TD>
 <SELECT NAME="PPD_MAKE" SIZE="10">
@@ -22,7 +32,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 <TR>
 <TD></TD>
@@ -35,7 +45,7 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Add Printer:Modify Printer}"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Add Printer:Modify Printer}"></TD>
 </TR>
 </TABLE>
 
index aa523080f93b2aab2e557f1bb7be51a9e2e886ca..dfee36486246838e7cc53358c365dc09cf9ad300 100644 (file)
@@ -1,18 +1,32 @@
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
 <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
 <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 
-<H2 CLASS="title">Model/Driver for {printer_name}</H2>
-
 <TABLE>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Name:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Location:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Make:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Select Another Make/Manufacturer"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Model:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
@@ -27,7 +41,7 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Add Printer:Modify Printer}"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Add Printer:Modify Printer}"></TD>
 </TR>
 </TABLE>
 
index e0bbb1b97df1a02a82f91de8220e9eb19fd33867..25a4931fb180e5e2b9199761cd3590cf25fe857e 100644 (file)
@@ -1,14 +1,12 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Serial Port Settings for {printer_name}</H2>
 
 <TABLE>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Baud Rate:</TH>
 <TD><SELECT NAME="BAUDRATE">
 {[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
@@ -40,7 +38,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 </TABLE>
 
index 8ab85636fc3d00743b583a1bf07082dc91b123fa..765a32e158d1567c747c1c2c35377e70967040ef 100644 (file)
@@ -1,15 +1,10 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
 <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
 
-<H2 CLASS="title">Device URI for {printer_name}</H2>
-
 <TABLE>
 <TR>
-<TH CLASS="label">Device URI:</TH>
+<TH CLASS="label">Connection:</TH>
 <TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
 </TR>
 <TR>
@@ -35,7 +30,7 @@ Printers"</A> for the correct URI to use with your printer.</P>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 </TABLE>
 
index b2122929fb05c572abc5b2aa2d42c8439d30fdda..77debf12aff6cabdf129ddb940521a95f14172ab 100644 (file)
@@ -1,7 +1,4 @@
 <P><B>Warning:</B> Are you sure you want to delete class
 {printer_name}?</P>
 
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Delete Class"
-CLASS="button"></A></P>
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Class"></FORM></P>
index 8e17c3996edd122e5869af9a841ed9d7758bcccc..cb6b3f6fb1695bf92f22e9984d8c0886db19e06f 100644 (file)
@@ -1,58 +1,46 @@
 {#printer_name=0?:
 {[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
+{#printer_name=1?:<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}}
 {?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
 
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
+<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
 <TR>
 <TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
+<IMG SRC="/images/classes.png" WIDTH="128" HEIGHT="128" ALT=""></A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 <TD VALIGN=TOP><B>Description:</B> {printer_info}<BR>
 <B>Location:</B> {printer_location}<BR>
 <B>Class State:</B> {printer_state=3?idle:{printer_state=4?processing:stopped}},
-{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {printer_is_shared=0?not:} published.
+{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {server_is_sharing_printers=0?not:{printer_is_shared=0?not:}} shared{default_name={printer_name}?, default printer:}.
 {?member_uris=?:<BR>Members: {member_uris}}
 
-<P><TABLE WIDTH="100%" CELLPADDING="5" SUMMARY="Actions">
-<TR VALIGN="TOP"><TD>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Print Test Page" CLASS="button"></A></TD>
-<TD>{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Start Class" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Stop Class" CLASS="button"></A>
+<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Maintenance Commands">
+<CAPTION>Maintenance Commands</CAPTION>
+<TR><TD><FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Test Page"></FORM>
+{printer_state=5?
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="start-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Start Class"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="stop-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Stop Class"></FORM>
 }
 {printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accept Jobs" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Reject Jobs" CLASS="button"></A>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="accept-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Accept Jobs"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="reject-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Reject Jobs"></FORM>
 }
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Cancel All Jobs" CLASS="button"></A></TD>
-<TD>{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publish Printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Unpublish Printer" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Modify Class" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-class-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Set Printer Options" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Delete Class" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Set As Default" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Set Allowed Users" CLASS="button"></A></TD>
-</TR>
-</TABLE></P>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="purge-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Cancel All Jobs"></FORM></TD></TR>
+</TABLE>
+
+<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Administration Commands">
+<CAPTION>Administration Commands</CAPTION>
+<TR><TD>{server_is_sharing_printers=0?:{printer_is_shared=0?
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&amp;shared=1<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Share Class"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&amp;shared=0<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Unshare Class"></FORM>
+}}
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="modify-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Modify Class"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-class-options"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Printer Options"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Delete Class"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-as-default"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Set As Default"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-allowed-users"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Set Allowed Users"></FORM></TD></TR>
+</TABLE>
 </TD>
 </TR>
 </TABLE>
 }}
+<BR>
diff --git a/templates/de/add-class.tmpl b/templates/de/add-class.tmpl
deleted file mode 100644 (file)
index c5bd8e4..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Klasse hinzuf&uuml;gen</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Ort:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beschreibung:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Mitglieder:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Klasse hinzuf&uuml;gen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/add-printer.tmpl b/templates/de/add-printer.tmpl
deleted file mode 100644 (file)
index 2313910..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Neuen Drucker hinzuf&uuml;gen</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Darf alle druckbaren Zeichen au&szlig;er "/", "#", und Leerzeichen enthalten)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Ort:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(F&uuml;r Menschen lesbarer Ort wie "Labor 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beschreibung:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(F&uuml;r Menschen lesbare Beschreibung wie "HP LaserJet mit Duplexeinheit")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/add-rss-subscription.tmpl b/templates/de/add-rss-subscription.tmpl
deleted file mode 100644 (file)
index 9b1d627..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
-
-<H2 CLASS="title">RSS Subskription hinzuf&uuml;gen</H2>
-
-<TABLE SUMMARY="Forumlar zum Hinzufügen einer RSS Subskription">
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
-<SMALL>(Darf alle druckbaren Zeichen au&szlig;er Leerzeichen, "/", "?", und "#" enthalten)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Warteschlange:</TH>
-<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>All Queues</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD>
-</TR>
-<TR VALIGN="TOP">
-<TH CLASS="label">Ereignisse:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Auftrag Erstellt<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Auftrag Abgeschlossen<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Auftrag Gestoppt<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Auftrags Parameter Ge&auml;ndert</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Warteschlange Gestoppt<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Warteschlange Hinzugef&uuml;gt<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Warteschlange Ge&auml;ndert<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Warteschlange Gel&ouml;scht</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Server Gestartet<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Server Gestoppt<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Server Neu Gestartet<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Server Sicherheits Pr&uuml;fung</TD>
-</TR>
-<TR>
-<TH CLASS="label">Maximale Ereignisse in Durchf&uuml;hrung:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD COLSPAN="5"><INPUT TYPE="IMAGE" SRC="/images/button-add-rss-subscription.gif" ALT="RSS Subskription hinzuf&uuml;gen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl
deleted file mode 100644 (file)
index 709ac3e..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Drucker</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Drucker hinzuf&uuml;gen" CLASS="button"></A>
-<A HREF="/admin?op=find-new-printers"><IMG
-SRC="/images/button-find-new-printers.gif"
-ALT="Verfügbare Drucker auflisten" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Drucker verwalten" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Drucker f&uuml;r Samba exportieren"
-CLASS="button"></A>:}
-</P>
-
-<H2 CLASS="title">Klassen</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Klasse hinzuf&uuml;gen" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Klassen verwalten" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Druckauftr&auml;ge</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Auftr&auml;ge
-verwalten" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Server</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Konfigurationsdatei
-bearbeiten" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Zugriffsprotokoll betrachten"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Fehlerprotokoll betrachten"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Seitenprotokoll betrachten"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Grundlegende Servereinstellungen:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Zeige verteilte Drucker von anderen Systemen<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Verteile publizierte Drucker welche mit diesem System verbunden sind<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Erlaube Drucken vom Internet aus<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Erlaube entfernte Verwaltung<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Benutze Kerberos Authentifizierung<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Erlaube Benutzern jeden Auftrag abzubrechen (nicht nur die Eigenen)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Speichere Fehlerinformationen f&uuml;r Fehlersuche</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Einstellungen &auml;ndern"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
-
-<H2 CLASS="title">Subskriptionen</H2>
-
-<P>
-<A HREF="/admin/?op=add-rss-subscription"><IMG SRC="/images/button-add-rss-subscription.gif" ALT="RSS Subskription hinzufügen" CLASS="button"></A>
-</P>
-
-{notify_subscription_id?<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="RSS Subskriptionen">
-<THEAD><TR CLASS="data"><TH>ID</TH><TH>Name</TH><TH>Ereignis</TH><TH>Warteschlange</TH></TR></THEAD>
-<TBODY>{[notify_subscription_id]
-<TR><TD><A HREF="{notify_recipient_uri}">{notify_subscription_id}</A></TD><TD NOWRAP><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A> <A HREF="/admin/?op=cancel-subscription&amp;notify_subscription_id={notify_subscription_id}"><IMG SRC="/images/button-cancel-subscription.gif" CLASS="button" ALT="RSS Subskription k&uuml;ndigen"></A>&nbsp;</TD><TD>{notify_events} </TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>}
-</TBODY>
-</TABLE>:}
diff --git a/templates/de/choose-device.tmpl b/templates/de/choose-device.tmpl
deleted file mode 100644 (file)
index a45c9ba..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Ger&auml;t f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Ger&auml;t:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/choose-make.tmpl b/templates/de/choose-make.tmpl
deleted file mode 100644 (file)
index db82117..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Marke/Hersteller f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Marke:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">Oder stellen Sie eine PPD Datei bereit:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Add Printer:Modify Printer}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/choose-model.tmpl b/templates/de/choose-model.tmpl
deleted file mode 100644 (file)
index 17d94b4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Modell/Treiber f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Modell:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Oder stellen Sie eine PPD Datei bereit:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Add Printer:Modify Printer}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/choose-serial.tmpl b/templates/de/choose-serial.tmpl
deleted file mode 100644 (file)
index 73cca51..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Serielle Anschlusseinstellungen f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Baud Rate:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Parit&auml;t:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>None
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Even
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Odd
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Daten Bits:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Flu&szlig;kontrolle:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>None
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Software)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Hardware)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Hardware)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/choose-uri.tmpl b/templates/de/choose-uri.tmpl
deleted file mode 100644 (file)
index b4068be..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Ger&auml;te URI f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Ger&auml;te URI:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Beispiele:
-<PRE>
-    http://hostname:631/ipp/
-    http://hostname:631/ipp/port1
-
-    ipp://hostname/ipp/
-    ipp://hostname/ipp/port1
-
-    lpd://hostname/warteschlange
-
-    socket://hostname
-    socket://hostname:9100
-</PRE>
-
-<P>Bitte lesen Sie <A HREF="/help/network.html" TARGET="_blank">"Netzwerk
-Drucker"</A> um die korrekte URI f&uuml;r Ihren Drucker zu benutzen.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/class-added.tmpl b/templates/de/class-added.tmpl
deleted file mode 100644 (file)
index abce917..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> wurde erfolgreich
-hinzugef&uuml;gt.
diff --git a/templates/de/class-confirm.tmpl b/templates/de/class-confirm.tmpl
deleted file mode 100644 (file)
index 3da201f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Warning:</B> Sind Sie sicher, da&szlig; Sie die Klasse
-{printer_name} l&ouml;schen zu wollen?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Klasse l&ouml;schen"
-CLASS="button"></A></P>
diff --git a/templates/de/class-deleted.tmpl b/templates/de/class-deleted.tmpl
deleted file mode 100644 (file)
index c75fab4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klasse {printer_name} wurde erfolgreich gel&ouml;scht.
diff --git a/templates/de/class-jobs-header.tmpl b/templates/de/class-jobs-header.tmpl
deleted file mode 100644 (file)
index e5b9e08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Auftr&auml;ge</H3>
diff --git a/templates/de/class-modified.tmpl b/templates/de/class-modified.tmpl
deleted file mode 100644 (file)
index 944b766..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Klasse <A HREF="/classes/{printer_name}">{printer_name}</A> wurde
-erfolgreich ge&auml;ndert.
diff --git a/templates/de/classes-header.tmpl b/templates/de/classes-header.tmpl
deleted file mode 100644 (file)
index f07d47d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Keine Klassen gefunden:Zeige {#printer_name} von {total} Klasse{total=1?:n}}.</P>
diff --git a/templates/de/classes.tmpl b/templates/de/classes.tmpl
deleted file mode 100644 (file)
index c2335fd..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Standarddrucker):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Beschreibung:</B> {printer_info}<BR>
-<B>Ort:</B> {printer_location}<BR>
-<B>Klassenstatus:</B> {printer_state=3?frei:{printer_state=4?verarbeitend:gestoppt}},
-{printer_is_accepting_jobs=0?Auftr&auml;ge ablehnen:Auftr&auml;ge akzeptieren}, {printer_is_shared=0?nicht:} publiziert.
-{?member_uris=?:<BR>Mitglieder: {member_uris}}
-
-<P><TABLE WIDTH="100%" CELLPADDING="5" SUMMARY="Actions">
-<TR VALIGN="TOP"><TD>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Testseite drucken" CLASS="button"></A></TD>
-<TD>{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Klasse starten" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Klasse stoppen" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Auftr&auml;ge akzeptieren" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Auftr&auml;ge ablehnen" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Alle Auftr&auml;ge abbrechen" CLASS="button"></A></TD>
-<TD>{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Drucker publizieren" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Druckerpublikation aufheben" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Klasse &auml;ndern" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-class-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Setze Drucker Optionen" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Klasse l&ouml;schen" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Setze als Standard" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen" CLASS="button"></A></TD>
-</TR>
-</TABLE></P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/de/edit-config.tmpl b/templates/de/edit-config.tmpl
deleted file mode 100644 (file)
index 88c4aef..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Server Konfigurationsdatei</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="&Auml;nderungen speichern"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Standard Konfigurationsdatei verwenden"></A></P>
-
-</FORM>
diff --git a/templates/de/error-op.tmpl b/templates/de/error-op.tmpl
deleted file mode 100644 (file)
index 9e1236c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Fehler:</P>
-
-<BLOCKQUOTE>Unbekannte Operation "{op}"!</BLOCKQUOTE>
diff --git a/templates/de/error.tmpl b/templates/de/error.tmpl
deleted file mode 100644 (file)
index 4653d8b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Fehler:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl.in
deleted file mode 100644 (file)
index 82692ca..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Startseite&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Verwaltung&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Klassen&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Dokumentation/Hilfe&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Auftr&auml;ge&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Drucker&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/de/help-header.tmpl b/templates/de/help-header.tmpl
deleted file mode 100644 (file)
index cef194f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Suche in
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Alle Dokumente}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Suche">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Leeren" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">On-Line Hilfe Dokumente</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Alle Dokumente</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Suchresultate in {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Alle Dokumente}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Keine &Uuml;bereinstimmung gefunden.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Druckversion anzeigen"
-CLASS="button"></A></H1>:<H1>CUPS Hilfeseiten</H1>
-
-<P>Dies ist das CUPS online Hilfesystem. Geben Sie Ihren Suchbegriff
-oben ein oder klicken Sie auf einen der Dokumentationslinks
-um sich die Online Hilfe Informationen anzeigen zu lassen</P>
-
-<P>Wenn Sie noch unerfahren im Umgang mit CUPS sind, lesen Sie die
-"<a href="overview.html">CUPS &Uuml;bersicht</a>".
-Erfahrene Benutzer sollten "<a href="whatsnew.html">Was ist neu in CUPS 1.3</a>" lesen.</P>
-
-<P>Die <A HREF="http://www.cups.org/">CUPS Home Page</A> bietet
-ebenfalls viele Angebote inklusive Benutzer Diskussionsforen,
-Antworten auf h&auml;ufig gestellte Fragen, und ein Formular für
-Fehlerberichte und W&uuml;nsche.</P>}
diff --git a/templates/de/help-printable.tmpl b/templates/de/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/de/job-cancel.tmpl b/templates/de/job-cancel.tmpl
deleted file mode 100644 (file)
index 06b305c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Auftrag {job_id}</A> wurde abgebrochen.
diff --git a/templates/de/job-hold.tmpl b/templates/de/job-hold.tmpl
deleted file mode 100644 (file)
index 7e4c477..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Auftrag {job_id}</A> wurde angehalten.
diff --git a/templates/de/job-move.tmpl b/templates/de/job-move.tmpl
deleted file mode 100644 (file)
index f48f251..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Verschiebe Auftrag {job_id}:Verschiebe alle Auftr&auml;ge}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Neues Ziel:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Verschiebe {job_id?Auftrag:Auftr&auml;ge}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/job-moved.tmpl b/templates/de/job-moved.tmpl
deleted file mode 100644 (file)
index 2d2b287..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Auftrag {job_id}</A>:All jobs} verschoben nach 
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/de/job-release.tmpl b/templates/de/job-release.tmpl
deleted file mode 100644 (file)
index 34279d6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Auftrag {job_id}</A> wurde f&uuml;r Druck freigegeben.
diff --git a/templates/de/job-restart.tmpl b/templates/de/job-restart.tmpl
deleted file mode 100644 (file)
index 9406117..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Auftrag {job_id}</A> wurde neu gestartet.
diff --git a/templates/de/jobs-header.tmpl b/templates/de/jobs-header.tmpl
deleted file mode 100644 (file)
index 419c779..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Fertige Auftr&auml;ge anzeigen"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Alle Auftr&auml;ge anzeigen">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Fertige Auftr&auml;ge anzeigen"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Aktive Auftr&auml;ge anzeigen">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Aktive Auftr&auml;ge anzeigen"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Alle Auftr&auml;ge anzeigen">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Keine Auftr&auml;ge gefunden:Zeige {#job_id} von {total} {?which_jobs=?active:{which_jobs=all?:fertigen}} {total=1?Auftrag:Auftr&auml;gen}}.</P>
diff --git a/templates/de/jobs.tmpl b/templates/de/jobs.tmpl
deleted file mode 100644 (file)
index 15ea37c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Auftragsliste">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Name&nbsp;</TH>
-<TH>Benutzer&nbsp;</TH>
-<TH>Gr&ouml;&szlig;e&nbsp;</TH>
-<TH>Seiten&nbsp;</TH>
-<TH>Status&nbsp;</TH>
-<TH>Kontrolle&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Unbekannt:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Unbekannt:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?schwebend seit<BR>{time_at_creation}:{job_state=4?angehalten seit<BR>{time_at_creation}:
-{job_state=5?verarbeitet seit<BR>{time_at_processing}:{job_state=6?gestoppt um<BR>{time_at_completed}:
-{job_state=7?abgebrochen um<BR>{time_at_completed}:{job_state=8?aborted:beendet um<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Auftrag neu drucken" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Auftrag freigeben" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Auftrag anhalten" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Auftrag abbrechen" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Auftrag verschieben" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/de/list-available-printers.tmpl b/templates/de/list-available-printers.tmpl
deleted file mode 100644 (file)
index c316c19..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<H2 CLASS="title">Verf&uuml;gbare Drucker</H2>
-
-{#device_uri=0?<P>Keine Drucker gefunden.</P>
-:<UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Diesen Drucker hinfzuf&uuml;gen" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
diff --git a/templates/de/maintenance.tmpl b/templates/de/maintenance.tmpl
deleted file mode 100644 (file)
index 811c401..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Wartungskommando gesendet; Auftrags ID ist <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/de/modify-class.tmpl b/templates/de/modify-class.tmpl
deleted file mode 100644 (file)
index 7798913..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Klasse {printer_name} &auml;ndern</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ort:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beschreibung:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Mitglieder:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Klasse &auml;ndern"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/modify-printer.tmpl b/templates/de/modify-printer.tmpl
deleted file mode 100644 (file)
index 54323df..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Drucker {printer_name} &auml;ndern</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ort:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(F&uuml;r Menschen lesbarer Ort wie "Labor 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beschreibung:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(F&uuml;r Menschen lesbare Beschreibung wie "HP LaserJet mit Duplexeinheit")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsetzen"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/option-boolean.tmpl b/templates/de/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/de/option-conflict.tmpl b/templates/de/option-conflict.tmpl
deleted file mode 100644 (file)
index 95b69f7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Error:</B> Die folgenden Parameter stehen im Konflikt zueinander:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Bitte ändern Sie einen oder mehrere Parameter um die Konflikte zu beheben.</P>
diff --git a/templates/de/option-header.tmpl b/templates/de/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/de/option-pickmany.tmpl b/templates/de/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/de/option-pickone.tmpl b/templates/de/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/de/option-trailer.tmpl b/templates/de/option-trailer.tmpl
deleted file mode 100644 (file)
index 02c7a96..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Druckereinstellungen festlegen"></TD>
-</TR>
-</TABLE>
diff --git a/templates/de/pager.tmpl b/templates/de/pager.tmpl
deleted file mode 100644 (file)
index fc602f7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Vorherige anzeigen" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Aufsteigend sortieren" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Absteigend sortieren" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="N&auml;chste anzeigen" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/de/printer-accept.tmpl b/templates/de/printer-accept.tmpl
deleted file mode 100644 (file)
index 5980e5b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-akzeptiert jetzt Auftr&auml;ge.</P>
diff --git a/templates/de/printer-added.tmpl b/templates/de/printer-added.tmpl
deleted file mode 100644 (file)
index 0ce8e8c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Drucker <A HREF="/printers/{printer_name}">{printer_name}</A> wurde erfolgreich
-hinzugef&uuml;gt.
diff --git a/templates/de/printer-configured.tmpl b/templates/de/printer-configured.tmpl
deleted file mode 100644 (file)
index a0469e6..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Drucker <A HREF="/printers/{printer_name}">{printer_name}</A> wurde
-erfolgreich konfiguriert.
diff --git a/templates/de/printer-confirm.tmpl b/templates/de/printer-confirm.tmpl
deleted file mode 100644 (file)
index 311cd11..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Warnung:</B> Sind Sie sicher, da&szlig; Sie den Drucker
-{printer_name} l&ouml;schen wollen?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Drucker l&ouml;schen"
-CLASS="button"></A></P>
diff --git a/templates/de/printer-default.tmpl b/templates/de/printer-default.tmpl
deleted file mode 100644 (file)
index d04a326..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wurde zum Standarddrucker f&uuml;r diesen Server bestimmt.</P>
-
-<BLOCKQUOTE><B>Notiz:</B> Jede benutzerspezifische Standardeinstellung welche
-mit dem Befehl <TT>lpoptions</TT> gemacht wird &uuml;berschreibt diese
-Standardeinstellung.</BLOCKQUOTE>
diff --git a/templates/de/printer-deleted.tmpl b/templates/de/printer-deleted.tmpl
deleted file mode 100644 (file)
index 4489a73..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drucker {printer_name} wurde erfolgreich gel&ouml;scht.
diff --git a/templates/de/printer-jobs-header.tmpl b/templates/de/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index e5b9e08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Auftr&auml;ge</H3>
diff --git a/templates/de/printer-modified.tmpl b/templates/de/printer-modified.tmpl
deleted file mode 100644 (file)
index dc1c104..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Drucker <A HREF="/printers/{printer_name}">{printer_name}</A> wurde
-erfolgreich ge&auml;ndert.
diff --git a/templates/de/printer-purge.tmpl b/templates/de/printer-purge.tmpl
deleted file mode 100644 (file)
index cafa5e8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wurde aus allen Auftr&auml;gen eliminiert.</P>
diff --git a/templates/de/printer-reject.tmpl b/templates/de/printer-reject.tmpl
deleted file mode 100644 (file)
index 513bba1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-akzeptiert ab sofort keine Auftr&auml;ge mehr.</P>
diff --git a/templates/de/printer-start.tmpl b/templates/de/printer-start.tmpl
deleted file mode 100644 (file)
index e6836c7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wurde gestartet.</P>
diff --git a/templates/de/printer-stop.tmpl b/templates/de/printer-stop.tmpl
deleted file mode 100644 (file)
index 64cbd72..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasse:Drucker} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wurde gestoppt.</P>
diff --git a/templates/de/printers-header.tmpl b/templates/de/printers-header.tmpl
deleted file mode 100644 (file)
index b247590..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Keine Drucker gefunden:Zeige {#printer_name} von {total} Drucker{total=1?:n}}.</P>
diff --git a/templates/de/printers.tmpl b/templates/de/printers.tmpl
deleted file mode 100644 (file)
index 90ccfe4..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Standarddrucker):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Beschreibung:</B> {printer_info}<BR>
-<B>Ort:</B> {printer_location}<BR>
-<B>Marke und Modell:</B> {printer_make_and_model}<BR>
-<B>Druckerstatus:</B> {printer_state=3?frei:{printer_state=4?verarbeitend:gestoppt}},
-{printer_is_accepting_jobs=0?Auftr&auml;ge ablehnen:Auftr&auml;ge akzeptieren}, {printer_is_shared=0?nicht:} publiziert.
-{?device_uri=?:<BR><B>Ger&auml;te URI:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Testseite drucken" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Druckk&ouml;pfe reinigen" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Selbsttest-Seite drucken" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Drucker starten" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Drucker stoppen" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Auftr&auml;ge akzeptieren" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Auftr&auml;ge ablehnen" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Alle Auftr&auml;ge verschieben" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Auftr&auml;ge abbrechen" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Drucker publizieren" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Druckerpublikation aufheben" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Drucker &auml;ndern" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Druckereinstellungen festlegen" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Drucker l&ouml;schen" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Als Standard festlegen" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/de/restart.tmpl b/templates/de/restart.tmpl
deleted file mode 100644 (file)
index 28f93bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Bitte warten Sie w&auml;hrend der Server neu startet...</p>
diff --git a/templates/de/samba-export.tmpl b/templates/de/samba-export.tmpl
deleted file mode 100644 (file)
index d76d401..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Exportiere Drucker f&uuml;r Samba</H2>
-
-{error?<P>Kann Drucker nicht f&uuml;r Samba exportieren\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Konsultieren Sie die <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> Datei um mehr Informationen zu erhalten.</P>:
-<P>Diese Seite erlaubt es Ihnen Drucker f&uuml;r Samba bereitzustellen
-damit auf diese mittels Windows Clients &uuml;ber die Desktopsymbole
-<VAR>Netzwerk Nachbarn</VAR> oder <VAR>Netzwerkumgebung</VAR>
-zugegriffen werden kann. Sie müssen zuerst einen
-Windows PostScript Druckerteiber installieren wie diese in der Hilfe f&uuml;r <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> beschrieben ist.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Drucker:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Alle Drucker exportieren
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba Benutzername:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (required)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba Passwort:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (required)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Exportiere Drucker f&uuml;r Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/de/samba-exported.tmpl b/templates/de/samba-exported.tmpl
deleted file mode 100644 (file)
index ff032b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drucker wurden f&uuml; Samba erfolgreich exportiert.</P>
diff --git a/templates/de/search.tmpl b/templates/de/search.tmpl
deleted file mode 100644 (file)
index fa53134..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Suche in
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Klassen:{SECTION=jobs?Auftr&auml;ge:Drucker}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Suche">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Leeren" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/de/set-printer-options-header.tmpl b/templates/de/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/de/set-printer-options-trailer.tmpl b/templates/de/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/de/subscription-added.tmpl b/templates/de/subscription-added.tmpl
deleted file mode 100644 (file)
index cdf50fc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Subskription {subscription_name} wurde erfolgreich hinzugef&uuml;gt.</P>
diff --git a/templates/de/subscription-canceled.tmpl b/templates/de/subscription-canceled.tmpl
deleted file mode 100644 (file)
index b12419a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Subskription #{notify_subscription_id} wurde gek&uuml;ndigt.</P>
diff --git a/templates/de/test-page.tmpl b/templates/de/test-page.tmpl
deleted file mode 100644 (file)
index a9a4bbd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Testseite gesendet; Auftrags ID ist <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl
deleted file mode 100644 (file)
index ac4db19..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-eingetragene Warenzeichen der <A HREF="http://www.apple.com">Apple Inc.</A> CUPS
-ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc, alle Rechte vorbehalten.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/de/users.tmpl b/templates/de/users.tmpl
deleted file mode 100644 (file)
index d2c9ba8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Berechtigte Benutzer f&uuml;r {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Benutzer:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Erlaube diesen Benutzern zu drucken
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Verweigere diesen Benutzern zu drucken
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index 884fea6e10ebbbd307937e4640d89fe0078e4d25..4aa78f944902a4a3715c2d2607b390c9682a1984 100644 (file)
@@ -13,10 +13,8 @@ function reset_config()
 
 <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
 
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Save Changes"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Use Default Configuration File"></A></P>
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Save Changes">
+<INPUT TYPE="BUTTON" VALUE="Use Default Configuration File"
+onClick="reset_config();"></P>
 
 </FORM>
diff --git a/templates/es/add-class.tmpl b/templates/es/add-class.tmpl
deleted file mode 100644 (file)
index 98401d7..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">A&ntilde;adir clase</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nombre:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Ubicaci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descripci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Miembros:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="A&ntilde;adir clase"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/add-printer.tmpl b/templates/es/add-printer.tmpl
deleted file mode 100644 (file)
index 82c004f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">A&ntilde;adir impresora nueva</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nombre:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Puede contener cualquier car&aacute;cter imprimible excepto "/", "#", y espacio)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Ubicaci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Ubicaci&oacute;n f&aacute;cilmente le&iacute;ble tal como "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descripci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(Descripci&oacute;n f&aacute;cilmente le&iacute;ble tal como "HP LaserJet de doble cara")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/add-rss-subscription.tmpl b/templates/es/add-rss-subscription.tmpl
deleted file mode 100644 (file)
index 07d2ce5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
-
-<H2 CLASS="title">A&ntilde;adir subscripci&oacute;n RSS</H2>
-
-<TABLE SUMMARY="Formulario de a&ntilde;adir subscripci&oacute;n RSS">
-<TR>
-<TH CLASS="label">Nombre:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
-<SMALL>(Puede contener cualquier car&aacute;cter imprimible excepto espacio, "/", "?", y "#")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Cola:</TH>
-<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Todas las colas</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD>
-</TR>
-<TR VALIGN="TOP">
-<TH CLASS="label">Eventos:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Trabajo creado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Trabajo completado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Trabajo parado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Opciones de trabajo cambiadas</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Cola parada<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Cola a&ntilde;adida<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Cola modificada<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Cola borrada</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Servidor iniciado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Servidor parado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Servidor reiniciado<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Auditoría de seguridad del servidor</TD>
-</TR>
-<TR>
-<TH CLASS="label">N&uacute;mero m&aacute;ximo de eventos del canal:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD COLSPAN="5"><INPUT TYPE="IMAGE" SRC="/images/button-add-rss-subscription.gif" ALT="A&ntilde;adir subscripci&oacute;n RSS"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl
deleted file mode 100644 (file)
index 0798857..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Tareas de administraci&oacute;n">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Impresoras</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="A&ntilde;adir impresora" CLASS="button"></A>
-<A HREF="/admin?op=find-new-printers"><IMG
-SRC="/images/button-find-new-printers.gif"
-ALT="Encontrar nuevas impresoras" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Administrar impresoras" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Exportar impresoras a Samba"
-CLASS="button"></A>:}
-</P>
-
-<H2 CLASS="title">Clases</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="A&ntilde;adir clase" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Administrar clases" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Trabajos</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Administrar
-trabajos" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Servidor</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Editar archivo
-configuraci&oacute;n" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Ver archivo de registro de accesos"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Ver archivo de registro de errores"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Ver archivo de registro de p&aacute;ginas"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Configuraci&oacute;n b&aacute;sica del servidor:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Mostrar impresoras compartidas por otros sistemas<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartir impresoras p&uacute;blicas conectadas a este sistema<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administraci&oacute;n remota<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autentificaci&oacute;n Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir a los usuarios cancelar cualquier trabajo (no s&oacute;lo los suyos propios)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Guardar informaci&oacute;n de depuraci&oacute;n para b&uacute;squeda de problemas</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Cambiar especificaciones"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
-
-<H2 CLASS="title">Subscripciones</H2>
-
-<P>
-<A HREF="/admin/?op=add-rss-subscription"><IMG SRC="/images/button-add-rss-subscription.gif" ALT="A&ntilde;adir subscripci&oacute;n RSS" CLASS="button"></A>
-</P>
-
-{notify_subscription_id?<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="Subscripciones RSS">
-<THEAD><TR CLASS="data"><TH>ID</TH><TH>Nombre</TH><TH>Eventos</TH><TH>Cola</TH></TR></THEAD>
-<TBODY>{[notify_subscription_id]
-<TR><TD><A HREF="{notify_recipient_uri}">{notify_subscription_id}</A></TD><TD NOWRAP><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A> <A HREF="/admin/?op=cancel-subscription&amp;notify_subscription_id={notify_subscription_id}"><IMG SRC="/images/button-cancel-subscription.gif" CLASS="button" ALT="Cancelar subscripci&oacute;n RSS"></A>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Todas las colas}</TD></TR>}
-</TBODY>
-</TABLE>:}
diff --git a/templates/es/choose-device.tmpl b/templates/es/choose-device.tmpl
deleted file mode 100644 (file)
index fbfb83d..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Tipo de conexi&oacute;n de {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Conexi&oacute;n:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/choose-make.tmpl b/templates/es/choose-make.tmpl
deleted file mode 100644 (file)
index 2358dfe..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Marca/Fabricante de {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Marca:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">O proporcione un archivo PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?A&ntilde;adir impresora:Modificar impresora}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/choose-model.tmpl b/templates/es/choose-model.tmpl
deleted file mode 100644 (file)
index 3362a67..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Modelo/Controlador para {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Modelo:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">O proporcione un archivo PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?A&ntilde;adir impresora:Modificar impresora}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/choose-serial.tmpl b/templates/es/choose-serial.tmpl
deleted file mode 100644 (file)
index 4b6508b..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Par&aacute;metros puerto serie para {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Baudios:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Paridad:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Sin paridad
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Par
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Impar
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Bits de datos:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Control de flujo:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Ninguno
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Software)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Hardware)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Hardware)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/choose-uri.tmpl b/templates/es/choose-uri.tmpl
deleted file mode 100644 (file)
index 12b71fc..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">URI de la conexi&oacute;n para {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">URI de la conexi&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Ejemplos:
-<PRE>
-    http://nombre_ordenador:631/ipp/
-    http://nombre_ordenador:631/ipp/puerto1
-
-    ipp://nombre_ordenador/ipp/
-    ipp://nombre_ordenador/ipp/puerto1
-
-    lpd://nombre_ordenador/cola
-
-    socket://nombre_ordenador
-    socket://nombre_ordenador:9100
-</PRE>
-
-<P>Vea <A HREF="/help/network.html" TARGET="_blank">"Impresoras
-en red"</A> para escoger el URI adecuado a usar con su impresora.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/class-added.tmpl b/templates/es/class-added.tmpl
deleted file mode 100644 (file)
index faf659a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha a&ntilde;adido con &eacute;xito la clase <A HREF="/classes/{printer_name}">{printer_name}</A>.
diff --git a/templates/es/class-confirm.tmpl b/templates/es/class-confirm.tmpl
deleted file mode 100644 (file)
index ee7d2be..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Advertencia:</B> &iquest;Est&aacute; seguro de querer borrar la clase
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Borrar clase"
-CLASS="button"></A></P>
diff --git a/templates/es/class-deleted.tmpl b/templates/es/class-deleted.tmpl
deleted file mode 100644 (file)
index c73465f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha borrado con &eacute;xito la clase {printer_name}.
diff --git a/templates/es/class-jobs-header.tmpl b/templates/es/class-jobs-header.tmpl
deleted file mode 100644 (file)
index f571813..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Trabajos</H3>
diff --git a/templates/es/class-modified.tmpl b/templates/es/class-modified.tmpl
deleted file mode 100644 (file)
index 959c151..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha modificado con &eacute;xito la clase <A HREF="/classes/{printer_name}">{printer_name}</A>.
\ No newline at end of file
diff --git a/templates/es/classes-header.tmpl b/templates/es/classes-header.tmpl
deleted file mode 100644 (file)
index 714ab89..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?No hay clases:Mostrando {#printer_name} de {total} clase{total=1?:s}}.</P>
diff --git a/templates/es/classes.tmpl b/templates/es/classes.tmpl
deleted file mode 100644 (file)
index da4d75b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Impresora predeterminada):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Descripci&oacute;n:</B> {printer_info}<BR>
-<B>Ubicaci&oacute;n:</B> {printer_location}<BR>
-<B>Estado de la clase:</B> {printer_state=3?inactiva:{printer_state=4?procesando:parada}},
-{printer_is_accepting_jobs=0?rechazando trabajos:aceptando trabajos}, {printer_is_shared=0?no:} p&uacute;blica.
-{?member_uris=?:<BR>Miembros: {member_uris}}
-
-<P><TABLE WIDTH="100%" CELLPADDING="5" SUMMARY="Acciones">
-<TR VALIGN="TOP"><TD>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimir p&aacute;gina de prueba" CLASS="button"></A></TD>
-<TD>{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Iniciar clase" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Detener clase" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Aceptar trabajos" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Rechazar trabajos" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Cancelar todos los trabajos" CLASS="button"></A></TD>
-<TD>{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publicar impresora" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="No publicar impresora" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Modificar clase" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-class-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Cambiar opciones impresora" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Borrar clase" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Poner como predeterminada" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Establecer usuarios permitidos" CLASS="button"></A>
-</TR>
-</TABLE></P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/es/edit-config.tmpl b/templates/es/edit-config.tmpl
deleted file mode 100644 (file)
index 59f7b3c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Archivo de configuraci&oacute;n del servidor</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Guardar cambios"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Usar archivo de configuraci&oacute;n predeterminado"></A></P>
-
-</FORM>
diff --git a/templates/es/error-op.tmpl b/templates/es/error-op.tmpl
deleted file mode 100644 (file)
index 9a33a1f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Error:</P>
-
-<BLOCKQUOTE>Operaci&oacute; desconocida "{op}"!</BLOCKQUOTE>
diff --git a/templates/es/error.tmpl b/templates/es/error.tmpl
deleted file mode 100644 (file)
index bf0530c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Error:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in
deleted file mode 100644 (file)
index 570be1b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Inicio&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Administraci&oacute;n&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Clases&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Documentaci&oacute;n/Ayuda&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Trabajos&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Impresoras&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/es/help-header.tmpl b/templates/es/help-header.tmpl
deleted file mode 100644 (file)
index d53ca07..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Buscar en
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:todos los documentos}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Buscar">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Borrar" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Documentos de ayuda en línea</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Todos los documentos</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Buscar resultados en {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:todos los documentos}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>No hay coincidencias.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Ver versi&oacute;n imprimible"
-CLASS="button"></A></H1>:<H1>P&aacute;ginas de ayuda de CUPS</H1>
-
-<P>Esta es la interfaz de ayuda en l&iacute;nea de CUPS. Introduzca las palabras
-a buscar aqu&iacute; encima o haga clic en cualquiera de los enlaces de la
-documentaci&oacute;n para visualizar la informaci&oacute;n de ayuda en l&iacute;nea.</P>
-
-<P>Si es nuevo en CUPS, lea la p&aacute;gina "<a
-href="overview.html">Informaci&oacute;n general de CUPS</a>". Los usuarios veteranos
-deber&iacute;an leer la p&aacute;gina "<a href="whatsnew.html">Qu&eacute; hay de nuevo en CUPS
-1.3</a>".</P>
-
-<P>La <A HREF="http://www.cups.org/">p&aacute;gina de inicio de CUPS</A> tambi&eacute;n
-proporciona muchos recursos, incluyendo foros de discusi&oacute;n de usuarios, respuestas
-a preguntas frecuentes, y un formulario para el env&iacute;o de informes de errores y
-peticiones de mejoras.</P>}
diff --git a/templates/es/help-printable.tmpl b/templates/es/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/es/job-cancel.tmpl b/templates/es/job-cancel.tmpl
deleted file mode 100644 (file)
index 84d65e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha cancelado el <A HREF="{job_printer_uri}">Trabajo {job_id}</A>.
diff --git a/templates/es/job-hold.tmpl b/templates/es/job-hold.tmpl
deleted file mode 100644 (file)
index f424bca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha retenido el <A HREF="{job_printer_uri}">Trabajo {job_id}</A>.
diff --git a/templates/es/job-move.tmpl b/templates/es/job-move.tmpl
deleted file mode 100644 (file)
index 2f8992b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Mover trabajo {job_id}:Mover todos los trabajos}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nuevo destino:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Mover trabajo{job_id?:s}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/job-moved.tmpl b/templates/es/job-moved.tmpl
deleted file mode 100644 (file)
index 806d2bc..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Se {job_id?ha movido el <A HREF="/jobs/{job_id}">Trabajo {job_id}</A>:han movido todos los trabajos} a
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/es/job-release.tmpl b/templates/es/job-release.tmpl
deleted file mode 100644 (file)
index 14e2d02..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha liberado el <A HREF="{job_printer_uri}">Trabajo {job_id}</A>.
diff --git a/templates/es/job-restart.tmpl b/templates/es/job-restart.tmpl
deleted file mode 100644 (file)
index d35dfb4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha reiniciado el <A HREF="{job_printer_uri}">Trabajo {job_id}</A>.
diff --git a/templates/es/jobs-header.tmpl b/templates/es/jobs-header.tmpl
deleted file mode 100644 (file)
index ca78fab..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Mostrar trabajos completados"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Mostrar todos los trabajos">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Mostrar trabajos completados"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Mostrar trabajos activos">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Mostrar trabajos activos"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Mostrar todos los trabajos">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?No hay trabajos:Mostrando {#job_id} de {total} trabajo{total=1?:s}{?which_jobs=? activo{total=1?:s}:{which_jobs=all?: completado{total=1?:s}}}}.</P>
diff --git a/templates/es/jobs.tmpl b/templates/es/jobs.tmpl
deleted file mode 100644 (file)
index 2338888..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Nombre&nbsp;</TH>
-<TH>Usuario&nbsp;</TH>
-<TH>Tama&ntilde;o&nbsp;</TH>
-<TH>P&aacute;ginas&nbsp;</TH>
-<TH>Estado&nbsp;</TH>
-<TH>Control&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Desconocido:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Desconocido:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?pendiente desde<BR>{time_at_creation}:{job_state=4?retenido desde<BR>{time_at_creation}:
-{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado:
-{job_state=7?cancelado el<BR>{time_at_completed}:{job_state=8?abandonado:completado el<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Reimprimir trabajo" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Liberar trabajo" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Retener trabajo" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Cancelar trabajo" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Mover trabajo" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/es/list-available-printers.tmpl b/templates/es/list-available-printers.tmpl
deleted file mode 100644 (file)
index 17a7dbc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<H2 CLASS="title">Impresoras disponibles</H2>
-
-{#device_uri=0?<P>No se encuentran impresoras.</P>
-:<UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="A&ntilde;adir esta impresora" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
diff --git a/templates/es/maintenance.tmpl b/templates/es/maintenance.tmpl
deleted file mode 100644 (file)
index 6672071..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Se han enviado los comandos de mantenimiento; la ID del trabajo es <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/es/modify-class.tmpl b/templates/es/modify-class.tmpl
deleted file mode 100644 (file)
index 6f7526a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Modificar clase {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nombre:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ubicaci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descripci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Miembros:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modificar clase"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/modify-printer.tmpl b/templates/es/modify-printer.tmpl
deleted file mode 100644 (file)
index f52de7c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Modificar impresora {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nombre:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ubicaci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Ubicaci&oacute;n f&aacute;cilmente le&iacute;ble tal como "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descripci&oacute;n:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Descripci&oacute;n f&aacute;cilmente le&iacute;ble tal como "HP LaserJet de doble cara")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Siguiente"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/norestart.tmpl b/templates/es/norestart.tmpl
deleted file mode 100644 (file)
index b4cb36c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>No se ha reiniciado el servidor debido a que no se han hecho
-cambios en la configuraci&oacute;n...</p>
diff --git a/templates/es/option-boolean.tmpl b/templates/es/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/es/option-conflict.tmpl b/templates/es/option-conflict.tmpl
deleted file mode 100644 (file)
index 6db0267..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Error:</B> Las siguientes opciones est&aacute;n en conflicto:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Cambie una o m&aacute;s de las opciones para resolver el problema.</P>
diff --git a/templates/es/option-header.tmpl b/templates/es/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/es/option-pickmany.tmpl b/templates/es/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/es/option-pickone.tmpl b/templates/es/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/es/option-trailer.tmpl b/templates/es/option-trailer.tmpl
deleted file mode 100644 (file)
index df397bb..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Cambiar opciones impresora"></TD>
-</TR>
-</TABLE>
diff --git a/templates/es/pager.tmpl b/templates/es/pager.tmpl
deleted file mode 100644 (file)
index 5fd2aa9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Barra de paginaci&oacute;n">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Mostrar anterior" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Orden ascendente" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Orden descendente" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Mostrar siguiente" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/es/printer-accept.tmpl b/templates/es/printer-accept.tmpl
deleted file mode 100644 (file)
index d6d4d54..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>La {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-ahora acepta trabajos.</P>
diff --git a/templates/es/printer-added.tmpl b/templates/es/printer-added.tmpl
deleted file mode 100644 (file)
index f0825b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha a&ntilde;adido con &eacute;xito la impresora <A HREF="/printers/{printer_name}">{printer_name}</A>.
diff --git a/templates/es/printer-configured.tmpl b/templates/es/printer-configured.tmpl
deleted file mode 100644 (file)
index 5a3eba1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha configurado con &eacute;xito la {OP=set-class-options?clase <A HREF="/classes/{printer_name}">:impresora <A HREF="/printers/{printer_name}">}</A>.
diff --git a/templates/es/printer-confirm.tmpl b/templates/es/printer-confirm.tmpl
deleted file mode 100644 (file)
index 82bbc03..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Advertencia:</B> &iquest;Est&aacute; seguro de querer borrar la impresora
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Borrar impresora"
-CLASS="button"></A></P>
diff --git a/templates/es/printer-default.tmpl b/templates/es/printer-default.tmpl
deleted file mode 100644 (file)
index 3efbf67..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>Se ha puesto como predeterminada en el servidor la {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>.</P>
-
-<BLOCKQUOTE><B>Nota:</B> cualquier opci&oacute;n de usuario
-que haya sido activada por mediaci&oacute;n del comando
-<TT>lpoptions</TT> tiene mayor preferencia que este ajuste 
-predeterminado.</BLOCKQUOTE>
diff --git a/templates/es/printer-deleted.tmpl b/templates/es/printer-deleted.tmpl
deleted file mode 100644 (file)
index ca8ed01..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha borrado con &eacute;xito la impresora {printer_name}.
diff --git a/templates/es/printer-jobs-header.tmpl b/templates/es/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index f571813..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Trabajos</H3>
diff --git a/templates/es/printer-modified.tmpl b/templates/es/printer-modified.tmpl
deleted file mode 100644 (file)
index 515d9ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha modificado con &eacute;xito la impresora <A HREF="/printers/{printer_name}">{printer_name}</A>.
diff --git a/templates/es/printer-purge.tmpl b/templates/es/printer-purge.tmpl
deleted file mode 100644 (file)
index 10fa0e4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Se han cancelado todos los trabajos de la {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>.</P>
diff --git a/templates/es/printer-reject.tmpl b/templates/es/printer-reject.tmpl
deleted file mode 100644 (file)
index 7f143ed..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>La {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-ya no acepta trabajos.</P>
diff --git a/templates/es/printer-start.tmpl b/templates/es/printer-start.tmpl
deleted file mode 100644 (file)
index cf7fe4f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>La {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-ha sido iniciada.</P>
diff --git a/templates/es/printer-stop.tmpl b/templates/es/printer-stop.tmpl
deleted file mode 100644 (file)
index 973644c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>La {is_class?clase:impresora} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-ha sido parada.</P>
diff --git a/templates/es/printers-header.tmpl b/templates/es/printers-header.tmpl
deleted file mode 100644 (file)
index 7280687..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?No hay impresoras:Mostrando {#printer_name} de {total} impresora{total=1?:s}}.</P>
diff --git a/templates/es/printers.tmpl b/templates/es/printers.tmpl
deleted file mode 100644 (file)
index bba8698..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Impresora predeterminada):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Descripci&oacute;n:</B> {printer_info}<BR>
-<B>Ubicaci&oacute;n:</B> {printer_location}<BR>
-<B>Fabricante y modelo:</B> {printer_make_and_model}<BR>
-<B>Estado de la impresora:</B> {printer_state=3?inactiva:{printer_state=4?procesando:parada}},
-{printer_is_accepting_jobs=0?rechazando trabajos:aceptando trabajos}, {printer_is_shared=0?no:} p&uacute;blica.
-{?device_uri=?:<BR><B>URI de la conexi&oacute;n:</B> {device_uri}}
-
-<P><TABLE WIDTH="100%" CELLPADDING="5" SUMMARY="Acciones">
-<TR VALIGN="TOP"><TD>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimir p&aacute;gina de prueba" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Limpiar cabezales de impresi&oacute;n" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Imprimir p&aacute;gina de auto-prueba" CLASS="button"></A>:}</TD>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Iniciar impresora" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Detener impresora" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Aceptar trabajos" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Rechazar trabajos" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Mover todos los trabajos" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Cancelar todos los trabajos" CLASS="button"></A></TD>
-<TD>{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publicar impresora" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="No publicar impresora" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Modificar impresora" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Cambiar opciones impresora" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Borrar impresora" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Poner como predeterminada" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Establecer usuarios permitidos" CLASS="button"></A></TD>
-</TR>
-</TABLE></P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/es/restart.tmpl b/templates/es/restart.tmpl
deleted file mode 100644 (file)
index b9b0e74..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Por favor espere mientras se reinicia el servidor...</p>
diff --git a/templates/es/samba-export.tmpl b/templates/es/samba-export.tmpl
deleted file mode 100644 (file)
index 886a138..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Exportar impresoras a Samba</H2>
-
-{error?<P>No se han podido exportar las impresoras a Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consulte el archivo <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> para m&aacute;s informaci&oacute;n.</P>:
-<P>Esta p&aacute;gina le permite exportar las impresoras a Samba para que
-los clientes Windows puedan acceder a ellas por los iconos de su
-escritorio <VAR>Entorno de red</VAR> o <VAR>Sitios de red</VAR>. Debe haber instalado
-previamente el controlador de impresora PostScript de Windows
-como se describe en la p&aacute;gina del manual
-<A HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Impresoras:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Exportar todas las impresoras
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Nombre de usuario Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (necesario)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Contrase&ntilde;a Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (necesaria)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Exportar impresoras a Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/es/samba-exported.tmpl b/templates/es/samba-exported.tmpl
deleted file mode 100644 (file)
index a54925d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se han exportado las impresoras a samba con &eacute;xito.</P>
diff --git a/templates/es/search.tmpl b/templates/es/search.tmpl
deleted file mode 100644 (file)
index 4001b33..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Buscar en
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?clases:{SECTION=jobs?trabajos:impresoras}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Buscar">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Borrar" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/es/set-printer-options-header.tmpl b/templates/es/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/es/set-printer-options-trailer.tmpl b/templates/es/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/es/subscription-added.tmpl b/templates/es/subscription-added.tmpl
deleted file mode 100644 (file)
index 725b8bb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se ha a&ntilde;adido con &eacute;xito la subscripci&oacute;n {subscription_name}.</P>
diff --git a/templates/es/subscription-canceled.tmpl b/templates/es/subscription-canceled.tmpl
deleted file mode 100644 (file)
index 8a68f54..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La subscripci&oacute;n #{notify_subscription_id} ha sido cancelada.</P>
diff --git a/templates/es/test-page.tmpl b/templates/es/test-page.tmpl
deleted file mode 100644 (file)
index 7670f98..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>P&aacute;gina de prueba enviada; el n&uacute;mero del trabajo es el <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
deleted file mode 100644 (file)
index 78051d4..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS, y el logo de CUPS son
-marcas registradas de <A HREF="http://www.apple.com">Apple, Inc.</A> Los
-derechos de copia de CUPS 2007 son de Apple Inc.
-Todos los derechos reservados.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/es/users.tmpl b/templates/es/users.tmpl
deleted file mode 100644 (file)
index c4ff1a5..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Usuarios permitidos para {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Usuarios:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Permitir a estos usuarios imprimir
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Evitar que estos usuarios impriman
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Establecer usuarios permitidos">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/add-class.tmpl b/templates/et/add-class.tmpl
deleted file mode 100644 (file)
index 50e655d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Klassi lisamine</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nimi:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Asukoht:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kirjeldus:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Liikmed:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Lisa klass"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/add-printer.tmpl b/templates/et/add-printer.tmpl
deleted file mode 100644 (file)
index ac59291..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Uue printeri lisamine</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nimi:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Võib sisaldada kõiki trükitavaid märke, välja arvatud "/", "#" ja tühik)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Asukoht:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Arusaadava sisuga asukoht, näiteks "Laud 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kirjeldus:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(Arusaadava sisuga kirjeldus, näiteks "HP LaserJet duplekseriga")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/admin.tmpl b/templates/et/admin.tmpl
deleted file mode 100644 (file)
index fd47b90..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Printerid</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Lisa printer" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Halda printereid" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Ekspordi printerid Sambasse"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>Leitud uued printerid:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Lisa see printer" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">Klassid</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Lisa klass" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Halda klasse" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Tööd</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Halda
-töid" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Server</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Muuda
-seadistustefaili" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Vaata kasutamislogi"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Vaata vealogi"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Vaata lehelogi"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Serveri põhiseadistused:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Teiste süsteemide jagatud printerite näitamine<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Aktiivse süsteemiga ühendatud avaldatud printerite jagamine<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Võrguhalduse lubamine<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Kasutajatel lubatakse katkestada kõiki töid (mitte ainult enda omi)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Silumisinfo salvestamine probleemide tuvastamiseks</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Muuda seadistusi"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/et/choose-device.tmpl b/templates/et/choose-device.tmpl
deleted file mode 100644 (file)
index cac4ca2..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Printeri {printer_name} seade</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Seade:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/choose-make.tmpl b/templates/et/choose-make.tmpl
deleted file mode 100644 (file)
index 4aede75..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Printeri {printer_name} valmistaja/tootja</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Valmistaja:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">või andke PPD-fail:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Lisa printer:Muuda printerit}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/choose-model.tmpl b/templates/et/choose-model.tmpl
deleted file mode 100644 (file)
index ee93197..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Printeri {printer_name} mudel/draiver</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Mudel:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">või andke PPD-fail:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Lisa printer:Muuda printerit}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/choose-serial.tmpl b/templates/et/choose-serial.tmpl
deleted file mode 100644 (file)
index 640c748..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Printeri {printer_name} jadapordi seadistused</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Andmevahetuse kiirus:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Paarsus:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Puudub
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Paaris
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Paaritu
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Andmebitid:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Voo reguleerimine:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Puudub
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (tarkvaraline)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (riistvaraline)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (riistvaraline)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/choose-uri.tmpl b/templates/et/choose-uri.tmpl
deleted file mode 100644 (file)
index fea2ae7..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Printeri {printer_name} seadme URI</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Seadme URI:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Näited:
-<PRE>
-    http://masinanimi:631/ipp/
-    http://masinanimi:631/ipp/port1
-
-    ipp://masinanimi/ipp/
-    ipp://masinanimi/ipp/port1
-
-    lpd://masinanimi/järjekord
-
-    socket://masinanimi
-    socket://masinanimi:9100
-</PRE>
-
-<P>Vaadake osa <A HREF="/help/network.html" TARGET="_blank">"Võrguprinterid"</A> 
-oma printeri korrektse URI tuvastamiseks.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/class-added.tmpl b/templates/et/class-added.tmpl
deleted file mode 100644 (file)
index e758ef8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Klass <A HREF="/classes/{printer_name}">{printer_name}</A> edukalt
-lisatud.
diff --git a/templates/et/class-confirm.tmpl b/templates/et/class-confirm.tmpl
deleted file mode 100644 (file)
index ede566e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Hoiatus:</B> kas soovite tõesti kustutada klassi
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Kustuta klass"
-CLASS="button"></A></P>
diff --git a/templates/et/class-deleted.tmpl b/templates/et/class-deleted.tmpl
deleted file mode 100644 (file)
index f2bc3ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klass {printer_name} edukalt kustutatud.
diff --git a/templates/et/class-jobs-header.tmpl b/templates/et/class-jobs-header.tmpl
deleted file mode 100644 (file)
index b3d29de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Tööd</H3>
diff --git a/templates/et/class-modified.tmpl b/templates/et/class-modified.tmpl
deleted file mode 100644 (file)
index a8c65fd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Klass <A HREF="/classes/{printer_name}">{printer_name}</A> edukalt
-muudetud.
diff --git a/templates/et/classes-header.tmpl b/templates/et/classes-header.tmpl
deleted file mode 100644 (file)
index 29e4fca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Klassid puuduvad:Näidatakse {#printer_name} klassi {total} klassist{total=1?:}}.</P>
diff --git a/templates/et/classes.tmpl b/templates/et/classes.tmpl
deleted file mode 100644 (file)
index 9f740d4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (vaikimisi printer):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Kirjeldus:</B> {printer_info}<BR>
-<B>Asukoht:</B> {printer_location}<BR>
-<B>Klassi olek:</B> {printer_state=3?jõude:{printer_state=4?töötleb:peatatud}},
-{printer_is_accepting_jobs=0?ei võta töid vastu:võtab töid vastu}, {printer_is_shared=0?pole:} avaldatud.
-{?member_uris=?:<BR>Liikmed: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Trüki testlehekülg" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Käivita klass" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Peata klass" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Võta töid vastu" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Ära võta töid vastu" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Katkesta kõik tööd" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Avalda printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Ära avalda printerit" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Muuda klassi" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Kustuta klass" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Määra vaikeväärtuseks" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Määra lubatud kasutajad" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/et/edit-config.tmpl b/templates/et/edit-config.tmpl
deleted file mode 100644 (file)
index b5f77c6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Serveri seadistustefail</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Salvesta muudatused"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Kasuta vaikimisi seadistustefaili"></A></P>
-
-</FORM>
diff --git a/templates/et/error-op.tmpl b/templates/et/error-op.tmpl
deleted file mode 100644 (file)
index 097cddd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Viga:</P>
-
-<BLOCKQUOTE>Tundmatu operatsioon "{op}"!</BLOCKQUOTE>
diff --git a/templates/et/error.tmpl b/templates/et/error.tmpl
deleted file mode 100644 (file)
index 09a02e2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Viga:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/et/header.tmpl.in b/templates/et/header.tmpl.in
deleted file mode 100644 (file)
index 24243d4..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Kodu&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Haldus&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Klassid&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Dokumentatsioon/abi&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Tööd&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Printerid&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/et/help-header.tmpl b/templates/et/help-header.tmpl
deleted file mode 100644 (file)
index c5b2be5..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Otsing - 
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:kõigis dokumentides}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Otsi">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Puhasta" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Abidokumendid</H3>
-
-<P CLASS="l0"><A HREF="/help{QUERY??QUERY={QUERY}:}">Kõik dokumendid</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Otsingutulemused - {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:kõigis dokumentides}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Midagi ei leitud.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Näita trükitavat versiooni"
-CLASS="button"></A></H1>:<H1>CUPS-i abi</H1>
-
-<P>See on CUPS-i abiliides. Sisestage otsingusõnad ülalolevasse kasti
-või klõpsake mõnele dokumentatsioonilingile abiinfo kuvamiseks.</P>
-
-<P>Kui Te pole veel CUPS-iga tuttav, lugege osa "<a
-href="overview.html">Overview of CUPS</a>". Kogenud kasutajad
-peaksid aga tutvuma osaga "<a href="whatsnew.html">What's New in CUPS
-1.3</a>".</P>
-
-<P><A HREF="http://www.cups.org/">CUPS-i kodulehekülg</A> pakub
-samuti palju materjali, kaasa arvatud kasutajate arutlusfoorumid, vastused
-levinumatele küsimustele ning vorm, mis võimaldab esitada veateateid
-ja soove.</P>}
diff --git a/templates/et/help-printable.tmpl b/templates/et/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/et/job-cancel.tmpl b/templates/et/job-cancel.tmpl
deleted file mode 100644 (file)
index da0bafc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Töö {job_id}</A> katkestatud.
diff --git a/templates/et/job-hold.tmpl b/templates/et/job-hold.tmpl
deleted file mode 100644 (file)
index ef4dca0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Tööd {job_id}</A> hoitakse trükkimast.
diff --git a/templates/et/job-moved.tmpl b/templates/et/job-moved.tmpl
deleted file mode 100644 (file)
index ca007aa..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Töö {job_id}</A>:Kõik tööd} on liigutatud printerisse
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/et/job-release.tmpl b/templates/et/job-release.tmpl
deleted file mode 100644 (file)
index 055c519..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Töö {job_id}</A> trükkimiseks vabastatud.
diff --git a/templates/et/job-restart.tmpl b/templates/et/job-restart.tmpl
deleted file mode 100644 (file)
index f2dee0f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Töö {job_id}</A> uuesti käivitatud.
diff --git a/templates/et/jobs-header.tmpl b/templates/et/jobs-header.tmpl
deleted file mode 100644 (file)
index 4c710a0..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Näita lõpetatud töid"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Näita kõiki töid">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Näita lõpetatud töid"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Näita aktiivseid töid">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Näita aktiivseid töid"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Näita kõiki töid">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Töid pole:Näidatakse {#job_id} tööd {total} {?which_jobs=?aktiivsest:{which_jobs=all?:lõpetatud}} tööst{total=1?:}}.</P>
diff --git a/templates/et/jobs.tmpl b/templates/et/jobs.tmpl
deleted file mode 100644 (file)
index 67d4ad2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Nimi&nbsp;</TH>
-<TH>Kasutaja&nbsp;</TH>
-<TH>Suurus&nbsp;</TH>
-<TH>Lehekülgi&nbsp;</TH>
-<TH>Olek&nbsp;</TH>
-<TH>Kontroll&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Teadmata:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Teadmata:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?ootel alates<BR>{time_at_creation}:{job_state=4?hoitakse alates<BR>{time_at_creation}:
-{job_state=5?töötluses alates<BR>{time_at_processing}:{job_state=6?peatatud:
-{job_state=7?katkestatud<BR>{time_at_completed}:{job_state=8?loobutud:lõpetatud<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Trüki töö uuesti" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Vabasta töö" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Hoia tööd" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Katkesta töö" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Liiguta töö" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/et/maintenance.tmpl b/templates/et/maintenance.tmpl
deleted file mode 100644 (file)
index c966241..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Hooldamiskäsud saadetud; töö ID on <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/et/modify-class.tmpl b/templates/et/modify-class.tmpl
deleted file mode 100644 (file)
index fd6b1a4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Klassi {printer_name} muutmine</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nimi:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Asukoht:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kirjeldus:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Liikmed:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Muuda klassi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/modify-printer.tmpl b/templates/et/modify-printer.tmpl
deleted file mode 100644 (file)
index 9f697c9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Printeri {printer_name} muutmine</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nimi:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Asukoht:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Arusaadava sisuga asukoht, näiteks "Laud 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kirjeldus:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Arusaadava sisuga kirjeldus, näiteks "HP LaserJet duplekseriga")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Edasi"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/norestart.tmpl b/templates/et/norestart.tmpl
deleted file mode 100644 (file)
index 84cfc5a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Serverit ei käivitatud uuesti, sest seadistusse ei tehtud mingeid muudatusi...</p>
diff --git a/templates/et/option-boolean.tmpl b/templates/et/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/et/option-conflict.tmpl b/templates/et/option-conflict.tmpl
deleted file mode 100644 (file)
index 16415ba..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Viga:</B> järgmised valikud on konfliktis:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Palun muutke konfliktide lahendamiseks vähemalt üht valikut.</P>
diff --git a/templates/et/option-header.tmpl b/templates/et/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/et/option-pickmany.tmpl b/templates/et/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/et/option-pickone.tmpl b/templates/et/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/et/option-trailer.tmpl b/templates/et/option-trailer.tmpl
deleted file mode 100644 (file)
index 188073f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Määra printeri valikud"></TD>
-</TR>
-</TABLE>
diff --git a/templates/et/pager.tmpl b/templates/et/pager.tmpl
deleted file mode 100644 (file)
index 0c9cdc6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Näita eelmist" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Sorteeri alanevalt" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Sorteeri tõusvalt" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Näita järgmist" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/et/printer-accept.tmpl b/templates/et/printer-accept.tmpl
deleted file mode 100644 (file)
index 8acec73..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-võtab nüüd töid vastu.</P>
diff --git a/templates/et/printer-added.tmpl b/templates/et/printer-added.tmpl
deleted file mode 100644 (file)
index 455c418..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> edukalt
-lisatud.
diff --git a/templates/et/printer-configured.tmpl b/templates/et/printer-configured.tmpl
deleted file mode 100644 (file)
index 5dbf70b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> edukalt
-seadistatud.
diff --git a/templates/et/printer-confirm.tmpl b/templates/et/printer-confirm.tmpl
deleted file mode 100644 (file)
index fec4bf0..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Hoiatus:</B> kas soovite tõesti kustutada printeri
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Kustuta printer"
-CLASS="button"></A></P>
diff --git a/templates/et/printer-default.tmpl b/templates/et/printer-default.tmpl
deleted file mode 100644 (file)
index 9adae5b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-on määratud serveri vaikimisi printeriks.</P>
-
-<BLOCKQUOTE><B>Märkus:</B> kõik kasutajate vaikeväärtused, mis on
-määratud käsuga <TT>lpoptions</TT>, tühistavad selle vaikeseadistuse.</BLOCKQUOTE>
diff --git a/templates/et/printer-deleted.tmpl b/templates/et/printer-deleted.tmpl
deleted file mode 100644 (file)
index aec0ced..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Printer {printer_name} edukalt kustutatud.
diff --git a/templates/et/printer-jobs-header.tmpl b/templates/et/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index b3d29de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Tööd</H3>
diff --git a/templates/et/printer-modified.tmpl b/templates/et/printer-modified.tmpl
deleted file mode 100644 (file)
index 0e5789a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> edukalt
-muudetud.
diff --git a/templates/et/printer-purge.tmpl b/templates/et/printer-purge.tmpl
deleted file mode 100644 (file)
index 3225c10..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-kõigist töödest puhastatud.</P>
diff --git a/templates/et/printer-reject.tmpl b/templates/et/printer-reject.tmpl
deleted file mode 100644 (file)
index e93de18..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-ei võta enam töid vastu.</P>
diff --git a/templates/et/printer-start.tmpl b/templates/et/printer-start.tmpl
deleted file mode 100644 (file)
index 533ac9b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-käivitatud.</P>
diff --git a/templates/et/printer-stop.tmpl b/templates/et/printer-stop.tmpl
deleted file mode 100644 (file)
index 601c50a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-peatatud.</P>
diff --git a/templates/et/printers-header.tmpl b/templates/et/printers-header.tmpl
deleted file mode 100644 (file)
index 5c37b37..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Printereid pole:Näidatakse {#printer_name} printerit {total} printerist{total=1?:}}.</P>
diff --git a/templates/et/printers.tmpl b/templates/et/printers.tmpl
deleted file mode 100644 (file)
index a9d1419..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (vaikimisi printer):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Kirjeldus:</B> {printer_info}<BR>
-<B>Asukoht:</B> {printer_location}<BR>
-<B>Valmistaja ja mudel:</B> {printer_make_and_model}<BR>
-<B>Printeri olek:</B> {printer_state=3?jõude:{printer_state=4?töötleb:peatatud}},
-{printer_is_accepting_jobs=0?ei võta töid vastu:võtab töid vastu}, {printer_is_shared=0?pole:} avaldatud.
-{?device_uri=?:<BR><B>Seadme URI:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Trüki testlehekülg" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Puhasta prindipead" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Trüki enesetesti lehekülg" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Käivita printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Peata printer" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Võta töid vastu" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Ära võta töid vastu" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Liiguta kõik tööd" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Katkesta kõik tööd" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Avalda printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Ära avalda printerit" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Muuda printerit" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Määra printeri valikud" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Kustuta printer" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Määra vaikeväärtuseks" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Määra lubatud kasutajad" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/et/restart.tmpl b/templates/et/restart.tmpl
deleted file mode 100644 (file)
index 7ec91b0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Palun oodake, kuni server taaskäivitub...</p>
diff --git a/templates/et/samba-export.tmpl b/templates/et/samba-export.tmpl
deleted file mode 100644 (file)
index 610d8ca..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Printerite eksport Sambasse</H2>
-
-{error?<P>Printerite eksport Sambasse ebaõnnestus:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Täpsemat infot annab <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A>.</P>:
-<P>Käesolev lehekülg võimaldab eksportida printereid Sambasse, et
-Windowsi kliendid saaksid neid kasutada ikoonide <VAR>Network
-Neighborhood</VAR> või <VAR>Network Places</VAR> abil oma töölaual.
-Teil peavad eelnevalt olema paigaldatud Windowsi PostScript
-printeridraiverid, nagu seda kirjeldab <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> manuaal.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Printerid:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Kõigi printerite eksport
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba kasutajanimi:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (nõutav)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba parool:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (nõutav)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Ekspordi printerid Sambasse"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/et/samba-exported.tmpl b/templates/et/samba-exported.tmpl
deleted file mode 100644 (file)
index b72a6b5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Printerid edukalt Sambasse eksporditud.</P>
diff --git a/templates/et/search.tmpl b/templates/et/search.tmpl
deleted file mode 100644 (file)
index c5e06ee..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Otsing - 
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?klassides:{SECTION=jobs?töödes:printerites}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Otsi">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Puhasta" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/et/set-printer-options-header.tmpl b/templates/et/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/et/set-printer-options-trailer.tmpl b/templates/et/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/et/test-page.tmpl b/templates/et/test-page.tmpl
deleted file mode 100644 (file)
index 4d5d88d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Testlehekülg saadetud; töö ID on <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/et/trailer.tmpl b/templates/et/trailer.tmpl
deleted file mode 100644 (file)
index 72871fb..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS ja CUPS-i logo on
-firma <A HREF="http://www.easysw.com">Easy Software
-Products</A> kaubamärgid. CUPS-i autoriõigus 1997-2006: Easy Software Products,
-kõik õigused kaitstud.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/et/users.tmpl b/templates/et/users.tmpl
deleted file mode 100644 (file)
index 2eaffed..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">{printer_name} lubatud kasutajad</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Kasutajad:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Neil kasutajatel lubatakse trükkida
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Neil kasutajatel keelatakse trükkida
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Määra lubatud kasutajad">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/add-class.tmpl b/templates/fr/add-class.tmpl
deleted file mode 100644 (file)
index 576d53f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Ajouter une classe</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nom :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Lieu :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Description :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Membres :</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Ajouter une classe"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/add-printer.tmpl b/templates/fr/add-printer.tmpl
deleted file mode 100644 (file)
index f27b415..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Ajouter une nouvelle imprimante</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nom :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>( Peut comporter tout caractère imprimable, "/", "#", et espace exceptés )</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Lieu :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>( Lieu compréhensible pour un utilisateur, comme "Labo 1" )</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Description :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>( Description compréhensible pour un utilisateur, comme "HP LaserJet recto/verso" )</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl
deleted file mode 100644 (file)
index 78c7f17..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Tâches d'administration">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Imprimantes</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Ajouter une imprimante" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Administrer les imprimantes" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Exporter les imprimantes vers SAMBA"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>Nouvelles imprimantes détectées:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Ajouter cette imprimante" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">Classes</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Ajouter une classe" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Administrer les classes" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Tâches d'impression</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Administrer les
-tâches" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Serveur</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Éditer le fichier de
-configuration" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Liste des accès"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Liste des erreurs"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Liste des pages"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Paramètres de base du serveur :</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Afficher les
-imprimantes partagées par d'autres systèmes<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les
-imprimantes publiques connectées à ce système<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser
-l'administration à distance<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les
-utilisateurs à annuler n'importe quelle tâche ( pas seulement les leurs )<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les
-informations de <I>debug</I> pour la résolution de problèmes</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Modifier
-les paramètres"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/fr/choose-device.tmpl b/templates/fr/choose-device.tmpl
deleted file mode 100644 (file)
index 14f19b7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Matériel pour {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Matériel :</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/choose-make.tmpl b/templates/fr/choose-make.tmpl
deleted file mode 100644 (file)
index 238d5d9..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Marque/Fabricant pour {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Marque :</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ou donnez un fichier PPD :</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Ajouter une imprimante:Modifier l'imprimante}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl
deleted file mode 100644 (file)
index 1efeeae..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Modèle/Pilote pour {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Modèle:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Ou donnez un fichier PPD :</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Ajouter une imprimante:Modifier l'imprimante}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/choose-serial.tmpl b/templates/fr/choose-serial.tmpl
deleted file mode 100644 (file)
index 5e51734..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Paramètres du port série pour {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Baud/s :</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Parité :</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Aucune
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Paire
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Impaire
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Bits données :</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Contrôle de flux :</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Auncun
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF ( Logiciel )
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS ( Matériel )
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR ( Matériel )
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/choose-uri.tmpl b/templates/fr/choose-uri.tmpl
deleted file mode 100644 (file)
index 1040178..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">URI du matériel pour {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">URI du matériel :</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Exemples :
-<PRE>
-    http://nom_machine:631/ipp/
-    http://nom_machine:631/ipp/port1
-
-    ipp://nom_machine/ipp/
-    ipp://nom_machine/ipp/port1
-
-    lpd://nom_machine/queue
-
-    socket://nom_machine
-    socket://nom_machine:9100
-</PRE>
-
-<P>cf. <A HREF="/help/network.html" TARGET="_blank">"Network
-Printers"</A> pour construire l'URI à employer avec votre imprimante.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/class-added.tmpl b/templates/fr/class-added.tmpl
deleted file mode 100644 (file)
index 097e508..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été ajoutée.
diff --git a/templates/fr/class-confirm.tmpl b/templates/fr/class-confirm.tmpl
deleted file mode 100644 (file)
index 95b4020..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Attention :</B> Êtes vous sûr(e) de vouloir supprimer la classe
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Supprimer la classe"
-CLASS="button"></A></P>
diff --git a/templates/fr/class-deleted.tmpl b/templates/fr/class-deleted.tmpl
deleted file mode 100644 (file)
index e7200e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La classe {printer_name} a bien été supprimée.
diff --git a/templates/fr/class-jobs-header.tmpl b/templates/fr/class-jobs-header.tmpl
deleted file mode 100644 (file)
index 8c6dd64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Tâches d'impression</H3>
diff --git a/templates/fr/class-modified.tmpl b/templates/fr/class-modified.tmpl
deleted file mode 100644 (file)
index e2e2c3d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été modifiée.
diff --git a/templates/fr/classes-header.tmpl b/templates/fr/classes-header.tmpl
deleted file mode 100644 (file)
index 953cec5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Aucune classe:Affichage de {#printer_name} classe{#printer_name=1?:s} sur {total}}.</P>
diff --git a/templates/fr/classes.tmpl b/templates/fr/classes.tmpl
deleted file mode 100644 (file)
index 4cedfc4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? ( Imprimante par défaut ) :}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Description :</B> {printer_info}<BR>
-<B>Lieu :</B> {printer_location}<BR>
-<B>État de la classe:</B> {printer_state=3?ne fait rien:{printer_state=4?en cours d'impression:arrêtée}},
-{printer_is_accepting_jobs=0?rejette les tâches:accepte les tâches}, {printer_is_shared=0?cachée:publique}.
-{?member_uris=?:<BR>Membres : {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimer une page de test" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Démarrer la classe" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Arrêter la classe" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accepter les tâches" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Rejeter les tâches" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annuler toutes les tâches" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publier l'imprimante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Cacher l'imprimante" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Modifier la classe" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Supprimer la classe" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Choisir par défaut" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/fr/edit-config.tmpl b/templates/fr/edit-config.tmpl
deleted file mode 100644 (file)
index 39ed9f0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Ficher de configuration du serveur</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Enregistrer les modifications"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Utiliser la configuration par défaut"></A></P>
-
-</FORM>
diff --git a/templates/fr/error-op.tmpl b/templates/fr/error-op.tmpl
deleted file mode 100644 (file)
index 85a1254..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Erreur :</P>
-
-<BLOCKQUOTE>Opération inconnue : "{op}"!</BLOCKQUOTE>
diff --git a/templates/fr/error.tmpl b/templates/fr/error.tmpl
deleted file mode 100644 (file)
index 834d131..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Erreur :}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in
deleted file mode 100644 (file)
index 1e9c6e5..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="HEADER">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="HEADER"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Accueil&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Classes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Documentation/Aide&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Tâches&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Imprimantes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/fr/help-header.tmpl b/templates/fr/help-header.tmpl
deleted file mode 100644 (file)
index eb1804d..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Rechercher dans 
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Tous les Documents}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Search">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Documents d'aide en ligne</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Tous les documents</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Résultats de la recherche dans {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Tous les Documents}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Aucun résultat.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Version imprimable"
-CLASS="button"></A></H1>:<H1>Pages d'aide de CUPS</H1>
-
-<P>Voici l'interface d'aide en ligne de CUPS. Entrez ci-dessus les mots à rechercher
-ou cliquez sur un lien ci-contre pour afficher l'ade en ligne du document.</P>
-
-<P><SMALL><B>NDT:</B> Cette interface n'a pas été traduite en Français. Si vous souhaitez vous
-atteler à cette tâche, merci d'aller au préalable sur le forum <A
-HREF="http://www.cups.org/newsgroups.php?gcups.development">cups.development</A>
-pour en informer les développeurs.</SMALL></P>
-
-<P>Si vous êtes un nouvel utilisateur de CUPS, lisez la page "<a
-href="overview.html">Overview of CUPS</a>". Il est conseillé aux utilisateurs
-habitués de lire la page "<a href="whatsnew.html">What's New in CUPS
-1.3</a>".</P>
-
-<P>La <A HREF="http://www.cups.org/">page d'accueil de CUPS</A> donne aussi
-accès à de nombreuses ressources, comme des forums de discussion pour les
-utilisateurs, des réponses aux questions fréquentes, et un formulaire pour
-soumettre des rapports de <I>bug</I> ou des demandes pour de nouvelles
-fonctionnalités.</P>}
diff --git a/templates/fr/help-printable.tmpl b/templates/fr/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/fr/job-cancel.tmpl b/templates/fr/job-cancel.tmpl
deleted file mode 100644 (file)
index 7e473c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été annulée.
diff --git a/templates/fr/job-hold.tmpl b/templates/fr/job-hold.tmpl
deleted file mode 100644 (file)
index eea3356..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> est retenue en attente.
diff --git a/templates/fr/job-move.tmpl b/templates/fr/job-move.tmpl
deleted file mode 100644 (file)
index 33f8cf5..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Transférer la tâche n°{job_id}:Transférer toutes les tâches}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nouvelle destination :</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Transférer {job_id?la tâche:les tâches}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/job-moved.tmpl b/templates/fr/job-moved.tmpl
deleted file mode 100644 (file)
index eb234ce..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">La tâche n°{job_id}</A>:Toutes les tâches}
-ont été transférées vers <A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/fr/job-release.tmpl b/templates/fr/job-release.tmpl
deleted file mode 100644 (file)
index bd1693b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été libérée pour l'impression.
diff --git a/templates/fr/job-restart.tmpl b/templates/fr/job-restart.tmpl
deleted file mode 100644 (file)
index 166cf86..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été redémarrée.
diff --git a/templates/fr/jobs-header.tmpl b/templates/fr/jobs-header.tmpl
deleted file mode 100644 (file)
index ddf82f3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Montrer les tâches terminées"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Montrer toutes les tâches">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Montrer les tâches terminées"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Montrer les tâches en cours">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Montrer les tâches en cours"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Montrer toutes les tâches">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Aucune tâche:Affichage de {#job_id}
-tâche{#job_id=1?:s} {?which_jobs=?en cours:{which_jobs=all?:terminée{#job_id=1?:s}}} sur {total}}.</P>
diff --git a/templates/fr/jobs.tmpl b/templates/fr/jobs.tmpl
deleted file mode 100644 (file)
index c727ed1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Liste de tâches">
-<TR CLASS="data">
-<TH>N°&nbsp;</TH>
-<TH>Nom&nbsp;</TH>
-<TH>Utilisateur&nbsp;</TH>
-<TH>Taille&nbsp;</TH>
-<TH>Pages&nbsp;</TH>
-<TH>État&nbsp;</TH>
-<TH>Contrôle&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Inconnue:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}ko&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Inconnue:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?en attente depuis le<BR>{time_at_creation}:{job_state=4?retenue depuis le<BR>{time_at_creation}:
-{job_state=5?en cours depuis le<BR>{time_at_processing}:{job_state=6?arrêtée:
-{job_state=7?annulée le<BR>{time_at_completed}:{job_state=8?abandonnée:terminée le<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Redémarrer la tâche" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Libérer la tâche" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Retenir la tâche" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Annuler la tâche" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Transférer la tâche" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/fr/maintenance.tmpl b/templates/fr/maintenance.tmpl
deleted file mode 100644 (file)
index ab2330d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Les commandes de maintenance ont été envoyées ; l'identifiant de tâche est <A
-HREF="/printers/{printer_name}"> {printer_name}-{job_id}</A>.</P>
diff --git a/templates/fr/modify-class.tmpl b/templates/fr/modify-class.tmpl
deleted file mode 100644 (file)
index 76cca38..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Modifier la classe {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nom :</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Lieu :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Description :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Membres :</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modifier la classe"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/modify-printer.tmpl b/templates/fr/modify-printer.tmpl
deleted file mode 100644 (file)
index 8834f6f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Modifier l'imprimante {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nom :</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Lieu :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>( Lieu compréhensible pour un utilisateur, comme "Labo 1" )</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Description :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>( Description compréhensible pour un utilisateur, comme "HP LaserJet recto/verso" )</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/norestart.tmpl b/templates/fr/norestart.tmpl
deleted file mode 100644 (file)
index 520980b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Le serveur n'a pas été redémarré parce que la configuration n'a pas été modifiée...</p>
diff --git a/templates/fr/option-boolean.tmpl b/templates/fr/option-boolean.tmpl
deleted file mode 100644 (file)
index cbac38a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
-NAME="{keyword}">{keytext}</A> :</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/fr/option-conflict.tmpl b/templates/fr/option-conflict.tmpl
deleted file mode 100644 (file)
index 4746ec8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Erreur :</B> Les options suivantes sont incompatibles entre elles :</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Veuillez modifier une ou plusieurs des ces options pour résoudre les conflits.</P>
diff --git a/templates/fr/option-header.tmpl b/templates/fr/option-header.tmpl
deleted file mode 100644 (file)
index 38491db..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name} : {group}</H2>
-
-<TABLE>
diff --git a/templates/fr/option-pickmany.tmpl b/templates/fr/option-pickmany.tmpl
deleted file mode 100644 (file)
index d59f8cb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
-NAME="{keyword}">{keytext}</A> :</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/fr/option-pickone.tmpl b/templates/fr/option-pickone.tmpl
deleted file mode 100644 (file)
index 3c74fca..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
-NAME="{keyword}">{keytext}</A> :</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/fr/option-trailer.tmpl b/templates/fr/option-trailer.tmpl
deleted file mode 100644 (file)
index 203796a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif"
-ALT="Définir les options de l'imprimante"></TD>
-</TR>
-</TABLE>
diff --git a/templates/fr/pager.tmpl b/templates/fr/pager.tmpl
deleted file mode 100644 (file)
index 5b0d3bf..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Mise en page">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG
-        SRC="/images/button-show-previous.gif" ALT="Montrer les précédentes" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A
-        HREF="{THISURL}&amp;ORDER=asc"><IMG
-        SRC="/images/button-sort-ascending.gif" ALT="Par ordre croissant" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Par ordre décroissant" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG
-        SRC="/images/button-show-next.gif" ALT="Montrer les suivantes" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/fr/printer-accept.tmpl b/templates/fr/printer-accept.tmpl
deleted file mode 100644 (file)
index 64e4611..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-accepte désormais les tâches d'impression.</P>
diff --git a/templates/fr/printer-added.tmpl b/templates/fr/printer-added.tmpl
deleted file mode 100644 (file)
index 67a7ae0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été ajoutée.
diff --git a/templates/fr/printer-configured.tmpl b/templates/fr/printer-configured.tmpl
deleted file mode 100644 (file)
index 808d51e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été configurée.
diff --git a/templates/fr/printer-confirm.tmpl b/templates/fr/printer-confirm.tmpl
deleted file mode 100644 (file)
index 8ffcdf9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Attention :</B> Êtes-vous sûr(e) de vouloir supprimer l'imprimante
-{printer_name} ?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Supprimer l'imprimante"
-CLASS="button"></A></P>
diff --git a/templates/fr/printer-default.tmpl b/templates/fr/printer-default.tmpl
deleted file mode 100644 (file)
index 2ce4ef8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>{is_class?La classe:L'imprimante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-a été définie comme imprimante par défaut sur le serveur.</P>
-
-<BLOCKQUOTE><B>NB:</B> Pour un utilisateur qui a défini un paramètre par défaut
-via la commande <TT>lpoptions</TT>, le paramètre du serveur sera
-ignoré.</BLOCKQUOTE>
diff --git a/templates/fr/printer-deleted.tmpl b/templates/fr/printer-deleted.tmpl
deleted file mode 100644 (file)
index 2f31e34..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>L'imprimante {printer_name} a bien été supprimée.
diff --git a/templates/fr/printer-jobs-header.tmpl b/templates/fr/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index 8c6dd64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Tâches d'impression</H3>
diff --git a/templates/fr/printer-modified.tmpl b/templates/fr/printer-modified.tmpl
deleted file mode 100644 (file)
index 16bec9a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été modifiée.
diff --git a/templates/fr/printer-purge.tmpl b/templates/fr/printer-purge.tmpl
deleted file mode 100644 (file)
index fe6b914..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:L'imprimante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-a été nettoyée de toute tâche... d'impression !</P>
diff --git a/templates/fr/printer-reject.tmpl b/templates/fr/printer-reject.tmpl
deleted file mode 100644 (file)
index aee5a5f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:L'imprimante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-n'accepte plus les tâches d'impression.</P>
diff --git a/templates/fr/printer-start.tmpl b/templates/fr/printer-start.tmpl
deleted file mode 100644 (file)
index 3691605..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:L'imprimante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-a été démarrée.</P>
diff --git a/templates/fr/printer-stop.tmpl b/templates/fr/printer-stop.tmpl
deleted file mode 100644 (file)
index df12bee..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:L'imprimante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-a été arrêtée.</P>
diff --git a/templates/fr/printers-header.tmpl b/templates/fr/printers-header.tmpl
deleted file mode 100644 (file)
index b97d99f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Aucune imprimante:Affichage de {#printer_name} imprimante{#printer_name=1?:s}} sur {total}.</P>
diff --git a/templates/fr/printers.tmpl b/templates/fr/printers.tmpl
deleted file mode 100644 (file)
index d392b25..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A
-HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (
-imprimante par défaut ) :}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Description :</B> {printer_info}<BR>
-<B>Lieu :</B> {printer_location}<BR>
-<B>Marque et modèle :</B> {printer_make_and_model}<BR>
-<B>État de l'imprimante :</B> {printer_state=3?ne fait rien:{printer_state=4?en cours d'impression:arrêtée}},
-{printer_is_accepting_jobs=0?rejette les tâches:accepte les tâches}, {printer_is_shared=0?cachée:publique}.
-{?device_uri=?:<BR><B>URI du matériel :</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimer la page de test CUPS" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Nettoyer les têtes d'impression" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Imprimer la page de test de l'imprimante" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Démarrer l'imprimante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Arrêter l'imprimante" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accepter les tâches" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Rejeter les tâches" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Transférer toutes les tâches" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annuler toutes les tâches" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publier l'imprimante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Cacher l'imprimante" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Modifier l'imprimante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Définir les options de l'imprimante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Supprimer l'imprimante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Définir par défaut" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/fr/restart.tmpl b/templates/fr/restart.tmpl
deleted file mode 100644 (file)
index b78344d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Attendez s'il vous plaît, que le serveur redémarre...</p>
diff --git a/templates/fr/samba-export.tmpl b/templates/fr/samba-export.tmpl
deleted file mode 100644 (file)
index 3a51c93..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Exporter des imprimantes vers SAMBA</H2>
-
-{error?<P>Impossible d'exporter les imprimantes vers SAMBA \:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Regardez le fichier <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> pour plus d'informations.</P>:
-<P>Cette page vous permet d'exporter des imprimantes vers SAMBA de sorte que des
-clients Windows puissent y accéder via l'icône <VAR>Voisinage réseau</VAR> ou
-<VAR>Favoris réseau</VAR> du bureau. Vous devez au préalable installer les
-pilotes Windows d'imprimante PostScript : cf. la page <i>man</i> <A
-HREF="/help/man-cupsaddsmb.html" TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Imprimantes :</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Exporter toutes les imprimantes
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Utilisateur SAMBA :</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> ( indispensable )</TD>
-</TR>
-<TR>
-<TH CLASS="label">Mot-de-passe SAMBA :</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> ( indispensable )</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Exporter les imprimantes vers SAMBA"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/fr/samba-exported.tmpl b/templates/fr/samba-exported.tmpl
deleted file mode 100644 (file)
index 2eca039..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Les imprimantes ont bien été exportées vers SAMBA.</P>
diff --git a/templates/fr/search.tmpl b/templates/fr/search.tmpl
deleted file mode 100644 (file)
index 667eedb..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Rechercher dans 
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?les classes:{SECTION=jobs?les tâches:les imprimantes}}} :</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Rechercher">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Nettoyer" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/fr/set-printer-options-header.tmpl b/templates/fr/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/fr/set-printer-options-trailer.tmpl b/templates/fr/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/fr/test-page.tmpl b/templates/fr/test-page.tmpl
deleted file mode 100644 (file)
index 60c16ac..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La page de test a été envoyée ; l'identifiant de la tâche est <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl
deleted file mode 100644 (file)
index 9d03e75..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Le logiciel CUPS ( Common UNIX Printing System ) et son logo sont
-propriété commerciale de <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS est sous copyright 1997-2006 par Easy Software Products, Tous
-Droits Réservés.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/fr/users.tmpl b/templates/fr/users.tmpl
deleted file mode 100644 (file)
index 8c5486a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Utilisateurs autorisés à utiliser {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Utilisateurs :</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Autoriser ces utilisateurs à imprimer
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Empêcher ces utilisateurs d'imprimer
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/add-class.tmpl b/templates/he/add-class.tmpl
deleted file mode 100644 (file)
index 1c6b72a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">הוסף מחלקה</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">שם:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">מיקום:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">תיאור:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">חברים:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="הוסף מחלקה"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/add-printer.tmpl b/templates/he/add-printer.tmpl
deleted file mode 100644 (file)
index 924dfeb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">הוסף מדפסת חדשה</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">שם:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(יכול להכיל כל תו דפיס למעט "/", "#", ורווח)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">מיקום:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(מיקום במלל חופשי כגון "חדר 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">תיאור:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(תיאור במלל חופשי כגון "HP LaserJet עם יחידת הדפסה דו-צידית")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/admin.tmpl b/templates/he/admin.tmpl
deleted file mode 100644 (file)
index 991d2ea..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="משימות ניהול">
-<TR><TD VALIGN="TOP" NOWRAP>
-
-<H2 CLASS="title">מדפסות</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="הוסף מדפסת" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="נהל מדפסות" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="ייצא מדפסות ל Samba"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>מדפסות חדשות נמצאו:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="הוסף מדפסת זו" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">מחלקות</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="הוסף מחלקה" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="נהל מחלקות" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">עבודות</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="נהל עבודות" 
-CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">שרת</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="ערוך קובץ הגדרות" 
-CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="צפה בלוג גישה"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="צפה בלוג שגיאות"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="צפה בלוג דפים"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>הגדרות שרת בסיסיות:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> הצג מדפסות משותפות במערכות אחרות<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> שתף מדפסות מפורסמות המותקנות במערכת זו<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> אפשר ניהול מרוחק<BR>
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> אפשר למשתמשים לבטל כל עבודה שהיא (לא רק שלהם)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> שמור נתוני ניפוי שגיאות (debug) לצורך פתרון תקלות</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="שנה הגדרות"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/he/choose-device.tmpl b/templates/he/choose-device.tmpl
deleted file mode 100644 (file)
index 63c70e1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">התקן עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">התקן:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI" dir=ltr>
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/choose-make.tmpl b/templates/he/choose-make.tmpl
deleted file mode 100644 (file)
index 88b9ea3..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">סוג/יצרן עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">סוג:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10" dir=ltr>
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">או ספק קובץ PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?הוסף מדפסת:שנה מדפסת}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/choose-model.tmpl b/templates/he/choose-model.tmpl
deleted file mode 100644 (file)
index b7fa4ee..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">דגם/מנהל-התקן עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">דגם:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10" dir=ltr>
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">או ספק קובץ PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?הוסף מדפסת:שנה מדפסת}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/choose-serial.tmpl b/templates/he/choose-serial.tmpl
deleted file mode 100644 (file)
index aefce47..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">הגדרות פתחה (Port) טורית עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">קצב שידור:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">סיבית בדיקת זוגיות:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>ללא
-<OPTION VALUE="even" {?parity=even?SELECTED:}>זוגי
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>אי-זוגי
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">סיביות נתונים:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">בקרת זרימה:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>ללא
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (תוכנה)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (חומרה)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (חומרה)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/choose-uri.tmpl b/templates/he/choose-uri.tmpl
deleted file mode 100644 (file)
index 1c74957..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">URI של ההתקן עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">URI של ההתקן:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}" dir=ltr></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>דוגמאות:
-<PRE dir=ltr>
-    http://hostname:631/ipp/
-    http://hostname:631/ipp/port1
-
-    ipp://hostname/ipp/
-    ipp://hostname/ipp/port1
-
-    lpd://hostname/queue
-
-    socket://hostname
-    socket://hostname:9100
-</PRE>
-
-<P>ראה <A HREF="/help/network.html" TARGET="_blank">"מדפסות רשת"</A>
-עבור ה URI המתאים להגדרת המדפסת שלך.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/class-added.tmpl b/templates/he/class-added.tmpl
deleted file mode 100644 (file)
index 40d1735..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מחלקה <A HREF="/classes/{printer_name}">{printer_name}</A> הוספה בהצלחה.
diff --git a/templates/he/class-confirm.tmpl b/templates/he/class-confirm.tmpl
deleted file mode 100644 (file)
index 760e375..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P><B>אזהרה:</B> האם את/ה בטוח/ה שאת/ה רוצה למחוק את המחלקה {printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="מחק מחלקה"
-CLASS="button"></A></P>
diff --git a/templates/he/class-deleted.tmpl b/templates/he/class-deleted.tmpl
deleted file mode 100644 (file)
index 49e0d08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מחלקה {printer_name} נמחקה בהצלחה.
diff --git a/templates/he/class-jobs-header.tmpl b/templates/he/class-jobs-header.tmpl
deleted file mode 100644 (file)
index e880919..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">עבודות</H3>
diff --git a/templates/he/class-modified.tmpl b/templates/he/class-modified.tmpl
deleted file mode 100644 (file)
index 8b44c8c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מחלקה <A HREF="/classes/{printer_name}">{printer_name}</A> שונתה בהצלחה.</P>
diff --git a/templates/he/classes-header.tmpl b/templates/he/classes-header.tmpl
deleted file mode 100644 (file)
index 5a59a92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?אין מחלקות:מציג {#printer_name} מתוך {total} מחלק{total=1?ה:ות}}.</P>
diff --git a/templates/he/classes.tmpl b/templates/he/classes.tmpl
deleted file mode 100644 (file)
index 1c70235..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (מדפסת ברירת מחדל):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>תיאור:</B> {printer_info}<BR>
-<B>מיקום:</B> {printer_location}<BR>
-<B>מצב מחלקה:</B> {printer_state=3?פנויה:{printer_state=4?מעבדת עבודה:עצורה}},
-{printer_is_accepting_jobs=0?דוחה עבודות:מקבלת עבודות}, {printer_is_shared=0?לא:} מפורסמת.
-{?member_uris=?:<BR>חברים: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="הדפס עמוד ניסיון" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="הפעל מחלקה" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="עצור מחלקה" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="קבל עבודות" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="דחה עבודות" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="בטל כל העבודות" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="פרסם מדפסת" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="בטל פרסום מדפסת" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="שנה מחלקה" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="מחק מחלקה" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="קבע כברירת מחדל" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="קבע משתמשים מורשים" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/he/edit-config.tmpl b/templates/he/edit-config.tmpl
deleted file mode 100644 (file)
index 74f7be9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">קובץ הגדרות של השרת</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25" dir=ltr>{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="שמור שינויים"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="השתמש בקובץ הגדרות התחלתי"></A></P>
-
-</FORM>
diff --git a/templates/he/error-op.tmpl b/templates/he/error-op.tmpl
deleted file mode 100644 (file)
index 800709e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>שגיאה:</P>
-
-<BLOCKQUOTE>פעולה לא מוכרת: "{op}"!</BLOCKQUOTE>
diff --git a/templates/he/error.tmpl b/templates/he/error.tmpl
deleted file mode 100644 (file)
index c6a3e55..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:שגיאה:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/he/header.tmpl.in b/templates/he/header.tmpl.in
deleted file mode 100644 (file)
index f5f78f3..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-right.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;דף הבית&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;ניהול&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;מחלקות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;תיעוד/עזרה&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;עבודות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;מדפסות&nbsp;&nbsp;<IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/he/help-header.tmpl b/templates/he/help-header.tmpl
deleted file mode 100644 (file)
index ca5ec5c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>חפש
-ב{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:כל התיעוד}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="חפש">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="נקה" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar" dir=ltr>
-<H3 CLASS="title" dir=rtl>מסמכי עזרה מקוונים</H3>
-
-<P CLASS="l0" dir=rtl><A HREF="/help/{QUERY??QUERY={QUERY}:}">כל המסמכים</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>חפש תוצאות ב{HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:כל המסמכים}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (ב<I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>לא נמצאו התאמות.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="צפה בגרסת הדפסה"
-CLASS="button"></A></H1><DIV dir=ltr>:<H1>דפי עזרה של CUPS</H1>
-
-<P>זהו ממשק העזרה המקוונת של CUPS. הקלד מילות חיפוש מעלה או הקלק על קישורי התיעוד כדי להציג עזרה מקוונת.</P>
-
-<P>אם את/ה משתמש חדש/ה ב CUPS, קרא/י את עמוד "<a
-href="overview.html">סקירה כללית של CUPS</a>". משתמשים וותיקים רצוי שיקראו את עמוד "<a href="whatsnew.html">מה חדש ב CUPS 1.3</a>".</P>
-
-<P>ה<A HREF="http://www.cups.org/">דף הבית של CUPS</A> גם מספק
-משאבים רבים לרבות פורומי משתמשים, תשובות לשאלות נפוצות,
-וטופס להגשת דיווחי באגים ובקשות שיפורים.</P>}
diff --git a/templates/he/help-printable.tmpl b/templates/he/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/he/job-cancel.tmpl b/templates/he/job-cancel.tmpl
deleted file mode 100644 (file)
index 3528fd9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">עבודה {job_id}</A> בוטלה.
diff --git a/templates/he/job-hold.tmpl b/templates/he/job-hold.tmpl
deleted file mode 100644 (file)
index 45aba58..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">עבודה {job_id}</A> הושהתה מהדפסה.
diff --git a/templates/he/job-move.tmpl b/templates/he/job-move.tmpl
deleted file mode 100644 (file)
index 4ca058d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?העבר עבודה {job_id}:העבר כל העבודות}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">יעד חדש:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="העבר עבוד{job_id?ה:ות}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/job-moved.tmpl b/templates/he/job-moved.tmpl
deleted file mode 100644 (file)
index 3f28ce9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">עבודה {job_id} הועברה</A>:כל העבודות הועברו}
-ל<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/he/job-release.tmpl b/templates/he/job-release.tmpl
deleted file mode 100644 (file)
index 625889f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">עבודה {job_id}</A> שוחררה להדפסה.
diff --git a/templates/he/job-restart.tmpl b/templates/he/job-restart.tmpl
deleted file mode 100644 (file)
index 5c2f6c2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">עבודה {job_id}</A> שוחזרה.
diff --git a/templates/he/jobs-header.tmpl b/templates/he/jobs-header.tmpl
deleted file mode 100644 (file)
index 9c8c140..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="הצג עבודות שהושלמו"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="הצג כל העבודות">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="הצג עבודות שהושלמו"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="הצג עבודות פעילות">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="הצג עבודות פעילות"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="הצג כל העבודות">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?אין עבודות:מציג {#job_id} מתוך {total} עבוד{total=1?ה:ות} {?which_jobs=?פעיל{total=1?ה:ות}:{which_jobs=all?:שהושלמ{total=1?ה:ו}}}}.</P>
diff --git a/templates/he/jobs.tmpl b/templates/he/jobs.tmpl
deleted file mode 100644 (file)
index 81983fe..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="רשימת עבודות">
-<TR CLASS="data">
-<TH>מזהה&nbsp;</TH>
-<TH>שם&nbsp;</TH>
-<TH>משתמש&nbsp;</TH>
-<TH>גודל&nbsp;</TH>
-<TH>דפים&nbsp;</TH>
-<TH>מצב&nbsp;</TH>
-<TH>שליטה&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?לא ידוע:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?לא ידוע:{?job_media_sheets_completed}}</TD>
-<TD>{job_state=3?ממתין מאז<BR>{time_at_creation}:{job_state=4?מושהה מאז<BR>{time_at_creation}:
-{job_state=5?מתבצע מאז<BR>{time_at_processing}:{job_state=6?עצור:
-{job_state=7?בוטל ב<BR>{time_at_completed}:{job_state=8?נכשל:הושלם ב<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="שחזר עבודה" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="שחרר עבודה" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="השהה עבודה" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="בטל עבודה" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="העבר עבודה" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/he/maintenance.tmpl b/templates/he/maintenance.tmpl
deleted file mode 100644 (file)
index 6b3ffd7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>פקודות תחזוקה נשלחו; מזהה עבודה הוא <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/he/modify-class.tmpl b/templates/he/modify-class.tmpl
deleted file mode 100644 (file)
index c5474db..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">שנה מחלקה {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">שם:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">מיקום:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">תיאור:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">חברים:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="שנה מחלקה"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/modify-printer.tmpl b/templates/he/modify-printer.tmpl
deleted file mode 100644 (file)
index e251edc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">שנה מדפסת {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">שם:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">מיקום:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(מיקום במלל חופשי כגון "חדר 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">תיאור:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(תיאור במלל חופשי כגון "HP LaserJet עם יחידת הדפסה דו-צידית")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="המשך"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/norestart.tmpl b/templates/he/norestart.tmpl
deleted file mode 100644 (file)
index 229a9e1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>השרת לא אותחל כיוון שלא נעשו שינויים בהגדרות...</p>
diff --git a/templates/he/option-boolean.tmpl b/templates/he/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/he/option-conflict.tmpl b/templates/he/option-conflict.tmpl
deleted file mode 100644 (file)
index 4faac2b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>שגיאה:</B> האפשרויות הבאות מתנגשות:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>נא שנה אפשרות אחת או יותר כדי לפתור את ההתנגשויות.</P>
diff --git a/templates/he/option-header.tmpl b/templates/he/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/he/option-pickmany.tmpl b/templates/he/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/he/option-pickone.tmpl b/templates/he/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/he/option-trailer.tmpl b/templates/he/option-trailer.tmpl
deleted file mode 100644 (file)
index bc9547f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="קבע אפשרויות מדפסת"></TD>
-</TR>
-</TABLE>
diff --git a/templates/he/pager.tmpl b/templates/he/pager.tmpl
deleted file mode 100644 (file)
index f69cc30..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="הצג הקודם" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="מיין בסדר עולה" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="מיין בסדר יורד" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="LEFT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="הצג הבא" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/he/printer-accept.tmpl b/templates/he/printer-accept.tmpl
deleted file mode 100644 (file)
index ad4731b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-מקבלת כעת עבודות.</P>
diff --git a/templates/he/printer-added.tmpl b/templates/he/printer-added.tmpl
deleted file mode 100644 (file)
index b02d95b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מדפסת <A HREF="/printers/{printer_name}">{printer_name}</A> הוספה בהצלחה.
diff --git a/templates/he/printer-configured.tmpl b/templates/he/printer-configured.tmpl
deleted file mode 100644 (file)
index a9a58ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מדפסת <A HREF="/printers/{printer_name}">{printer_name}</A> הוגדרה בהצלחה.
diff --git a/templates/he/printer-confirm.tmpl b/templates/he/printer-confirm.tmpl
deleted file mode 100644 (file)
index 4758f1f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P><B>אזהרה:</B> האם את/ה בטוח/ה שברצונך למחוק את המדפסת {printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="מחק מדפסת"
-CLASS="button"></A></P>
diff --git a/templates/he/printer-default.tmpl b/templates/he/printer-default.tmpl
deleted file mode 100644 (file)
index 139b57a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P>{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-הוגדרה כמדפסת ברירת-המחדל בשרת.</P>
-
-<BLOCKQUOTE><B>הערה:</B> איזושהי ברירת-מחדל ברמת משתמש שהוגדרה עם הפקודה
-<TT>lpoptions</TT> תקבל עדיפות על-פני הגדרת ברירת-מחדל זו.</BLOCKQUOTE>
diff --git a/templates/he/printer-deleted.tmpl b/templates/he/printer-deleted.tmpl
deleted file mode 100644 (file)
index 8f3aee1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מדפסת {printer_name} נמחקה בהצלחה.
diff --git a/templates/he/printer-jobs-header.tmpl b/templates/he/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index e880919..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">עבודות</H3>
diff --git a/templates/he/printer-modified.tmpl b/templates/he/printer-modified.tmpl
deleted file mode 100644 (file)
index 395c54b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מדפסת <A HREF="/printers/{printer_name}">{printer_name}</A> שונתה בהצלחה.
diff --git a/templates/he/printer-purge.tmpl b/templates/he/printer-purge.tmpl
deleted file mode 100644 (file)
index a847b97..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>כל העבודות נמחקו מ{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>.</P>
diff --git a/templates/he/printer-reject.tmpl b/templates/he/printer-reject.tmpl
deleted file mode 100644 (file)
index 6a48c42..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-כבר אינה מקבלת עבודות.</P>
diff --git a/templates/he/printer-start.tmpl b/templates/he/printer-start.tmpl
deleted file mode 100644 (file)
index 0e97347..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-הופעלה.</P>
diff --git a/templates/he/printer-stop.tmpl b/templates/he/printer-stop.tmpl
deleted file mode 100644 (file)
index 0cb8155..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?מחלקה:מדפסת} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-נעצרה.</P>
diff --git a/templates/he/printers-header.tmpl b/templates/he/printers-header.tmpl
deleted file mode 100644 (file)
index c934a5e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?אין מדפסות:מציג {#printer_name} מתוך {total} מדפס{total=1?ת:ות}}.</P>
diff --git a/templates/he/printers.tmpl b/templates/he/printers.tmpl
deleted file mode 100644 (file)
index dd10d08..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (מדפסת ברירת מחדל):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>תיאור:</B> {printer_info}<BR>
-<B>מיקום:</B> {printer_location}<BR>
-<B>סוג ודגם:</B> <SPAN dir=ltr>{printer_make_and_model}</SPAN><BR>
-<B>מצב מדפסת:</B> {printer_state=3?פנויה:{printer_state=4?מעבדת עבודה:עצורה}},
-{printer_is_accepting_jobs=0?דוחה עבודות:מקבלת עבודות}, {printer_is_shared=0?לא:} מפורסמת.
-{?device_uri=?:<BR><B>URI של התקן:</B> <SPAN dir=ltr>{device_uri}</SPAN>}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="הדפס עמוד ניסיון" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="נקה ראשי הדפסה" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="הדפס דף בדיקה-עצמית" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="הפעל מדפסת" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="עצור מדפסת" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="קבל עבודות" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="דחה עבודות" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="העבר כל העבודות" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="בטל כל העבודות" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="פרסם מדפסת" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="בטל פרסום מדפסת" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="שנה מדפסת" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="קבע אפשרויות מדפסת" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="מחק מדפסת" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="קבע כברירת מחדל" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="קבע משתמשים מורשים" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/he/restart.tmpl b/templates/he/restart.tmpl
deleted file mode 100644 (file)
index 6cda4c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>נא המתן בעת שהשרת מאותחל...</P>
diff --git a/templates/he/samba-export.tmpl b/templates/he/samba-export.tmpl
deleted file mode 100644 (file)
index 028550a..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">ייצא מדפסות ל Samba</H2>
-
-{error?<P>כשלון בייצוא מדפסות ל Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>התייעץ בקובץ <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> עבור מידע נוסף.</P>:
-<P>עמוד זה מאפשר לך לייצא מדפסות ל Samba כך שעמדות
-Windows יוכלו לקבל גישה דרך צלמיות <VAR>שכנים ברשת</VAR> או
-<VAR>מיקומי רשת</VAR> בשולחן העבודה. יש ראשית להתקין בעמדת ה
-Windows מנהל מדפסת PostScript כמו שמתואר בעמוד man של
-<A HREF="/help/man-cupsaddsmb.html" TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">מדפסות:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> ייצא כל המדפסות
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">שם משתמש Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (נדרש)</TD>
-</TR>
-<TR>
-<TH CLASS="label">סיסמת Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (נדרש)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="ייצא מדפסות ל Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/he/samba-exported.tmpl b/templates/he/samba-exported.tmpl
deleted file mode 100644 (file)
index ef73e30..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>מדפסות יוצאו ל samba בהצלחה.</P>
diff --git a/templates/he/search.tmpl b/templates/he/search.tmpl
deleted file mode 100644 (file)
index c39f5d3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>חפש
-ב{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?מחלקות:{SECTION=jobs?עבודות:מדפסות}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="חפש">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="נקה" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/he/set-printer-options-header.tmpl b/templates/he/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/he/set-printer-options-trailer.tmpl b/templates/he/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/he/test-page.tmpl b/templates/he/test-page.tmpl
deleted file mode 100644 (file)
index 587109f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>עמוד ניסיון נשלח; מזהה העבודה הוא <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/he/trailer.tmpl b/templates/he/trailer.tmpl
deleted file mode 100644 (file)
index e16e8bd..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;" dir=ltr>
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2006 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
-
-</TD>
-
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/he/users.tmpl b/templates/he/users.tmpl
deleted file mode 100644 (file)
index 8e4ecc0..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">משתמשים מורשים עבור {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">משתמשים:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>הרשה למשתמשים אלה להדפיס
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>דחה משתמשים אלה מלהדפיס
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="קבע משתמשים מורשים">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index 10966a70b95d1b22150bfd8f8fce3057db4cf4ba..00c215e1f9557f896c57c8ea56b9a5f9e4459d71 100644 (file)
@@ -2,62 +2,30 @@
 <HTML>
 <HEAD>
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+       <TITLE>{title} - CUPS 1.4svn-r6854</TITLE>
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
+       <LINK REL="SHORTCUT ICON" HREF="/favicon.png" TYPE="image/png">
+       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
 </HEAD>
 <BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TABLE CLASS="page" SUMMARY="{title}">
+<TR><TD CLASS="body">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
+<TR HEIGHT="32">
+<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
+SRC="/images/left.gif" WIDTH="64" HEIGHT="32" BORDER="0" ALT=""></A></TD>
+<TD CLASS="unsel"><A HREF="/">&nbsp;&nbsp;Home&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Online&nbsp;Help&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Jobs&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Printers&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="16" HEIGHT="32" ALT=""></TD>
 </TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Home&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Classes&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Documentation/Help&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Jobs&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Printers&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
+</TABLE>
+<IMG SRC="/images/shadow.png" WIDTH="100%" HEIGHT="4" ALT="">
 
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
+<H1>{title}</H1>
index 25b713e4c6443d4284810803fe6dbb5766a4648e..68833c0ad185ba5e683f18d2cfec55fa7036537e 100644 (file)
@@ -3,15 +3,17 @@
 
 <P ALIGN="CENTER"><B>Search in
 {HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:All Documents}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Search">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="60" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Search">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Clear"></P>
 
 </FORM>
 
 <!-- Bookmarks -->
-<DIV CLASS="sidebar">
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Contents">
+<TR><TD>
+
 <H3 CLASS="title">On-Line Help Documents</H3>
 
 <P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">All Documents</A></P>
@@ -19,7 +21,8 @@ SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
 
 {[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
 }
-</DIV>
+</TD></TR>
+</TABLE></DIV>
 
 {QUERY?<P>Search Results in {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:All Documents}}\:</P>
 {QTEXT?<UL>
@@ -27,10 +30,7 @@ SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
 {QTEXT?</UL>:}
 :<P>No matches found.</P>}
 <HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="View Printable Version"
-CLASS="button"></A></H1>:<H1>CUPS Help Pages</H1>
+{HELPTITLE?<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="View Printable Version"></FORM>:
 
 <P>This is the CUPS on-line help interface. Enter search words
 above or click on any of the documentation links to display
diff --git a/templates/it/add-class.tmpl b/templates/it/add-class.tmpl
deleted file mode 100644 (file)
index 92d5e77..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Aggiungi classe</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nome:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Posizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descrizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Membri:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Aggiungi classe"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/add-printer.tmpl b/templates/it/add-printer.tmpl
deleted file mode 100644 (file)
index b8c440f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Add New Printer</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(May contain any printable characters except "/", "#", and space)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Location:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Description:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/admin.tmpl b/templates/it/admin.tmpl
deleted file mode 100644 (file)
index f74ffde..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Stampanti</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Aggiungi stampante" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Gestione stampanti" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Esporta stampanti su Samba"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>Nuove stampanti trovate:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Aggiungi questa stampante" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">Classi</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Aggiungi classe" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Gestione classi" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Operazioni</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Gestione
-operazioni" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Server</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Modifica file di configurazione"
-CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Mostra registro degli accessi"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Mostra registro degli errori"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Mostra registro delle pagine"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Impostazioni di base del server:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Mostra stampanti condivise da altri sistemi<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Condividi le stampanti pubblicate connesse a questo sistema<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Consenti amministrazione remota<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Consenti agli utenti di annullare qualunque operazione (non solo le proprie)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Salva le informazioni di debug per la risoluzione di problemi</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Modifica impostazioni"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/it/choose-device.tmpl b/templates/it/choose-device.tmpl
deleted file mode 100644 (file)
index 767c021..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Dispositivo per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Dispositivo:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continua"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/choose-make.tmpl b/templates/it/choose-make.tmpl
deleted file mode 100644 (file)
index 7240ac5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Marca/Produttore per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Marca:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continua"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">O fornisci un file PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Aggiungi stampante:Modifica stampante}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/choose-model.tmpl b/templates/it/choose-model.tmpl
deleted file mode 100644 (file)
index 3ab1dec..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Modello/Driver per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Modello:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">O fornisci un file PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Aggiungi stampante:Modifica stampante}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/choose-serial.tmpl b/templates/it/choose-serial.tmpl
deleted file mode 100644 (file)
index dbcc12d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Impostazioni porta seriale per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Velocit&agrave; di trasmissione:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Parit&agrave;:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Nessuna
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Pari
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Dispary
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Bit dati:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Controllo di flusso:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Nessuno
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Software)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Hardware)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Hardware)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continua"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/choose-uri.tmpl b/templates/it/choose-uri.tmpl
deleted file mode 100644 (file)
index 3837b2b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">URI del dispositivo per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">URI del dispositivo:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Esempi:
-<PRE>
-    http://hostname:631/ipp/
-    http://hostname:631/ipp/port1
-
-    ipp://hostname/ipp/
-    ipp://hostname/ipp/port1
-
-    lpd://hostname/queue
-
-    socket://hostname
-    socket://hostname:9100
-</PRE>
-
-<P>Vedi <A HREF="/help/network.html" TARGET="_blank">"Stampanti di
-rete"</A> per il corretto URI da utilizzare con la tua stampante.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continua"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/class-added.tmpl b/templates/it/class-added.tmpl
deleted file mode 100644 (file)
index ef4fe49..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> &egrave; stata aggiunta
-con successo.
diff --git a/templates/it/class-confirm.tmpl b/templates/it/class-confirm.tmpl
deleted file mode 100644 (file)
index 0a24833..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Attenzione:</B> Sei sicuro di voler eliminare la classe
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Elimina classe"
-CLASS="button"></A></P>
diff --git a/templates/it/class-deleted.tmpl b/templates/it/class-deleted.tmpl
deleted file mode 100644 (file)
index 3fc2ffa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La classe {printer_name} &egrave; stata eliminata con successo.
diff --git a/templates/it/class-jobs-header.tmpl b/templates/it/class-jobs-header.tmpl
deleted file mode 100644 (file)
index 2a0cadc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Operazioni</H3>
diff --git a/templates/it/class-modified.tmpl b/templates/it/class-modified.tmpl
deleted file mode 100644 (file)
index 27ebcd7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> &egrave; stata
-modificata con successo.
diff --git a/templates/it/classes-header.tmpl b/templates/it/classes-header.tmpl
deleted file mode 100644 (file)
index 1fe0f4f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Nessuna classe:Mostrat{total=1?a:e} {#printer_name} di {total} class{total=1?e:i}}.</P>
diff --git a/templates/it/classes.tmpl b/templates/it/classes.tmpl
deleted file mode 100644 (file)
index 2882706..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Stampante predefinita):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Descrizione:</B> {printer_info}<BR>
-<B>Posizione:</B> {printer_location}<BR>
-<B>Stato della classe:</B> {printer_state=3?in attesa:{printer_state=4?elaborazione in corso:fermata}},
-{printer_is_accepting_jobs=0?scarta operazioni:accetta operazioni}, {printer_is_shared=0?non:} pubblicata.
-{?member_uris=?:<BR>Membri: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Stampa pagina di prova" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Avvia classe" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Ferma classe" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accetta operazioni" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Scarta operazioni" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annulla tutte le operazioni" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Pubblica la stampante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Non pubblicare la stampante" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Modifica classe" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Elimina classe" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Imposta come predefinita" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Imposta utenti autorizzati" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/it/edit-config.tmpl b/templates/it/edit-config.tmpl
deleted file mode 100644 (file)
index 3ae7185..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">File di configurazione del server</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Salva le modifiche"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Usa il file di configurazione predefinito"></A></P>
-
-</FORM>
diff --git a/templates/it/error-op.tmpl b/templates/it/error-op.tmpl
deleted file mode 100644 (file)
index 5e56a6c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Errore:</P>
-
-<BLOCKQUOTE>Operazione "{op}" sconosciuta!</BLOCKQUOTE>
diff --git a/templates/it/error.tmpl b/templates/it/error.tmpl
deleted file mode 100644 (file)
index ad9f643..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Errore:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/it/header.tmpl.in b/templates/it/header.tmpl.in
deleted file mode 100644 (file)
index cec48bb..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Home&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Amministrazione&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Classi&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Documentazione/Aiuto&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Operazioni&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Stampanti&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/it/help-header.tmpl b/templates/it/help-header.tmpl
deleted file mode 100644 (file)
index 73e4a75..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Cerca in
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Tutti i documenti}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Cerca">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Pulisci" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Guida in linea</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Tutti i documenti</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Cerca risultati in {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Tutti i documenti}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Nessuna corrispondenza trovata.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Mostra versione stampabile"
-CLASS="button"></A></H1>:<H1>Pagine della guida di CUPS</H1>
-
-<P>Questa &egrave; l'interfaccia di guida in linea di CUPS. Inserisci sopra i termini di
-ricerca o fai clic su ognuno dei collegamenti alla documentazione per visualizzare
-le informazioni.</P>
-
-<P>Se sei nuovo di CUPS, leggi la pagina "<a
-href="overview.html">Sommario di CUPS</a>". Gli utenti di vecchia data
-dovrebbero leggere la pagina "<a href="whatsnew.html">Cosa c'&egrave; di nuovo in CUPS
-1.3</a>".</P>
-
-<P>La <A HREF="http://www.cups.org/">pagina principale di CUPS</A> fornisce
-inoltre molte risorse tra cui forum di discussione per utenti, risposte
-alla domande frequenti, e un modulo per la segnalazione di bug
-e richieste di nuove funzionalit&agrave;.</P>}
diff --git a/templates/it/help-printable.tmpl b/templates/it/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/it/job-cancel.tmpl b/templates/it/job-cancel.tmpl
deleted file mode 100644 (file)
index 24054cf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">L'operazione {job_id}</A> &egrave; stata annullata.
diff --git a/templates/it/job-hold.tmpl b/templates/it/job-hold.tmpl
deleted file mode 100644 (file)
index 97df9d3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">L'operazione {job_id}</A> &egrave; stata bloccata.
diff --git a/templates/it/job-move.tmpl b/templates/it/job-move.tmpl
deleted file mode 100644 (file)
index cc4a8a0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Sposta l'operazione {job_id}:Sposta tutte le operazioni}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nuova destinazione:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Sposta operazion{job_id?e:i}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/job-moved.tmpl b/templates/it/job-moved.tmpl
deleted file mode 100644 (file)
index d14cc58..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Operazione {job_id}</A>:Tutte le operazioni} spostat{job_id?a:e} su
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/it/job-release.tmpl b/templates/it/job-release.tmpl
deleted file mode 100644 (file)
index fc82ff0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">L'operazione {job_id}</A> &egrave; stata rilasciata per la stampa.
diff --git a/templates/it/job-restart.tmpl b/templates/it/job-restart.tmpl
deleted file mode 100644 (file)
index 9f1b740..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">L'operazione {job_id}</A> &egrave; stata riavviata.
diff --git a/templates/it/jobs-header.tmpl b/templates/it/jobs-header.tmpl
deleted file mode 100644 (file)
index 385534f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Mostra operazioni completate"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Mostra tutte le operazioni">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Mostra operazioni completate"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Mostra operazioni attive">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Mostra operazioni attive"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Mostra tutte le operazioni">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Nessuna operazione:Mostrat{total=1?a:e} {#job_id} di {total} operazion{total=1?e:i} {?which_jobs=?attiva:{which_jobs=all?:completata}} }.</P>
diff --git a/templates/it/jobs.tmpl b/templates/it/jobs.tmpl
deleted file mode 100644 (file)
index e4a36c2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Nome&nbsp;</TH>
-<TH>Utente&nbsp;</TH>
-<TH>Dimensione&nbsp;</TH>
-<TH>Pagine&nbsp;</TH>
-<TH>Stato&nbsp;</TH>
-<TH>Controllo&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Sconosciuto:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Sconosciuto:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?in sospeso da<BR>{time_at_creation}:{job_state=4?bloccata da<BR>{time_at_creation}:
-{job_state=5?elaborazione in corso da<BR>{time_at_processing}:{job_state=6?fermata:
-{job_state=7?annullata a<BR>{time_at_completed}:{job_state=8?interrotta:completata a<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Ristampa operazione" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Rilascia operazione" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Blocca operazione" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Annulla operazione" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Sposta operazione" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/it/maintenance.tmpl b/templates/it/maintenance.tmpl
deleted file mode 100644 (file)
index 1b88d6c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>comandi di manutenzione inviati; l'ID dell'operazione &egrave; <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/it/modify-class.tmpl b/templates/it/modify-class.tmpl
deleted file mode 100644 (file)
index 25d158a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Modifica classe {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nome:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Posizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descrizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Membri:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modifica classe"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/modify-printer.tmpl b/templates/it/modify-printer.tmpl
deleted file mode 100644 (file)
index a9eafb1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Modifica stampante {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nome:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Posizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Posizione comprensibile del tipo "Laboratorio 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Descrizione:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Descrizione comprensibile del tipo "HP LaserJet con Duplexer")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continua"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/norestart.tmpl b/templates/it/norestart.tmpl
deleted file mode 100644 (file)
index 780f766..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>Il server non &egrave; riavviato poich&eacute; non ci sono state modifiche
-della configurazione...</p>
diff --git a/templates/it/option-boolean.tmpl b/templates/it/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/it/option-conflict.tmpl b/templates/it/option-conflict.tmpl
deleted file mode 100644 (file)
index c0e2031..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Errore:</B> Le seguenti opzioni sono in conflitto:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Modifica una o pi&ugrave; opzioni per risolvere il problema.</P>
diff --git a/templates/it/option-header.tmpl b/templates/it/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/it/option-pickmany.tmpl b/templates/it/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/it/option-pickone.tmpl b/templates/it/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/it/option-trailer.tmpl b/templates/it/option-trailer.tmpl
deleted file mode 100644 (file)
index 25af378..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Imposta opzioni stampante"></TD>
-</TR>
-</TABLE>
diff --git a/templates/it/pager.tmpl b/templates/it/pager.tmpl
deleted file mode 100644 (file)
index e3dbd09..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Mostra precedente" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Ordine crescente" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Ordine decrescente" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Mostra successivo" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/it/printer-accept.tmpl b/templates/it/printer-accept.tmpl
deleted file mode 100644 (file)
index 19de4a1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-adesso accetta operazioni.</P>
diff --git a/templates/it/printer-added.tmpl b/templates/it/printer-added.tmpl
deleted file mode 100644 (file)
index e45fb7f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La stampante <A HREF="/printers/{printer_name}">{printer_name}</A> &egrave; stata aggiunta
-con successo.
diff --git a/templates/it/printer-configured.tmpl b/templates/it/printer-configured.tmpl
deleted file mode 100644 (file)
index c28b9d0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La stampante <A HREF="/printers/{printer_name}">{printer_name}</A> &egrave;
-stata configurata con successo.
diff --git a/templates/it/printer-confirm.tmpl b/templates/it/printer-confirm.tmpl
deleted file mode 100644 (file)
index 1f3e891..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Attenzione:</B> Sei sicuro di voler eliminare la stampante
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Elimina stampante"
-CLASS="button"></A></P>
diff --git a/templates/it/printer-default.tmpl b/templates/it/printer-default.tmpl
deleted file mode 100644 (file)
index cab22c3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-&egrave; stata impostata come predefinita sul server.</P>
-
-<BLOCKQUOTE><B>Nota:</B> Qualunque valore inserito dall'utente impostato con
-il comando <TT>lpoptions</TT> sarà scavalcato da questa impostazione
-predefinita.</BLOCKQUOTE>
diff --git a/templates/it/printer-deleted.tmpl b/templates/it/printer-deleted.tmpl
deleted file mode 100644 (file)
index fe498a5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>La stampante {printer_name} &egrave; stata eliminata con successo.
diff --git a/templates/it/printer-jobs-header.tmpl b/templates/it/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index 2a0cadc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Operazioni</H3>
diff --git a/templates/it/printer-modified.tmpl b/templates/it/printer-modified.tmpl
deleted file mode 100644 (file)
index a36b81d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>La stampante <A HREF="/printers/{printer_name}">{printer_name}</A> &egrave; stata
-modificata con successo.
diff --git a/templates/it/printer-purge.tmpl b/templates/it/printer-purge.tmpl
deleted file mode 100644 (file)
index b196be0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-&egrave; stata svuotata di tutte le operazioni.</P>
diff --git a/templates/it/printer-reject.tmpl b/templates/it/printer-reject.tmpl
deleted file mode 100644 (file)
index 225783f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-non accetta altre operazioni.</P>
diff --git a/templates/it/printer-start.tmpl b/templates/it/printer-start.tmpl
deleted file mode 100644 (file)
index b5abdc9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-&egrave; stata avviata.</P>
diff --git a/templates/it/printer-stop.tmpl b/templates/it/printer-stop.tmpl
deleted file mode 100644 (file)
index 5af7bff..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?La classe:La stampante} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-&egrave; stata fermata.</P>
diff --git a/templates/it/printers-header.tmpl b/templates/it/printers-header.tmpl
deleted file mode 100644 (file)
index e10112d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Nessuna stampante:Mostrat{total=1?a:e} {#printer_name} di {total} stampant{total=1?e:i}}.</P>
diff --git a/templates/it/printers.tmpl b/templates/it/printers.tmpl
deleted file mode 100644 (file)
index 1069744..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Descrizione:</B> {printer_info}<BR>
-<B>Posizione:</B> {printer_location}<BR>
-<B>Marca e modello:</B> {printer_make_and_model}<BR>
-<B>Stato della stampante:</B> {printer_state=3?in attesa:{printer_state=4?elaborazione in corso:fermata}},
-{printer_is_accepting_jobs=0?scarta operazioni:accetta operazioni}, {printer_is_shared=0?non:} pubblicata.
-{?device_uri=?:<BR><B>URI del dispositivo:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Stampa pagina di prova" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Pulizia delle testine" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Stampa pagina di prova predefinita" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Avvia stampante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Ferma stampante" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accetta operazioni" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Scarta operazioni" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Sposta tutte le operazioni" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annulla tutte le operazioni" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Pubblica stampante" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Non pubblicare stampante" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Modifica stampante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Imposta opzioni stampante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Elimina stampante" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Imposta come predefinita" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Imposta utenti autorizzati" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/it/restart.tmpl b/templates/it/restart.tmpl
deleted file mode 100644 (file)
index 7ba2a58..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Attendere il riavvio del server...</p>
diff --git a/templates/it/samba-export.tmpl b/templates/it/samba-export.tmpl
deleted file mode 100644 (file)
index 9339e8d..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Esporta stampanti su Samba</H2>
-
-{error?<P>Impossibile esportare stampanti su Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consulta il file <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> per ulteriori informazioni.</P>:
-<P>Questa pagina ti consente di esportare stampanti su Samba in modo tale
-che i client Windows possano accedere ad esse dall'icona <VAR>Risorse di 
-rete</VAR> sui rispettivi desktop. Occorre installare previamente il driver 
-di stampa Windows PostScript come descritto nella pagina di manuale <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Stampanti:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Esporta tutte le stampanti
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Nome utente Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (richiesto)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Password Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (richiesto)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Esporta stampanti su Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/it/samba-exported.tmpl b/templates/it/samba-exported.tmpl
deleted file mode 100644 (file)
index 78ee85e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Stampanti esportate su Samba con successo.</P>
diff --git a/templates/it/search.tmpl b/templates/it/search.tmpl
deleted file mode 100644 (file)
index d69e934..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Cerca in
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classi:{SECTION=jobs?Operazioni:Stampanti}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Cerca">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Pulisci" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/it/set-printer-options-header.tmpl b/templates/it/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/it/set-printer-options-trailer.tmpl b/templates/it/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/it/test-page.tmpl b/templates/it/test-page.tmpl
deleted file mode 100644 (file)
index a2718c8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Pagina di prova inviata; l'ID dell'operazione &egrave; <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/it/trailer.tmpl b/templates/it/trailer.tmpl
deleted file mode 100644 (file)
index b598b6f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS, e il logo CUPS sono marchi
-registrati da <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS &egrave; un copyright 1997-2006 di Easy Software Products,
-Tutti i diritti sono riservati.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/it/users.tmpl b/templates/it/users.tmpl
deleted file mode 100644 (file)
index 3d5222f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Utenti autorizzati per {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Utenti:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Consenti a questi utenti a stampare
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Impedisci a questi utenti di stampare
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Imposta utenti autorizzati">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/add-class.tmpl b/templates/ja/add-class.tmpl
deleted file mode 100644 (file)
index eee2ef9..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">クラスの追加</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名前:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">場所:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">説明:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">メンバー:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="クラスの追加"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/add-printer.tmpl b/templates/ja/add-printer.tmpl
deleted file mode 100644 (file)
index 87cda33..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">新しいプリンタの追加</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名前:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>("/"、"#"、空白を除く適当な表示可能文字を含めることができます)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">場所:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>("Lab 1" のように人間が読みやすい場所)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">説明:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>("HP LaserJet with Duplexer" のように人間が読みやすい説明)</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl
deleted file mode 100644 (file)
index 03512ac..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">プリンタ</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="プリンタの追加" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="プリンタの管理" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="プリンタをSambaにエキスポート"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>新しいプリンタが見つかりました:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="このプリンタを追加"
-CLASS="button" ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">クラス</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="クラスの追加" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="クラスの管理" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">ジョブ</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="ジョブの管理" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">サーバ</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="設定ファイルの編集" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="アクセスログの表示"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="エラーログの表示"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="ページログの表示"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>基本サーバ設定:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> ほかのシステムで共有されているプリンタを表示<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> このシステムに接続されている公開済みプリンタを共有<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> リモート管理を許可<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> どのジョブであってもキャンセルすることを (たとえ所有者でなくても) ユーザに許可<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> トラブルシューティングのためにデバッグ情報を保存</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="設定の変更"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/ja/choose-device.tmpl b/templates/ja/choose-device.tmpl
deleted file mode 100644 (file)
index 303bf27..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">{printer_name} のデバイス</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">デバイス:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!不明?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!不明?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/choose-make.tmpl b/templates/ja/choose-make.tmpl
deleted file mode 100644 (file)
index 87cd06f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">{printer_name} のメーカ/製造元</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">メーカ:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">または PPD ファイルを提供してください:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?プリンタの追加:プリンタの変更}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/choose-model.tmpl b/templates/ja/choose-model.tmpl
deleted file mode 100644 (file)
index 53bd69b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">{printer_name} のモデル/ドライバ</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">モデル:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">または PPD ファイルを提供してください:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?プリンタの追加:プリンタの変更}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/choose-serial.tmpl b/templates/ja/choose-serial.tmpl
deleted file mode 100644 (file)
index e66b52d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">{printer_name} のシリアルポートの設定</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">ボーレート:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">パリティ:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>なし
-<OPTION VALUE="even" {?parity=even?SELECTED:}>偶数
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>奇数
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">データビット:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">フロー制御:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>なし
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (ソフトウェア)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (ハードウェア)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (ハードウェア)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/choose-uri.tmpl b/templates/ja/choose-uri.tmpl
deleted file mode 100644 (file)
index 990ecfa..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">{printer_name} のデバイス URI</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">デバイス URI:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>例:
-<PRE>
-    http://hostname:631/ipp/
-    http://hostname:631/ipp/port1
-
-    ipp://hostname/ipp/
-    ipp://hostname/ipp/port1
-
-    lpd://hostname/queue
-
-    socket://hostname
-    socket://hostname:9100
-</PRE>
-
-<P>あなたのプリンタにふさわしい URI については、
-<A HREF="/help/network.html" TARGET="_blank">"ネットワーク
-プリンタ"</A> を参照してください。</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/class-added.tmpl b/templates/ja/class-added.tmpl
deleted file mode 100644 (file)
index ccda96d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>クラス <A HREF="/classes/{printer_name}">{printer_name}</A> は正しく追加されました。
diff --git a/templates/ja/class-confirm.tmpl b/templates/ja/class-confirm.tmpl
deleted file mode 100644 (file)
index 382f1f5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>警告:</B> 本当にクラス
-{printer_name} を削除してもよいですか?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="クラスの削除"
-CLASS="button"></A></P>
diff --git a/templates/ja/class-deleted.tmpl b/templates/ja/class-deleted.tmpl
deleted file mode 100644 (file)
index 7c76490..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>クラス {printer_name} は正しく削除されました。
diff --git a/templates/ja/class-jobs-header.tmpl b/templates/ja/class-jobs-header.tmpl
deleted file mode 100644 (file)
index d12840e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">ジョブ</H3>
diff --git a/templates/ja/class-modified.tmpl b/templates/ja/class-modified.tmpl
deleted file mode 100644 (file)
index 54e1f60..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>クラス <A HREF="/classes/{printer_name}">{printer_name}</A> は正しく変更されました。
diff --git a/templates/ja/classes-header.tmpl b/templates/ja/classes-header.tmpl
deleted file mode 100644 (file)
index 3dad28c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?クラスがありません:{total} 個のクラスのうち {#printer_name} 個を表示中}。</P>
diff --git a/templates/ja/classes.tmpl b/templates/ja/classes.tmpl
deleted file mode 100644 (file)
index 2e117e8..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (デフォルトプリンタ):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN
->}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>説明:</B> {printer_info}<BR>
-<B>場所:</B> {printer_location}<BR>
-<B>クラスの状態:</B> {printer_state=3?待機中:{printer_state=4?処理中:停止}},
-{printer_is_accepting_jobs=0?ジョブを拒否中:ジョブを受け付け中}, {printer_is_shared=0?not:} 公開。
-{?printer_state_message=?:<BR><I>"{printer_state_message}"</I>}
-{?member_uris=?:<BR>メンバー: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="テストページの印刷" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="クラスを開始" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="クラスを停止" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="ジョブを受け付け" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="ジョブを拒否" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="すべてのジョブをキャンセル" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="プリンタを公開" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="プリンタを非公開" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="クラスの変更" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="クラスの削除" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="デフォルトに設定" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="許可するユーザの設定" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/ja/edit-config.tmpl b/templates/ja/edit-config.tmpl
deleted file mode 100644 (file)
index 524159c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">サーバ設定ファイル</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="変更を保存"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="デフォルトの設定ファイルを使用"></A></P>
-
-</FORM>
diff --git a/templates/ja/error-op.tmpl b/templates/ja/error-op.tmpl
deleted file mode 100644 (file)
index 08657ef..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>エラー:</P>
-
-<BLOCKQUOTE>"{op}" は未知の操作です!</BLOCKQUOTE>
diff --git a/templates/ja/error.tmpl b/templates/ja/error.tmpl
deleted file mode 100644 (file)
index c4ae91e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:エラー:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl.in
deleted file mode 100644 (file)
index 2e7274b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;ホーム&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;管理&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;クラス&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;ドキュメント/ヘルプ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;ジョブ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;プリンタ&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/ja/help-header.tmpl b/templates/ja/help-header.tmpl
deleted file mode 100644 (file)
index 6538c11..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:すべてのドキュメント}} 内を検索:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="検索"></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">オンラインヘルプドキュメント</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">すべてのドキュメント</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>{HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:すべてのドキュメント}} の検索結果\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (<I><A HREF="{QPLINK}">{QPTEXT}</A></I>内):}</LI>}
-{QTEXT?</UL>:}
-:<P>マッチするものはありませんでした。</P>}
-{HELPTITLE?<HR NOSHADE>:}:}
-{HELPTITLE?<H1>{HELPTITLE}</H1>:}
diff --git a/templates/ja/job-cancel.tmpl b/templates/ja/job-cancel.tmpl
deleted file mode 100644 (file)
index 4ee7d1f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P><A HREF="{job_printer_uri}">ジョブ {job_id}</A> はキャンセルされました。
-
diff --git a/templates/ja/job-hold.tmpl b/templates/ja/job-hold.tmpl
deleted file mode 100644 (file)
index 792c538..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P><A HREF="{job_printer_uri}">ジョブ {job_id}</A> は印刷をホールドされました。
-
diff --git a/templates/ja/job-move.tmpl b/templates/ja/job-move.tmpl
deleted file mode 100644 (file)
index bfb630e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?ジョブ {job_id} の移動:すべてのジョブの移動}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">新しい宛先:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="ジョブの移動"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/job-moved.tmpl b/templates/ja/job-moved.tmpl
deleted file mode 100644 (file)
index e76a804..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">ジョブ {job_id}</A>:すべてのジョブ} は
-<A HREF="{job_printer_uri}">{job_printer_name}</A> に移動しました。</P>
diff --git a/templates/ja/job-release.tmpl b/templates/ja/job-release.tmpl
deleted file mode 100644 (file)
index 132f02b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P><A HREF="{job_printer_uri}">ジョブ {job_id}</A> は印刷から解放されました。
-
diff --git a/templates/ja/job-restart.tmpl b/templates/ja/job-restart.tmpl
deleted file mode 100644 (file)
index b066827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">ジョブ {job_id}</A> は再印刷されました。
diff --git a/templates/ja/jobs-header.tmpl b/templates/ja/jobs-header.tmpl
deleted file mode 100644 (file)
index 7310f3c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="完了したジョブを表示"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="すべてのジョブを表示">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="完了したジョブを表示"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="アクティブなジョブを表示">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="アクティブなジョブを表示"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="すべてのジョブを表示">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?ジョブはありません:{total} 個の{?which_jobs=?アクティブな:{which_jobs=all?:完了した}}ジョブのうち {#job_id} 個を表示中}。</P>
diff --git a/templates/ja/jobs.tmpl b/templates/ja/jobs.tmpl
deleted file mode 100644 (file)
index 086b8f2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>名前&nbsp;</TH>
-<TH>ユーザ&nbsp;</TH>
-<TH>サイズ&nbsp;</TH>
-<TH>ページ&nbsp;</TH>
-<TH>状態&nbsp;</TH>
-<TH>制御&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?未知:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?不明:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?{time_at_creation}<BR>から保留中:{job_state=4?{time_at_creation}<BR>からホールド中:
-{job_state=5?{time_at_processing}<BR>から処理中:{job_state=6?に停止:
-{job_state=7?{time_at_completed}<BR>にキャンセル:{time_at_completed}<BR>{job_state=8?に中断:に完了}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="ジョブの再印刷" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="ジョブを解放" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="ジョブをホールド" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="ジョブをキャンセル" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="ジョブを移動" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/ja/maintenance.tmpl b/templates/ja/maintenance.tmpl
deleted file mode 100644 (file)
index 78fc9bc..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>メンテナンスコマンドを送りました; ジョブ ID は <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A> です。</P>
diff --git a/templates/ja/modify-class.tmpl b/templates/ja/modify-class.tmpl
deleted file mode 100644 (file)
index 11f362d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">クラス {printer_name} の変更</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名前:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">場所:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">説明:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">メンバー:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="クラスの変更"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/modify-printer.tmpl b/templates/ja/modify-printer.tmpl
deleted file mode 100644 (file)
index 9fdd159..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">プリンタ {printer_name} の変更</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名前:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">場所:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>("Lab 1" のように人間が読みやすい場所)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">説明:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>("HP LaserJet with Duplexer" のように人間が読みやすい説明)</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="続ける"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/option-conflict.tmpl b/templates/ja/option-conflict.tmpl
deleted file mode 100644 (file)
index c7d586b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>エラー:</B> 以下のオプションは競合します:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>競合を解決するために、1つ以上のオプションを変更してください。</P>
diff --git a/templates/ja/option-trailer.tmpl b/templates/ja/option-trailer.tmpl
deleted file mode 100644 (file)
index f7b1eb7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="プリンタオプションの設定"></TD>
-</TR>
-</TABLE>
diff --git a/templates/ja/pager.tmpl b/templates/ja/pager.tmpl
deleted file mode 100644 (file)
index 13aa874..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="前を表示" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="昇順にソート" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="降順にソート" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="次を表示" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/ja/printer-accept.tmpl b/templates/ja/printer-accept.tmpl
deleted file mode 100644 (file)
index 073d126..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-はジョブを受け付けるようになりました。</P>
diff --git a/templates/ja/printer-added.tmpl b/templates/ja/printer-added.tmpl
deleted file mode 100644 (file)
index e01b437..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンタ <A HREF="/printers/{printer_name}">{printer_name}</A> は正しく追加されました。
diff --git a/templates/ja/printer-configured.tmpl b/templates/ja/printer-configured.tmpl
deleted file mode 100644 (file)
index 1861afb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンタ <A HREF="/printers/{printer_name}">{printer_name}</A> は正しく設定されました。
diff --git a/templates/ja/printer-confirm.tmpl b/templates/ja/printer-confirm.tmpl
deleted file mode 100644 (file)
index 7a2fe77..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>警告:</B> 本当にプリンタ
-{printer_name} を削除してもよいですか?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="プリンタの削除"
-CLASS="button"></A></P>
diff --git a/templates/ja/printer-default.tmpl b/templates/ja/printer-default.tmpl
deleted file mode 100644 (file)
index c6290c9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-はサーバのデフォルトプリンタとなりました。</P>
-
-<BLOCKQUOTE><B>注意:</B> <TT>lpoptions</TT> コマンドで設定されたユーザのデフォルトは、このサーバのデフォルト設定を上書きします。
-</BLOCKQUOTE>
diff --git a/templates/ja/printer-deleted.tmpl b/templates/ja/printer-deleted.tmpl
deleted file mode 100644 (file)
index 7d48b8a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンタ {printer_name} は正しく削除されました。
diff --git a/templates/ja/printer-jobs-header.tmpl b/templates/ja/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index d12840e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">ジョブ</H3>
diff --git a/templates/ja/printer-modified.tmpl b/templates/ja/printer-modified.tmpl
deleted file mode 100644 (file)
index 55d8aca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンタ <A HREF="/printers/{printer_name}">{printer_name}</A> は正しく変更されました。
diff --git a/templates/ja/printer-purge.tmpl b/templates/ja/printer-purge.tmpl
deleted file mode 100644 (file)
index 8057fef..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-はすべてのジョブを削除しました。</P>
diff --git a/templates/ja/printer-reject.tmpl b/templates/ja/printer-reject.tmpl
deleted file mode 100644 (file)
index bb2c4a8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-はもうジョブを受け付けません。</P>
diff --git a/templates/ja/printer-start.tmpl b/templates/ja/printer-start.tmpl
deleted file mode 100644 (file)
index daa27e1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-は開始しました。</P>
diff --git a/templates/ja/printer-stop.tmpl b/templates/ja/printer-stop.tmpl
deleted file mode 100644 (file)
index 494aae7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?クラス:プリンタ} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-は停止しました。</P>
diff --git a/templates/ja/printers-header.tmpl b/templates/ja/printers-header.tmpl
deleted file mode 100644 (file)
index f9c78f0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?プリンタがありません:{total} 個のプリンタのうち {#printer_name} 個を表示中}。</P>
diff --git a/templates/ja/printers.tmpl b/templates/ja/printers.tmpl
deleted file mode 100644 (file)
index 716e159..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (デフォルトプリンタ):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>説明:</B> {printer_info}<BR>
-<B>場所:</B> {printer_location}<BR>
-<B>メーカとモデル:</B> {printer_make_and_model}<BR>
-<B>プリンタの状態:</B> {printer_state=3?待機中:{printer_state=4?処理中:停止}},
-{printer_is_accepting_jobs=0?ジョブを拒否中:ジョブを受け付け中}, {printer_is_shared=0?非:}公開。
-{?device_uri=?:<BR><B>デバイス URI:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="テストページの印刷" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="プリタを開始" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="プリンタを停止" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="ジョブを受け付け" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="ジョブを拒否" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="すべてのジョブの移動" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="すべてのジョブをキャンセル" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="プリンタを公開" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="プリンタを非公開" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="プリンタの変更" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="プリンタオプションの設定" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="プリンタの削除" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="デフォルトに設定" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="許可するユーザの設定" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/ja/restart.tmpl b/templates/ja/restart.tmpl
deleted file mode 100644 (file)
index 9801f51..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>サーバが再起動するあいだ、しばらくお待ちください...</p>
diff --git a/templates/ja/samba-export.tmpl b/templates/ja/samba-export.tmpl
deleted file mode 100644 (file)
index 87b8479..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">プリンタを Samba にエキスポート</H2>
-
-{error?<P>プリンタを Samba にエキスポートできません\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>より詳細な情報については <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> ファイルを参照してください。</P>:
-<P>このページは、Windows クライアントがデスクトップ上の
-<VAR>マイネットワーク</VAR> や <VAR>ネットワークの場所</VAR>
-アイコン経由でアクセスできるよう、プリンタの Samba
-へのエキスポートを許可します。<A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> man ページに書かれているように、
-事前に Windows PostScript ドライバをインストールしておく必要があります。
-</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">プリンタ:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> すべてのプリンタをエキスポート
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba のユーザ名:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (必須)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba のパスワード:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (必須)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="プリンタをSambaにエキスポート"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/ja/samba-exported.tmpl b/templates/ja/samba-exported.tmpl
deleted file mode 100644 (file)
index 854834a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンタは Samba に正しくエキスポートされました。</P>
diff --git a/templates/ja/search.tmpl b/templates/ja/search.tmpl
deleted file mode 100644 (file)
index deaac31..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?クラス:{SECTION=jobs?ジョブ:プリンタ}}} 内を検索:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="検索"></P>
-
-</FORM>
diff --git a/templates/ja/test-page.tmpl b/templates/ja/test-page.tmpl
deleted file mode 100644 (file)
index a4f42fa..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>テストページを送信しました; ジョブ ID は <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A> です。
diff --git a/templates/ja/users.tmpl b/templates/ja/users.tmpl
deleted file mode 100644 (file)
index ff6ea2f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">{printer_name}に許可するユーザ</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">ユーザ:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>これらのユーザの印刷を許可
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>これらのユーザの印刷を禁止
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="許可するユーザの設定">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index df2f3734819518350b208be9976c29f7f9e46087..a7a06ab4f973df9ad9bd7b65d3c44349b22195f2 100644 (file)
@@ -15,7 +15,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Move Job{job_id?:s}"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Move Job{job_id?:s}"></TD>
 </TR>
 </TABLE>
 
index 5a660611fdb952f710d3639734d2612ff0b53f4f..8a90438409feff60aced05c0411cc98bd6c1ad82 100644 (file)
@@ -1,15 +1,5 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Show Completed Jobs"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Show All Jobs">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Show Completed Jobs"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Show Active Jobs">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Show Active Jobs"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Show All Jobs">}}</A></P>
+<P>{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Show Active Jobs"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Show Completed Jobs"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Show All Jobs"></FORM>}</P>
 
 <P ALIGN="CENTER">{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.</P>
index 498decf07f2416497968d7926565f4603c334d9d..76ca4924f7e4699b6b223a5f03282a8a50df2b12 100644 (file)
@@ -1,5 +1,5 @@
 {#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
+<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Job List">
 <TR CLASS="data">
 <TH>ID&nbsp;</TH>
 <TH>Name&nbsp;</TH>
 {job_state=7?canceled at<BR>{time_at_completed}:{job_state=8?aborted:completed at<BR>{time_at_completed}}}}}}}&nbsp;</TD>
 <TD>
 {job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Reprint Job" CLASS="button"></A>:}
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Reprint Job"></FORM>:}
 {job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Release Job" CLASS="button"></A>:}
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Release Job"></FORM>:}
 {job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Hold Job" CLASS="button"></A>:}
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Hold Job"></FORM>:}
 {job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Cancel Job" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Move Job" CLASS="button"></A>:}
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Cancel Job"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Move Job"></FORM>:}
 &nbsp;</TD>
 </TR>
 }
 </TABLE>
 }
+<BR>
index bd7ff88595859dd71e617a7c78b04a995112feed..4ff6d0e3dac8320aa9e9e1eef39ca397e63fa3c8 100644 (file)
@@ -2,9 +2,6 @@
 
 {#device_uri=0?<P>No printers found.</P>
 :<UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Add This Printer" CLASS="button"
-ALIGN="MIDDLE"></A>
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Add This Printer"></FORM>
 {device_make_and_model} ({device_info})</LI>
 }</UL>}
-
index 88839ec48fc2b7e6235801d92cbb7d12bac33fb0..2255b2bb4dd35a7b38f45f1629a821d1824e792f 100644 (file)
@@ -1,8 +1,6 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
-<H2 CLASS="title">Modify Class {printer_name}</H2>
-
 <TABLE>
 <TR>
 <TH CLASS="label">Name:</TH>
@@ -27,7 +25,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modify Class"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Modify Class"></TD>
 </TR>
 </TABLE>
 
index af72cf99633bdad2c5bc9ab178b1a0e4e85b42db..238bc3da4187aba92e9d37e356129067eeedf392 100644 (file)
@@ -1,28 +1,29 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Modify Printer {printer_name}</H2>
+{?printer_make_and_model=?{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
 
 <TABLE>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
 </TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
+</TR>
 <TR>
 <TH CLASS="label">Location:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
 <SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
 </TR>
 <TR>
-<TH CLASS="label">Description:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
-</TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Continue"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
 </TR>
 </TABLE>
 
index d689a442d693adcefbfc34f8a86b5fbe542b118c..83635f4c96b4e709375f79036a7ee74166f3739a 100644 (file)
@@ -1,5 +1,5 @@
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Set Printer Options"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Set Printer Options"></TD>
 </TR>
 </TABLE>
index 975f5923ac5a4d2eb2ea8e4feeeccda27d3657fd..1c870943cd802945d24e722c121eaa8d944abd77 100644 (file)
@@ -1,7 +1,7 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
+<TABLE WIDTH="100%" CLASS="inset" SUMMARY="Paging Bar">
 <TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Show Previous" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Sort Ascending" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Sort Descending" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Show Next" CLASS="button"></A>:&nbsp;}</TD>
+       <TD WIDTH="33%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Show Previous"></FORM>:&nbsp;}</TD>
+       <TD WIDTH="34%" ALIGN="CENTER"><FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{FIRST}"><INPUT TYPE="HIDDEN" NAME="ORDER" {ORDER=dec?VALUE="asc"><INPUT TYPE="SUBMIT" VALUE="&#x25b2; Sort Ascending &#x25b2;">:VALUE="dec"><INPUT TYPE="SUBMIT" VALUE="&#x25bc; Sort Descending &#x25bc;">}</FORM></TD>
+       <TD WIDTH="33%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Show Next &#x25b6;"></FORM>:&nbsp;}</TD>
 </TR>
 </TABLE>
diff --git a/templates/pl/add-class.tmpl b/templates/pl/add-class.tmpl
deleted file mode 100644 (file)
index 6120c87..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Dodaj klasę</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nazwa:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Położenie:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Opis:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Elementy:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Dodaj klasę"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/add-printer.tmpl b/templates/pl/add-printer.tmpl
deleted file mode 100644 (file)
index 59aa6fa..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Dodaj nową drukarkę</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nazwa:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Może zawierać dowolne drukowalne znaki z wyjątkiem "/", "#" i spacji)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Położenie:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Położenie czytelne dla człowieka, takie jak "Laboratorium 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Opis:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(Opis czytelny dla człowieka, taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/admin.tmpl b/templates/pl/admin.tmpl
deleted file mode 100644 (file)
index 1302a78..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Zadania administracyjne">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Drukarki</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Dodaj drukarkę" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Zarządzaj drukarkami" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Wyeksportuj drukarki do Samby"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>Znaleziono nowe drukarki:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Dodaj tę drukarkę" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">Klasy</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Dodaj klasę" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Zarządzaj klasami" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Zadania</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Zarządzaj zadaniami" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Serwer</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Edytuj plik konfiguracji" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Wyświetl dziennik dostępu"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Wyświetl dziennik błędów"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Wyświetl dziennik strony"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Podstawowe ustawienia serwera:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Wyświetl drukarki udostępniane przez inne systemy<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Udostępnij opublikowane drukarki połączone do tego systemu<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Pozwól na zdalną administrację<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Pozwól użytkownikom na anulowanie każdego zadania (nie tylko ich)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Zapisz informacje o debugowaniu do rozwiązywania problemów</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Zmień ustawienia"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/pl/choose-device.tmpl b/templates/pl/choose-device.tmpl
deleted file mode 100644 (file)
index fe8d9a6..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Urządzenie {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Urządzenie:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/choose-make.tmpl b/templates/pl/choose-make.tmpl
deleted file mode 100644 (file)
index c679630..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Producent {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Producent:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">Lub dostarcz plik PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkę:Zmodyfikuj drukarkę}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/choose-model.tmpl b/templates/pl/choose-model.tmpl
deleted file mode 100644 (file)
index c3ef958..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Model/sterownik {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Model:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Lub dostarcz plik PPD:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkę:Zmodyfikuj drukarkę}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/choose-serial.tmpl b/templates/pl/choose-serial.tmpl
deleted file mode 100644 (file)
index beade69..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Ustawienia portu szeregowego {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Prędkość transmisji:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Parzystość:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Brak
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Parzystość
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Nieparzystość
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Bity danych:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kontrola przepływu:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Brak
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (programowa)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (sprzętowa)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (sprzętowa)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/choose-uri.tmpl b/templates/pl/choose-uri.tmpl
deleted file mode 100644 (file)
index fe424dd..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">URI urządzenia {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">URI urządzenia:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Przykłady:
-<PRE>
-    http://nazwakomputera:631/ipp/
-    http://nazwakomputera:631/ipp/port1
-
-    ipp://nazwakomputera/ipp/
-    ipp://nazwakomputera/ipp/port1
-
-    lpd://nazwakomputera/kolejka
-
-    gniazdo://nazwakomputera
-    gniazdo://nazwakomputera:9100
-</PRE>
-
-<P>Zobacz <A HREF="/help/network.html" TARGET="_blank">"Drukarki sieciowe"</A>, aby uzyskać poprawny URI do użycia z drukarką.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/class-added.tmpl b/templates/pl/class-added.tmpl
deleted file mode 100644 (file)
index 6cf3488..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie dodana.
diff --git a/templates/pl/class-confirm.tmpl b/templates/pl/class-confirm.tmpl
deleted file mode 100644 (file)
index 01290e6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Ostrzeżenie:</B> Czy jesteś pewny, że chcesz usunąć klasę
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Usuń klasę"
-CLASS="button"></A></P>
diff --git a/templates/pl/class-deleted.tmpl b/templates/pl/class-deleted.tmpl
deleted file mode 100644 (file)
index 3a156a9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klasa {printer_name} została pomyślnie usunięta.
diff --git a/templates/pl/class-jobs-header.tmpl b/templates/pl/class-jobs-header.tmpl
deleted file mode 100644 (file)
index fcc4b09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Zadania</H3>
diff --git a/templates/pl/class-modified.tmpl b/templates/pl/class-modified.tmpl
deleted file mode 100644 (file)
index 938ef56..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
diff --git a/templates/pl/classes-header.tmpl b/templates/pl/classes-header.tmpl
deleted file mode 100644 (file)
index 2246044..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Brak klas:Wyświetlanie {#printer_name} z {total} klas{total=1?:}}.</P>
diff --git a/templates/pl/classes.tmpl b/templates/pl/classes.tmpl
deleted file mode 100644 (file)
index 15a6e5a..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Domyślna drukarka):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Opis:</B> {printer_info}<BR>
-<B>Położenie:</B> {printer_location}<BR>
-<B>Stan klasy:</B> {printer_state=3?bezczynna:{printer_state=4?processing:zatrzymana}},
-{printer_is_accepting_jobs=0?odrzucanie zadań:akceptowanie zadań}, {printer_is_shared=0?nie opublikowana:opublikowana}.
-{?member_uris=?:<BR>Elementy: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Wydrukuj stronę próbną" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Uruchom klasę" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Zatrzymaj klasę" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Zaakceptuj zadania" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzuć zadania" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Anuluj wszystkie zadania" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Opublikuj drukarkę" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie publikuj drukarki" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Usuń klasę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Ustaw jako domyślną" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Pozwól zezwolonym użytkownikom" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/pl/edit-config.tmpl b/templates/pl/edit-config.tmpl
deleted file mode 100644 (file)
index f967151..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Plik Konfiguracji Serwera</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Zachowaj Zmiany"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Użyj Domyślnego Pliku Konfiguracji"></A></P>
-
-</FORM>
diff --git a/templates/pl/error-op.tmpl b/templates/pl/error-op.tmpl
deleted file mode 100644 (file)
index a1d6aae..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Błąd:</P>
-
-<BLOCKQUOTE>Nieznana operacja "{op}"!</BLOCKQUOTE>
diff --git a/templates/pl/error.tmpl b/templates/pl/error.tmpl
deleted file mode 100644 (file)
index b275407..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Błąd:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/pl/header.tmpl.in b/templates/pl/header.tmpl.in
deleted file mode 100644 (file)
index 7028f70..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Strona&nbsp;Główna&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Administracja&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Grupy&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Dokumentacja/Pomoc&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Wydruki&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Drukarki&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/pl/help-header.tmpl b/templates/pl/help-header.tmpl
deleted file mode 100644 (file)
index 5346c4e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Wyszukaj we
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:wszystkich dokumentach}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Wyszukaj">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Wyczyść" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Dokumenty pomocy on-line</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Wszystkie dokumenty</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Wyniki wyszukiwania we {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:wszystkich dokumentach}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (w <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Nie znaleziono wyników.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Wyświetl wersję drukowalną"
-CLASS="button"></A></H1>:<H1>Strony pomocy CUPS</H1>
-
-<P>To jest interfejs on-line pomocy CUPS. Podaj wyszukiwane
-słowa powyżej lub naciśnij na jakiś odnośnik do dokumentacji,
-aby wyświetlić dokumentację pomocy on-line.</P>
-
-<P>Jeśli jesteś nowy w CUPS-ie, przeczytaj stronę "<a
-href="overview.html">Wstęp do CUPS</a>". Użytkownicy dobrze
-znający CUPS powinni przeczytać stronę "<a href="whatsnew.html">
-Co nowego w CUPS 1.3</a>".</P>
-
-<P>The <A HREF="http://www.cups.org/">Strona domowa CUPS</A> także
-dostarcza wielu zasobów, w tym fora dyskusyjne użytkowników,
-odpowiedzi na najczęściej zadawane pytania oraz formularz do
-wysyłania raportów błędów i żądań funkcji.</P>}
diff --git a/templates/pl/help-printable.tmpl b/templates/pl/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/pl/job-cancel.tmpl b/templates/pl/job-cancel.tmpl
deleted file mode 100644 (file)
index 39a89cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało anulowane.
diff --git a/templates/pl/job-hold.tmpl b/templates/pl/job-hold.tmpl
deleted file mode 100644 (file)
index 999c29b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało wstrzymane od drukowania.
diff --git a/templates/pl/job-move.tmpl b/templates/pl/job-move.tmpl
deleted file mode 100644 (file)
index ec671bc..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Przenieś zadanie {job_id}:Przenieś wszystkie zadania}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nowy cel:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Przenieś zadania{job_id?:}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/job-moved.tmpl b/templates/pl/job-moved.tmpl
deleted file mode 100644 (file)
index 596ebaa..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Zadanie {job_id}</A>:Wszystkie zadania} zostało przeniesione do 
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/pl/job-release.tmpl b/templates/pl/job-release.tmpl
deleted file mode 100644 (file)
index 753d21c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało zwolnione od drukowania.
diff --git a/templates/pl/job-restart.tmpl b/templates/pl/job-restart.tmpl
deleted file mode 100644 (file)
index be2d26f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało ponownie uruchomione.
diff --git a/templates/pl/jobs-header.tmpl b/templates/pl/jobs-header.tmpl
deleted file mode 100644 (file)
index 5b6975b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Wyświetl zakończone zadania"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Wyświetl wszystkie zadania">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Wyświetl zakończone zadania"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Wyświetl aktywne zadania">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Wyświetl aktywne zadania"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Wyświetl wszystkie zadania">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Brak zadań:Wyświetlanie {#job_id} z {total} {?which_jobs=?active:{which_jobs=all?:zakończonych}} zadań{total=1?:}}.</P>
diff --git a/templates/pl/jobs.tmpl b/templates/pl/jobs.tmpl
deleted file mode 100644 (file)
index ccd1ab0..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Lista zadań">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Nazwa&nbsp;</TH>
-<TH>Użytkownik&nbsp;</TH>
-<TH>Rozmiar&nbsp;</TH>
-<TH>Strony&nbsp;</TH>
-<TH>Stan&nbsp;</TH>
-<TH>Kontrola&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Nieznane:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Nieznane:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?oczekiwanie od<BR>{time_at_creation}:{job_state=4?wstrzymane od<BR>{time_at_creation}:
-{job_state=5?przetwarzanie od<BR>{time_at_processing}:{job_state=6?zatrzymane:
-{job_state=7?anulowane o<BR>{time_at_completed}:{job_state=8?przerwane:zakończone o<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Ponownie wydrukuj zadanie" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Zwolnij zadanie" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Wstrzymaj zadanie" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Anuluj zadanie" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Przenieś zadanie" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/pl/maintenance.tmpl b/templates/pl/maintenance.tmpl
deleted file mode 100644 (file)
index baef534..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Polecenia utrzymywania zostały wysłane; ID zadania to <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/pl/modify-class.tmpl b/templates/pl/modify-class.tmpl
deleted file mode 100644 (file)
index d1c27db..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Zmodyfikuj klasę {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nazwa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Położenie:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Opis:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Elementy:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasę"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/modify-printer.tmpl b/templates/pl/modify-printer.tmpl
deleted file mode 100644 (file)
index 1c9eb47..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Zmodyfikuj drukarkę {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nazwa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Położenie:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Położenie czytelne dla człowieka, takie jak "Laboratorium 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Opis:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Opis czytelny dla człowieka, taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/option-boolean.tmpl b/templates/pl/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/pl/option-conflict.tmpl b/templates/pl/option-conflict.tmpl
deleted file mode 100644 (file)
index 9d808c9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Błąd:</B> Następujące opcje są w konflikcie:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Zmień jedną lub więcej opcji, aby rozwiązań konflikty.</P>
diff --git a/templates/pl/option-header.tmpl b/templates/pl/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/pl/option-pickmany.tmpl b/templates/pl/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/pl/option-pickone.tmpl b/templates/pl/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/pl/option-trailer.tmpl b/templates/pl/option-trailer.tmpl
deleted file mode 100644 (file)
index 11a29b0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ustaw opcje drukarki"></TD>
-</TR>
-</TABLE>
diff --git a/templates/pl/pager.tmpl b/templates/pl/pager.tmpl
deleted file mode 100644 (file)
index 740c29b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Pasek stronowania">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Wyświetl poprzednie" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Posortuj rosnąco" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Posortuj malejąco" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Wyświetl następne" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/pl/printer-accept.tmpl b/templates/pl/printer-accept.tmpl
deleted file mode 100644 (file)
index d08f7af..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
-teraz akceptuje zadania.</P>
diff --git a/templates/pl/printer-added.tmpl b/templates/pl/printer-added.tmpl
deleted file mode 100644 (file)
index b16e4cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została pomyślnie dodana.
diff --git a/templates/pl/printer-configured.tmpl b/templates/pl/printer-configured.tmpl
deleted file mode 100644 (file)
index caaf703..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została pomyślnie skonfigurowana.
diff --git a/templates/pl/printer-confirm.tmpl b/templates/pl/printer-confirm.tmpl
deleted file mode 100644 (file)
index 8773389..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Ostrzeżenie:</B> Czy jesteś pewny, że chcesz usunąć drukarkę
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Usuń drukarkę"
-CLASS="button"></A></P>
diff --git a/templates/pl/printer-default.tmpl b/templates/pl/printer-default.tmpl
deleted file mode 100644 (file)
index bab58d1..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
-została utworzona domyślną drukarką na serwerze.</P>
-
-<BLOCKQUOTE><B>Uwaga:</B> każdy domyślny użytkownik, który został ustawiony przez
-polecenie <TT>lpoptions</TT> zastąpi te domyślne
-ustawienie.</BLOCKQUOTE>
diff --git a/templates/pl/printer-deleted.tmpl b/templates/pl/printer-deleted.tmpl
deleted file mode 100644 (file)
index 8406069..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drukarka {printer_name} została pomyślnie usunięta.
diff --git a/templates/pl/printer-jobs-header.tmpl b/templates/pl/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index fcc4b09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Zadania</H3>
diff --git a/templates/pl/printer-modified.tmpl b/templates/pl/printer-modified.tmpl
deleted file mode 100644 (file)
index 0cb831c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została
-pomyślnie zmodyfikowana.
diff --git a/templates/pl/printer-purge.tmpl b/templates/pl/printer-purge.tmpl
deleted file mode 100644 (file)
index e349fa4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki/{printer_name}">{printer_name}</A>
-została wyczyszczone ze wszystkich zadań.</P>
diff --git a/templates/pl/printer-reject.tmpl b/templates/pl/printer-reject.tmpl
deleted file mode 100644 (file)
index 4e5fb3c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
-już nie akceptuje zadań.</P>
diff --git a/templates/pl/printer-start.tmpl b/templates/pl/printer-start.tmpl
deleted file mode 100644 (file)
index 28c2f47..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
-została uruchomiona.</P>
diff --git a/templates/pl/printer-stop.tmpl b/templates/pl/printer-stop.tmpl
deleted file mode 100644 (file)
index caebd4e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Klasa:Drukarka} <A
-HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
-została zatrzymana.</P>
diff --git a/templates/pl/printers-header.tmpl b/templates/pl/printers-header.tmpl
deleted file mode 100644 (file)
index f749dad..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Brak drukarek:Wyświetlanie {#printer_name} z {total} drukarek{total=1?:}}.</P>
diff --git a/templates/pl/printers.tmpl b/templates/pl/printers.tmpl
deleted file mode 100644 (file)
index c548474..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Domyślna drukarka):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Opis:</B> {printer_info}<BR>
-<B>Położenie:</B> {printer_location}<BR>
-<B>Producent i model:</B> {printer_make_and_model}<BR>
-<B>Stan drukarki:</B> {printer_state=3?bezczynna:{printer_state=4?przetwarzanie:zatrzymana}},
-{printer_is_accepting_jobs=0?odrzucanie zadań:akceptowanie zadań}, {printer_is_shared=0?nie opublikowana:opublikowana}.
-{?device_uri=?:<BR><B>URI urządzenia:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Wydrukuj stronę próbną" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Wyczyść głowice drukowania" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Wydrukuj samodzielną stronę próbną" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Uruchom drukarkę" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Zatrzymaj drukarkę" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Zaakceptuj zadania" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzuć zadania" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Przenieś wszystkie zadania" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Anuluj wszystkie zadania" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Opublikuj drukarke" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Odpublikuj drukarkę" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Zmodyfikuj drukarkę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Ustaw opcje drukarki" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Usuń drukarkę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Ustaw jako domyślną" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Ustaw zezwolonych użytkowników" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/pl/restart.tmpl b/templates/pl/restart.tmpl
deleted file mode 100644 (file)
index 57091c8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Proszę chwilę poczekać podczas ponownego uruchamiania serwera...</p>
diff --git a/templates/pl/samba-export.tmpl b/templates/pl/samba-export.tmpl
deleted file mode 100644 (file)
index 5341caf..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Wyeksportuj drukarki do Samby</H2>
-
-{error?<P>Nie można wyeksportować drukarek do Samby\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Zobacz plik <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A>, aby uzyskać więcej informacji.</P>:
-<P>Ta strona pozwala na wyeksportowanie drukarek do Samby, więc
-klienci Windows mogą mieć do nich dostęp przez ikony <VAR>Otoczenie
-sieciowe</VAR> lub <VAR>Miejsca sieciowe</VAR> na ich
-pulpitach. Poprzednio musisz zainstalować sterowniki drukarek
-Windows PostScript tak, jak to opisano na stronie podręcznika <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Drukarki:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Wyeksportuj wszystkie drukarki
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Nazwa użytkownika Samby:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (wymagane)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Hasło Samby:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (wymagane)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Wyeksportuj drukarki do Samby"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/pl/samba-exported.tmpl b/templates/pl/samba-exported.tmpl
deleted file mode 100644 (file)
index f1ba3dc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Drukarki zostały pomyślnie wyeksportowane do Samby.</P>
diff --git a/templates/pl/search.tmpl b/templates/pl/search.tmpl
deleted file mode 100644 (file)
index 053439a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Wyszukaj w
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Klasach:{SECTION=jobs?Zadaniach:Drukarkach}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Wyszukaj">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Wyczyść" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/pl/set-printer-options-header.tmpl b/templates/pl/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/pl/set-printer-options-trailer.tmpl b/templates/pl/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/pl/test-page.tmpl b/templates/pl/test-page.tmpl
deleted file mode 100644 (file)
index 6cbfd31..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Strona próbna została wysłana; ID zadania to <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/pl/trailer.tmpl b/templates/pl/trailer.tmpl
deleted file mode 100644 (file)
index 5b07fca..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System, CUPS i logo CUPS są
-zarejestrowanymi znakami towarowymi <A HREF="http://www.easysw.com">Easy Software
-Products</A>. Copyright 1997-2006 Easy Software Products,
-wszelkie prawa zastrzeżone.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/pl/users.tmpl b/templates/pl/users.tmpl
deleted file mode 100644 (file)
index 856d51f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Zezwoleni użytkownicy dla {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Użytkownicy:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?sprawdzone:}>Pozwól tym użytkownikom na drukowanie
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?sprawdzone:}>Zabroń tym użytkownikom drukowania
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ustaw zezwolonych użytkowników">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index 054d3895f3e0d14f7090f9305c37f60d5be81a4a..516aeea38c2d8a62af3032e7717e34e099cbb652 100644 (file)
@@ -1,7 +1,4 @@
 <P><B>Warning:</B> Are you sure you want to delete printer
 {printer_name}?</P>
 
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Delete Printer"
-CLASS="button"></A></P>
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Printer"></FORM></P>
index 56e4abce534896a65695364376013b250412c181..21782ee03b142b64016db9918b4ecb68b5d6901e 100644 (file)
@@ -1,66 +1,53 @@
 {printer_type?:}{#printer_name=0?:
 {[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
+{#printer_name=1?:<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}}
 {?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
 
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
+<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
 <TR>
 <TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
+<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.png" WIDTH="128" HEIGHT="128" ALT=""></A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 <TD VALIGN="TOP"><B>Description:</B> {printer_info}<BR>
 <B>Location:</B> {printer_location}<BR>
-<B>Printer Driver:</B> {printer_make_and_model}<BR>
+<B>Printer Driver:</B> {printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
 <B>Printer State:</B> {printer_state=3?idle:{printer_state=4?processing:stopped}},
-{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {printer_is_shared=0?not:} published.
+{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {server_is_sharing_printers=0?not:{printer_is_shared=0?not:}} shared{default_name={printer_name}?, default printer:}.<BR>
+<B>Default Options:</B> job-sheets={job_sheets_default}
+media={media_default?{media_default}:unknown}
+{sides_default?sides={sides_default}:}
 {?device_uri=?:<BR><B>Device URI:</B> {device_uri}}
 
-<P><TABLE WIDTH="100%" CELLPADDING="5" SUMMARY="Actions">
-<TR VALIGN="TOP"><TD>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Print Test Page" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Clean Print Heads" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Print Self Test Page" CLASS="button"></A>:}</TD>
-<TD>{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Start Printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Stop Printer" CLASS="button"></A>
+<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Maintenance Commands">
+<CAPTION>Maintenance Commands</CAPTION>
+<TR><TD><FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Test Page"></FORM>
+{?cupscommand=1?<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="clean-print-heads"><INPUT TYPE="SUBMIT" VALUE="Clean Print Heads"></FORM>
+<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-self-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Self Test Page"></FORM>:}
+{printer_state=5?
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="start-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Start Printer"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="stop-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Stop Printer"></FORM>
 }
 {printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Accept Jobs" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Reject Jobs" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Move All Jobs" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Cancel All Jobs" CLASS="button"></A></TD>
-<TD>{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publish Printer" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Unpublish Printer" CLASS="button"></A>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="accept-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Accept Jobs"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="reject-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Reject Jobs"></FORM>
 }
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Modify Printer" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Set Printer Options" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Delete Printer" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Set As Default" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Set Allowed Users" CLASS="button"></A></TD>
-</TR>
-</TABLE></P>
+<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Move All Jobs"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="purge-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Cancel All Jobs"></FORM>
+</TABLE>
+
+<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Administration Commands">
+<CAPTION>Administration Commands</CAPTION>
+<TR><TD>{server_is_sharing_printers=0?:{printer_is_shared=0?
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&amp;shared=1"><INPUT TYPE="SUBMIT" VALUE="Share Printer"></FORM>
+:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&amp;shared=0"><INPUT TYPE="SUBMIT" VALUE="Unshare Printer"></FORM>
+}}
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="modify-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Modify Printer"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-printer-options"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Printer Options"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Delete Printer"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-as-default"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set As Default"></FORM>
+<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-allowed-users"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Allowed Users"></FORM></TD></TR>
+</TABLE>
 </TD>
 </TR>
 </TABLE>
 }}
+<BR>
index 426465905ae793e227d2e734a968270b395b85fa..92a291f1e4946e2ba2fef1ef85028de52b3bff61 100644 (file)
@@ -47,8 +47,7 @@ onChange="select_printers()"> Export All Printers
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Export Printers to Samba"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></TD>
 </TR>
 </TABLE>
 
index e1c7c9e74898414523a77b00f4d7c2b1f55807ad..0fcc43861ff8f520d5e108aa67a63b0ae41feb60 100644 (file)
@@ -1,13 +1,10 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+<FORM ACTION="{THIS_URL}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 
 <P ALIGN="CENTER"><B>Search in
 {SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Search">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Search"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Clear"></P>
 
 </FORM>
diff --git a/templates/sv/add-class.tmpl b/templates/sv/add-class.tmpl
deleted file mode 100644 (file)
index 33a1acf..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Lägg till klass</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Namn:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Plats:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beskrivning:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Medlemmar:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Lägg till klass"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/add-printer.tmpl b/templates/sv/add-printer.tmpl
deleted file mode 100644 (file)
index 712e843..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}
-
-<H2 CLASS="title">Lägg till ny skrivare</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Namn:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Får innehålla utskrivbara tecken förutom "/", "#", och blanksteg)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Plats:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(Läsbar plats såsom "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beskrivning:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(Läsbar beskrivning såsom "HP LaserJet")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/admin.tmpl b/templates/sv/admin.tmpl
deleted file mode 100644 (file)
index 690ec58..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Skrivare</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Lägg till skrivare" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Hantera skrivare" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Exportera skrivare till Samba"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>Nya skrivare hittade:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Lägg till denna skrivare"
-CLASS="button" ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">Klasser</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Lägg till klass" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Hantera klasser" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">Jobb</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Hantera jobb"
- CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Server</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Redigera konfigurationsfil"
- CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Visa åtkomstlogg"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Visa fellogg"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Visa sidlogg"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>Grundläggande serverinställningar:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Visa skrivare utdelade av andra system<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Dela ut publicerade skrivare anslutna till detta system<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Tillåt fjärradministration<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Tillåt användare att avbryta alla jobb (inte bara sina egna)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Spara felsökningsinformation för problemlösning</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Ändra inställningar"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/sv/choose-device.tmpl b/templates/sv/choose-device.tmpl
deleted file mode 100644 (file)
index dd2e8a4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Enhet för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Enhet:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/choose-make.tmpl b/templates/sv/choose-make.tmpl
deleted file mode 100644 (file)
index f47ed81..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Märke/Tillverkare för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Tillverkare:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">Eller tillhandahåll en PPD-fil:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Lägg till skrivare:Modifiera skrivare}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/choose-model.tmpl b/templates/sv/choose-model.tmpl
deleted file mode 100644 (file)
index 0645eec..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">Modell/Drivrutin för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Modell:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Eller tillhandahåll en PPD-fil:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Lägg till skrivare:Modifiera skrivare}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/choose-serial.tmpl b/templates/sv/choose-serial.tmpl
deleted file mode 100644 (file)
index 877015e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">Serieportsinställningar för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Baudhastighet:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Paritet:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Ingen
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Jämn
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Udda
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Databitar:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Flödeskontroll:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Ingen
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Programvara)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Maskinvara)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Maskinvara)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/choose-uri.tmpl b/templates/sv/choose-uri.tmpl
deleted file mode 100644 (file)
index b65dffc..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">Enhets-URI för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Enhets-URI:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Exempel:
-<PRE>
-    http://värdnamn:631/ipp/
-    http://värdnamn:631/ipp/port1
-
-    ipp://värdnamn/ipp/
-    ipp://värdnamn/ipp/port1
-
-    lpd://värdnamn/kö
-
-    socket://värdnamn
-    socket://värdnamn:9100
-</PRE>
-
-<P>Se <A HREF="/help/network.html" TARGET="_blank">"Nätverksskrivare"
-</A> för den korrekta URI:n att använda för din skrivare.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/class-added.tmpl b/templates/sv/class-added.tmpl
deleted file mode 100644 (file)
index 512a2f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klassen <A HREF="/classes/{printer_name}">{printer_name}</A> har lagts till.
diff --git a/templates/sv/class-confirm.tmpl b/templates/sv/class-confirm.tmpl
deleted file mode 100644 (file)
index 40df8ea..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Varning:</B> Är du säker på att du vill ta bort klassen 
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Ta bort klass"
-CLASS="button"></A></P>
diff --git a/templates/sv/class-deleted.tmpl b/templates/sv/class-deleted.tmpl
deleted file mode 100644 (file)
index b14513f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Klassen {printer_name} har tagits bort.
diff --git a/templates/sv/class-jobs-header.tmpl b/templates/sv/class-jobs-header.tmpl
deleted file mode 100644 (file)
index 59f2054..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Jobb</H3>
diff --git a/templates/sv/class-modified.tmpl b/templates/sv/class-modified.tmpl
deleted file mode 100644 (file)
index a5d5fb0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Klassen <A HREF="/classes/{printer_name}">{printer_name}</A> har 
-modifierats.
diff --git a/templates/sv/classes-header.tmpl b/templates/sv/classes-header.tmpl
deleted file mode 100644 (file)
index c87bc20..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Inga klasser:Visar {#printer_name} av {total} klass{total=1?:er}}.</P>
diff --git a/templates/sv/classes.tmpl b/templates/sv/classes.tmpl
deleted file mode 100644 (file)
index d555c0c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Standardskrivare):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>Beskrivning:</B> {printer_info}<BR>
-<B>Plats:</B> {printer_location}<BR>
-<B>Klasstillstånd:</B> {printer_state=3?overksam:{printer_state=4?behandlar:stoppad}},
-{printer_is_accepting_jobs=0?vägrar jobb:accepterar jobb}, {printer_is_shared=0?inte:} publicerad.
-{?member_uris=?:<BR>Medlemmar: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Skriv ut testsida" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Starta klass" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Stoppa klass" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Acceptera jobb" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Vägra jobb" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Avbryt alla jobb" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publicera skrivare" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Avpublicera skrivare" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Modifiera klass" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Ta bort klass" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Ställ in som standard" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Ställ in tillåtna användare" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/sv/edit-config.tmpl b/templates/sv/edit-config.tmpl
deleted file mode 100644 (file)
index 1673e50..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Serverkonfigurationsfil</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Spara ändringar"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Använd standardkonfigurationsfil"></A></P>
-
-</FORM>
diff --git a/templates/sv/error-op.tmpl b/templates/sv/error-op.tmpl
deleted file mode 100644 (file)
index 153b0a9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>Fel:</P>
-
-<BLOCKQUOTE>Okänd åtgärd "{op}"!</BLOCKQUOTE>
diff --git a/templates/sv/error.tmpl b/templates/sv/error.tmpl
deleted file mode 100644 (file)
index f4f82b1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:Fel:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/sv/header.tmpl.in b/templates/sv/header.tmpl.in
deleted file mode 100644 (file)
index 50e0e09..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS 1.2rc2</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Hem&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Klasser&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Dokumentation/Hjälp&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Jobb&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;Skrivare&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/sv/help-header.tmpl b/templates/sv/help-header.tmpl
deleted file mode 100644 (file)
index 59435d9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>Sök i
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Alla dokument}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Sök">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="Töm" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">Hjälpdokument</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Alla dokument</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>Sök resultat i {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Alla dokument}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>Inga träffar.</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Visa utskrivbar version"
-CLASS="button"></A></H1>:<H1>CUPS Hjälpsidor</H1>
-
-<P>Detta är CUPS hjälpgränssnitt. Ange sökord
-ovan eller klicka på någon av dokumentationslänkarna för att visa
-hjälpinformation.</P>
-
-<P>Om du är nybörjare i CUPS, läs sidan "<a
-href="overview.html">Översikt av CUPS</a>". Veterananvändare
-bör läsa sidan "<a href="whatsnew.html">Vad är nytt i CUPS
-1.3</a>".</P>
-
-<P><A HREF="http://www.cups.org/">CUPS hemsida</A> tillhandahåll även
-många resurser inklusive diskussionsforum för användarna, svar
-på ofta ställda frågor, och ett formulär för att skicka in felrapporter
-och förslag.</P>}
diff --git a/templates/sv/help-printable.tmpl b/templates/sv/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/sv/job-cancel.tmpl b/templates/sv/job-cancel.tmpl
deleted file mode 100644 (file)
index 7f922e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Jobbet {job_id}</A> har avbrutits.
diff --git a/templates/sv/job-hold.tmpl b/templates/sv/job-hold.tmpl
deleted file mode 100644 (file)
index 1ff1fdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Jobbet {job_id}</A> har undanhållits från utskrift.
diff --git a/templates/sv/job-move.tmpl b/templates/sv/job-move.tmpl
deleted file mode 100644 (file)
index 388f7ad..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?Flytta jobb {job_id}:Flytta alla jobb}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Nytt mål:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Flytta jobb{job_id?:s}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/job-moved.tmpl b/templates/sv/job-moved.tmpl
deleted file mode 100644 (file)
index 5e31389..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Jobbet {job_id}</A>:Alla jobb} har flyttats till
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
diff --git a/templates/sv/job-release.tmpl b/templates/sv/job-release.tmpl
deleted file mode 100644 (file)
index 86bad19..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Jobbet {job_id}</A> har släppts för utskrift.
diff --git a/templates/sv/job-restart.tmpl b/templates/sv/job-restart.tmpl
deleted file mode 100644 (file)
index 082afec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">Jobbet {job_id}</A> har startats om.
diff --git a/templates/sv/jobs-header.tmpl b/templates/sv/jobs-header.tmpl
deleted file mode 100644 (file)
index e0d1101..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Visa färdiga jobb"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Visa alla jobb">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Visa färdiga jobb"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Visa aktiva jobb">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Visa aktiva jobb"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Visa alla jobb">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?Inga jobb:Visar {#job_id} av {total} {?which_jobs=?aktiva:{which_jobs=all?:färdiga}} jobb{total=1?:s}}.</P>
diff --git a/templates/sv/jobs.tmpl b/templates/sv/jobs.tmpl
deleted file mode 100644 (file)
index 7626273..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Namn&nbsp;</TH>
-<TH>Användare&nbsp;</TH>
-<TH>Storlek&nbsp;</TH>
-<TH>Sidor&nbsp;</TH>
-<TH>Tillstånd&nbsp;</TH>
-<TH>Kontroll&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Okänt:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Okänt:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?väntar sedan<BR>{time_at_creation}:{job_state=4?hålls kvar sedan<BR>{time_at_creation}:
-{job_state=5?behandlas sedan<BR>{time_at_processing}:{job_state=6?stoppad:
-{job_state=7?cancelled at<BR>{time_at_completed}:{job_state=8?aborted:färdig kl<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Skriv ut jobb igen" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Släpp jobb" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Håll kvar jobb" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Avbryt jobb" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Flytta jobb" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/sv/maintenance.tmpl b/templates/sv/maintenance.tmpl
deleted file mode 100644 (file)
index 7bb5fd8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Underhållskommandon skickade; jobb-id är <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/sv/modify-class.tmpl b/templates/sv/modify-class.tmpl
deleted file mode 100644 (file)
index 8105d85..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">Modifiera klass {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Namn:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Plats:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beskrivning:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Medlemmar:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modifiera klass"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/modify-printer.tmpl b/templates/sv/modify-printer.tmpl
deleted file mode 100644 (file)
index 4090ab4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">Modifiera skrivare {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Namn:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Plats:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Läsbar plats såsom "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Beskrivning:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Läsbar beskrivning såsom "HP LaserJet")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Fortsätt"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/option-boolean.tmpl b/templates/sv/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/sv/option-conflict.tmpl b/templates/sv/option-conflict.tmpl
deleted file mode 100644 (file)
index 10d6002..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Fel:</B> Följande alternativ är i konflikt:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>Ändra ett eller flera av alternativen för att läsa konflikterna.</P>
diff --git a/templates/sv/option-header.tmpl b/templates/sv/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/sv/option-pickmany.tmpl b/templates/sv/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/sv/option-pickone.tmpl b/templates/sv/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/sv/option-trailer.tmpl b/templates/sv/option-trailer.tmpl
deleted file mode 100644 (file)
index f81ffbd..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ställ in skrivaralternativ"></TD>
-</TR>
-</TABLE>
diff --git a/templates/sv/pager.tmpl b/templates/sv/pager.tmpl
deleted file mode 100644 (file)
index 536fdd1..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="Visa föregående" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Sortera stigande" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Sortera fallande" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Visa nästa" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/sv/printer-accept.tmpl b/templates/sv/printer-accept.tmpl
deleted file mode 100644 (file)
index b8a032b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-accepterar nu jobb.</P>
diff --git a/templates/sv/printer-added.tmpl b/templates/sv/printer-added.tmpl
deleted file mode 100644 (file)
index 8fe0c1c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Skrivaren <A HREF="/printers/{printer_name}">{printer_name}</A> har lagts till.
diff --git a/templates/sv/printer-configured.tmpl b/templates/sv/printer-configured.tmpl
deleted file mode 100644 (file)
index db94934..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Skrivaren <A HREF="/printers/{printer_name}">{printer_name}</A> har nu konfigurerats.
diff --git a/templates/sv/printer-confirm.tmpl b/templates/sv/printer-confirm.tmpl
deleted file mode 100644 (file)
index 0f4d081..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>Varning:</B> Är du säker på att du vill ta bort skrivaren 
-{printer_name}?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="Ta bort skrivare"
-CLASS="button"></A></P>
diff --git a/templates/sv/printer-default.tmpl b/templates/sv/printer-default.tmpl
deleted file mode 100644 (file)
index a564e34..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-har gjorts till standardskrivaren på servern.</P>
-
-<BLOCKQUOTE><B>Notera:</B> Alla användarinställningar som har ställts in via
-kommandot <TT>lpoptions</TT> kommer att åsidosätta denna standardinställning.
-</BLOCKQUOTE>
diff --git a/templates/sv/printer-deleted.tmpl b/templates/sv/printer-deleted.tmpl
deleted file mode 100644 (file)
index 640fab0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Skrivaren {printer_name} har tagits bort.
diff --git a/templates/sv/printer-jobs-header.tmpl b/templates/sv/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index 59f2054..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">Jobb</H3>
diff --git a/templates/sv/printer-modified.tmpl b/templates/sv/printer-modified.tmpl
deleted file mode 100644 (file)
index e209ea0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Skrivaren <A HREF="/printers/{printer_name}">{printer_name}</A> har modifierats.
diff --git a/templates/sv/printer-purge.tmpl b/templates/sv/printer-purge.tmpl
deleted file mode 100644 (file)
index a53c9ae..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-har fått alla sina jobb rensade.</P>
diff --git a/templates/sv/printer-reject.tmpl b/templates/sv/printer-reject.tmpl
deleted file mode 100644 (file)
index a15567d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-accepterar inte längre jobb.</P>
diff --git a/templates/sv/printer-start.tmpl b/templates/sv/printer-start.tmpl
deleted file mode 100644 (file)
index 2a06b26..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-har startats.</P>
diff --git a/templates/sv/printer-stop.tmpl b/templates/sv/printer-stop.tmpl
deleted file mode 100644 (file)
index 668de21..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-har stoppats.</P>
diff --git a/templates/sv/printers-header.tmpl b/templates/sv/printers-header.tmpl
deleted file mode 100644 (file)
index 52fd615..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Inga skrivare:Visar {#printer_name} av {total} skrivare}.</P>
diff --git a/templates/sv/printers.tmpl b/templates/sv/printers.tmpl
deleted file mode 100644 (file)
index 3251d42..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Standardskrivare):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>Beskrivning:</B> {printer_info}<BR>
-<B>Plats:</B> {printer_location}<BR>
-<B>Tillverkare och modell:</B> {printer_make_and_model}<BR>
-<B>Tillstånd:</B> {printer_state=3?overksam:{printer_state=4?behandlar:stoppad}},
-{printer_is_accepting_jobs=0?vägrar jobb:accepterar jobb}, {printer_is_shared=0?inte:} publicerad.
-{?device_uri=?:<BR><B>Enhets-URI:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Skriv ut testsida" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="Rengör skrivarhuvuden" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="Skriv ut självtestsida" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="Starta skrivare" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="Stoppa skrivare" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Acceptera jobb" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Vägra jobb" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="Flytta alla jobb" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Avbryt alla jobb" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Publicera skrivare" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Avpublicera skrivare" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="Modifiera skrivare" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="Ställ in skrivaralternativ" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="Ta bort skrivare" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Ställ in som standard" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Ställ in tillåtna användare" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/sv/restart.tmpl b/templates/sv/restart.tmpl
deleted file mode 100644 (file)
index b8416a9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>Var god vänta under tiden servern startar om...</p>
diff --git a/templates/sv/samba-export.tmpl b/templates/sv/samba-export.tmpl
deleted file mode 100644 (file)
index 6d7eff8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">Exportera skrivare till Samba</H2>
-
-{error?<P>Kunde inte exportera skrivare till Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Konsultera filen <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> för mer information.</P>:
-<P>Denna sida låter dig exportera skrivare till Samba så att
-Windows-klienter kan komma åt dem genom ikonerna <VAR>Network
-Neighborhood</VAR> eller <VAR>Network Places</VAR> på deras
-skrivbord. Du måste tidigare ha installerat skrivardrivrutinerna för Windows PostScript
-som beskrivs på manualsidan <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Skrivare:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> Exportera alla skrivare
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Användarnamn för Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (krävs)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Lösenord för Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (krävs)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="Exportera skrivare till Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/sv/samba-exported.tmpl b/templates/sv/samba-exported.tmpl
deleted file mode 100644 (file)
index 7281bfb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>Skrivare exporterade till Samba.</P>
diff --git a/templates/sv/search.tmpl b/templates/sv/search.tmpl
deleted file mode 100644 (file)
index fa835f2..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>Sök i
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Klasser:{SECTION=jobs?Jobb:Skrivare}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Sök">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Töm" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/sv/set-printer-options-header.tmpl b/templates/sv/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/sv/set-printer-options-trailer.tmpl b/templates/sv/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/sv/test-page.tmpl b/templates/sv/test-page.tmpl
deleted file mode 100644 (file)
index a712193..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Testsida skickad; jobb-id är <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>.</P>
diff --git a/templates/sv/trailer.tmpl b/templates/sv/trailer.tmpl
deleted file mode 100644 (file)
index 01698fe..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, och CUPS-logotypen är
-varumärken tillhörande <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS är copyright 1997-2006 Easy Software Products,
-Alla rättigheter reserverade.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/sv/users.tmpl b/templates/sv/users.tmpl
deleted file mode 100644 (file)
index 117d549..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">Tillåtna användare för {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">Användare:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Tillåt dessa användare att skriva ut
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Förhindra dessa användare från att skriva ut
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ställ in tillåtna användare">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index 040a27f7e9b20b303412d576e3f8ed845d7433d5..18fe6c914b8a4e07dd403008eb3305b51a0a8fab 100644 (file)
@@ -1,20 +1,9 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.apple.com">Apple, Inc.</A> CUPS
-is copyright 2007 by Apple Inc, all rights reserved.</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and
+the CUPS logo are the trademark property of
+<A HREF="http://www.apple.com">Apple, Inc.</A> CUPS is copyright 2007 by Apple
+Inc, all rights reserved.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
index b2594f0923cb7da344d006ee7e216dc3f69e9395..369e30b11e3fdf73a376d460d82254cbae6c75f9 100644 (file)
@@ -18,7 +18,7 @@
 <TR>
 <TD></TD>
 <TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Set Allowed Users">
+<INPUT TYPE="SUBMIT" VALUE="Set Allowed Users">
 </TD>
 </TR>
 </TABLE>
diff --git a/templates/zh_TW/add-class.tmpl b/templates/zh_TW/add-class.tmpl
deleted file mode 100644 (file)
index 33cda9f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">加入分類</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名稱:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">位置:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">描述:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">成員:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="加入分類"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/add-printer.tmpl b/templates/zh_TW/add-printer.tmpl
deleted file mode 100644 (file)
index 500045b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">加入新的印表機</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名稱:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(可能包含任何除了 "/"、"#" 和 space 以外可列印的字元)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">位置:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(容易理解的位置,像是 "實驗室一")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">描述:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(容易理解的描述,像是 "HP LaserJet with Duplexer")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/admin.tmpl b/templates/zh_TW/admin.tmpl
deleted file mode 100644 (file)
index 9ea7fd1..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="管理任務">
-<TR><TD VALIGN="TOP" NOWRAP>
-
-<H2 CLASS="title">印表機</H2>
-
-<P>
-<A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="加入印表機" CLASS="button"></A>
-<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="管理印表機" CLASS="button"></A>
-{have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="匯出印表機到 Samba"
-CLASS="button"></A>:}
-</P>
-
-{#device_uri=0?:<P><B>找到新的印表機:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="加入此印表機" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
-}</UL>}
-
-<H2 CLASS="title">分類</H2>
-
-<P>
-<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="加入分類" CLASS="button"></A>
-<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="管理分類" CLASS="button"></A>
-</P>
-
-<H2 CLASS="title">工作</H2>
-
-<P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="管理
-工作" CLASS="button"></A>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">伺服器</H2>
-
-<P>
-<A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="編輯配置
-檔案" CLASS="button"></A>
-<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="檢視存取記錄"
-CLASS="button"></A>
-<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="檢視錯誤記錄"
-CLASS="button"></A>
-<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="檢視頁面記錄"
-CLASS="button"></A>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-<P><B>基本伺服器設定值:</B></P>
-
-<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> 顯示其他系統分享的印表機<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> 分享連接到此系統的公開印表機<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> 允許遠端管理<BR>
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> 允許使用者取消任何工作 (而非只有他們所擁有的)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> 儲存除錯資訊以便解決問題</P>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="變更設定值"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
diff --git a/templates/zh_TW/choose-device.tmpl b/templates/zh_TW/choose-device.tmpl
deleted file mode 100644 (file)
index 5ad4bba..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">{printer_name} 的裝置</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">裝置:</TH>
-<TD>
-<SELECT NAME="DEVICE_URI">
-{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/choose-make.tmpl b/templates/zh_TW/choose-make.tmpl
deleted file mode 100644 (file)
index 8e76598..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">{printer_name} 的廠牌/製造商</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">廠牌:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">或是提供 PPD 檔案:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?加入印表機:修改印表機}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/choose-model.tmpl b/templates/zh_TW/choose-model.tmpl
deleted file mode 100644 (file)
index 202687c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<H2 CLASS="title">{printer_name} 的型號/驅動程式</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">型號:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">或是提供 PPD 檔案:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
-TYPE="FILE" NAME="PPD_FILE"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?加入印表機:修改印表機}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/choose-serial.tmpl b/templates/zh_TW/choose-serial.tmpl
deleted file mode 100644 (file)
index 66fae24..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
-
-<H2 CLASS="title">{printer_name} 的序列埠設定值</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">傳輸速率:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">同位檢查:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>無
-<OPTION VALUE="even" {?parity=even?SELECTED:}>偶
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>奇
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">資料位元:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">流程控制:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>無
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (軟體)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (硬體)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (硬體)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/choose-uri.tmpl b/templates/zh_TW/choose-uri.tmpl
deleted file mode 100644 (file)
index 64fc4ab..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<H2 CLASS="title">{printer_name} 的裝置 URI</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">裝置 URI:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>範例:
-<PRE>
-    http://hostname:631/ipp/
-    http://hostname:631/ipp/port1
-
-    ipp://hostname/ipp/
-    ipp://hostname/ipp/port1
-
-    lpd://hostname/queue
-
-    socket://hostname
-    socket://hostname:9100
-</PRE>
-
-<P>參看 <A HREF="/help/network.html" TARGET="_blank">"網路
-印表機"</A> 來取得正確的 URI 以用於您的印表機。</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/class-added.tmpl b/templates/zh_TW/class-added.tmpl
deleted file mode 100644 (file)
index 51ca603..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>分類 <A HREF="/classes/{printer_name}">{printer_name}</A> 已經成功加入。
diff --git a/templates/zh_TW/class-confirm.tmpl b/templates/zh_TW/class-confirm.tmpl
deleted file mode 100644 (file)
index 1eed0cf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>警告:</B> 您確定要刪除分類
-{printer_name} 嗎?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="刪除分類"
-CLASS="button"></A></P>
diff --git a/templates/zh_TW/class-deleted.tmpl b/templates/zh_TW/class-deleted.tmpl
deleted file mode 100644 (file)
index 4551cf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>分類 {printer_name} 已經成功刪除。
diff --git a/templates/zh_TW/class-jobs-header.tmpl b/templates/zh_TW/class-jobs-header.tmpl
deleted file mode 100644 (file)
index 6a6be7d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">工作</H3>
diff --git a/templates/zh_TW/class-modified.tmpl b/templates/zh_TW/class-modified.tmpl
deleted file mode 100644 (file)
index 99b7e04..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> 已經
-成功修改。
diff --git a/templates/zh_TW/classes-header.tmpl b/templates/zh_TW/classes-header.tmpl
deleted file mode 100644 (file)
index eb4e41d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?沒有分類:顯示 {total} 種分類}的 {#printer_name} 。</P>
diff --git a/templates/zh_TW/classes.tmpl b/templates/zh_TW/classes.tmpl
deleted file mode 100644 (file)
index 784cf18..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
-<TD VALIGN=TOP><B>描述:</B> {printer_info}<BR>
-<B>位置:</B> {printer_location}<BR>
-<B>分類狀態:</B> {printer_state=3?閒置:{printer_state=4?處理中:已停止}},
-{printer_is_accepting_jobs=0?拒絕工作:接受工作}, {printer_is_shared=0?未:已}公開。
-{?member_uris=?:<BR>成員: {member_uris}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="列印測試頁" CLASS="button"></A>
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="開始分類" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="停止分類" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="接受工作" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="拒絕工作" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="取消所有工作" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="公開印表機" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="不公開印表機" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="修改分類" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="刪除分類" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="設為預設" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="設定允許的使用者" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/zh_TW/edit-config.tmpl b/templates/zh_TW/edit-config.tmpl
deleted file mode 100644 (file)
index e83a93d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<H2 CLASS="title">伺服器配置檔案</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="儲存變更"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="使用預設配置檔案"></A></P>
-
-</FORM>
diff --git a/templates/zh_TW/error-op.tmpl b/templates/zh_TW/error-op.tmpl
deleted file mode 100644 (file)
index bc7fb8f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>錯誤:</P>
-
-<BLOCKQUOTE>不明的操作 "{op}"!</BLOCKQUOTE>
diff --git a/templates/zh_TW/error.tmpl b/templates/zh_TW/error.tmpl
deleted file mode 100644 (file)
index 4e40162..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{?message?{message}:錯誤:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
diff --git a/templates/zh_TW/header.tmpl.in b/templates/zh_TW/header.tmpl.in
deleted file mode 100644 (file)
index 7e731e3..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <!-- Prevent caching of CGI content -->
-       <META HTTP-EQUIV="Expires" CONTENT="now">
-       <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
-<TR CLASS="header">
-<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
-<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
-<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
-<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
-SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-<TR CLASS="header"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
-
-<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
-WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;首頁&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;管理&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;分類&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;文件/求助&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;工作&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
-SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT="">&nbsp;&nbsp;印表機&nbsp;&nbsp;<IMG
-SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
-BORDER="0" ALT=""></A>
-
-</TD></TR>
-<TR CLASS="page">
-<TD WIDTH="15">&nbsp;</TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
diff --git a/templates/zh_TW/help-header.tmpl b/templates/zh_TW/help-header.tmpl
deleted file mode 100644 (file)
index 9a28a3c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
-{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
-
-<P ALIGN="CENTER"><B>搜尋於
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:所有文件}}:</B> <INPUT
-TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="搜尋">
-<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
-SRC="/images/button-clear.gif" ALT="清空" CLASS="button"></A></P>
-
-</FORM>
-
-<!-- Bookmarks -->
-<DIV CLASS="sidebar">
-<H3 CLASS="title">線上說明文件</H3>
-
-<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">所有文件</A></P>
-<HR>
-
-{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
-}
-</DIV>
-
-{QUERY?<P>搜尋結果於 {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:所有文件}}\:</P>
-{QTEXT?<UL>
-{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
-{QTEXT?</UL>:}
-:<P>找不到符合者。</P>}
-<HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}
-<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="檢視可列印版本"
-CLASS="button"></A></H1>:<H1>CUPS 說明頁面</H1>
-
-<P>這是 CUPS 線上說明介面。在上方輸入搜尋字詞
-或是按下任何的文件連結以顯示線上說明資訊。</P>
-
-<P>如果您剛接觸 CUPS,請參閱 "<a
-href="overview.html">CUPS 概觀</a>" 頁面。有經驗的使用者
-應該參閱 "<a href="whatsnew.html">CUPS 1.3 有何新功能</a>" 頁面。</P>
-
-<P><A HREF="http://www.cups.org/">CUPS 首頁</A> 也
-提供許多資源,包括使用者論壇、常見問題的回答,
-以及用來提交錯誤報告與功能需求的表格。</P>}
diff --git a/templates/zh_TW/help-printable.tmpl b/templates/zh_TW/help-printable.tmpl
deleted file mode 100644 (file)
index 305112a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{HELPTITLE}</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
-       <LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
-</HEAD>
-<BODY>
-
-<H1>{HELPTITLE}</H1>
diff --git a/templates/zh_TW/job-cancel.tmpl b/templates/zh_TW/job-cancel.tmpl
deleted file mode 100644 (file)
index d60b15e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">工作 {job_id}</A> 已經取消。
diff --git a/templates/zh_TW/job-hold.tmpl b/templates/zh_TW/job-hold.tmpl
deleted file mode 100644 (file)
index 1a53db4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">工作 {job_id}</A> 已經延遲列印。
diff --git a/templates/zh_TW/job-move.tmpl b/templates/zh_TW/job-move.tmpl
deleted file mode 100644 (file)
index 67fbedc..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
-
-<H2 CLASS="title">{job_id?移動工作 {job_id}:移動所有工作}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">新目的地:</TH>
-<TD>
-<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
-{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="移動工作"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/job-moved.tmpl b/templates/zh_TW/job-moved.tmpl
deleted file mode 100644 (file)
index b66712c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">工作 {job_id}</A>:所有工作} 移動至
-<A HREF="{job_printer_uri}">{job_printer_name}</A>。</P>
diff --git a/templates/zh_TW/job-release.tmpl b/templates/zh_TW/job-release.tmpl
deleted file mode 100644 (file)
index 8565446..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">工作 {job_id}</A> 已經釋出至列印。
diff --git a/templates/zh_TW/job-restart.tmpl b/templates/zh_TW/job-restart.tmpl
deleted file mode 100644 (file)
index 168f533..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P><A HREF="{job_printer_uri}">工作 {job_id}</A> 已經重新啟動。
diff --git a/templates/zh_TW/jobs-header.tmpl b/templates/zh_TW/jobs-header.tmpl
deleted file mode 100644 (file)
index 52117c4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<P>{?which_jobs=?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="顯示已完成工作"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="顯示所有工作">:{which_jobs=all?<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="顯示已完成工作"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="顯示進行中工作">:<A
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="顯示進行中工作"></A>
-<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="顯示所有工作">}}</A></P>
-
-<P ALIGN="CENTER">{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.</P>
diff --git a/templates/zh_TW/jobs.tmpl b/templates/zh_TW/jobs.tmpl
deleted file mode 100644 (file)
index 8b17a02..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>名稱&nbsp;</TH>
-<TH>使用者&nbsp;</TH>
-<TH>大小&nbsp;</TH>
-<TH>頁數&nbsp;</TH>
-<TH>狀態&nbsp;</TH>
-<TH>控制&nbsp;</TH>
-</TR>
-
-{[job_id]
-<TR CLASS="data" VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?不明:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
-<TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?不明:{?job_media_sheets_completed}}&nbsp;</TD>
-<TD>{job_state=3?擱置自<BR>{time_at_creation}:{job_state=4?延遲自<BR>{time_at_creation}:
-{job_state=5?處理自<BR>{time_at_processing}:{job_state=6?停止:
-{job_state=7?取消於<BR>{time_at_completed}:{job_state=8?中斷:完成於<BR>{time_at_completed}}}}}}}&nbsp;</TD>
-<TD>
-{job_preserved>0?
-<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="重新列印工作" CLASS="button"></A>:}
-{job_state=4?
-<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="釋出工作" CLASS="button"></A>:}
-{job_state=3?
-<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="延遲工作" CLASS="button"></A>:}
-{job_state<7?
-<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="取消工作" CLASS="button"></A>
-<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="移動工作" CLASS="button"></A>:}
-&nbsp;</TD>
-</TR>
-}
-</TABLE>
-}
diff --git a/templates/zh_TW/maintenance.tmpl b/templates/zh_TW/maintenance.tmpl
deleted file mode 100644 (file)
index 2e7532c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>送出維護命令;工作 ID 為 <A HREF="/printers/{printer_name}">
-{printer_name}-{job_id}</A>。</P>
diff --git a/templates/zh_TW/modify-class.tmpl b/templates/zh_TW/modify-class.tmpl
deleted file mode 100644 (file)
index 3fbaeef..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<H2 CLASS="title">修改分類 {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名稱:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">位置:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">描述:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
-<TH CLASS="label">成員:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="修改分類"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/modify-printer.tmpl b/templates/zh_TW/modify-printer.tmpl
deleted file mode 100644 (file)
index 10f33f5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
-{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
-
-<H2 CLASS="title">修改印表機 {printer_name}</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">名稱:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
-<TR>
-<TH CLASS="label">位置:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(容易理解的位置,像是 "實驗室一")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">描述:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(容易理解的描述,像是 "HP LaserJet with Duplexer")</SMALL></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="繼續"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/option-boolean.tmpl b/templates/zh_TW/option-boolean.tmpl
deleted file mode 100644 (file)
index 72c8518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
-</TD>
-</TR>
diff --git a/templates/zh_TW/option-conflict.tmpl b/templates/zh_TW/option-conflict.tmpl
deleted file mode 100644 (file)
index 70c963b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><B>錯誤:</B> 下列選項之間發生衝突:</P>
-
-<UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
-}</UL>
-
-<P>請變更一或多個選項以解決衝突。</P>
diff --git a/templates/zh_TW/option-header.tmpl b/templates/zh_TW/option-header.tmpl
deleted file mode 100644 (file)
index cafc9f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<H2 CLASS="title">{printer_name}: {group}</H2>
-
-<TABLE>
diff --git a/templates/zh_TW/option-pickmany.tmpl b/templates/zh_TW/option-pickmany.tmpl
deleted file mode 100644 (file)
index d2534af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/zh_TW/option-pickone.tmpl b/templates/zh_TW/option-pickone.tmpl
deleted file mode 100644 (file)
index 08342d0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<TR>
-<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A NAME="{keyword}">{keytext}</A>:</TH>
-<TD><SELECT NAME="{keyword}">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
-</SELECT></TD>
-</TR>
diff --git a/templates/zh_TW/option-trailer.tmpl b/templates/zh_TW/option-trailer.tmpl
deleted file mode 100644 (file)
index bee811c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="設定印表機選項"></TD>
-</TR>
-</TABLE>
diff --git a/templates/zh_TW/pager.tmpl b/templates/zh_TW/pager.tmpl
deleted file mode 100644 (file)
index 1248fbd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
-<TR>
-       <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/button-show-previous.gif" ALT="顯示上一個" CLASS="button"></A>:&nbsp;}</TD>
-       <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&amp;ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="遞增排序" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="遞減排序" CLASS="button"></A>}</TD>
-       <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="顯示下一個" CLASS="button"></A>:&nbsp;}</TD>
-</TR>
-</TABLE>
diff --git a/templates/zh_TW/printer-accept.tmpl b/templates/zh_TW/printer-accept.tmpl
deleted file mode 100644 (file)
index 65a73c4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?分類:印表機} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-現在準備接受工作。</P>
diff --git a/templates/zh_TW/printer-added.tmpl b/templates/zh_TW/printer-added.tmpl
deleted file mode 100644 (file)
index b81b1f7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>印表機 <A HREF="/printers/{printer_name}">{printer_name}</A> 已經成功
-加入。
diff --git a/templates/zh_TW/printer-configured.tmpl b/templates/zh_TW/printer-configured.tmpl
deleted file mode 100644 (file)
index 5a30980..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>印表機 <A HREF="/printers/{printer_name}">{printer_name}</A> 已經
-成功配置。
diff --git a/templates/zh_TW/printer-confirm.tmpl b/templates/zh_TW/printer-confirm.tmpl
deleted file mode 100644 (file)
index e6b0a98..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P><B>警告:</B> 您確定要刪除印表機 {printer_name} 嗎?</P>
-
-<P ALIGN="CENTER"><A
-HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-printer.gif" ALT="刪除印表機"
-CLASS="button"></A></P>
diff --git a/templates/zh_TW/printer-default.tmpl b/templates/zh_TW/printer-default.tmpl
deleted file mode 100644 (file)
index 7c26e78..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<P>{is_class?分類:印表機} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-已被設為伺服器上的預設印表機。</P>
-
-<BLOCKQUOTE><B>注意:</B> 任何經由 <TT>lpoptions</TT> 命令所設定的使用者預設值,
-將會蓋過此一設定值。</BLOCKQUOTE>
diff --git a/templates/zh_TW/printer-deleted.tmpl b/templates/zh_TW/printer-deleted.tmpl
deleted file mode 100644 (file)
index 00ad550..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>印表機 {printer_name} 已經成功刪除。
diff --git a/templates/zh_TW/printer-jobs-header.tmpl b/templates/zh_TW/printer-jobs-header.tmpl
deleted file mode 100644 (file)
index 6a6be7d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<H3 CLASS="title">工作</H3>
diff --git a/templates/zh_TW/printer-modified.tmpl b/templates/zh_TW/printer-modified.tmpl
deleted file mode 100644 (file)
index 43a72f6..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>印表機 <A HREF="/printers/{printer_name}">{printer_name}</A> 已經成功
-修改。
diff --git a/templates/zh_TW/printer-purge.tmpl b/templates/zh_TW/printer-purge.tmpl
deleted file mode 100644 (file)
index e3d0948..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?分類:印表機} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-的所有工作都已被清除。</P>
diff --git a/templates/zh_TW/printer-reject.tmpl b/templates/zh_TW/printer-reject.tmpl
deleted file mode 100644 (file)
index 3035a00..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?分類:印表機} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-已不再接受工作。</P>
diff --git a/templates/zh_TW/printer-start.tmpl b/templates/zh_TW/printer-start.tmpl
deleted file mode 100644 (file)
index d66c8c9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?分類:印表機} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-已經啟動。</P>
diff --git a/templates/zh_TW/printer-stop.tmpl b/templates/zh_TW/printer-stop.tmpl
deleted file mode 100644 (file)
index 6df0fa8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<P>{is_class?Class:Printer} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-已經停止。</P>
diff --git a/templates/zh_TW/printers-header.tmpl b/templates/zh_TW/printers-header.tmpl
deleted file mode 100644 (file)
index 4ec355f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?沒有任何印表機:顯示 {total} 台印表機中的 {#printer_name}}。</P>
diff --git a/templates/zh_TW/printers.tmpl b/templates/zh_TW/printers.tmpl
deleted file mode 100644 (file)
index 24f6ad7..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{printer_type?:}{#printer_name=0?:
-{[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
-
-<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
-<TR>
-<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
-<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
-</TD>
-<TD VALIGN="TOP"><B>描述:</B> {printer_info}<BR>
-<B>位置:</B> {printer_location}<BR>
-<B>型號:</B> {printer_make_and_model}<BR>
-<B>狀態:</B> {printer_state=3?閒置:{printer_state=4?處理中:已停止}},
-{printer_is_accepting_jobs=0?正在拒絕工作:正在接受工作}, {printer_is_shared=0?未:} 公開。
-{?device_uri=?:<BR><B>裝置 URI:</B> {device_uri}}
-
-<P>
-<A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="印表測試頁" CLASS="button"></A>
-{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
-<IMG SRC="/images/button-clean-print-heads.gif" ALT="清理列印頭" CLASS="button"></A>
-<A HREF="{printer_uri_supported}?op=print-self-test-page">
-<IMG SRC="/images/button-print-self-test-page.gif" ALT="列印自我測試頁" CLASS="button"></A>:}
-{printer_state=5?
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-start-printer.gif" ALT="啟動印表機" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-stop-printer.gif" ALT="停止印表機" CLASS="button"></A>
-}
-{printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="接受工作" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="拒絕工作" CLASS="button"></A>
-}
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-move-jobs.gif" ALT="移動所有工作" CLASS="button"></A>
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="取消所有工作" CLASS="button"></A>
-{printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-<IMG SRC="/images/button-publish-printer.gif" ALT="公開印表機" CLASS="button"></A>
-:
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="不公開印表機" CLASS="button"></A>
-}
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-modify-printer.gif" ALT="修改印表機" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-printer-options.gif" ALT="設定印表機選項" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-delete-printer.gif" ALT="刪除印表機" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-as-default.gif" ALT="設為預設印表機" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="設定允許的使用者" CLASS="button"></A>
-</P>
-</TD>
-</TR>
-</TABLE>
-}}
diff --git a/templates/zh_TW/restart.tmpl b/templates/zh_TW/restart.tmpl
deleted file mode 100644 (file)
index 06a35ab..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>請稍待,伺服器重新啟動中…</p>
diff --git a/templates/zh_TW/samba-export.tmpl b/templates/zh_TW/samba-export.tmpl
deleted file mode 100644 (file)
index 4e08162..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></SCRIPT>
-
-<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
-
-<H2 CLASS="title">匯出印表機至 Samba</H2>
-
-{error?<P>無法匯出印表機至 Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>參閱 <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> 檔案以獲得更多資訊。</P>:
-<P>此頁允許您匯出印表機至 Samba,以便
-Windows 客戶端可以經由他們桌面上的 <VAR>Network
-Neighborhood</VAR> 或 <VAR>Network Places</VAR> 圖示
-來存取它們。之前您必須安裝 Windows PostScript
-印表機驅動程式,描述請見 <A HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> 說明頁面。</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">印表機:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"> 匯出所有印表機
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba 使用者名稱:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (必要)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba 密碼:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (必要)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
-ALT="匯出印表機至 Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>
diff --git a/templates/zh_TW/samba-exported.tmpl b/templates/zh_TW/samba-exported.tmpl
deleted file mode 100644 (file)
index 63843c6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<P>印表機成功匯出至 samba。</P>
diff --git a/templates/zh_TW/search.tmpl b/templates/zh_TW/search.tmpl
deleted file mode 100644 (file)
index 5389353..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
-{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
-{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
-
-<P ALIGN="CENTER"><B>搜尋於
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?分類:{SECTION=jobs?工作:印表機}}}:</B>
-<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Search">
-<A
-HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
-SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
-
-</FORM>
diff --git a/templates/zh_TW/set-printer-options-header.tmpl b/templates/zh_TW/set-printer-options-header.tmpl
deleted file mode 100644 (file)
index 864f9f0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/zh_TW/set-printer-options-trailer.tmpl b/templates/zh_TW/set-printer-options-trailer.tmpl
deleted file mode 100644 (file)
index a3d1e1f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-</FORM>
diff --git a/templates/zh_TW/test-page.tmpl b/templates/zh_TW/test-page.tmpl
deleted file mode 100644 (file)
index a134695..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<P>已送出測試頁;工作 ID 為 <A HREF="/{SECTION}/{printer_name}">
-{printer_name}-{job_id}</A>。</P>
diff --git a/templates/zh_TW/trailer.tmpl b/templates/zh_TW/trailer.tmpl
deleted file mode 100644 (file)
index 3346804..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-</TD>
-<TD WIDTH="15">&nbsp;</TD>
-</TR>
-<TR CLASS="trailer">
-<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
-
-<P><SMALL>Common UNIX Printing System、CUPS 以及 CUPS 圖標都是
-<A HREF="http://www.easysw.com">Easy Software Products</A>
-的商標財產。CUPS 是 1997-2007 由 Easy Software Products 版權所有,
-保留一切權利。</SMALL></P>
-
-</TD>
-
-<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
-WIDTH="15" HEIGHT="15" ALT=""></TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/templates/zh_TW/users.tmpl b/templates/zh_TW/users.tmpl
deleted file mode 100644 (file)
index 51622fc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
-<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
-
-<H2 CLASS="title">{printer_name} 所允許的使用者</H2>
-
-<TABLE>
-<TR>
-<TH CLASS="label">使用者:</TH>
-<TD>
-<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
-<BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>允許這些使用者列印
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>拒絕這些使用者列印
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="設定允許的使用者">
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
index 48e16f9ae564feed649dc63e2e9c15fedcbac445..53ede17d56cf117b9e45734b7a039c2a8b0f95af 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: makesrcdist 6979 2007-09-18 22:10:40Z mike $"
+# "$Id: makesrcdist 6892 2007-08-29 22:32:41Z mike $"
 #
 # makesrcdist - make a source distribution of CUPS.
 #
@@ -18,9 +18,9 @@ if test $# = 0; then
        echo Updating for snapshot...
        svn up
        rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'`
-       version="1.3svn"
+       version="1.4svn"
        revision="-r$rev"
-       fileversion="1.3svn-r$rev"
+       fileversion="1.4svn-r$rev"
        fileurl="ftp://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar."
        url="."
 else
@@ -32,7 +32,7 @@ else
        fileurl="ftp://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar."
        url="https://svn.easysw.com/public/cups/tags/release-$version"
 
-       svn copy https://svn.easysw.com/public/cups/branches/branch-1.3 "$url" \
+       svn copy https://svn.easysw.com/public/cups/trunk "$url" \
                -m "Tag $version" || exit 1
 fi
 
@@ -81,5 +81,5 @@ rm -rf cups-$version
 echo "Done!"
 
 #
-# End of "$Id: makesrcdist 6979 2007-09-18 22:10:40Z mike $".
+# End of "$Id: makesrcdist 6892 2007-08-29 22:32:41Z mike $".
 #
index 550a4ae3cd9551cc62a7527a67dca08567db1d8c..fe44a364ccc2eec84e9295a237fc7af4b058b127 100755 (executable)
@@ -20,7 +20,7 @@ fi
 rev=`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[a-zA-Z]*//g'`
 
 if test $# = 0; then
-       version="1.3svn-r$rev"
+       version="1.4svn-r$rev"
 else
        version=$1
 fi
@@ -95,7 +95,7 @@ esac
 
 # Tag the current revision in the plist and web interface files...
 for file in packaging/cups-desc.plist packaging/cups-info.plist \
-               doc/index.html doc/ja/index.html templates/header.tmpl; do
+               doc/index.html templates/header.tmpl; do
        echo Updating $file...
        sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
                -e '1,$s/@CUPS_REVISION@//g' \