[Pkg-cups-devel] r210 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches

Martin Pitt mpitt at costa.debian.org
Tue Apr 25 18:01:07 UTC 2006


Author: mpitt
Date: Tue Apr 25 18:01:05 2006
New Revision: 210

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/57_svn_5461.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
Log:
* Add debian/patches/57_svn_5461.dpatch:
  - Properly HTML-quote the printer name so that names containing e. g. '+'
    work properly in the web interface.
  - Upstream svn commit 5461.
  - Closes: LP#37018



Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Tue Apr 25 18:01:05 2006
@@ -26,8 +26,13 @@
     - Fix browse.conf parsing to set the correct debconf default value, so
       that the browse setting is not reset to 'off' on upgrades.
       Closes: LP#38704
+  * Add debian/patches/57_svn_5461.dpatch: 
+    - Properly HTML-quote the printer name so that names containing e. g. '+'
+      work properly in the web interface.
+    - Upstream svn commit 5461.
+    - Closes: LP#37018
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 19:43:33 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 19:49:48 +0200
 
 cupsys (1.1.99.rc2-0ubuntu2) dapper; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Tue Apr 25 18:01:05 2006
@@ -19,4 +19,5 @@
 #48_stdlib.dpatch
 55_ppd_okidata_name.dpatch
 56_revert_svn_5438.dpatch
+57_svn_5461.dpatch
 ubuntu-nowebadmin.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/57_svn_5461.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/57_svn_5461.dpatch	Tue Apr 25 18:01:05 2006
