Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/de/option-boolean.tmpl.str3244 cups-1.4rc1/templates/de/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/de/option-boolean.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/de/option-boolean.tmpl	2009-07-01 14:07:00.333422971 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/de/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/de/option-pickmany.tmpl	2009-07-01 14:07:00.333422971 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/de/option-pickone.tmpl.str3244 cups-1.4rc1/templates/de/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/de/option-pickone.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/de/option-pickone.tmpl	2009-07-01 14:07:00.334423521 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}:
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/es/option-boolean.tmpl.str3244 cups-1.4rc1/templates/es/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/es/option-boolean.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/es/option-boolean.tmpl	2009-07-01 14:07:00.335423309 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/es/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/es/option-pickmany.tmpl	2009-07-01 14:07:00.335423309 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/es/option-pickone.tmpl.str3244 cups-1.4rc1/templates/es/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/es/option-pickone.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/es/option-pickone.tmpl	2009-07-01 14:07:00.336423193 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}:
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ja/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ja/option-boolean.tmpl	2009-07-01 14:07:00.336423193 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ja/option-pickmany.tmpl	2009-07-01 14:07:00.337423282 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ja/option-pickone.tmpl	2009-07-01 14:07:00.337423282 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}:
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/option-boolean.tmpl.str3244 cups-1.4rc1/templates/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/option-boolean.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/option-boolean.tmpl	2009-07-01 14:07:00.338423040 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/option-pickmany.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/option-pickmany.tmpl	2009-07-01 14:07:00.338423040 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/option-pickone.tmpl.str3244 cups-1.4rc1/templates/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/option-pickone.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/option-pickone.tmpl	2009-07-01 14:07:00.339298478 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}:
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244 cups-1.4rc1/templates/pl/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/pl/option-boolean.tmpl	2009-07-01 14:07:00.340298367 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/pl/option-pickmany.tmpl	2009-07-01 14:07:00.340298367 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/pl/option-pickone.tmpl	2009-07-01 14:07:00.344297815 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}:
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ru/option-boolean.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ru/option-boolean.tmpl	2009-07-01 14:07:00.345423743 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickmany.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ru/option-pickmany.tmpl	2009-07-01 14:07:00.345423743 +0100
Tim Waugh 1d6dbf
@@ -1,6 +1,6 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" MULTIPLE SIZE="10">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
diff -up cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickone.tmpl
Tim Waugh 1d6dbf
--- cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
Tim Waugh 1d6dbf
+++ cups-1.4rc1/templates/ru/option-pickone.tmpl	2009-07-01 14:07:00.346423150 +0100
Tim Waugh 1d6dbf
@@ -1,7 +1,7 @@
Tim Waugh 1d6dbf
 
Tim Waugh 1d6dbf
 {keytext}:
Tim Waugh 1d6dbf
 <SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
Tim Waugh 1d6dbf
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
Tim Waugh 1d6dbf
 </SELECT>
Tim Waugh 1d6dbf
 {iscustom=1?{[params]
Tim Waugh 1d6dbf
 {paramtext}: