- update to 1.4.1

8 files changed, 340 insertions, 1187 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index b1d5425dc39..ee6bbb70b9e 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.3.10
+PORTVERSION=	1.4.1
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
@@ -182,7 +182,12 @@ MAN1=	cancel.1 \
 	lpq.1 \
 	lprm.1 \
 	lpr.1 \
-	lpstat.1
+	lpstat.1 \
+	ppdc.1 \
+	ppdhtml.1 \
+	ppdi.1 \
+	ppdmerge.1 \
+	ppdpo.1
 MAN5=	classes.conf.5 \
 	client.conf.5 \
 	cups-snmp.conf.5 \
@@ -190,26 +195,31 @@ MAN5=	classes.conf.5 \
 	mailto.conf.5 \
 	mime.convs.5 \
 	mime.types.5 \
+	ppdcfile.5 \
 	printers.conf.5 \
 	subscriptions.conf.5
 MAN7=	backend.7 \
-	filter.7
+	drv.7 \
+	filter.7 \
+	notifier.7
 MAN8=	accept.8 \
+	cupsaccept.8 \
 	cupsaddsmb.8 \
-	cups-deviced.8 \
-	cups-driverd.8 \
-	cups-lpd.8 \
-	cups-polld.8 \
 	cupsctl.8 \
 	cupsd.8 \
 	cupsenable.8 \
 	cupsfilter.8 \
+	cups-deviced.8 \
+	cups-driverd.8 \
+	cups-lpd.8 \
+	cups-polld.8 \
 	lpadmin.8 \
 	lpinfo.8 \
 	lpmove.8 \
 	lpc.8
 
 MLINKS=	accept.8 reject.8 \
+	cupsaccept.8 cupsreject.8 \
 	cupsenable.8 cupsdisable.8
 .endif
 
@@ -228,7 +238,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/scheduler/cups-driverd.c
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/scheduler/cups-driverd.cxx
 	@${REINPLACE_CMD} -e 's|CXX="$$CC"||g ; s|-lpthreads.*;|${PTHREAD_LIBS};|g' \
 		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -271,6 +281,11 @@ pre-build:
 .endif
 .endif
 
+.if defined(CUPS_IMAGE)
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${PREFIX}/include/cups/
+.endif
+
 .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
 post-build:
 	cd ${WRKSRC}/filter && ${MAKE} pdftops
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index d0d4d693e21..5b1d04dc406 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.3.10-source.tar.bz2) = 84fffe96b8537c81a463faccead80026
-SHA256 (cups-1.3.10-source.tar.bz2) = 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
-SIZE (cups-1.3.10-source.tar.bz2) = 3778970
+MD5 (cups-1.4.1-source.tar.bz2) = 587a58039c112ecb3c932e048c8a7b01
+SHA256 (cups-1.4.1-source.tar.bz2) = cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba
+SIZE (cups-1.4.1-source.tar.bz2) = 4449577
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
new file mode 100644
index 00000000000..c286243267c
--- /dev/null
+++ b/print/cups-base/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- cups/Makefile.orig	2009-05-27 01:27:06.000000000 +0200
++++ cups/Makefile	2009-10-21 09:49:20.000000000 +0200
+@@ -102,7 +102,6 @@
+ 		ipp.h \
+ 		language.h \
+ 		ppd.h \
+-		raster.h \
+ 		sidechannel.h \
+ 		transcode.h \
+ 		versioning.h
diff --git a/print/cups-base/files/patch-usb-unix.c b/print/cups-base/files/patch-usb-unix.c
new file mode 100644
index 00000000000..acf182383bc
--- /dev/null
+++ b/print/cups-base/files/patch-usb-unix.c
@@ -0,0 +1,30 @@
+--- backend/usb-unix.c.orig	2009-08-31 20:45:43.000000000 +0200
++++ backend/usb-unix.c	2009-10-21 09:21:14.000000000 +0200
+@@ -36,7 +36,7 @@
+  */
+ 
+ static int	open_device(const char *uri, int *use_bc);
+-static int	side_cb(int print_fd, int device_fd, int snmp_fd,
++static void	side_cb(int print_fd, int device_fd, int snmp_fd,
+ 		        http_addr_t *addr, int use_bc);
+ 
+ 
+@@ -579,7 +579,7 @@
+   datalen = sizeof(data);
+ 
+   if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
+-    return (-1);
++    return;
+ 
+   switch (command)
+   {
+@@ -622,7 +622,8 @@
+ 	break;
+   }
+ 
+-  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
++  cupsSideChannelWrite(command, status, data, datalen, 1.0);
++  return;
+ }
+ 
+ 
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index f70dd793984..f57ed35bd19 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -44,7 +44,25 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
+bin/ppdc
+bin/ppdhtml
+bin/ppdi
+bin/ppdmerge
+bin/ppdpo
 etc/cups/cupsd.conf.default
+include/cups/cgi.h
+include/cups/driver.h
+include/cups/help-index.h
+include/cups/mime.h
+include/cups/ppdc.h
+lib/libcupscgi.so
+lib/libcupscgi.so.1
+lib/libcupsdriver.so
+lib/libcupsdriver.so.1
+lib/libcupsmime.so
+lib/libcupsmime.so.1
+lib/libcupsppdc.so
+lib/libcupsppdc.so.1
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/phpcups.so
 libexec/cups/backend/http
 libexec/cups/backend/ipp
@@ -64,18 +82,24 @@ libexec/cups/daemon/cups-deviced
 libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-lpd
 libexec/cups/daemon/cups-polld
+libexec/cups/filter/commandtoescpx
+libexec/cups/filter/commandtopclx
 %%WITH_GHOSTSCRIPT%%libexec/cups/filter/pdftops
+libexec/cups/filter/rastertoescpx
+libexec/cups/filter/rastertopclx
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
 libexec/cups/notifier/mailto
 libexec/cups/notifier/rss
 sbin/accept
+sbin/cupsaccept
 sbin/cupsaddsmb
 sbin/cupsctl
 sbin/cupsd
 sbin/cupsdisable
 sbin/cupsenable
 sbin/cupsfilter
+sbin/cupsreject
 sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
@@ -128,28 +152,33 @@ sbin/reject
 %%DATADIR%%/charsets/utf-8
 %%DATADIR%%/data/HPGLprolog
 %%DATADIR%%/data/psglyphs
-%%DATADIR%%/data/testprint.ps
-%%DATADIR%%/fonts/Courier
-%%DATADIR%%/fonts/Courier-Bold
-%%DATADIR%%/fonts/Courier-BoldOblique
-%%DATADIR%%/fonts/Courier-Oblique
-%%DATADIR%%/fonts/Symbol
-%%DATADIR%%/model/deskjet.ppd
-%%DATADIR%%/model/dymo.ppd
-%%DATADIR%%/model/epson24.ppd
-%%DATADIR%%/model/epson9.ppd
-%%DATADIR%%/model/intelbar.ppd
-%%DATADIR%%/model/laserjet.ppd
-%%DATADIR%%/model/okidat24.ppd
-%%DATADIR%%/model/okidata9.ppd
-%%DATADIR%%/model/stcolor.ppd
-%%DATADIR%%/model/stcolor2.ppd
-%%DATADIR%%/model/stphoto.ppd
-%%DATADIR%%/model/stphoto2.ppd
-%%DATADIR%%/model/zebra.ppd
-%%DATADIR%%/model/zebracpl.ppd
-%%DATADIR%%/model/zebraep1.ppd
-%%DATADIR%%/model/zebraep2.ppd
+%%DATADIR%%/data/testprint
+%%DATADIR%%/drv/sample.drv
+%%DATADIR%%/examples/color.drv
+%%DATADIR%%/examples/constraint.drv
+%%DATADIR%%/examples/custom.drv
+%%DATADIR%%/examples/grouping.drv
+%%DATADIR%%/examples/laserjet-basic.drv
+%%DATADIR%%/examples/laserjet-pjl.drv
+%%DATADIR%%/examples/minimum.drv
+%%DATADIR%%/examples/postscript.drv
+%%DATADIR%%/examples/r300-basic.drv
+%%DATADIR%%/examples/r300-colorman.drv
+%%DATADIR%%/examples/r300-remote.drv
+%%DATADIR%%/fonts/Monospace
+%%DATADIR%%/fonts/Monospace-Bold
+%%DATADIR%%/fonts/Monospace-BoldOblique
+%%DATADIR%%/fonts/Monospace-Oblique
+%%DATADIR%%/mime/mime.convs
+%%DATADIR%%/mime/mime.types
+%%DATADIR%%/ppdc/epson.h
+%%DATADIR%%/ppdc/escp.h
+%%DATADIR%%/ppdc/font.defs
+%%DATADIR%%/ppdc/hp.h
+%%DATADIR%%/ppdc/label.h
+%%DATADIR%%/ppdc/media.defs
+%%DATADIR%%/ppdc/pcl.h
+%%DATADIR%%/ppdc/raster.defs
 %%DATADIR%%/templates/add-class.tmpl
 %%DATADIR%%/templates/add-printer.tmpl
 %%DATADIR%%/templates/add-rss-subscription.tmpl
@@ -164,8 +193,10 @@ sbin/reject
 %%DATADIR%%/templates/class-deleted.tmpl
 %%DATADIR%%/templates/class-jobs-header.tmpl
 %%DATADIR%%/templates/class-modified.tmpl
+%%DATADIR%%/templates/class.tmpl
 %%DATADIR%%/templates/classes-header.tmpl
 %%DATADIR%%/templates/classes.tmpl
+%%DATADIR%%/templates/command.tmpl
 %%DATADIR%%/templates/de/add-class.tmpl
 %%DATADIR%%/templates/de/add-printer.tmpl
 %%DATADIR%%/templates/de/add-rss-subscription.tmpl
@@ -180,13 +211,16 @@ sbin/reject
 %%DATADIR%%/templates/de/class-deleted.tmpl
 %%DATADIR%%/templates/de/class-jobs-header.tmpl
 %%DATADIR%%/templates/de/class-modified.tmpl
+%%DATADIR%%/templates/de/class.tmpl
 %%DATADIR%%/templates/de/classes-header.tmpl
 %%DATADIR%%/templates/de/classes.tmpl
+%%DATADIR%%/templates/de/command.tmpl
 %%DATADIR%%/templates/de/edit-config.tmpl
 %%DATADIR%%/templates/de/error-op.tmpl
 %%DATADIR%%/templates/de/error.tmpl
 %%DATADIR%%/templates/de/header.tmpl
 %%DATADIR%%/templates/de/help-header.tmpl
+%%DATADIR%%/templates/de/help-trailer.tmpl
 %%DATADIR%%/templates/de/help-printable.tmpl
 %%DATADIR%%/templates/de/job-cancel.tmpl
 %%DATADIR%%/templates/de/job-hold.tmpl
@@ -197,9 +231,9 @@ sbin/reject
 %%DATADIR%%/templates/de/jobs-header.tmpl
 %%DATADIR%%/templates/de/jobs.tmpl
 %%DATADIR%%/templates/de/list-available-printers.tmpl
-%%DATADIR%%/templates/de/maintenance.tmpl
 %%DATADIR%%/templates/de/modify-class.tmpl
 %%DATADIR%%/templates/de/modify-printer.tmpl
+%%DATADIR%%/templates/de/norestart.tmpl
 %%DATADIR%%/templates/de/option-boolean.tmpl
 %%DATADIR%%/templates/de/option-conflict.tmpl
 %%DATADIR%%/templates/de/option-header.tmpl
@@ -219,6 +253,7 @@ sbin/reject
 %%DATADIR%%/templates/de/printer-reject.tmpl
 %%DATADIR%%/templates/de/printer-start.tmpl
 %%DATADIR%%/templates/de/printer-stop.tmpl
+%%DATADIR%%/templates/de/printer.tmpl
 %%DATADIR%%/templates/de/printers-header.tmpl
 %%DATADIR%%/templates/de/printers.tmpl
 %%DATADIR%%/templates/de/restart.tmpl
@@ -249,14 +284,17 @@ sbin/reject
 %%DATADIR%%/templates/es/class-deleted.tmpl
 %%DATADIR%%/templates/es/class-jobs-header.tmpl
 %%DATADIR%%/templates/es/class-modified.tmpl
+%%DATADIR%%/templates/es/class.tmpl
 %%DATADIR%%/templates/es/classes-header.tmpl
 %%DATADIR%%/templates/es/classes.tmpl
+%%DATADIR%%/templates/es/command.tmpl
 %%DATADIR%%/templates/es/edit-config.tmpl
 %%DATADIR%%/templates/es/error-op.tmpl
 %%DATADIR%%/templates/es/error.tmpl
 %%DATADIR%%/templates/es/header.tmpl
 %%DATADIR%%/templates/es/help-header.tmpl
 %%DATADIR%%/templates/es/help-printable.tmpl
+%%DATADIR%%/templates/es/help-trailer.tmpl
 %%DATADIR%%/templates/es/job-cancel.tmpl
 %%DATADIR%%/templates/es/job-hold.tmpl
 %%DATADIR%%/templates/es/job-move.tmpl
@@ -266,7 +304,6 @@ sbin/reject
 %%DATADIR%%/templates/es/jobs-header.tmpl
 %%DATADIR%%/templates/es/jobs.tmpl
 %%DATADIR%%/templates/es/list-available-printers.tmpl
-%%DATADIR%%/templates/es/maintenance.tmpl
 %%DATADIR%%/templates/es/modify-class.tmpl
 %%DATADIR%%/templates/es/modify-printer.tmpl
 %%DATADIR%%/templates/es/norestart.tmpl
@@ -289,6 +326,7 @@ sbin/reject
 %%DATADIR%%/templates/es/printer-reject.tmpl
 %%DATADIR%%/templates/es/printer-start.tmpl
 %%DATADIR%%/templates/es/printer-stop.tmpl
+%%DATADIR%%/templates/es/printer.tmpl
 %%DATADIR%%/templates/es/printers-header.tmpl
 %%DATADIR%%/templates/es/printers.tmpl
 %%DATADIR%%/templates/es/restart.tmpl
@@ -302,327 +340,80 @@ sbin/reject
 %%DATADIR%%/templates/es/test-page.tmpl
 %%DATADIR%%/templates/es/trailer.tmpl
 %%DATADIR%%/templates/es/users.tmpl
-%%DATADIR%%/templates/et/add-class.tmpl
-%%DATADIR%%/templates/et/add-printer.tmpl
-%%DATADIR%%/templates/et/admin.tmpl
-%%DATADIR%%/templates/et/choose-device.tmpl
-%%DATADIR%%/templates/et/choose-make.tmpl
-%%DATADIR%%/templates/et/choose-model.tmpl
-%%DATADIR%%/templates/et/choose-serial.tmpl
-%%DATADIR%%/templates/et/choose-uri.tmpl
-%%DATADIR%%/templates/et/class-added.tmpl
-%%DATADIR%%/templates/et/class-confirm.tmpl
-%%DATADIR%%/templates/et/class-deleted.tmpl
-%%DATADIR%%/templates/et/class-jobs-header.tmpl
-%%DATADIR%%/templates/et/class-modified.tmpl
-%%DATADIR%%/templates/et/classes-header.tmpl
-%%DATADIR%%/templates/et/classes.tmpl
-%%DATADIR%%/templates/et/edit-config.tmpl
-%%DATADIR%%/templates/et/error-op.tmpl
-%%DATADIR%%/templates/et/error.tmpl
-%%DATADIR%%/templates/et/header.tmpl
-%%DATADIR%%/templates/et/help-header.tmpl
-%%DATADIR%%/templates/et/help-printable.tmpl
-%%DATADIR%%/templates/et/job-cancel.tmpl
-%%DATADIR%%/templates/et/job-hold.tmpl
-%%DATADIR%%/templates/et/job-moved.tmpl
-%%DATADIR%%/templates/et/job-release.tmpl
-%%DATADIR%%/templates/et/job-restart.tmpl
-%%DATADIR%%/templates/et/jobs-header.tmpl
-%%DATADIR%%/templates/et/jobs.tmpl
-%%DATADIR%%/templates/et/maintenance.tmpl
-%%DATADIR%%/templates/et/modify-class.tmpl
-%%DATADIR%%/templates/et/modify-printer.tmpl
-%%DATADIR%%/templates/et/norestart.tmpl
-%%DATADIR%%/templates/et/option-boolean.tmpl
-%%DATADIR%%/templates/et/option-conflict.tmpl
-%%DATADIR%%/templates/et/option-header.tmpl
-%%DATADIR%%/templates/et/option-pickmany.tmpl
-%%DATADIR%%/templates/et/option-pickone.tmpl
-%%DATADIR%%/templates/et/option-trailer.tmpl
-%%DATADIR%%/templates/et/pager.tmpl
-%%DATADIR%%/templates/et/printer-accept.tmpl
-%%DATADIR%%/templates/et/printer-added.tmpl
-%%DATADIR%%/templates/et/printer-configured.tmpl
-%%DATADIR%%/templates/et/printer-confirm.tmpl
-%%DATADIR%%/templates/et/printer-default.tmpl
-%%DATADIR%%/templates/et/printer-deleted.tmpl
-%%DATADIR%%/templates/et/printer-jobs-header.tmpl
-%%DATADIR%%/templates/et/printer-modified.tmpl
-%%DATADIR%%/templates/et/printer-purge.tmpl
-%%DATADIR%%/templates/et/printer-reject.tmpl
-%%DATADIR%%/templates/et/printer-start.tmpl
-%%DATADIR%%/templates/et/printer-stop.tmpl
-%%DATADIR%%/templates/et/printers-header.tmpl
-%%DATADIR%%/templates/et/printers.tmpl
-%%DATADIR%%/templates/et/restart.tmpl
-%%DATADIR%%/templates/et/samba-export.tmpl
-%%DATADIR%%/templates/et/samba-exported.tmpl
-%%DATADIR%%/templates/et/search.tmpl
-%%DATADIR%%/templates/et/set-printer-options-header.tmpl
-%%DATADIR%%/templates/et/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/et/test-page.tmpl
-%%DATADIR%%/templates/et/trailer.tmpl
-%%DATADIR%%/templates/et/users.tmpl
-%%DATADIR%%/templates/fr/add-class.tmpl
-%%DATADIR%%/templates/fr/add-printer.tmpl
-%%DATADIR%%/templates/fr/admin.tmpl
-%%DATADIR%%/templates/fr/choose-device.tmpl
-%%DATADIR%%/templates/fr/choose-make.tmpl
-%%DATADIR%%/templates/fr/choose-model.tmpl
-%%DATADIR%%/templates/fr/choose-serial.tmpl
-%%DATADIR%%/templates/fr/choose-uri.tmpl
-%%DATADIR%%/templates/fr/class-added.tmpl
-%%DATADIR%%/templates/fr/class-confirm.tmpl
-%%DATADIR%%/templates/fr/class-deleted.tmpl
-%%DATADIR%%/templates/fr/class-jobs-header.tmpl
-%%DATADIR%%/templates/fr/class-modified.tmpl
-%%DATADIR%%/templates/fr/classes-header.tmpl
-%%DATADIR%%/templates/fr/classes.tmpl
-%%DATADIR%%/templates/fr/edit-config.tmpl
-%%DATADIR%%/templates/fr/error-op.tmpl
-%%DATADIR%%/templates/fr/error.tmpl
-%%DATADIR%%/templates/fr/header.tmpl
-%%DATADIR%%/templates/fr/help-header.tmpl
-%%DATADIR%%/templates/fr/help-printable.tmpl
-%%DATADIR%%/templates/fr/job-cancel.tmpl
-%%DATADIR%%/templates/fr/job-hold.tmpl
-%%DATADIR%%/templates/fr/job-move.tmpl
-%%DATADIR%%/templates/fr/job-moved.tmpl
-%%DATADIR%%/templates/fr/job-release.tmpl
-%%DATADIR%%/templates/fr/job-restart.tmpl
-%%DATADIR%%/templates/fr/jobs-header.tmpl
-%%DATADIR%%/templates/fr/jobs.tmpl
-%%DATADIR%%/templates/fr/maintenance.tmpl
-%%DATADIR%%/templates/fr/modify-class.tmpl
-%%DATADIR%%/templates/fr/modify-printer.tmpl
-%%DATADIR%%/templates/fr/norestart.tmpl
-%%DATADIR%%/templates/fr/option-boolean.tmpl
-%%DATADIR%%/templates/fr/option-conflict.tmpl
-%%DATADIR%%/templates/fr/option-header.tmpl
-%%DATADIR%%/templates/fr/option-pickmany.tmpl
-%%DATADIR%%/templates/fr/option-pickone.tmpl
-%%DATADIR%%/templates/fr/option-trailer.tmpl
-%%DATADIR%%/templates/fr/pager.tmpl
-%%DATADIR%%/templates/fr/printer-accept.tmpl
-%%DATADIR%%/templates/fr/printer-added.tmpl
-%%DATADIR%%/templates/fr/printer-configured.tmpl
-%%DATADIR%%/templates/fr/printer-confirm.tmpl
-%%DATADIR%%/templates/fr/printer-default.tmpl
-%%DATADIR%%/templates/fr/printer-deleted.tmpl
-%%DATADIR%%/templates/fr/printer-jobs-header.tmpl
-%%DATADIR%%/templates/fr/printer-modified.tmpl
-%%DATADIR%%/templates/fr/printer-purge.tmpl
-%%DATADIR%%/templates/fr/printer-reject.tmpl
-%%DATADIR%%/templates/fr/printer-start.tmpl
-%%DATADIR%%/templates/fr/printer-stop.tmpl
-%%DATADIR%%/templates/fr/printers-header.tmpl
-%%DATADIR%%/templates/fr/printers.tmpl
-%%DATADIR%%/templates/fr/restart.tmpl
-%%DATADIR%%/templates/fr/samba-export.tmpl
-%%DATADIR%%/templates/fr/samba-exported.tmpl
-%%DATADIR%%/templates/fr/search.tmpl
-%%DATADIR%%/templates/fr/set-printer-options-header.tmpl
-%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/fr/test-page.tmpl
-%%DATADIR%%/templates/fr/trailer.tmpl
-%%DATADIR%%/templates/fr/users.tmpl
-%%DATADIR%%/templates/he/add-class.tmpl
-%%DATADIR%%/templates/he/add-printer.tmpl
-%%DATADIR%%/templates/he/admin.tmpl
-%%DATADIR%%/templates/he/choose-device.tmpl
-%%DATADIR%%/templates/he/choose-make.tmpl
-%%DATADIR%%/templates/he/choose-model.tmpl
-%%DATADIR%%/templates/he/choose-serial.tmpl
-%%DATADIR%%/templates/he/choose-uri.tmpl
-%%DATADIR%%/templates/he/class-added.tmpl
-%%DATADIR%%/templates/he/class-confirm.tmpl
-%%DATADIR%%/templates/he/class-deleted.tmpl
-%%DATADIR%%/templates/he/class-jobs-header.tmpl
-%%DATADIR%%/templates/he/class-modified.tmpl
-%%DATADIR%%/templates/he/classes-header.tmpl
-%%DATADIR%%/templates/he/classes.tmpl
-%%DATADIR%%/templates/he/edit-config.tmpl
-%%DATADIR%%/templates/he/error-op.tmpl
-%%DATADIR%%/templates/he/error.tmpl
-%%DATADIR%%/templates/he/header.tmpl
-%%DATADIR%%/templates/he/help-header.tmpl
-%%DATADIR%%/templates/he/help-printable.tmpl
-%%DATADIR%%/templates/he/job-cancel.tmpl
-%%DATADIR%%/templates/he/job-hold.tmpl
-%%DATADIR%%/templates/he/job-move.tmpl
-%%DATADIR%%/templates/he/job-moved.tmpl
-%%DATADIR%%/templates/he/job-release.tmpl
-%%DATADIR%%/templates/he/job-restart.tmpl
-%%DATADIR%%/templates/he/jobs-header.tmpl
-%%DATADIR%%/templates/he/jobs.tmpl
-%%DATADIR%%/templates/he/maintenance.tmpl
-%%DATADIR%%/templates/he/modify-class.tmpl
-%%DATADIR%%/templates/he/modify-printer.tmpl
-%%DATADIR%%/templates/he/norestart.tmpl
-%%DATADIR%%/templates/he/option-boolean.tmpl
-%%DATADIR%%/templates/he/option-conflict.tmpl
-%%DATADIR%%/templates/he/option-header.tmpl
-%%DATADIR%%/templates/he/option-pickmany.tmpl
-%%DATADIR%%/templates/he/option-pickone.tmpl
-%%DATADIR%%/templates/he/option-trailer.tmpl
-%%DATADIR%%/templates/he/pager.tmpl
-%%DATADIR%%/templates/he/printer-accept.tmpl
-%%DATADIR%%/templates/he/printer-added.tmpl
-%%DATADIR%%/templates/he/printer-configured.tmpl
-%%DATADIR%%/templates/he/printer-confirm.tmpl
-%%DATADIR%%/templates/he/printer-default.tmpl
-%%DATADIR%%/templates/he/printer-deleted.tmpl
-%%DATADIR%%/templates/he/printer-jobs-header.tmpl
-%%DATADIR%%/templates/he/printer-modified.tmpl
-%%DATADIR%%/templates/he/printer-purge.tmpl
-%%DATADIR%%/templates/he/printer-reject.tmpl
-%%DATADIR%%/templates/he/printer-start.tmpl
-%%DATADIR%%/templates/he/printer-stop.tmpl
-%%DATADIR%%/templates/he/printers-header.tmpl
-%%DATADIR%%/templates/he/printers.tmpl
-%%DATADIR%%/templates/he/restart.tmpl
-%%DATADIR%%/templates/he/samba-export.tmpl
-%%DATADIR%%/templates/he/samba-exported.tmpl
-%%DATADIR%%/templates/he/search.tmpl
-%%DATADIR%%/templates/he/set-printer-options-header.tmpl
-%%DATADIR%%/templates/he/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/he/test-page.tmpl
-%%DATADIR%%/templates/he/trailer.tmpl
-%%DATADIR%%/templates/he/users.tmpl
+%%DATADIR%%/templates/eu/add-class.tmpl
+%%DATADIR%%/templates/eu/add-printer.tmpl
+%%DATADIR%%/templates/eu/add-rss-subscription.tmpl
+%%DATADIR%%/templates/eu/admin.tmpl
+%%DATADIR%%/templates/eu/choose-device.tmpl
+%%DATADIR%%/templates/eu/choose-make.tmpl
+%%DATADIR%%/templates/eu/choose-model.tmpl
+%%DATADIR%%/templates/eu/choose-serial.tmpl
+%%DATADIR%%/templates/eu/choose-uri.tmpl
+%%DATADIR%%/templates/eu/class-added.tmpl
+%%DATADIR%%/templates/eu/class-confirm.tmpl
+%%DATADIR%%/templates/eu/class-deleted.tmpl
+%%DATADIR%%/templates/eu/class-jobs-header.tmpl
+%%DATADIR%%/templates/eu/class-modified.tmpl
+%%DATADIR%%/templates/eu/class.tmpl
+%%DATADIR%%/templates/eu/classes-header.tmpl
+%%DATADIR%%/templates/eu/classes.tmpl
+%%DATADIR%%/templates/eu/command.tmpl
+%%DATADIR%%/templates/eu/edit-config.tmpl
+%%DATADIR%%/templates/eu/error-op.tmpl
+%%DATADIR%%/templates/eu/error.tmpl
+%%DATADIR%%/templates/eu/header.tmpl
+%%DATADIR%%/templates/eu/help-header.tmpl
+%%DATADIR%%/templates/eu/help-printable.tmpl
+%%DATADIR%%/templates/eu/help-trailer.tmpl
+%%DATADIR%%/templates/eu/job-cancel.tmpl
+%%DATADIR%%/templates/eu/job-hold.tmpl
+%%DATADIR%%/templates/eu/job-move.tmpl
+%%DATADIR%%/templates/eu/job-moved.tmpl
+%%DATADIR%%/templates/eu/job-release.tmpl
+%%DATADIR%%/templates/eu/job-restart.tmpl
+%%DATADIR%%/templates/eu/jobs-header.tmpl
+%%DATADIR%%/templates/eu/jobs.tmpl
+%%DATADIR%%/templates/eu/list-available-printers.tmpl
+%%DATADIR%%/templates/eu/modify-class.tmpl
+%%DATADIR%%/templates/eu/modify-printer.tmpl
+%%DATADIR%%/templates/eu/norestart.tmpl
+%%DATADIR%%/templates/eu/option-boolean.tmpl
+%%DATADIR%%/templates/eu/option-conflict.tmpl
+%%DATADIR%%/templates/eu/option-header.tmpl
+%%DATADIR%%/templates/eu/option-pickmany.tmpl
+%%DATADIR%%/templates/eu/option-pickone.tmpl
+%%DATADIR%%/templates/eu/option-trailer.tmpl
+%%DATADIR%%/templates/eu/pager.tmpl
+%%DATADIR%%/templates/eu/printer-accept.tmpl
+%%DATADIR%%/templates/eu/printer-added.tmpl
+%%DATADIR%%/templates/eu/printer-configured.tmpl
+%%DATADIR%%/templates/eu/printer-confirm.tmpl
+%%DATADIR%%/templates/eu/printer-default.tmpl
+%%DATADIR%%/templates/eu/printer-deleted.tmpl
+%%DATADIR%%/templates/eu/printer-jobs-header.tmpl
+%%DATADIR%%/templates/eu/printer-modified.tmpl
+%%DATADIR%%/templates/eu/printer-purge.tmpl
+%%DATADIR%%/templates/eu/printer-reject.tmpl
+%%DATADIR%%/templates/eu/printer-start.tmpl
+%%DATADIR%%/templates/eu/printer-stop.tmpl
+%%DATADIR%%/templates/eu/printer.tmpl
+%%DATADIR%%/templates/eu/printers-header.tmpl
+%%DATADIR%%/templates/eu/printers.tmpl
+%%DATADIR%%/templates/eu/restart.tmpl
+%%DATADIR%%/templates/eu/samba-export.tmpl
+%%DATADIR%%/templates/eu/samba-exported.tmpl
+%%DATADIR%%/templates/eu/search.tmpl
+%%DATADIR%%/templates/eu/set-printer-options-header.tmpl
+%%DATADIR%%/templates/eu/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/eu/subscription-added.tmpl
+%%DATADIR%%/templates/eu/subscription-canceled.tmpl
+%%DATADIR%%/templates/eu/test-page.tmpl
+%%DATADIR%%/templates/eu/trailer.tmpl
+%%DATADIR%%/templates/eu/users.tmpl
 %%DATADIR%%/templates/header.tmpl
 %%DATADIR%%/templates/help-header.tmpl
 %%DATADIR%%/templates/help-printable.tmpl
