Merge changes from CUPS 1.5b2-r9811.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3289 a1ca3aef-8c08-0410-bb20-df032aa958be

8 files changed, 9 insertions, 9 deletions

diff --git a/templates/es/choose-serial.tmpl b/templates/es/choose-serial.tmpl
index e296fb95f..1f734b9cd 100644
--- a/templates/es/choose-serial.tmpl
+++ b/templates/es/choose-serial.tmpl
@@ -9,7 +9,7 @@
 
 <TABLE>
 <TR>
-<TH CLASS="label">Conexi&ocaute;n:</TH>
+<TH CLASS="label">Conexi&oacute;n:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
 </TR>
 <TR>
@@ -49,4 +49,4 @@
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
+</DIV>
diff --git a/templates/eu/add-printer.tmpl b/templates/eu/add-printer.tmpl
index 312da1e6e..d4bf8b251 100644
--- a/templates/eu/add-printer.tmpl
+++ b/templates/eu/add-printer.tmpl
@@ -34,7 +34,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
 Partekatu inprimagailu hau</TD>
 </TR>
 <TR>
diff --git a/templates/eu/modify-printer.tmpl b/templates/eu/modify-printer.tmpl
index 9b0417a54..33a350d2c 100644
--- a/templates/eu/modify-printer.tmpl
+++ b/templates/eu/modify-printer.tmpl
@@ -28,7 +28,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
 Partekatu inprimagailu hau</TD>
 </TR>
 <TR>
diff --git a/templates/eu/option-pickmany.tmpl b/templates/eu/option-pickmany.tmpl
index 067075aec..0da75e5d2 100644
--- a/templates/eu/option-pickmany.tmpl
+++ b/templates/eu/option-pickmany.tmpl
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff --git a/templates/eu/option-pickone.tmpl b/templates/eu/option-pickone.tmpl
index 70866dfb5..0e57a509f 100644
--- a/templates/eu/option-pickone.tmpl
+++ b/templates/eu/option-pickone.tmpl
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff --git a/templates/id/admin.tmpl b/templates/id/admin.tmpl
index 9106d6518..a19a00a9e 100644
--- a/templates/id/admin.tmpl
+++ b/templates/id/admin.tmpl
@@ -20,7 +20,7 @@
 <H2 CLASS="title">Tugas</H2>
 
 <P>
-<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Atur Tugas"></FORM>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Atur Tugas"></FORM>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
diff --git a/templates/it/admin.tmpl b/templates/it/admin.tmpl
index 355c51fcc..7f7e44bb3 100644
--- a/templates/it/admin.tmpl
+++ b/templates/it/admin.tmpl
@@ -20,7 +20,7 @@
 <H2 CLASS="title">Stampe</H2>
 
 <P>
-<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Gestisci stampe"></FORM>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gestisci stampe"></FORM>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
diff --git a/templates/ru/class.tmpl b/templates/ru/class.tmpl
index 70dd90a79..47891ced7 100644
--- a/templates/ru/class.tmpl
+++ b/templates/ru/class.tmpl
@@ -17,7 +17,7 @@
 <INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
 </FORM>
 
-<FORM METHOD="POST" ACTION="{admin_uri}" NAME="Администрирование">
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">