@@ -0,0 +1,611 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 57_svn_5461.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cups-1.2-ubuntu~/cgi-bin/template.c cups-1.2-ubuntu/cgi-bin/template.c
+--- cups-1.2-ubuntu~/cgi-bin/template.c	2006-03-29 18:26:38.000000000 +0200
++++ cups-1.2-ubuntu/cgi-bin/template.c	2006-04-25 19:45:50.000000000 +0200
+@@ -44,6 +44,7 @@
+ static void	cgi_copy(FILE *out, FILE *in, int element, char term,
+ 		         int indent);
+ static void	cgi_puts(const char *s, FILE *out);
++static void	cgi_puturi(const char *s, FILE *out);
+ 
+ 
+ /*
+@@ -235,6 +236,7 @@
+   char		outval[1024],		/* Formatted output string */
+ 		compare[1024];		/* Comparison string */
+   int		result;			/* Result of comparison */
++  int		uriencode;		/* Encode as URI */
+ 
+ 
+   fprintf(stderr, "DEBUG: %*sStarting at file position %ld...\n", indent, "",
+@@ -253,9 +255,13 @@
+       * Get a variable name...
+       */
+ 
++      uriencode = 0;
++
+       for (s = name; (ch = getc(in)) != EOF;)
+         if (strchr("}]<>=! \t\n", ch))
+           break;
++	else if (s == name && ch == '%')
++	  uriencode = 1;
+         else if (s > name && ch == '?')
+ 	  break;
+ 	else if (s < (name + sizeof(name) - 1))
+@@ -399,7 +405,12 @@
+         */
+ 
+ 	if (out)
+-	  cgi_puts(outptr, out);
++	{
++	  if (uriencode)
++	    cgi_puturi(outptr, out);
++	  else
++	    cgi_puts(outptr, out);
++        }
+ 
+         continue;
+       }
+@@ -638,5 +649,25 @@
+ 
+ 
+ /*
+- * End of "$Id: template.c 5352 2006-03-29 16:26:38Z mike $".
++ * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
++ */
++
++static void
++cgi_puturi(const char *s,		/* I - String to output */
++           FILE       *out)		/* I - Output file */
++{
++  while (*s)
++  {
++    if (strchr("%&+ <>#=", *s) || *s & 128)
++      fprintf(out, "%%%02X", *s & 255);
++    else
++      putc(*s, out);
++
++    s ++;
++  }
++}
++
++
++/*
++ * End of "$Id: template.c 5461 2006-04-25 17:15:45Z mike $".
+  */
+diff -urNad cups-1.2-ubuntu~/templates/classes.tmpl cups-1.2-ubuntu/templates/classes.tmpl
+--- cups-1.2-ubuntu~/templates/classes.tmpl	2006-03-04 03:00:43.000000000 +0100
++++ cups-1.2-ubuntu/templates/classes.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -17,35 +17,35 @@
+ <A HREF="{printer_uri_supported}?op=print-test-page">
+ <IMG SRC="/images/button-print-test-page.gif" ALT="Print Test Page" CLASS="button"></A>
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
++<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">
++<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>
+ }
+ {printer_is_accepting_jobs=0?
+-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
++<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">
++<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>
+ }
+-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
++<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>
+ {printer_is_shared=0?
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
++<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">
++<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}">
++<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=delete-class&amp;printer_name={printer_name}">
++<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">
++<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">
++<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>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/es/classes.tmpl cups-1.2-ubuntu/templates/es/classes.tmpl
+--- cups-1.2-ubuntu~/templates/es/classes.tmpl	2006-03-13 14:34:24.000000000 +0100
++++ cups-1.2-ubuntu/templates/es/classes.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -17,35 +17,35 @@
+ <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>
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
++<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">
++<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">
++<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">
++<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">
++<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>
+ {printer_is_shared=0?
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
++<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">
++<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}">
++<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=delete-class&amp;printer_name={printer_name}">
++<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">
++<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">
++<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>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/es/printers.tmpl cups-1.2-ubuntu/templates/es/printers.tmpl
+--- cups-1.2-ubuntu~/templates/es/printers.tmpl	2006-03-13 14:34:24.000000000 +0100
++++ cups-1.2-ubuntu/templates/es/printers.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -23,39 +23,39 @@
+ <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>:}
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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>
+ {printer_is_shared=0?
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
++<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">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/ja/classes.tmpl cups-1.2-ubuntu/templates/ja/classes.tmpl
+--- cups-1.2-ubuntu~/templates/ja/classes.tmpl	2006-03-04 03:00:43.000000000 +0100
++++ cups-1.2-ubuntu/templates/ja/classes.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -19,35 +19,35 @@
+ <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">
++<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">
++<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">
++<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">
++<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">
++<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">
++<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">
++<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}">
++<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}">
++<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">
++<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">
++<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>
+diff -urNad cups-1.2-ubuntu~/templates/ja/printers.tmpl cups-1.2-ubuntu/templates/ja/printers.tmpl
+--- cups-1.2-ubuntu~/templates/ja/printers.tmpl	2006-03-04 03:00:43.000000000 +0100
++++ cups-1.2-ubuntu/templates/ja/printers.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -19,39 +19,39 @@
+ <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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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">
++<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">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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>
+diff -urNad cups-1.2-ubuntu~/templates/pl/classes.tmpl cups-1.2-ubuntu/templates/pl/classes.tmpl
+--- cups-1.2-ubuntu~/templates/pl/classes.tmpl	2006-04-22 06:05:45.000000000 +0200
++++ cups-1.2-ubuntu/templates/pl/classes.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -17,35 +17,35 @@
+ <A HREF="{printer_uri_supported}?op=print-test-page">
+ <IMG SRC="/images/button-print-test-page.gif" ALT="Drukuj Stronę Testową" CLASS="button"></A>
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
++<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 Grupy" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
++<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 Grupę" CLASS="button"></A>
+ }
+ {printer_is_accepting_jobs=0?
+-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
++<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+ <IMG SRC="/images/button-accept-jobs.gif" ALT="Akceptuj Wydruki" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
++<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+ <IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzucaj Wydruki" CLASS="button"></A>
+ }
+-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
++<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="Skasuj Wszystkie Wydruki" 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">
++<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="Upublicznij Drukarkę" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
++<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 Upubliczniaj Drukarki" CLASS="button"></A>
+ }
+-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-modify-class.gif" ALT="Modyfikuj Grupę" CLASS="button"></A>
+-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-delete-class.gif" ALT="Usuń Grupę" CLASS="button"></A>
+-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
++<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">
++<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="Ustaw Uprawnienia Użytkowników" CLASS="button"></A>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/pl/printers.tmpl cups-1.2-ubuntu/templates/pl/printers.tmpl
+--- cups-1.2-ubuntu~/templates/pl/printers.tmpl	2006-04-22 06:05:45.000000000 +0200
++++ cups-1.2-ubuntu/templates/pl/printers.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -23,39 +23,39 @@
+ <A HREF="{printer_uri_supported}?op=print-self-test-page">
+ <IMG SRC="/images/button-print-self-test-page.gif" ALT="Drukuj Auto-Test Drukarki" CLASS="button"></A>:}
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-start-printer.gif" ALT="Start Drukarki" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
++<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}">
++<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-accept-jobs.gif" ALT="Akceptuj Wydruki" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzucaj Wydruki" CLASS="button"></A>
+ }
+-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
++<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-move-jobs.gif" ALT="Przenieś Wszystkie Wydruki" CLASS="button"></A>
+-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Skasuj Wszystkie Wydruki" CLASS="button"></A>
+ {printer_is_shared=0?
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
++<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
+ <IMG SRC="/images/button-publish-printer.gif" ALT="Upublicznij Drukarkę" CLASS="button"></A>
+ :
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
++<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
+ <IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Upubliczniaj Drukarki" CLASS="button"></A>
+ }
+-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
++<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-modify-printer.gif" ALT="Modyfikuj Drukarkę" CLASS="button"></A>
+-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
++<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}">
++<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}">
++<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}">
++<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
+ <IMG SRC="/images/button-set-allowed-users.gif" ALT="Ustaw Uprawnienia Użytkowników" CLASS="button"></A>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/printers.tmpl cups-1.2-ubuntu/templates/printers.tmpl
+--- cups-1.2-ubuntu~/templates/printers.tmpl	2006-03-04 03:00:43.000000000 +0100
++++ cups-1.2-ubuntu/templates/printers.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -23,39 +23,39 @@
+ <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>:}
+ {printer_state=5?
+-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
++<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}">
++<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>
+ }
+ {printer_is_accepting_jobs=0?
+-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
++<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}">
++<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}">
++<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}">
++<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>
+ {printer_is_shared=0?
+-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
++<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">
++<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>
+ }
+-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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>
+ </P>
+ </TD>
+diff -urNad cups-1.2-ubuntu~/templates/sv/classes.tmpl cups-1.2-ubuntu/templates/sv/classes.tmpl
+--- cups-1.2-ubuntu~/templates/sv/classes.tmpl	2006-04-17 16:50:45.000000000 +0200
++++ cups-1.2-ubuntu/templates/sv/classes.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -17,35 +17,35 @@
+ <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">
++<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">
++<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">
++<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">
++<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">
++<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">
++<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">
++<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}">
++<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}">
++<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">
++<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">
++<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>
+diff -urNad cups-1.2-ubuntu~/templates/sv/printers.tmpl cups-1.2-ubuntu/templates/sv/printers.tmpl
+--- cups-1.2-ubuntu~/templates/sv/printers.tmpl	2006-04-17 16:50:45.000000000 +0200
++++ cups-1.2-ubuntu/templates/sv/printers.tmpl	2006-04-25 19:45:50.000000000 +0200
+@@ -23,39 +23,39 @@
+ <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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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">
++<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">
++<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}">
++<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}">
++<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}">
++<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}">
++<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}">
++<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>



More information about the Pkg-cups-devel mailing list