-%%DATADIR%%/templates/id/add-class.tmpl
-%%DATADIR%%/templates/id/add-printer.tmpl
-%%DATADIR%%/templates/id/add-rss-subscription.tmpl
-%%DATADIR%%/templates/id/admin.tmpl
-%%DATADIR%%/templates/id/choose-device.tmpl
-%%DATADIR%%/templates/id/choose-make.tmpl
-%%DATADIR%%/templates/id/choose-model.tmpl
-%%DATADIR%%/templates/id/choose-serial.tmpl
-%%DATADIR%%/templates/id/choose-uri.tmpl
-%%DATADIR%%/templates/id/class-added.tmpl
-%%DATADIR%%/templates/id/class-confirm.tmpl
-%%DATADIR%%/templates/id/class-deleted.tmpl
-%%DATADIR%%/templates/id/class-jobs-header.tmpl
-%%DATADIR%%/templates/id/class-modified.tmpl
-%%DATADIR%%/templates/id/classes-header.tmpl
-%%DATADIR%%/templates/id/classes.tmpl
-%%DATADIR%%/templates/id/edit-config.tmpl
-%%DATADIR%%/templates/id/error-op.tmpl
-%%DATADIR%%/templates/id/error.tmpl
-%%DATADIR%%/templates/id/header.tmpl
-%%DATADIR%%/templates/id/help-header.tmpl
-%%DATADIR%%/templates/id/help-printable.tmpl
-%%DATADIR%%/templates/id/list-available-printers.tmpl
-%%DATADIR%%/templates/id/job-cancel.tmpl
-%%DATADIR%%/templates/id/job-hold.tmpl
-%%DATADIR%%/templates/id/job-move.tmpl
-%%DATADIR%%/templates/id/job-moved.tmpl
-%%DATADIR%%/templates/id/job-release.tmpl
-%%DATADIR%%/templates/id/job-restart.tmpl
-%%DATADIR%%/templates/id/jobs-header.tmpl
-%%DATADIR%%/templates/id/jobs.tmpl
-%%DATADIR%%/templates/id/maintenance.tmpl
-%%DATADIR%%/templates/id/modify-class.tmpl
-%%DATADIR%%/templates/id/modify-printer.tmpl
-%%DATADIR%%/templates/id/norestart.tmpl
-%%DATADIR%%/templates/id/option-boolean.tmpl
-%%DATADIR%%/templates/id/option-conflict.tmpl
-%%DATADIR%%/templates/id/option-header.tmpl
-%%DATADIR%%/templates/id/option-pickmany.tmpl
-%%DATADIR%%/templates/id/option-pickone.tmpl
-%%DATADIR%%/templates/id/option-trailer.tmpl
-%%DATADIR%%/templates/id/pager.tmpl
-%%DATADIR%%/templates/id/printer-accept.tmpl
-%%DATADIR%%/templates/id/printer-added.tmpl
-%%DATADIR%%/templates/id/printer-configured.tmpl
-%%DATADIR%%/templates/id/printer-confirm.tmpl
-%%DATADIR%%/templates/id/printer-default.tmpl
-%%DATADIR%%/templates/id/printer-deleted.tmpl
-%%DATADIR%%/templates/id/printer-jobs-header.tmpl
-%%DATADIR%%/templates/id/printer-modified.tmpl
-%%DATADIR%%/templates/id/printer-purge.tmpl
-%%DATADIR%%/templates/id/printer-reject.tmpl
-%%DATADIR%%/templates/id/printer-start.tmpl
-%%DATADIR%%/templates/id/printer-stop.tmpl
-%%DATADIR%%/templates/id/printers-header.tmpl
-%%DATADIR%%/templates/id/printers.tmpl
-%%DATADIR%%/templates/id/restart.tmpl
-%%DATADIR%%/templates/id/samba-export.tmpl
-%%DATADIR%%/templates/id/samba-exported.tmpl
-%%DATADIR%%/templates/id/search.tmpl
-%%DATADIR%%/templates/id/set-printer-options-header.tmpl
-%%DATADIR%%/templates/id/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/id/subscription-added.tmpl
-%%DATADIR%%/templates/id/subscription-canceled.tmpl
-%%DATADIR%%/templates/id/test-page.tmpl
-%%DATADIR%%/templates/id/trailer.tmpl
-%%DATADIR%%/templates/id/users.tmpl
-%%DATADIR%%/templates/it/add-class.tmpl
-%%DATADIR%%/templates/it/add-printer.tmpl
-%%DATADIR%%/templates/it/admin.tmpl
-%%DATADIR%%/templates/it/choose-device.tmpl
-%%DATADIR%%/templates/it/choose-make.tmpl
-%%DATADIR%%/templates/it/choose-model.tmpl
-%%DATADIR%%/templates/it/choose-serial.tmpl
-%%DATADIR%%/templates/it/choose-uri.tmpl
-%%DATADIR%%/templates/it/class-added.tmpl
-%%DATADIR%%/templates/it/class-confirm.tmpl
-%%DATADIR%%/templates/it/class-deleted.tmpl
-%%DATADIR%%/templates/it/class-jobs-header.tmpl
-%%DATADIR%%/templates/it/class-modified.tmpl
-%%DATADIR%%/templates/it/classes-header.tmpl
-%%DATADIR%%/templates/it/classes.tmpl
-%%DATADIR%%/templates/it/edit-config.tmpl
-%%DATADIR%%/templates/it/error-op.tmpl
-%%DATADIR%%/templates/it/error.tmpl
-%%DATADIR%%/templates/it/header.tmpl
-%%DATADIR%%/templates/it/help-header.tmpl
-%%DATADIR%%/templates/it/help-printable.tmpl
-%%DATADIR%%/templates/it/job-cancel.tmpl
-%%DATADIR%%/templates/it/job-hold.tmpl
-%%DATADIR%%/templates/it/job-move.tmpl
-%%DATADIR%%/templates/it/job-moved.tmpl
-%%DATADIR%%/templates/it/job-release.tmpl
-%%DATADIR%%/templates/it/job-restart.tmpl
-%%DATADIR%%/templates/it/jobs-header.tmpl
-%%DATADIR%%/templates/it/jobs.tmpl
-%%DATADIR%%/templates/it/maintenance.tmpl
-%%DATADIR%%/templates/it/modify-class.tmpl
-%%DATADIR%%/templates/it/modify-printer.tmpl
-%%DATADIR%%/templates/it/norestart.tmpl
-%%DATADIR%%/templates/it/option-boolean.tmpl
-%%DATADIR%%/templates/it/option-conflict.tmpl
-%%DATADIR%%/templates/it/option-header.tmpl
-%%DATADIR%%/templates/it/option-pickmany.tmpl
-%%DATADIR%%/templates/it/option-pickone.tmpl
-%%DATADIR%%/templates/it/option-trailer.tmpl
-%%DATADIR%%/templates/it/pager.tmpl
-%%DATADIR%%/templates/it/printer-accept.tmpl
-%%DATADIR%%/templates/it/printer-added.tmpl
-%%DATADIR%%/templates/it/printer-configured.tmpl
-%%DATADIR%%/templates/it/printer-confirm.tmpl
-%%DATADIR%%/templates/it/printer-default.tmpl
-%%DATADIR%%/templates/it/printer-deleted.tmpl
-%%DATADIR%%/templates/it/printer-jobs-header.tmpl
-%%DATADIR%%/templates/it/printer-modified.tmpl
-%%DATADIR%%/templates/it/printer-purge.tmpl
-%%DATADIR%%/templates/it/printer-reject.tmpl
-%%DATADIR%%/templates/it/printer-start.tmpl
-%%DATADIR%%/templates/it/printer-stop.tmpl
-%%DATADIR%%/templates/it/printers-header.tmpl
-%%DATADIR%%/templates/it/printers.tmpl
-%%DATADIR%%/templates/it/restart.tmpl
-%%DATADIR%%/templates/it/samba-export.tmpl
-%%DATADIR%%/templates/it/samba-exported.tmpl
-%%DATADIR%%/templates/it/search.tmpl
-%%DATADIR%%/templates/it/set-printer-options-header.tmpl
-%%DATADIR%%/templates/it/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/it/test-page.tmpl
-%%DATADIR%%/templates/it/trailer.tmpl
-%%DATADIR%%/templates/it/users.tmpl
+%%DATADIR%%/templates/help-trailer.tmpl
 %%DATADIR%%/templates/ja/add-class.tmpl
 %%DATADIR%%/templates/ja/add-printer.tmpl
 %%DATADIR%%/templates/ja/add-rss-subscription.tmpl
@@ -637,13 +428,17 @@ sbin/reject
 %%DATADIR%%/templates/ja/class-deleted.tmpl
 %%DATADIR%%/templates/ja/class-jobs-header.tmpl
 %%DATADIR%%/templates/ja/class-modified.tmpl
+%%DATADIR%%/templates/ja/class.tmpl
 %%DATADIR%%/templates/ja/classes-header.tmpl
 %%DATADIR%%/templates/ja/classes.tmpl
+%%DATADIR%%/templates/ja/command.tmpl
 %%DATADIR%%/templates/ja/edit-config.tmpl
 %%DATADIR%%/templates/ja/error-op.tmpl
 %%DATADIR%%/templates/ja/error.tmpl
 %%DATADIR%%/templates/ja/header.tmpl
 %%DATADIR%%/templates/ja/help-header.tmpl
+%%DATADIR%%/templates/ja/help-printable.tmpl
+%%DATADIR%%/templates/ja/help-trailer.tmpl
 %%DATADIR%%/templates/ja/job-cancel.tmpl
 %%DATADIR%%/templates/ja/job-hold.tmpl
 %%DATADIR%%/templates/ja/job-move.tmpl
@@ -653,11 +448,14 @@ sbin/reject
 %%DATADIR%%/templates/ja/jobs-header.tmpl
 %%DATADIR%%/templates/ja/jobs.tmpl
 %%DATADIR%%/templates/ja/list-available-printers.tmpl
-%%DATADIR%%/templates/ja/maintenance.tmpl
 %%DATADIR%%/templates/ja/modify-class.tmpl
 %%DATADIR%%/templates/ja/modify-printer.tmpl
 %%DATADIR%%/templates/ja/norestart.tmpl
+%%DATADIR%%/templates/ja/option-boolean.tmpl
 %%DATADIR%%/templates/ja/option-conflict.tmpl
+%%DATADIR%%/templates/ja/option-header.tmpl
+%%DATADIR%%/templates/ja/option-pickmany.tmpl
+%%DATADIR%%/templates/ja/option-pickone.tmpl
 %%DATADIR%%/templates/ja/option-trailer.tmpl
 %%DATADIR%%/templates/ja/pager.tmpl
 %%DATADIR%%/templates/ja/printer-accept.tmpl
@@ -672,15 +470,19 @@ sbin/reject
 %%DATADIR%%/templates/ja/printer-reject.tmpl
 %%DATADIR%%/templates/ja/printer-start.tmpl
 %%DATADIR%%/templates/ja/printer-stop.tmpl
+%%DATADIR%%/templates/ja/printer.tmpl
 %%DATADIR%%/templates/ja/printers-header.tmpl
 %%DATADIR%%/templates/ja/printers.tmpl
 %%DATADIR%%/templates/ja/restart.tmpl
 %%DATADIR%%/templates/ja/samba-export.tmpl
 %%DATADIR%%/templates/ja/samba-exported.tmpl
 %%DATADIR%%/templates/ja/search.tmpl
+%%DATADIR%%/templates/ja/set-printer-options-header.tmpl
+%%DATADIR%%/templates/ja/set-printer-options-trailer.tmpl
 %%DATADIR%%/templates/ja/subscription-added.tmpl
 %%DATADIR%%/templates/ja/subscription-canceled.tmpl
 %%DATADIR%%/templates/ja/test-page.tmpl
+%%DATADIR%%/templates/ja/trailer.tmpl
 %%DATADIR%%/templates/ja/users.tmpl
 %%DATADIR%%/templates/job-cancel.tmpl
 %%DATADIR%%/templates/job-hold.tmpl
@@ -691,7 +493,6 @@ sbin/reject
 %%DATADIR%%/templates/jobs-header.tmpl
 %%DATADIR%%/templates/jobs.tmpl
 %%DATADIR%%/templates/list-available-printers.tmpl
-%%DATADIR%%/templates/maintenance.tmpl
 %%DATADIR%%/templates/modify-class.tmpl
 %%DATADIR%%/templates/modify-printer.tmpl
 %%DATADIR%%/templates/norestart.tmpl
@@ -704,6 +505,7 @@ sbin/reject
 %%DATADIR%%/templates/pager.tmpl
 %%DATADIR%%/templates/pl/add-class.tmpl
 %%DATADIR%%/templates/pl/add-printer.tmpl
+%%DATADIR%%/templates/pl/add-rss-subscription.tmpl
 %%DATADIR%%/templates/pl/admin.tmpl
 %%DATADIR%%/templates/pl/choose-device.tmpl
 %%DATADIR%%/templates/pl/choose-make.tmpl
@@ -715,14 +517,17 @@ sbin/reject
 %%DATADIR%%/templates/pl/class-deleted.tmpl
 %%DATADIR%%/templates/pl/class-jobs-header.tmpl
 %%DATADIR%%/templates/pl/class-modified.tmpl
+%%DATADIR%%/templates/pl/class.tmpl
 %%DATADIR%%/templates/pl/classes-header.tmpl
 %%DATADIR%%/templates/pl/classes.tmpl
+%%DATADIR%%/templates/pl/command.tmpl
 %%DATADIR%%/templates/pl/edit-config.tmpl
 %%DATADIR%%/templates/pl/error-op.tmpl
 %%DATADIR%%/templates/pl/error.tmpl
 %%DATADIR%%/templates/pl/header.tmpl
 %%DATADIR%%/templates/pl/help-header.tmpl
 %%DATADIR%%/templates/pl/help-printable.tmpl
+%%DATADIR%%/templates/pl/help-trailer.tmpl
 %%DATADIR%%/templates/pl/job-cancel.tmpl
 %%DATADIR%%/templates/pl/job-hold.tmpl
 %%DATADIR%%/templates/pl/job-move.tmpl
@@ -731,7 +536,7 @@ sbin/reject
 %%DATADIR%%/templates/pl/job-restart.tmpl
 %%DATADIR%%/templates/pl/jobs-header.tmpl
 %%DATADIR%%/templates/pl/jobs.tmpl
-%%DATADIR%%/templates/pl/maintenance.tmpl
+%%DATADIR%%/templates/pl/list-available-printers.tmpl
 %%DATADIR%%/templates/pl/modify-class.tmpl
 %%DATADIR%%/templates/pl/modify-printer.tmpl
 %%DATADIR%%/templates/pl/option-boolean.tmpl
@@ -761,6 +566,8 @@ sbin/reject
 %%DATADIR%%/templates/pl/search.tmpl
 %%DATADIR%%/templates/pl/set-printer-options-header.tmpl
 %%DATADIR%%/templates/pl/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/pl/subscription-added.tmpl
+%%DATADIR%%/templates/pl/subscription-canceled.tmpl
 %%DATADIR%%/templates/pl/test-page.tmpl
 %%DATADIR%%/templates/pl/trailer.tmpl
 %%DATADIR%%/templates/pl/users.tmpl
@@ -776,9 +583,82 @@ sbin/reject
 %%DATADIR%%/templates/printer-reject.tmpl
 %%DATADIR%%/templates/printer-start.tmpl
 %%DATADIR%%/templates/printer-stop.tmpl
+%%DATADIR%%/templates/pl/norestart.tmpl
+%%DATADIR%%/templates/pl/printer.tmpl
+%%DATADIR%%/templates/printer.tmpl
 %%DATADIR%%/templates/printers-header.tmpl
 %%DATADIR%%/templates/printers.tmpl
 %%DATADIR%%/templates/restart.tmpl
+%%DATADIR%%/templates/ru/add-class.tmpl
+%%DATADIR%%/templates/ru/add-printer.tmpl
+%%DATADIR%%/templates/ru/add-rss-subscription.tmpl
+%%DATADIR%%/templates/ru/admin.tmpl
+%%DATADIR%%/templates/ru/choose-device.tmpl
+%%DATADIR%%/templates/ru/choose-make.tmpl
+%%DATADIR%%/templates/ru/choose-model.tmpl
+%%DATADIR%%/templates/ru/choose-serial.tmpl
+%%DATADIR%%/templates/ru/choose-uri.tmpl
+%%DATADIR%%/templates/ru/class-added.tmpl
+%%DATADIR%%/templates/ru/class-confirm.tmpl
+%%DATADIR%%/templates/ru/class-deleted.tmpl
+%%DATADIR%%/templates/ru/class-jobs-header.tmpl
+%%DATADIR%%/templates/ru/class-modified.tmpl
+%%DATADIR%%/templates/ru/class.tmpl
+%%DATADIR%%/templates/ru/classes-header.tmpl
+%%DATADIR%%/templates/ru/classes.tmpl
+%%DATADIR%%/templates/ru/command.tmpl
+%%DATADIR%%/templates/ru/edit-config.tmpl
+%%DATADIR%%/templates/ru/error-op.tmpl
+%%DATADIR%%/templates/ru/error.tmpl
+%%DATADIR%%/templates/ru/header.tmpl
+%%DATADIR%%/templates/ru/help-header.tmpl
+%%DATADIR%%/templates/ru/help-printable.tmpl
+%%DATADIR%%/templates/ru/help-trailer.tmpl
+%%DATADIR%%/templates/ru/job-cancel.tmpl
+%%DATADIR%%/templates/ru/job-hold.tmpl
+%%DATADIR%%/templates/ru/job-move.tmpl
+%%DATADIR%%/templates/ru/job-moved.tmpl
+%%DATADIR%%/templates/ru/job-release.tmpl
+%%DATADIR%%/templates/ru/job-restart.tmpl
+%%DATADIR%%/templates/ru/jobs-header.tmpl
+%%DATADIR%%/templates/ru/jobs.tmpl
+%%DATADIR%%/templates/ru/list-available-printers.tmpl
+%%DATADIR%%/templates/ru/modify-class.tmpl
+%%DATADIR%%/templates/ru/modify-printer.tmpl
+%%DATADIR%%/templates/ru/norestart.tmpl
+%%DATADIR%%/templates/ru/option-boolean.tmpl
+%%DATADIR%%/templates/ru/option-conflict.tmpl
+%%DATADIR%%/templates/ru/option-header.tmpl
+%%DATADIR%%/templates/ru/option-pickmany.tmpl
+%%DATADIR%%/templates/ru/option-pickone.tmpl
+%%DATADIR%%/templates/ru/option-trailer.tmpl
+%%DATADIR%%/templates/ru/pager.tmpl
+%%DATADIR%%/templates/ru/printer-accept.tmpl
+%%DATADIR%%/templates/ru/printer-added.tmpl
+%%DATADIR%%/templates/ru/printer-configured.tmpl
+%%DATADIR%%/templates/ru/printer-confirm.tmpl
+%%DATADIR%%/templates/ru/printer-default.tmpl
+%%DATADIR%%/templates/ru/printer-deleted.tmpl
+%%DATADIR%%/templates/ru/printer-jobs-header.tmpl
+%%DATADIR%%/templates/ru/printer-modified.tmpl
+%%DATADIR%%/templates/ru/printer-purge.tmpl
+%%DATADIR%%/templates/ru/printer-reject.tmpl
+%%DATADIR%%/templates/ru/printer-start.tmpl
+%%DATADIR%%/templates/ru/printer-stop.tmpl
+%%DATADIR%%/templates/ru/printer.tmpl
+%%DATADIR%%/templates/ru/printers-header.tmpl
+%%DATADIR%%/templates/ru/printers.tmpl
+%%DATADIR%%/templates/ru/restart.tmpl
+%%DATADIR%%/templates/ru/samba-export.tmpl
+%%DATADIR%%/templates/ru/samba-exported.tmpl
+%%DATADIR%%/templates/ru/search.tmpl
+%%DATADIR%%/templates/ru/set-printer-options-header.tmpl
+%%DATADIR%%/templates/ru/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/ru/subscription-added.tmpl
+%%DATADIR%%/templates/ru/subscription-canceled.tmpl
+%%DATADIR%%/templates/ru/test-page.tmpl
+%%DATADIR%%/templates/ru/trailer.tmpl
+%%DATADIR%%/templates/ru/users.tmpl
 %%DATADIR%%/templates/samba-export.tmpl
 %%DATADIR%%/templates/samba-exported.tmpl
 %%DATADIR%%/templates/search.tmpl
@@ -786,434 +666,42 @@ sbin/reject
 %%DATADIR%%/templates/set-printer-options-trailer.tmpl
 %%DATADIR%%/templates/subscription-added.tmpl
 %%DATADIR%%/templates/subscription-canceled.tmpl
-%%DATADIR%%/templates/sv/add-class.tmpl
-%%DATADIR%%/templates/sv/add-printer.tmpl
-%%DATADIR%%/templates/sv/admin.tmpl
-%%DATADIR%%/templates/sv/choose-device.tmpl
-%%DATADIR%%/templates/sv/choose-make.tmpl
-%%DATADIR%%/templates/sv/choose-model.tmpl
-%%DATADIR%%/templates/sv/choose-serial.tmpl
-%%DATADIR%%/templates/sv/choose-uri.tmpl
-%%DATADIR%%/templates/sv/class-added.tmpl
-%%DATADIR%%/templates/sv/class-confirm.tmpl
-%%DATADIR%%/templates/sv/class-deleted.tmpl
-%%DATADIR%%/templates/sv/class-jobs-header.tmpl
-%%DATADIR%%/templates/sv/class-modified.tmpl
-%%DATADIR%%/templates/sv/classes-header.tmpl
-%%DATADIR%%/templates/sv/classes.tmpl
-%%DATADIR%%/templates/sv/edit-config.tmpl
-%%DATADIR%%/templates/sv/error-op.tmpl
-%%DATADIR%%/templates/sv/error.tmpl
-%%DATADIR%%/templates/sv/header.tmpl
-%%DATADIR%%/templates/sv/help-header.tmpl
-%%DATADIR%%/templates/sv/help-printable.tmpl
-%%DATADIR%%/templates/sv/job-cancel.tmpl
-%%DATADIR%%/templates/sv/job-hold.tmpl
-%%DATADIR%%/templates/sv/job-move.tmpl
-%%DATADIR%%/templates/sv/job-moved.tmpl
-%%DATADIR%%/templates/sv/job-release.tmpl
-%%DATADIR%%/templates/sv/job-restart.tmpl
-%%DATADIR%%/templates/sv/jobs-header.tmpl
-%%DATADIR%%/templates/sv/jobs.tmpl
-%%DATADIR%%/templates/sv/maintenance.tmpl
-%%DATADIR%%/templates/sv/modify-class.tmpl
-%%DATADIR%%/templates/sv/modify-printer.tmpl
-%%DATADIR%%/templates/sv/option-boolean.tmpl
-%%DATADIR%%/templates/sv/option-conflict.tmpl
-%%DATADIR%%/templates/sv/option-header.tmpl
-%%DATADIR%%/templates/sv/option-pickmany.tmpl
-%%DATADIR%%/templates/sv/option-pickone.tmpl
-%%DATADIR%%/templates/sv/option-trailer.tmpl
-%%DATADIR%%/templates/sv/pager.tmpl
-%%DATADIR%%/templates/sv/printer-accept.tmpl
-%%DATADIR%%/templates/sv/printer-added.tmpl
-%%DATADIR%%/templates/sv/printer-configured.tmpl
-%%DATADIR%%/templates/sv/printer-confirm.tmpl
-%%DATADIR%%/templates/sv/printer-default.tmpl
-%%DATADIR%%/templates/sv/printer-deleted.tmpl
-%%DATADIR%%/templates/sv/printer-jobs-header.tmpl
-%%DATADIR%%/templates/sv/printer-modified.tmpl
-%%DATADIR%%/templates/sv/printer-purge.tmpl
-%%DATADIR%%/templates/sv/printer-reject.tmpl
-%%DATADIR%%/templates/sv/printer-start.tmpl
-%%DATADIR%%/templates/sv/printer-stop.tmpl
-%%DATADIR%%/templates/sv/printers-header.tmpl
-%%DATADIR%%/templates/sv/printers.tmpl
-%%DATADIR%%/templates/sv/restart.tmpl
-%%DATADIR%%/templates/sv/samba-export.tmpl
-%%DATADIR%%/templates/sv/samba-exported.tmpl
-%%DATADIR%%/templates/sv/search.tmpl
-%%DATADIR%%/templates/sv/set-printer-options-header.tmpl
-%%DATADIR%%/templates/sv/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/sv/test-page.tmpl
-%%DATADIR%%/templates/sv/trailer.tmpl
-%%DATADIR%%/templates/sv/users.tmpl
 %%DATADIR%%/templates/test-page.tmpl
 %%DATADIR%%/templates/trailer.tmpl
 %%DATADIR%%/templates/users.tmpl
-%%DATADIR%%/templates/zh_TW/add-class.tmpl
-%%DATADIR%%/templates/zh_TW/add-printer.tmpl
-%%DATADIR%%/templates/zh_TW/admin.tmpl
-%%DATADIR%%/templates/zh_TW/choose-device.tmpl
-%%DATADIR%%/templates/zh_TW/choose-make.tmpl
-%%DATADIR%%/templates/zh_TW/choose-model.tmpl
-%%DATADIR%%/templates/zh_TW/choose-serial.tmpl
-%%DATADIR%%/templates/zh_TW/choose-uri.tmpl
-%%DATADIR%%/templates/zh_TW/class-added.tmpl
-%%DATADIR%%/templates/zh_TW/class-confirm.tmpl
-%%DATADIR%%/templates/zh_TW/class-deleted.tmpl
-%%DATADIR%%/templates/zh_TW/class-jobs-header.tmpl
-%%DATADIR%%/templates/zh_TW/class-modified.tmpl
-%%DATADIR%%/templates/zh_TW/classes-header.tmpl
-%%DATADIR%%/templates/zh_TW/classes.tmpl
-%%DATADIR%%/templates/zh_TW/edit-config.tmpl
-%%DATADIR%%/templates/zh_TW/error-op.tmpl
-%%DATADIR%%/templates/zh_TW/error.tmpl
-%%DATADIR%%/templates/zh_TW/header.tmpl
-%%DATADIR%%/templates/zh_TW/help-header.tmpl
-%%DATADIR%%/templates/zh_TW/help-printable.tmpl
-%%DATADIR%%/templates/zh_TW/job-cancel.tmpl
-%%DATADIR%%/templates/zh_TW/job-hold.tmpl
-%%DATADIR%%/templates/zh_TW/job-move.tmpl
-%%DATADIR%%/templates/zh_TW/job-moved.tmpl
-%%DATADIR%%/templates/zh_TW/job-release.tmpl
-%%DATADIR%%/templates/zh_TW/job-restart.tmpl
-%%DATADIR%%/templates/zh_TW/jobs-header.tmpl
-%%DATADIR%%/templates/zh_TW/jobs.tmpl
-%%DATADIR%%/templates/zh_TW/maintenance.tmpl
-%%DATADIR%%/templates/zh_TW/modify-class.tmpl
-%%DATADIR%%/templates/zh_TW/modify-printer.tmpl
-%%DATADIR%%/templates/zh_TW/option-boolean.tmpl
-%%DATADIR%%/templates/zh_TW/option-conflict.tmpl
-%%DATADIR%%/templates/zh_TW/option-header.tmpl
-%%DATADIR%%/templates/zh_TW/option-pickmany.tmpl
-%%DATADIR%%/templates/zh_TW/option-pickone.tmpl
-%%DATADIR%%/templates/zh_TW/option-trailer.tmpl
-%%DATADIR%%/templates/zh_TW/pager.tmpl
-%%DATADIR%%/templates/zh_TW/printer-accept.tmpl
-%%DATADIR%%/templates/zh_TW/printer-added.tmpl
-%%DATADIR%%/templates/zh_TW/printer-configured.tmpl
-%%DATADIR%%/templates/zh_TW/printer-confirm.tmpl
-%%DATADIR%%/templates/zh_TW/printer-default.tmpl
-%%DATADIR%%/templates/zh_TW/printer-deleted.tmpl
-%%DATADIR%%/templates/zh_TW/printer-jobs-header.tmpl
-%%DATADIR%%/templates/zh_TW/printer-modified.tmpl
-%%DATADIR%%/templates/zh_TW/printer-purge.tmpl
-%%DATADIR%%/templates/zh_TW/printer-reject.tmpl
-%%DATADIR%%/templates/zh_TW/printer-start.tmpl
-%%DATADIR%%/templates/zh_TW/printer-stop.tmpl
-%%DATADIR%%/templates/zh_TW/printers-header.tmpl
-%%DATADIR%%/templates/zh_TW/printers.tmpl
-%%DATADIR%%/templates/zh_TW/restart.tmpl
-%%DATADIR%%/templates/zh_TW/samba-export.tmpl
-%%DATADIR%%/templates/zh_TW/samba-exported.tmpl
-%%DATADIR%%/templates/zh_TW/search.tmpl
-%%DATADIR%%/templates/zh_TW/set-printer-options-header.tmpl
-%%DATADIR%%/templates/zh_TW/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/zh_TW/test-page.tmpl
-%%DATADIR%%/templates/zh_TW/trailer.tmpl
-%%DATADIR%%/templates/zh_TW/users.tmpl
 %%DOCSDIR%%/cups-printable.css
 %%DOCSDIR%%/cups.css
-%%DOCSDIR%%/de/images/button-accept-jobs.gif
-%%DOCSDIR%%/de/images/button-add-class.gif
-%%DOCSDIR%%/de/images/button-add-printer.gif
-%%DOCSDIR%%/de/images/button-add-rss-subscription.gif
-%%DOCSDIR%%/de/images/button-add-this-printer.gif
-%%DOCSDIR%%/de/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/de/images/button-cancel-job.gif
-%%DOCSDIR%%/de/images/button-cancel-subscription.gif
-%%DOCSDIR%%/de/images/button-change-settings.gif
-%%DOCSDIR%%/de/images/button-clean-print-heads.gif
-%%DOCSDIR%%/de/images/button-clear.gif
-%%DOCSDIR%%/de/images/button-continue.gif
-%%DOCSDIR%%/de/images/button-delete-class.gif
-%%DOCSDIR%%/de/images/button-delete-printer.gif
-%%DOCSDIR%%/de/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/de/images/button-export-samba.gif
-%%DOCSDIR%%/de/images/button-find-new-printers.gif
-%%DOCSDIR%%/de/images/button-help.gif
-%%DOCSDIR%%/de/images/button-hold-job.gif
-%%DOCSDIR%%/de/images/button-manage-classes.gif
-%%DOCSDIR%%/de/images/button-manage-jobs.gif
-%%DOCSDIR%%/de/images/button-manage-printers.gif
-%%DOCSDIR%%/de/images/button-manage-server.gif
-%%DOCSDIR%%/de/images/button-modify-class.gif
-%%DOCSDIR%%/de/images/button-modify-printer.gif
-%%DOCSDIR%%/de/images/button-move-job.gif
-%%DOCSDIR%%/de/images/button-move-jobs.gif
-%%DOCSDIR%%/de/images/button-print-self-test-page.gif
-%%DOCSDIR%%/de/images/button-print-test-page.gif
-%%DOCSDIR%%/de/images/button-publish-printer.gif
-%%DOCSDIR%%/de/images/button-reject-jobs.gif
-%%DOCSDIR%%/de/images/button-release-job.gif
-%%DOCSDIR%%/de/images/button-restart-job.gif
-%%DOCSDIR%%/de/images/button-save-changes.gif
-%%DOCSDIR%%/de/images/button-search.gif
-%%DOCSDIR%%/de/images/button-set-allowed-users.gif
-%%DOCSDIR%%/de/images/button-set-as-default.gif
-%%DOCSDIR%%/de/images/button-set-printer-options.gif
-%%DOCSDIR%%/de/images/button-show-active.gif
-%%DOCSDIR%%/de/images/button-show-all.gif
-%%DOCSDIR%%/de/images/button-show-completed.gif
-%%DOCSDIR%%/de/images/button-show-next.gif
-%%DOCSDIR%%/de/images/button-show-previous.gif
-%%DOCSDIR%%/de/images/button-sort-ascending.gif
-%%DOCSDIR%%/de/images/button-sort-descending.gif
-%%DOCSDIR%%/de/images/button-start-class.gif
-%%DOCSDIR%%/de/images/button-start-printer.gif
-%%DOCSDIR%%/de/images/button-stop-class.gif
-%%DOCSDIR%%/de/images/button-stop-printer.gif
-%%DOCSDIR%%/de/images/button-unpublish-printer.gif
-%%DOCSDIR%%/de/images/button-use-default-config.gif
-%%DOCSDIR%%/de/images/button-view-access-log.gif
-%%DOCSDIR%%/de/images/button-view-error-log.gif
-%%DOCSDIR%%/de/images/button-view-page-log.gif
-%%DOCSDIR%%/de/images/button-view-printable-version.gif
 %%DOCSDIR%%/de/index.html
-%%DOCSDIR%%/es/images/button-accept-jobs.gif
-%%DOCSDIR%%/es/images/button-add-class.gif
-%%DOCSDIR%%/es/images/button-add-printer.gif
-%%DOCSDIR%%/es/images/button-add-rss-subscription.gif
-%%DOCSDIR%%/es/images/button-add-this-printer.gif
-%%DOCSDIR%%/es/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/es/images/button-cancel-job.gif
-%%DOCSDIR%%/es/images/button-cancel-subscription.gif
-%%DOCSDIR%%/es/images/button-change-settings.gif
-%%DOCSDIR%%/es/images/button-clean-print-heads.gif
-%%DOCSDIR%%/es/images/button-clear.gif
-%%DOCSDIR%%/es/images/button-continue.gif
-%%DOCSDIR%%/es/images/button-delete-class.gif
-%%DOCSDIR%%/es/images/button-delete-printer.gif
-%%DOCSDIR%%/es/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/es/images/button-export-samba.gif
-%%DOCSDIR%%/es/images/button-find-new-printers.gif
-%%DOCSDIR%%/es/images/button-help.gif
-%%DOCSDIR%%/es/images/button-hold-job.gif
-%%DOCSDIR%%/es/images/button-manage-classes.gif
-%%DOCSDIR%%/es/images/button-manage-jobs.gif
-%%DOCSDIR%%/es/images/button-manage-printers.gif
-%%DOCSDIR%%/es/images/button-manage-server.gif
-%%DOCSDIR%%/es/images/button-modify-class.gif
-%%DOCSDIR%%/es/images/button-modify-printer.gif
-%%DOCSDIR%%/es/images/button-move-job.gif
-%%DOCSDIR%%/es/images/button-move-jobs.gif
-%%DOCSDIR%%/es/images/button-print-self-test-page.gif
-%%DOCSDIR%%/es/images/button-print-test-page.gif
-%%DOCSDIR%%/es/images/button-publish-printer.gif
-%%DOCSDIR%%/es/images/button-reject-jobs.gif
-%%DOCSDIR%%/es/images/button-release-job.gif
-%%DOCSDIR%%/es/images/button-restart-job.gif
-%%DOCSDIR%%/es/images/button-save-changes.gif
-%%DOCSDIR%%/es/images/button-search.gif
-%%DOCSDIR%%/es/images/button-set-allowed-users.gif
-%%DOCSDIR%%/es/images/button-set-as-default.gif
-%%DOCSDIR%%/es/images/button-set-printer-options.gif
-%%DOCSDIR%%/es/images/button-show-active.gif
-%%DOCSDIR%%/es/images/button-show-all.gif
-%%DOCSDIR%%/es/images/button-show-completed.gif
-%%DOCSDIR%%/es/images/button-show-next.gif
-%%DOCSDIR%%/es/images/button-show-previous.gif
-%%DOCSDIR%%/es/images/button-sort-ascending.gif
-%%DOCSDIR%%/es/images/button-sort-descending.gif
-%%DOCSDIR%%/es/images/button-start-class.gif
-%%DOCSDIR%%/es/images/button-start-printer.gif
-%%DOCSDIR%%/es/images/button-stop-class.gif
-%%DOCSDIR%%/es/images/button-stop-printer.gif
-%%DOCSDIR%%/es/images/button-unpublish-printer.gif
-%%DOCSDIR%%/es/images/button-use-default-config.gif
-%%DOCSDIR%%/es/images/button-view-access-log.gif
-%%DOCSDIR%%/es/images/button-view-error-log.gif
-%%DOCSDIR%%/es/images/button-view-page-log.gif
-%%DOCSDIR%%/es/images/button-view-printable-version.gif
 %%DOCSDIR%%/es/index.html
-%%DOCSDIR%%/et/images/button-accept-jobs.gif
-%%DOCSDIR%%/et/images/button-add-class.gif
-%%DOCSDIR%%/et/images/button-add-printer.gif
-%%DOCSDIR%%/et/images/button-add-this-printer.gif
-%%DOCSDIR%%/et/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/et/images/button-cancel-job.gif
-%%DOCSDIR%%/et/images/button-change-settings.gif
-%%DOCSDIR%%/et/images/button-clean-print-heads.gif
-%%DOCSDIR%%/et/images/button-clear.gif
-%%DOCSDIR%%/et/images/button-continue.gif
-%%DOCSDIR%%/et/images/button-delete-class.gif
-%%DOCSDIR%%/et/images/button-delete-printer.gif
-%%DOCSDIR%%/et/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/et/images/button-export-samba.gif
-%%DOCSDIR%%/et/images/button-help.gif
-%%DOCSDIR%%/et/images/button-hold-job.gif
-%%DOCSDIR%%/et/images/button-manage-classes.gif
-%%DOCSDIR%%/et/images/button-manage-jobs.gif
-%%DOCSDIR%%/et/images/button-manage-printers.gif
-%%DOCSDIR%%/et/images/button-manage-server.gif
-%%DOCSDIR%%/et/images/button-modify-class.gif
-%%DOCSDIR%%/et/images/button-modify-printer.gif
-%%DOCSDIR%%/et/images/button-move-job.gif
-%%DOCSDIR%%/et/images/button-move-jobs.gif
-%%DOCSDIR%%/et/images/button-print-self-test-page.gif
-%%DOCSDIR%%/et/images/button-print-test-page.gif
-%%DOCSDIR%%/et/images/button-publish-printer.gif
-%%DOCSDIR%%/et/images/button-reject-jobs.gif
-%%DOCSDIR%%/et/images/button-release-job.gif
-%%DOCSDIR%%/et/images/button-restart-job.gif
-%%DOCSDIR%%/et/images/button-save-changes.gif
-%%DOCSDIR%%/et/images/button-search.gif
-%%DOCSDIR%%/et/images/button-set-allowed-users.gif
-%%DOCSDIR%%/et/images/button-set-as-default.gif
-%%DOCSDIR%%/et/images/button-set-printer-options.gif
-%%DOCSDIR%%/et/images/button-show-active.gif
-%%DOCSDIR%%/et/images/button-show-all.gif
-%%DOCSDIR%%/et/images/button-show-completed.gif
-%%DOCSDIR%%/et/images/button-show-next.gif
-%%DOCSDIR%%/et/images/button-show-previous.gif
-%%DOCSDIR%%/et/images/button-sort-ascending.gif
-%%DOCSDIR%%/et/images/button-sort-descending.gif
-%%DOCSDIR%%/et/images/button-start-class.gif
-%%DOCSDIR%%/et/images/button-start-printer.gif
-%%DOCSDIR%%/et/images/button-stop-class.gif
-%%DOCSDIR%%/et/images/button-stop-printer.gif
-%%DOCSDIR%%/et/images/button-unpublish-printer.gif
-%%DOCSDIR%%/et/images/button-use-default-config.gif
-%%DOCSDIR%%/et/images/button-view-access-log.gif
-%%DOCSDIR%%/et/images/button-view-error-log.gif
-%%DOCSDIR%%/et/images/button-view-page-log.gif
-%%DOCSDIR%%/et/images/button-view-printable-version.gif
-%%DOCSDIR%%/et/index.html
-%%DOCSDIR%%/favicon.ico
-%%DOCSDIR%%/fr/images/button-accept-jobs.gif
-%%DOCSDIR%%/fr/images/button-add-class.gif
-%%DOCSDIR%%/fr/images/button-add-printer.gif
-%%DOCSDIR%%/fr/images/button-add-this-printer.gif
-%%DOCSDIR%%/fr/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/fr/images/button-cancel-job.gif
-%%DOCSDIR%%/fr/images/button-change-settings.gif
-%%DOCSDIR%%/fr/images/button-clean-print-heads.gif
-%%DOCSDIR%%/fr/images/button-clear.gif
-%%DOCSDIR%%/fr/images/button-continue.gif
-%%DOCSDIR%%/fr/images/button-delete-class.gif
-%%DOCSDIR%%/fr/images/button-delete-printer.gif
-%%DOCSDIR%%/fr/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/fr/images/button-export-samba.gif
-%%DOCSDIR%%/fr/images/button-find-new-printers.gif
-%%DOCSDIR%%/fr/images/button-help.gif
-%%DOCSDIR%%/fr/images/button-hold-job.gif
-%%DOCSDIR%%/fr/images/button-manage-classes.gif
-%%DOCSDIR%%/fr/images/button-manage-jobs.gif
-%%DOCSDIR%%/fr/images/button-manage-printers.gif
-%%DOCSDIR%%/fr/images/button-manage-server.gif
-%%DOCSDIR%%/fr/images/button-modify-class.gif
-%%DOCSDIR%%/fr/images/button-modify-printer.gif
-%%DOCSDIR%%/fr/images/button-move-job.gif
-%%DOCSDIR%%/fr/images/button-move-jobs.gif
-%%DOCSDIR%%/fr/images/button-print-self-test-page.gif
-%%DOCSDIR%%/fr/images/button-print-test-page.gif
-%%DOCSDIR%%/fr/images/button-publish-printer.gif
-%%DOCSDIR%%/fr/images/button-reject-jobs.gif
-%%DOCSDIR%%/fr/images/button-release-job.gif
-%%DOCSDIR%%/fr/images/button-restart-job.gif
-%%DOCSDIR%%/fr/images/button-save-changes.gif
-%%DOCSDIR%%/fr/images/button-search.gif
-%%DOCSDIR%%/fr/images/button-set-allowed-users.gif
-%%DOCSDIR%%/fr/images/button-set-as-default.gif
-%%DOCSDIR%%/fr/images/button-set-printer-options.gif
-%%DOCSDIR%%/fr/images/button-show-active.gif
-%%DOCSDIR%%/fr/images/button-show-all.gif
-%%DOCSDIR%%/fr/images/button-show-completed.gif
-%%DOCSDIR%%/fr/images/button-show-next.gif
-%%DOCSDIR%%/fr/images/button-show-previous.gif
-%%DOCSDIR%%/fr/images/button-sort-ascending.gif
-%%DOCSDIR%%/fr/images/button-sort-descending.gif
-%%DOCSDIR%%/fr/images/button-start-class.gif
-%%DOCSDIR%%/fr/images/button-start-printer.gif
-%%DOCSDIR%%/fr/images/button-stop-class.gif
-%%DOCSDIR%%/fr/images/button-stop-printer.gif
-%%DOCSDIR%%/fr/images/button-unpublish-printer.gif
-%%DOCSDIR%%/fr/images/button-use-default-config.gif
-%%DOCSDIR%%/fr/images/button-view-access-log.gif
-%%DOCSDIR%%/fr/images/button-view-error-log.gif
-%%DOCSDIR%%/fr/images/button-view-page-log.gif
-%%DOCSDIR%%/fr/images/button-view-printable-version.gif
-%%DOCSDIR%%/fr/index.html
-%%DOCSDIR%%/he/cups.css
-%%DOCSDIR%%/he/images/button-accept-jobs.gif
-%%DOCSDIR%%/he/images/button-add-class.gif
-%%DOCSDIR%%/he/images/button-add-printer.gif
-%%DOCSDIR%%/he/images/button-add-this-printer.gif
-%%DOCSDIR%%/he/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/he/images/button-cancel-job.gif
-%%DOCSDIR%%/he/images/button-change-settings.gif
-%%DOCSDIR%%/he/images/button-clean-print-heads.gif
-%%DOCSDIR%%/he/images/button-clear.gif
-%%DOCSDIR%%/he/images/button-continue.gif
-%%DOCSDIR%%/he/images/button-delete-class.gif
-%%DOCSDIR%%/he/images/button-delete-printer.gif
-%%DOCSDIR%%/he/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/he/images/button-export-samba.gif
-%%DOCSDIR%%/he/images/button-help.gif
-%%DOCSDIR%%/he/images/button-hold-job.gif
-%%DOCSDIR%%/he/images/button-manage-classes.gif
-%%DOCSDIR%%/he/images/button-manage-jobs.gif
-%%DOCSDIR%%/he/images/button-manage-printers.gif
-%%DOCSDIR%%/he/images/button-manage-server.gif
-%%DOCSDIR%%/he/images/button-modify-class.gif
-%%DOCSDIR%%/he/images/button-modify-printer.gif
-%%DOCSDIR%%/he/images/button-move-job.gif
-%%DOCSDIR%%/he/images/button-move-jobs.gif
-%%DOCSDIR%%/he/images/button-print-self-test-page.gif
-%%DOCSDIR%%/he/images/button-print-test-page.gif
-%%DOCSDIR%%/he/images/button-publish-printer.gif
-%%DOCSDIR%%/he/images/button-reject-jobs.gif
-%%DOCSDIR%%/he/images/button-release-job.gif
-%%DOCSDIR%%/he/images/button-restart-job.gif
-%%DOCSDIR%%/he/images/button-save-changes.gif
-%%DOCSDIR%%/he/images/button-search.gif
-%%DOCSDIR%%/he/images/button-set-allowed-users.gif
-%%DOCSDIR%%/he/images/button-set-as-default.gif
-%%DOCSDIR%%/he/images/button-set-printer-options.gif
-%%DOCSDIR%%/he/images/button-show-active.gif
-%%DOCSDIR%%/he/images/button-show-all.gif
-%%DOCSDIR%%/he/images/button-show-completed.gif
-%%DOCSDIR%%/he/images/button-show-next.gif
-%%DOCSDIR%%/he/images/button-show-previous.gif
-%%DOCSDIR%%/he/images/button-sort-ascending.gif
-%%DOCSDIR%%/he/images/button-sort-descending.gif
-%%DOCSDIR%%/he/images/button-start-class.gif
-%%DOCSDIR%%/he/images/button-start-printer.gif
-%%DOCSDIR%%/he/images/button-stop-class.gif
-%%DOCSDIR%%/he/images/button-stop-printer.gif
-%%DOCSDIR%%/he/images/button-unpublish-printer.gif
-%%DOCSDIR%%/he/images/button-use-default-config.gif
-%%DOCSDIR%%/he/images/button-view-access-log.gif
-%%DOCSDIR%%/he/images/button-view-error-log.gif
-%%DOCSDIR%%/he/images/button-view-page-log.gif
-%%DOCSDIR%%/he/images/button-view-printable-version.gif
-%%DOCSDIR%%/he/index.html
+%%DOCSDIR%%/eu/index.html
 %%DOCSDIR%%/help/accounting.html
 %%DOCSDIR%%/help/api-array.html
+%%DOCSDIR%%/help/api-cgi.html
 %%DOCSDIR%%/help/api-cups.html
+%%DOCSDIR%%/help/api-driver.html
 %%DOCSDIR%%/help/api-filedir.html
 %%DOCSDIR%%/help/api-filter.html
 %%DOCSDIR%%/help/api-httpipp.html
+%%DOCSDIR%%/help/api-mime.html
+%%DOCSDIR%%/help/api-overview.html
 %%DOCSDIR%%/help/api-ppd.html
+%%DOCSDIR%%/help/api-ppdc.html
 %%DOCSDIR%%/help/api-raster.html
 %%DOCSDIR%%/help/cgi.html
 %%DOCSDIR%%/help/glossary.html
 %%DOCSDIR%%/help/kerberos.html
 %%DOCSDIR%%/help/license.html
-%%DOCSDIR%%/help/man-accept.html
 %%DOCSDIR%%/help/man-backend.html
 %%DOCSDIR%%/help/man-cancel.html
-%%DOCSDIR%%/help/man-classes.conf.html
-%%DOCSDIR%%/help/man-client.conf.html
 %%DOCSDIR%%/help/man-cups-lpd.html
 %%DOCSDIR%%/help/man-cups-polld.html
+%%DOCSDIR%%/help/man-cupsaccept.html
 %%DOCSDIR%%/help/man-cupsaddsmb.html
-%%DOCSDIR%%/help/man-cupsd.conf.html
 %%DOCSDIR%%/help/man-cupsd.html
 %%DOCSDIR%%/help/man-cupsenable.html
 %%DOCSDIR%%/help/man-cupstestdsc.html
 %%DOCSDIR%%/help/man-cupstestppd.html
+%%DOCSDIR%%/help/man-drv.html
 %%DOCSDIR%%/help/man-filter.html
 %%DOCSDIR%%/help/man-lp.html
 %%DOCSDIR%%/help/man-lpadmin.html
@@ -1228,11 +716,19 @@ sbin/reject
 %%DOCSDIR%%/help/man-lpstat.html
 %%DOCSDIR%%/help/man-mime.convs.html
 %%DOCSDIR%%/help/man-mime.types.html
-%%DOCSDIR%%/help/man-printers.conf.html
+%%DOCSDIR%%/help/man-notifier.html
+%%DOCSDIR%%/help/man-ppdc.html
+%%DOCSDIR%%/help/man-ppdhtml.html
+%%DOCSDIR%%/help/man-ppdi.html
+%%DOCSDIR%%/help/man-ppdmerge.html
+%%DOCSDIR%%/help/man-ppdpo.html
 %%DOCSDIR%%/help/network.html
 %%DOCSDIR%%/help/options.html
 %%DOCSDIR%%/help/overview.html
 %%DOCSDIR%%/help/policies.html
+%%DOCSDIR%%/help/postscript-driver.html
+%%DOCSDIR%%/help/ppd-compiler.html
+%%DOCSDIR%%/help/raster-driver.html
 %%DOCSDIR%%/help/ref-access_log.html
 %%DOCSDIR%%/help/ref-classes-conf.html
 %%DOCSDIR%%/help/ref-client-conf.html
@@ -1240,426 +736,45 @@ sbin/reject
 %%DOCSDIR%%/help/ref-error_log.html
 %%DOCSDIR%%/help/ref-mailto-conf.html
 %%DOCSDIR%%/help/ref-page_log.html
+%%DOCSDIR%%/help/ref-ppdcfile.html
 %%DOCSDIR%%/help/ref-printers-conf.html
 %%DOCSDIR%%/help/ref-snmp-conf.html
 %%DOCSDIR%%/help/ref-subscriptions-conf.html
 %%DOCSDIR%%/help/security.html
+%%DOCSDIR%%/help/sharing.html
+%%DOCSDIR%%/help/spec-banner.html
+%%DOCSDIR%%/help/spec-browsing.html
 %%DOCSDIR%%/help/spec-cmp.html
 %%DOCSDIR%%/help/spec-command.html
 %%DOCSDIR%%/help/spec-design.html
 %%DOCSDIR%%/help/spec-ipp.html
 %%DOCSDIR%%/help/spec-postscript.html
+%%DOCSDIR%%/help/spec-pdf.html
 %%DOCSDIR%%/help/spec-ppd.html
 %%DOCSDIR%%/help/spec-raster.html
 %%DOCSDIR%%/help/spec-stp.html
 %%DOCSDIR%%/help/standard.html
 %%DOCSDIR%%/help/translation.html
 %%DOCSDIR%%/help/whatsnew.html
-%%DOCSDIR%%/images/bottom-left.gif
-%%DOCSDIR%%/images/bottom-right.gif
-%%DOCSDIR%%/images/button-accept-jobs.gif
-%%DOCSDIR%%/images/button-add-class.gif
-%%DOCSDIR%%/images/button-add-printer.gif
-%%DOCSDIR%%/images/button-add-rss-subscription.gif
-%%DOCSDIR%%/images/button-add-this-printer.gif
-%%DOCSDIR%%/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/images/button-cancel-job.gif
-%%DOCSDIR%%/images/button-cancel-subscription.gif
-%%DOCSDIR%%/images/button-change-settings.gif
-%%DOCSDIR%%/images/button-clean-print-heads.gif
-%%DOCSDIR%%/images/button-clear.gif
-%%DOCSDIR%%/images/button-continue.gif
-%%DOCSDIR%%/images/button-delete-class.gif
-%%DOCSDIR%%/images/button-delete-printer.gif
-%%DOCSDIR%%/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/images/button-export-samba.gif
-%%DOCSDIR%%/images/button-find-new-printers.gif
-%%DOCSDIR%%/images/button-help.gif
-%%DOCSDIR%%/images/button-hold-job.gif
-%%DOCSDIR%%/images/button-manage-classes.gif
-%%DOCSDIR%%/images/button-manage-jobs.gif
-%%DOCSDIR%%/images/button-manage-printers.gif
-%%DOCSDIR%%/images/button-manage-server.gif
-%%DOCSDIR%%/images/button-modify-class.gif
-%%DOCSDIR%%/images/button-modify-printer.gif
-%%DOCSDIR%%/images/button-move-job.gif
-%%DOCSDIR%%/images/button-move-jobs.gif
-%%DOCSDIR%%/images/button-print-self-test-page.gif
-%%DOCSDIR%%/images/button-print-test-page.gif
-%%DOCSDIR%%/images/button-publish-printer.gif
-%%DOCSDIR%%/images/button-reject-jobs.gif
-%%DOCSDIR%%/images/button-release-job.gif
-%%DOCSDIR%%/images/button-restart-job.gif
-%%DOCSDIR%%/images/button-save-changes.gif
-%%DOCSDIR%%/images/button-search.gif
-%%DOCSDIR%%/images/button-set-allowed-users.gif
-%%DOCSDIR%%/images/button-set-as-default.gif
-%%DOCSDIR%%/images/button-set-printer-options.gif
-%%DOCSDIR%%/images/button-show-active.gif
-%%DOCSDIR%%/images/button-show-all.gif
-%%DOCSDIR%%/images/button-show-completed.gif
-%%DOCSDIR%%/images/button-show-next.gif
-%%DOCSDIR%%/images/button-show-previous.gif
-%%DOCSDIR%%/images/button-sort-ascending.gif
-%%DOCSDIR%%/images/button-sort-descending.gif
-%%DOCSDIR%%/images/button-start-class.gif
-%%DOCSDIR%%/images/button-start-printer.gif
-%%DOCSDIR%%/images/button-stop-class.gif
-%%DOCSDIR%%/images/button-stop-printer.gif
-%%DOCSDIR%%/images/button-unpublish-printer.gif
-%%DOCSDIR%%/images/button-use-default-config.gif
-%%DOCSDIR%%/images/button-view-access-log.gif
-%%DOCSDIR%%/images/button-view-error-log.gif
-%%DOCSDIR%%/images/button-view-page-log.gif
-%%DOCSDIR%%/images/button-view-printable-version.gif
-%%DOCSDIR%%/images/classes.gif
-%%DOCSDIR%%/images/cups-block-diagram.gif
-%%DOCSDIR%%/images/esp-logo.gif
-%%DOCSDIR%%/images/happy.gif
-%%DOCSDIR%%/images/logo.gif
-%%DOCSDIR%%/images/printer-idle.gif
-%%DOCSDIR%%/images/printer-processing.gif
-%%DOCSDIR%%/images/printer-stopped.gif
+%%DOCSDIR%%/images/color-wheel.png
+%%DOCSDIR%%/images/cups-block-diagram.png
+%%DOCSDIR%%/images/cups-command-chain.png
+%%DOCSDIR%%/images/cups-icon.png
+%%DOCSDIR%%/images/cups-postscript-chain.png
+%%DOCSDIR%%/images/cups-raster-chain.png
+%%DOCSDIR%%/images/cups.png
+%%DOCSDIR%%/images/left.gif
 %%DOCSDIR%%/images/raster.png
-%%DOCSDIR%%/images/raster.svg
+%%DOCSDIR%%/images/right.gif
+%%DOCSDIR%%/images/sel.gif
 %%DOCSDIR%%/images/smiley.jpg
-%%DOCSDIR%%/images/tab-left.gif
-%%DOCSDIR%%/images/tab-right.gif
-%%DOCSDIR%%/images/top-left.gif
-%%DOCSDIR%%/images/top-middle.gif
-%%DOCSDIR%%/images/top-right.gif
-%%DOCSDIR%%/images/web-add-this-printer.gif
-%%DOCSDIR%%/images/web-password.gif
-%%DOCSDIR%%/images/web-printer-driver.gif
-%%DOCSDIR%%/images/web-printer-status.gif
-%%DOCSDIR%%/images/web-set-printer-options.gif
-%%DOCSDIR%%/images/web-test-page.gif
+%%DOCSDIR%%/images/unsel.gif
+%%DOCSDIR%%/images/wait.gif
 %%DOCSDIR%%/index.html
-%%DOCSDIR%%/id/images/button-accept-jobs.gif
-%%DOCSDIR%%/id/images/button-add-class.gif
-%%DOCSDIR%%/id/images/button-add-printer.gif
-%%DOCSDIR%%/id/images/button-add-rss-subscription.gif
-%%DOCSDIR%%/id/images/button-add-this-printer.gif
-%%DOCSDIR%%/id/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/id/images/button-cancel-job.gif
-%%DOCSDIR%%/id/images/button-cancel-subscription.gif
-%%DOCSDIR%%/id/images/button-change-settings.gif
-%%DOCSDIR%%/id/images/button-clean-print-heads.gif
-%%DOCSDIR%%/id/images/button-clear.gif
-%%DOCSDIR%%/id/images/button-continue.gif
-%%DOCSDIR%%/id/images/button-delete-class.gif
-%%DOCSDIR%%/id/images/button-delete-printer.gif
-%%DOCSDIR%%/id/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/id/images/button-export-samba.gif
-%%DOCSDIR%%/id/images/button-find-new-printers.gif
-%%DOCSDIR%%/id/images/button-help.gif
-%%DOCSDIR%%/id/images/button-hold-job.gif
-%%DOCSDIR%%/id/images/button-manage-classes.gif
-%%DOCSDIR%%/id/images/button-manage-jobs.gif
-%%DOCSDIR%%/id/images/button-manage-printers.gif
-%%DOCSDIR%%/id/images/button-manage-server.gif
-%%DOCSDIR%%/id/images/button-modify-class.gif
-%%DOCSDIR%%/id/images/button-modify-printer.gif
-%%DOCSDIR%%/id/images/button-move-job.gif
-%%DOCSDIR%%/id/images/button-move-jobs.gif
-%%DOCSDIR%%/id/images/button-print-self-test-page.gif
-%%DOCSDIR%%/id/images/button-print-test-page.gif
-%%DOCSDIR%%/id/images/button-publish-printer.gif
-%%DOCSDIR%%/id/images/button-reject-jobs.gif
-%%DOCSDIR%%/id/images/button-release-job.gif
-%%DOCSDIR%%/id/images/button-restart-job.gif
-%%DOCSDIR%%/id/images/button-save-changes.gif
-%%DOCSDIR%%/id/images/button-search.gif
-%%DOCSDIR%%/id/images/button-set-allowed-users.gif
-%%DOCSDIR%%/id/images/button-set-as-default.gif
-%%DOCSDIR%%/id/images/button-set-printer-options.gif
-%%DOCSDIR%%/id/images/button-show-active.gif
-%%DOCSDIR%%/id/images/button-show-all.gif
-%%DOCSDIR%%/id/images/button-show-completed.gif
-%%DOCSDIR%%/id/images/button-show-next.gif
-%%DOCSDIR%%/id/images/button-show-previous.gif
-%%DOCSDIR%%/id/images/button-sort-ascending.gif
-%%DOCSDIR%%/id/images/button-sort-descending.gif
-%%DOCSDIR%%/id/images/button-start-class.gif
-%%DOCSDIR%%/id/images/button-start-printer.gif
-%%DOCSDIR%%/id/images/button-stop-class.gif
-%%DOCSDIR%%/id/images/button-stop-printer.gif
-%%DOCSDIR%%/id/images/button-unpublish-printer.gif
-%%DOCSDIR%%/id/images/button-use-default-config.gif
-%%DOCSDIR%%/id/images/button-view-access-log.gif
-%%DOCSDIR%%/id/images/button-view-error-log.gif
-%%DOCSDIR%%/id/images/button-view-page-log.gif
-%%DOCSDIR%%/id/images/button-view-printable-version.gif
-%%DOCSDIR%%/id/index.html
-%%DOCSDIR%%/it/images/button-accept-jobs.gif
-%%DOCSDIR%%/it/images/button-add-class.gif
-%%DOCSDIR%%/it/images/button-add-printer.gif
-%%DOCSDIR%%/it/images/button-add-this-printer.gif
-%%DOCSDIR%%/it/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/it/images/button-cancel-job.gif
-%%DOCSDIR%%/it/images/button-change-settings.gif
-%%DOCSDIR%%/it/images/button-clean-print-heads.gif
-%%DOCSDIR%%/it/images/button-clear.gif
-%%DOCSDIR%%/it/images/button-continue.gif
-%%DOCSDIR%%/it/images/button-delete-class.gif
-%%DOCSDIR%%/it/images/button-delete-printer.gif
-%%DOCSDIR%%/it/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/it/images/button-export-samba.gif
-%%DOCSDIR%%/it/images/button-help.gif
-%%DOCSDIR%%/it/images/button-hold-job.gif
-%%DOCSDIR%%/it/images/button-manage-classes.gif
-%%DOCSDIR%%/it/images/button-manage-jobs.gif
-%%DOCSDIR%%/it/images/button-manage-printers.gif
-%%DOCSDIR%%/it/images/button-manage-server.gif
-%%DOCSDIR%%/it/images/button-modify-class.gif
-%%DOCSDIR%%/it/images/button-modify-printer.gif
-%%DOCSDIR%%/it/images/button-move-job.gif
-%%DOCSDIR%%/it/images/button-move-jobs.gif
-%%DOCSDIR%%/it/images/button-print-self-test-page.gif
-%%DOCSDIR%%/it/images/button-print-test-page.gif
-%%DOCSDIR%%/it/images/button-publish-printer.gif
-%%DOCSDIR%%/it/images/button-reject-jobs.gif
-%%DOCSDIR%%/it/images/button-release-job.gif
-%%DOCSDIR%%/it/images/button-restart-job.gif
-%%DOCSDIR%%/it/images/button-save-changes.gif
-%%DOCSDIR%%/it/images/button-search.gif
-%%DOCSDIR%%/it/images/button-set-allowed-users.gif
-%%DOCSDIR%%/it/images/button-set-as-default.gif
-%%DOCSDIR%%/it/images/button-set-printer-options.gif
-%%DOCSDIR%%/it/images/button-show-active.gif
-%%DOCSDIR%%/it/images/button-show-all.gif
-%%DOCSDIR%%/it/images/button-show-completed.gif
-%%DOCSDIR%%/it/images/button-show-next.gif
-%%DOCSDIR%%/it/images/button-show-previous.gif
-%%DOCSDIR%%/it/images/button-sort-ascending.gif
-%%DOCSDIR%%/it/images/button-sort-descending.gif
-%%DOCSDIR%%/it/images/button-start-class.gif
-%%DOCSDIR%%/it/images/button-start-printer.gif
-%%DOCSDIR%%/it/images/button-stop-class.gif
-%%DOCSDIR%%/it/images/button-stop-printer.gif
-%%DOCSDIR%%/it/images/button-unpublish-printer.gif
-%%DOCSDIR%%/it/images/button-use-default-config.gif
-%%DOCSDIR%%/it/images/button-view-access-log.gif
-%%DOCSDIR%%/it/images/button-view-error-log.gif
-%%DOCSDIR%%/it/images/button-view-page-log.gif
-%%DOCSDIR%%/it/images/button-view-printable-version.gif
-%%DOCSDIR%%/it/index.html
-%%DOCSDIR%%/ja/images/button-accept-jobs.gif
-%%DOCSDIR%%/ja/images/button-add-class.gif
-%%DOCSDIR%%/ja/images/button-add-printer.gif
-%%DOCSDIR%%/ja/images/button-add-rss-subscription.gif
-%%DOCSDIR%%/ja/images/button-add-this-printer.gif
-%%DOCSDIR%%/ja/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/ja/images/button-cancel-job.gif
-%%DOCSDIR%%/ja/images/button-cancel-subscription.gif
-%%DOCSDIR%%/ja/images/button-change-settings.gif
-%%DOCSDIR%%/ja/images/button-clean-print-heads.gif
-%%DOCSDIR%%/ja/images/button-clear.gif
-%%DOCSDIR%%/ja/images/button-continue.gif
-%%DOCSDIR%%/ja/images/button-delete-class.gif
-%%DOCSDIR%%/ja/images/button-delete-printer.gif
-%%DOCSDIR%%/ja/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/ja/images/button-export-samba.gif
-%%DOCSDIR%%/ja/images/button-find-new-printers.gif
-%%DOCSDIR%%/ja/images/button-help.gif
-%%DOCSDIR%%/ja/images/button-hold-job.gif
-%%DOCSDIR%%/ja/images/button-manage-classes.gif
-%%DOCSDIR%%/ja/images/button-manage-jobs.gif
-%%DOCSDIR%%/ja/images/button-manage-printers.gif
-%%DOCSDIR%%/ja/images/button-manage-server.gif
-%%DOCSDIR%%/ja/images/button-modify-class.gif
-%%DOCSDIR%%/ja/images/button-modify-printer.gif
-%%DOCSDIR%%/ja/images/button-move-job.gif
-%%DOCSDIR%%/ja/images/button-move-jobs.gif
-%%DOCSDIR%%/ja/images/button-print-self-test-page.gif
-%%DOCSDIR%%/ja/images/button-print-test-page.gif
-%%DOCSDIR%%/ja/images/button-publish-printer.gif
-%%DOCSDIR%%/ja/images/button-reject-jobs.gif
-%%DOCSDIR%%/ja/images/button-release-job.gif
-%%DOCSDIR%%/ja/images/button-restart-job.gif
-%%DOCSDIR%%/ja/images/button-save-changes.gif
-%%DOCSDIR%%/ja/images/button-search.gif
-%%DOCSDIR%%/ja/images/button-set-allowed-users.gif
-%%DOCSDIR%%/ja/images/button-set-as-default.gif
-%%DOCSDIR%%/ja/images/button-set-printer-options.gif
-%%DOCSDIR%%/ja/images/button-show-active.gif
-%%DOCSDIR%%/ja/images/button-show-all.gif
-%%DOCSDIR%%/ja/images/button-show-completed.gif
-%%DOCSDIR%%/ja/images/button-show-next.gif
-%%DOCSDIR%%/ja/images/button-show-previous.gif
-%%DOCSDIR%%/ja/images/button-sort-ascending.gif
-%%DOCSDIR%%/ja/images/button-sort-descending.gif
-%%DOCSDIR%%/ja/images/button-start-class.gif
-%%DOCSDIR%%/ja/images/button-start-printer.gif
-%%DOCSDIR%%/ja/images/button-stop-class.gif
-%%DOCSDIR%%/ja/images/button-stop-printer.gif
-%%DOCSDIR%%/ja/images/button-unpublish-printer.gif
-%%DOCSDIR%%/ja/images/button-use-default-config.gif
-%%DOCSDIR%%/ja/images/button-view-access-log.gif
-%%DOCSDIR%%/ja/images/button-view-error-log.gif
-%%DOCSDIR%%/ja/images/button-view-page-log.gif
-%%DOCSDIR%%/ja/images/button-view-printable-version.gif
 %%DOCSDIR%%/ja/index.html
-%%DOCSDIR%%/pl/images/button-accept-jobs.gif
-%%DOCSDIR%%/pl/images/button-add-class.gif
-%%DOCSDIR%%/pl/images/button-add-printer.gif
-%%DOCSDIR%%/pl/images/button-add-this-printer.gif
-%%DOCSDIR%%/pl/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/pl/images/button-cancel-job.gif
-%%DOCSDIR%%/pl/images/button-change-settings.gif
-%%DOCSDIR%%/pl/images/button-clean-print-heads.gif
-%%DOCSDIR%%/pl/images/button-clear.gif
-%%DOCSDIR%%/pl/images/button-continue.gif
-%%DOCSDIR%%/pl/images/button-delete-class.gif
-%%DOCSDIR%%/pl/images/button-delete-printer.gif
-%%DOCSDIR%%/pl/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/pl/images/button-export-samba.gif
-%%DOCSDIR%%/pl/images/button-help.gif
-%%DOCSDIR%%/pl/images/button-hold-job.gif
-%%DOCSDIR%%/pl/images/button-manage-classes.gif
-%%DOCSDIR%%/pl/images/button-manage-jobs.gif
-%%DOCSDIR%%/pl/images/button-manage-printers.gif
-%%DOCSDIR%%/pl/images/button-manage-server.gif
-%%DOCSDIR%%/pl/images/button-modify-class.gif
-%%DOCSDIR%%/pl/images/button-modify-printer.gif
-%%DOCSDIR%%/pl/images/button-move-job.gif
-%%DOCSDIR%%/pl/images/button-move-jobs.gif
-%%DOCSDIR%%/pl/images/button-print-self-test-page.gif
-%%DOCSDIR%%/pl/images/button-print-test-page.gif
-%%DOCSDIR%%/pl/images/button-publish-printer.gif
-%%DOCSDIR%%/pl/images/button-reject-jobs.gif
-%%DOCSDIR%%/pl/images/button-release-job.gif
-%%DOCSDIR%%/pl/images/button-restart-job.gif
-%%DOCSDIR%%/pl/images/button-save-changes.gif
-%%DOCSDIR%%/pl/images/button-search.gif
-%%DOCSDIR%%/pl/images/button-set-allowed-users.gif
-%%DOCSDIR%%/pl/images/button-set-as-default.gif
-%%DOCSDIR%%/pl/images/button-set-printer-options.gif
-%%DOCSDIR%%/pl/images/button-show-active.gif
-%%DOCSDIR%%/pl/images/button-show-all.gif
-%%DOCSDIR%%/pl/images/button-show-completed.gif
-%%DOCSDIR%%/pl/images/button-show-next.gif
-%%DOCSDIR%%/pl/images/button-show-previous.gif
-%%DOCSDIR%%/pl/images/button-sort-ascending.gif
-%%DOCSDIR%%/pl/images/button-sort-descending.gif
-%%DOCSDIR%%/pl/images/button-start-class.gif
-%%DOCSDIR%%/pl/images/button-start-printer.gif
-%%DOCSDIR%%/pl/images/button-stop-class.gif
-%%DOCSDIR%%/pl/images/button-stop-printer.gif
-%%DOCSDIR%%/pl/images/button-unpublish-printer.gif
-%%DOCSDIR%%/pl/images/button-use-default-config.gif
-%%DOCSDIR%%/pl/images/button-view-access-log.gif
-%%DOCSDIR%%/pl/images/button-view-error-log.gif
-%%DOCSDIR%%/pl/images/button-view-page-log.gif
-%%DOCSDIR%%/pl/images/button-view-printable-version.gif
 %%DOCSDIR%%/pl/index.html
 %%DOCSDIR%%/robots.txt
-%%DOCSDIR%%/sv/images/button-accept-jobs.gif
-%%DOCSDIR%%/sv/images/button-add-class.gif
-%%DOCSDIR%%/sv/images/button-add-printer.gif
-%%DOCSDIR%%/sv/images/button-add-this-printer.gif
-%%DOCSDIR%%/sv/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/sv/images/button-cancel-job.gif
-%%DOCSDIR%%/sv/images/button-change-settings.gif
-%%DOCSDIR%%/sv/images/button-clean-print-heads.gif
-%%DOCSDIR%%/sv/images/button-clear.gif
-%%DOCSDIR%%/sv/images/button-continue.gif
-%%DOCSDIR%%/sv/images/button-delete-class.gif
-%%DOCSDIR%%/sv/images/button-delete-printer.gif
-%%DOCSDIR%%/sv/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/sv/images/button-export-samba.gif
-%%DOCSDIR%%/sv/images/button-help.gif
-%%DOCSDIR%%/sv/images/button-hold-job.gif
-%%DOCSDIR%%/sv/images/button-manage-classes.gif
-%%DOCSDIR%%/sv/images/button-manage-jobs.gif
-%%DOCSDIR%%/sv/images/button-manage-printers.gif
-%%DOCSDIR%%/sv/images/button-manage-server.gif
-%%DOCSDIR%%/sv/images/button-modify-class.gif
-%%DOCSDIR%%/sv/images/button-modify-printer.gif
-%%DOCSDIR%%/sv/images/button-move-job.gif
-%%DOCSDIR%%/sv/images/button-move-jobs.gif
-%%DOCSDIR%%/sv/images/button-print-self-test-page.gif
-%%DOCSDIR%%/sv/images/button-print-test-page.gif
-%%DOCSDIR%%/sv/images/button-publish-printer.gif
-%%DOCSDIR%%/sv/images/button-reject-jobs.gif
-%%DOCSDIR%%/sv/images/button-release-job.gif
-%%DOCSDIR%%/sv/images/button-restart-job.gif
-%%DOCSDIR%%/sv/images/button-save-changes.gif
-%%DOCSDIR%%/sv/images/button-search.gif
-%%DOCSDIR%%/sv/images/button-set-allowed-users.gif
-%%DOCSDIR%%/sv/images/button-set-as-default.gif
-%%DOCSDIR%%/sv/images/button-set-printer-options.gif
-%%DOCSDIR%%/sv/images/button-show-active.gif
-%%DOCSDIR%%/sv/images/button-show-all.gif
-%%DOCSDIR%%/sv/images/button-show-completed.gif
-%%DOCSDIR%%/sv/images/button-show-next.gif
-%%DOCSDIR%%/sv/images/button-show-previous.gif
-%%DOCSDIR%%/sv/images/button-sort-ascending.gif
-%%DOCSDIR%%/sv/images/button-sort-descending.gif
-%%DOCSDIR%%/sv/images/button-start-class.gif
-%%DOCSDIR%%/sv/images/button-start-printer.gif
-%%DOCSDIR%%/sv/images/button-stop-class.gif
-%%DOCSDIR%%/sv/images/button-stop-printer.gif
-%%DOCSDIR%%/sv/images/button-unpublish-printer.gif
-%%DOCSDIR%%/sv/images/button-use-default-config.gif
-%%DOCSDIR%%/sv/images/button-view-access-log.gif
-%%DOCSDIR%%/sv/images/button-view-error-log.gif
-%%DOCSDIR%%/sv/images/button-view-page-log.gif
-%%DOCSDIR%%/sv/images/button-view-printable-version.gif
-%%DOCSDIR%%/sv/index.html
-%%DOCSDIR%%/zh_TW/images/button-accept-jobs.gif
-%%DOCSDIR%%/zh_TW/images/button-add-class.gif
-%%DOCSDIR%%/zh_TW/images/button-add-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-add-this-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-cancel-all-jobs.gif
-%%DOCSDIR%%/zh_TW/images/button-cancel-job.gif
-%%DOCSDIR%%/zh_TW/images/button-change-settings.gif
-%%DOCSDIR%%/zh_TW/images/button-clean-print-heads.gif
-%%DOCSDIR%%/zh_TW/images/button-clear.gif
-%%DOCSDIR%%/zh_TW/images/button-continue.gif
-%%DOCSDIR%%/zh_TW/images/button-delete-class.gif
-%%DOCSDIR%%/zh_TW/images/button-delete-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-edit-configuration-file.gif
-%%DOCSDIR%%/zh_TW/images/button-export-samba.gif
-%%DOCSDIR%%/zh_TW/images/button-help.gif
-%%DOCSDIR%%/zh_TW/images/button-hold-job.gif
-%%DOCSDIR%%/zh_TW/images/button-manage-classes.gif
-%%DOCSDIR%%/zh_TW/images/button-manage-jobs.gif
-%%DOCSDIR%%/zh_TW/images/button-manage-printers.gif
-%%DOCSDIR%%/zh_TW/images/button-manage-server.gif
-%%DOCSDIR%%/zh_TW/images/button-modify-class.gif
-%%DOCSDIR%%/zh_TW/images/button-modify-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-move-job.gif
-%%DOCSDIR%%/zh_TW/images/button-move-jobs.gif
-%%DOCSDIR%%/zh_TW/images/button-print-self-test-page.gif
-%%DOCSDIR%%/zh_TW/images/button-print-test-page.gif
-%%DOCSDIR%%/zh_TW/images/button-publish-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-reject-jobs.gif
-%%DOCSDIR%%/zh_TW/images/button-release-job.gif
-%%DOCSDIR%%/zh_TW/images/button-restart-job.gif
-%%DOCSDIR%%/zh_TW/images/button-save-changes.gif
-%%DOCSDIR%%/zh_TW/images/button-search.gif
-%%DOCSDIR%%/zh_TW/images/button-set-allowed-users.gif
-%%DOCSDIR%%/zh_TW/images/button-set-as-default.gif
-%%DOCSDIR%%/zh_TW/images/button-set-printer-options.gif
-%%DOCSDIR%%/zh_TW/images/button-show-active.gif
-%%DOCSDIR%%/zh_TW/images/button-show-all.gif
-%%DOCSDIR%%/zh_TW/images/button-show-completed.gif
-%%DOCSDIR%%/zh_TW/images/button-show-next.gif
-%%DOCSDIR%%/zh_TW/images/button-show-previous.gif
-%%DOCSDIR%%/zh_TW/images/button-sort-ascending.gif
-%%DOCSDIR%%/zh_TW/images/button-sort-descending.gif
-%%DOCSDIR%%/zh_TW/images/button-start-class.gif
-%%DOCSDIR%%/zh_TW/images/button-start-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-stop-class.gif
-%%DOCSDIR%%/zh_TW/images/button-stop-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-unpublish-printer.gif
-%%DOCSDIR%%/zh_TW/images/button-use-default-config.gif
-%%DOCSDIR%%/zh_TW/images/button-view-access-log.gif
-%%DOCSDIR%%/zh_TW/images/button-view-error-log.gif
-%%DOCSDIR%%/zh_TW/images/button-view-page-log.gif
-%%DOCSDIR%%/zh_TW/images/button-view-printable-version.gif
-%%DOCSDIR%%/zh_TW/index.html
+%%DOCSDIR%%/ru/index.html
 %%EXAMPLESDIR%%/lpt-cupsd.conf
 share/applications/cups.desktop
 share/icons/hicolor/16x16/apps/cups.png
@@ -1669,11 +784,9 @@ share/icons/hicolor/128x128/apps/cups.png
 share/locale/da/cups_da.po
 share/locale/de/cups_de.po
 share/locale/es/cups_es.po
-share/locale/et/cups_et.po
+share/locale/eu/cups_eu.po
 share/locale/fi/cups_fi.po
 share/locale/fr/cups_fr.po
-share/locale/he/cups_he.po
-share/locale/id/cups_id.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
 share/locale/ko/cups_ko.po
@@ -1697,49 +810,32 @@ share/locale/zh_TW/cups_zh_TW.po
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
-@dirrm %%DOCSDIR%%/zh_TW/images
-@dirrm %%DOCSDIR%%/zh_TW
-@dirrm %%DOCSDIR%%/sv/images
-@dirrm %%DOCSDIR%%/sv
-@dirrm %%DOCSDIR%%/pl/images
+@dirrm %%DOCSDIR%%/ru
 @dirrm %%DOCSDIR%%/pl
-@dirrm %%DOCSDIR%%/ja/images
 @dirrm %%DOCSDIR%%/ja
-@dirrm %%DOCSDIR%%/id/images
-@dirrm %%DOCSDIR%%/id
-@dirrm %%DOCSDIR%%/it/images
-@dirrm %%DOCSDIR%%/it
 @dirrm %%DOCSDIR%%/images
 @dirrm %%DOCSDIR%%/help
-@dirrm %%DOCSDIR%%/he/images
-@dirrm %%DOCSDIR%%/he
-@dirrm %%DOCSDIR%%/fr/images
-@dirrm %%DOCSDIR%%/fr
-@dirrm %%DOCSDIR%%/et/images
-@dirrm %%DOCSDIR%%/et
-@dirrm %%DOCSDIR%%/es/images
+@dirrm %%DOCSDIR%%/eu
 @dirrm %%DOCSDIR%%/es
-@dirrm %%DOCSDIR%%/de/images
 @dirrm %%DOCSDIR%%/de
 @dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/templates/zh_TW
-@dirrm %%DATADIR%%/templates/sv
+@dirrm %%DATADIR%%/templates/ru
 @dirrm %%DATADIR%%/templates/pl
 @dirrm %%DATADIR%%/templates/ja
-@dirrm %%DATADIR%%/templates/it
-@dirrm %%DATADIR%%/templates/id
-@dirrm %%DATADIR%%/templates/he
-@dirrm %%DATADIR%%/templates/fr
-@dirrm %%DATADIR%%/templates/et
+@dirrm %%DATADIR%%/templates/eu
 @dirrm %%DATADIR%%/templates/es
 @dirrm %%DATADIR%%/templates/de
 @dirrm %%DATADIR%%/templates
 @exec  mkdir -p %D/%%DATADIR%%/profiles
 @dirrm %%DATADIR%%/profiles
+@dirrm %%DATADIR%%/ppdc
 @dirrmtry %%DATADIR%%/model
+@dirrm %%DATADIR%%/mime
 @dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/drv
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/charmaps
 @dirrm %%DATADIR%%/banners
diff --git a/print/cups-base/pkg-plist.client b/print/cups-base/pkg-plist.client
index bbd8bbe6339..fab334b52e1 100644
--- a/print/cups-base/pkg-plist.client
+++ b/print/cups-base/pkg-plist.client
@@ -11,6 +11,7 @@ include/cups/language.h
 include/cups/ppd.h
 include/cups/sidechannel.h
 include/cups/transcode.h
+include/cups/versioning.h
 lib/libcups.a
 lib/libcups.so
 lib/libcups.so.2
diff --git a/print/cups-base/pkg-plist.image b/print/cups-base/pkg-plist.image
index 6a2258afa36..efb4eb0e6d2 100644
--- a/print/cups-base/pkg-plist.image
+++ b/print/cups-base/pkg-plist.image
@@ -2,6 +2,8 @@ include/cups/image.h
 include/cups/raster.h
 lib/libcupsimage.so
 lib/libcupsimage.so.2
+libexec/cups/filter/bannertops
+libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
 libexec/cups/filter/hpgltops
 libexec/cups/filter/imagetops
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 43f8888c9a9..8d2f2257bb1 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.3.10
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty