diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-06 16:50:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 16:50:03 -0500 |
| commit | a236979ee38d70c1cc8b5b3469372a88e35f9172 (patch) | |
| tree | 903af5b0c0dcee8fece8fe4c888fcbce235ac5e3 /templates | |
| parent | 7ec11630684301572cb7d19a95c244c104961a2a (diff) | |
| parent | 7db93414665cf3cf7170f546156914e22077a133 (diff) | |
| download | cups-a236979ee38d70c1cc8b5b3469372a88e35f9172.tar.gz | |
Merge pull request #5161 from gpunktschmitz/master
added html tag LABEL to inputs of type CHECKBOX and RADIO
Diffstat (limited to 'templates')
49 files changed, 218 insertions, 218 deletions
diff --git a/templates/add-printer.tmpl b/templates/add-printer.tmpl index 14d4eb6f1..339fe662f 100644 --- a/templates/add-printer.tmpl +++ b/templates/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Sharing:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Share This Printer</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Share This Printer</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/admin.tmpl b/templates/admin.tmpl index ae8339993..a5660e2e0 100644 --- a/templates/admin.tmpl +++ b/templates/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">Advanced <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Share printers connected to this system</LABEL><BR> Max clients\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Advertise web interface<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preserve job history<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Allow printing from the Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Advertise web interface</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Allow remote administration</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Allow users to cancel any job (not just their own)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Preserve job history</LABEL><BR> Maximum jobs (0 for no limit)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Retain Metadata\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Retain Documents\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Save debugging information for troubleshooting</LABEL><BR> Max log file size\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Advanced <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Share printers connected to this system</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Allow printing from the Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Allow remote administration</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Allow users to cancel any job (not just their own)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Save debugging information for troubleshooting</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Change Settings"></P> diff --git a/templates/choose-device.tmpl b/templates/choose-device.tmpl index 5f4693962..27c872625 100644 --- a/templates/choose-device.tmpl +++ b/templates/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Current Connection\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Local Printers\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Discovered Network Printers\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Other Network Printers\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/de/add-printer.tmpl b/templates/de/add-printer.tmpl index e618a73af..b54fb225f 100644 --- a/templates/de/add-printer.tmpl +++ b/templates/de/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Freigabe:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Drucker im Netzwerk freigeben</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Drucker im Netzwerk freigeben</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl index c5fed72aa..ebf193ea2 100644 --- a/templates/de/admin.tmpl +++ b/templates/de/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">Erweitert <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Mit diesem System verbundene Drucker freigeben<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Mit diesem System verbundene Drucker freigeben</LABEL><BR> Maximale Anzahl an Clients\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Drucken aus dem Internet zulassen<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Weboberfläche im Netzwerk bekanntmachen<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Fernwartung zulassen<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Auftragsverlauf behalten<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Drucken aus dem Internet zulassen</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Weboberfläche im Netzwerk bekanntmachen</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Fernwartung zulassen</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Auftragsverlauf behalten</LABEL><BR> Maximale Auftragsanzahl (0 für unbegrenzt)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Metadaten aufbewahren\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Dokumente aufbewahren\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Mehr Informationen zur Fehlersuche speichern<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Mehr Informationen zur Fehlersuche speichern</LABEL><BR> Maximale Protokoll-Dateigröße\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Erweitert <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Mit diesem System verbundene Drucker freigeben<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Drucken aus dem Internet zulassen<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Fernwartung zulassen<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Mehr Informationen zur Fehlersuche speichern</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Mit diesem System verbundene Drucker freigeben</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Drucken aus dem Internet zulassen</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Fernwartung zulassen</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Mehr Informationen zur Fehlersuche speichern</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Einstellungen ändern"></P> diff --git a/templates/de/choose-device.tmpl b/templates/de/choose-device.tmpl index 6e3b6f318..0cd3f8559 100644 --- a/templates/de/choose-device.tmpl +++ b/templates/de/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Aktuelle Verbindung\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Lokale Drucker\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Gefundene Netzwerkdrucker\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Andere Netzwerkdrucker\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/de/modify-printer.tmpl b/templates/de/modify-printer.tmpl index 638e6cb59..8844bfa79 100644 --- a/templates/de/modify-printer.tmpl +++ b/templates/de/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Freigabe:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Drucker im Netzwerk freigeben</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Drucker im Netzwerk freigeben</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/de/option-boolean.tmpl b/templates/de/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/de/option-boolean.tmpl +++ b/templates/de/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/de/samba-export.tmpl b/templates/de/samba-export.tmpl index 148e0f3ad..1850aef2c 100644 --- a/templates/de/samba-export.tmpl +++ b/templates/de/samba-export.tmpl @@ -35,8 +35,8 @@ worden sein.</P>} <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Alle Drucker freigeben +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Alle Drucker freigeben</LABEL> </TD> </TR> <TR> diff --git a/templates/de/users.tmpl b/templates/de/users.tmpl index e9242546f..a35dcdcc8 100644 --- a/templates/de/users.tmpl +++ b/templates/de/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Diesen Benutzern das Drucken erlauben -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Diesen Benutzern das Drucken verbieten +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Diesen Benutzern das Drucken erlauben</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Diesen Benutzern das Drucken verbieten</LABEL> </TD> </TR> <TR> diff --git a/templates/es/add-printer.tmpl b/templates/es/add-printer.tmpl index 6ccd325f3..05bf42164 100644 --- a/templates/es/add-printer.tmpl +++ b/templates/es/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Compartición:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Compartir esta impresora</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Compartir esta impresora</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl index edc0adf71..2be1ed0af 100644 --- a/templates/es/admin.tmpl +++ b/templates/es/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">Avanzada <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartir impresoras conectadas a este sistema<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Compartir impresoras conectadas a este sistema</LABEL><BR> Número máximo de clientes\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir la impresión desde Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Anunciar la interfaz web<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administración remota<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autentificación Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir a los usuarios cancelar cualquier trabajo (no sólo los suyos propios)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preservar el historial de trabajos<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Permitir la impresión desde Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Anunciar la interfaz web</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Permitir administración remota</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Usar autentificación Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Permitir a los usuarios cancelar cualquier trabajo (no sólo los suyos propios)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Preservar el historial de trabajos</LABEL><BR> Número máximo de trabajos (0 sin límite)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Retener metadatos\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Retener documentos\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Guardar información de depuración para búsqueda de problemas<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Guardar información de depuración para búsqueda de problemas</LABEL><BR> Tamaño máximo del archivo de registro\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Avanzada <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartir impresoras conectadas a este sistema<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir la impresión desde Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administración remota<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autentificación Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir a los usuarios cancelar cualquier trabajo (no sólo los suyos propios)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Guardar información de depuración para búsqueda de problemas</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Compartir impresoras conectadas a este sistema</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Permitir la impresión desde Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Permitir administración remota</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Usar autentificación Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Permitir a los usuarios cancelar cualquier trabajo (no sólo los suyos propios)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Guardar información de depuración para búsqueda de problemas</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Cambiar configuración"></P> diff --git a/templates/es/choose-device.tmpl b/templates/es/choose-device.tmpl index 0c3776413..feea2e9d8 100644 --- a/templates/es/choose-device.tmpl +++ b/templates/es/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Conexión actual\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Impresoras locales\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Impresoras en red descubiertas\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Otras impresoras en red\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/es/modify-printer.tmpl b/templates/es/modify-printer.tmpl index d18d51721..1da5bb6fa 100644 --- a/templates/es/modify-printer.tmpl +++ b/templates/es/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Compartida:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Compartir esta impresora</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Compartir esta impresora</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/es/option-boolean.tmpl b/templates/es/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/es/option-boolean.tmpl +++ b/templates/es/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/es/samba-export.tmpl b/templates/es/samba-export.tmpl index 0036372ed..946e3128e 100644 --- a/templates/es/samba-export.tmpl +++ b/templates/es/samba-export.tmpl @@ -34,8 +34,8 @@ TARGET="_blank">cupsaddsmb(8)</A>.</P>} <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Exportar todas las impresoras +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exportar todas las impresoras</LABEL> </TD> </TR> <TR> diff --git a/templates/es/users.tmpl b/templates/es/users.tmpl index 3d24a5afe..200b4c227 100644 --- a/templates/es/users.tmpl +++ b/templates/es/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Permitir a estos usuarios imprimir -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Evitar que estos usuarios impriman +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Permitir a estos usuarios imprimir</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Evitar que estos usuarios impriman</LABEL> </TD> </TR> <TR> diff --git a/templates/fr/add-printer.tmpl b/templates/fr/add-printer.tmpl index 592de846a..4ec128347 100644 --- a/templates/fr/add-printer.tmpl +++ b/templates/fr/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Partage :</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Partager cette imprimante</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Partager cette imprimante</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl index 6e8026553..eb2abe1f5 100644 --- a/templates/fr/admin.tmpl +++ b/templates/fr/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">Avancé <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les imprimantes connectées à ce système<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Partager les imprimantes connectées à ce système</LABEL><BR> Nombre maximum de clients \: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Autoriser l'impression depuis Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Annoncer l'interface Web<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser l'administration à distance<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les utilisateurs à annuler n'importe quelle tâche (Pas seulement les leurs)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Conserver l'historique des tâches<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Autoriser l'impression depuis Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Annoncer l'interface Web</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Autoriser l'administration à distance</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Autoriser les utilisateurs à annuler n'importe quelle tâche (Pas seulement les leurs)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Conserver l'historique des tâches</LABEL><BR> Maximum jobs (0 for no limit)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Conserver les meta-données \: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Conserver les documents \: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les informations de debug pour la résolution de problèmes<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Enregistrer les informations de debug pour la résolution de problèmes</LABEL><BR> Taille maximum du journal système \: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Avancé <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les imprimantes connectées à ce système<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Autoriser l'impression depuis Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser l'administration à distance<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les utilisateurs à annuler n'importe quelle tâche (Pas seulement les leurs)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les informations de debug pour la résolution de problèmes</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Partager les imprimantes connectées à ce système</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Autoriser l'impression depuis Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Autoriser l'administration à distance</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Autoriser les utilisateurs à annuler n'importe quelle tâche (Pas seulement les leurs)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Enregistrer les informations de debug pour la résolution de problèmes</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Modifier les paramètres"></P> diff --git a/templates/fr/choose-device.tmpl b/templates/fr/choose-device.tmpl index 7ce72bd65..90a5f1294 100644 --- a/templates/fr/choose-device.tmpl +++ b/templates/fr/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Connexion courante \:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Imprimantes locales \:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Imprimantes réseaux découvertes \:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Autres imprimantes réseaux \:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/fr/modify-printer.tmpl b/templates/fr/modify-printer.tmpl index 733b1d5df..56376912c 100644 --- a/templates/fr/modify-printer.tmpl +++ b/templates/fr/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Partage :</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Partager cette imprimante</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Partager cette imprimante</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/fr/option-boolean.tmpl b/templates/fr/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/fr/option-boolean.tmpl +++ b/templates/fr/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/fr/samba-export.tmpl b/templates/fr/samba-export.tmpl index 4c070a506..fa16d3037 100644 --- a/templates/fr/samba-export.tmpl +++ b/templates/fr/samba-export.tmpl @@ -31,8 +31,8 @@ TARGET="_blank">cupsaddsmb(8)</A>.</P>} <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Exporter toutes les imprimantes +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exporter toutes les imprimantes</LABEL> </TD> </TR> <TR> diff --git a/templates/fr/users.tmpl b/templates/fr/users.tmpl index ad336220d..f9fb8b0bc 100644 --- a/templates/fr/users.tmpl +++ b/templates/fr/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Autoriser ces utilisateurs à imprimer -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Empêcher ces utilisateurs d'imprimer +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Autoriser ces utilisateurs à imprimer</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Empêcher ces utilisateurs d'imprimer</LABEL> </TD> </TR> <TR> diff --git a/templates/ja/add-printer.tmpl b/templates/ja/add-printer.tmpl index 13d5e2011..450624a39 100644 --- a/templates/ja/add-printer.tmpl +++ b/templates/ja/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">共有:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -このプリンターを共有する</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">このプリンターを共有する</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl index 3443297a7..e115e6e91 100644 --- a/templates/ja/admin.tmpl +++ b/templates/ja/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">詳細 <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> このシステムに接続されているプリンターを共有<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> このシステムに接続されているプリンターを共有</LABEL><BR> 最大クライアント数\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> インターネットからの印刷を許可<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> ウェブインターフェイスを公開<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> リモート管理を許可<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos 認証を使用 (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> 所有者以外のユーザーにもジョブのキャンセルを許可<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> ジョブの履歴を保存<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> インターネットからの印刷を許可</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> ウェブインターフェイスを公開</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> リモート管理を許可</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Kerberos 認証を使用 (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> 所有者以外のユーザーにもジョブのキャンセルを許可</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> ジョブの履歴を保存</LABEL><BR> 最大ジョブ数 (0 は無制限)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> メタデータを保持\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> ドキュメントを保持\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> トラブルシューティングのためにデバッグ情報を保存<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> トラブルシューティングのためにデバッグ情報を保存</LABEL><BR> 最大ログファイルサイズ\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">詳細 <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> このシステムに接続されているプリンターを共有<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> インターネットからの印刷を許可<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> リモート管理を許可<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos 認証を使用 (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> 所有者以外のユーザーにもジョブのキャンセルを許可<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> トラブルシューティングのためにデバッグ情報を保存</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> このシステムに接続されているプリンターを共有</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> インターネットからの印刷を許可</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> リモート管理を許可</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Kerberos 認証を使用 (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> 所有者以外のユーザーにもジョブのキャンセルを許可</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> トラブルシューティングのためにデバッグ情報を保存</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="設定の変更"></P> diff --git a/templates/ja/choose-device.tmpl b/templates/ja/choose-device.tmpl index 3a4fe7434..30bdc3bbe 100644 --- a/templates/ja/choose-device.tmpl +++ b/templates/ja/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">現在の接続\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">ローカルプリンター\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">発見されたネットワークプリンター\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">その他のネットワークプリンター\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/ja/modify-printer.tmpl b/templates/ja/modify-printer.tmpl index bb9aeac3e..a3ac71644 100644 --- a/templates/ja/modify-printer.tmpl +++ b/templates/ja/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">共有:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -このプリンターを共有する</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">このプリンターを共有する</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/ja/option-boolean.tmpl b/templates/ja/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/ja/option-boolean.tmpl +++ b/templates/ja/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/ja/samba-export.tmpl b/templates/ja/samba-export.tmpl index b1d5050a4..f2d3a9e4b 100644 --- a/templates/ja/samba-export.tmpl +++ b/templates/ja/samba-export.tmpl @@ -34,8 +34,8 @@ TARGET="_blank">cupsaddsmb(8)</A> man ページに書かれているように、 <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> すべてのプリンターをエクスポート +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> すべてのプリンターをエクスポート</LABEL> </TD> </TR> <TR> diff --git a/templates/ja/users.tmpl b/templates/ja/users.tmpl index 4ba985515..fc695d8ef 100644 --- a/templates/ja/users.tmpl +++ b/templates/ja/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>これらのユーザーの印刷を許可 -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>これらのユーザーの印刷を禁止 +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>これらのユーザーの印刷を許可</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>これらのユーザーの印刷を禁止</LABEL> </TD> </TR> <TR> diff --git a/templates/modify-printer.tmpl b/templates/modify-printer.tmpl index 72b4bc5e2..1aed9f39c 100644 --- a/templates/modify-printer.tmpl +++ b/templates/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Sharing:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Share This Printer</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Share This Printer</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/option-boolean.tmpl b/templates/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/option-boolean.tmpl +++ b/templates/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/pt_BR/add-printer.tmpl b/templates/pt_BR/add-printer.tmpl index a52c444f8..ce82480f6 100644 --- a/templates/pt_BR/add-printer.tmpl +++ b/templates/pt_BR/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Compartilhamento:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Compartilhar essa impressora</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Compartilhar essa impressora</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl index c7095e17c..8ee2d4ba8 100644 --- a/templates/pt_BR/admin.tmpl +++ b/templates/pt_BR/admin.tmpl @@ -43,22 +43,22 @@ <P><A HREF="/admin/">Avançado <SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartilhar impressoras conectadas a este sistema<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Compartilhar impressoras conectadas a este sistema</LABEL><BR> Máximo de clientes\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir impressão a partir da Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Anunciar interface web<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administração remota<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir aos usuários cancelar qualquer trabalho (não apenas os seus próprios)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preservar o histórico de trabalhos<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Permitir impressão a partir da Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Anunciar interface web</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Permitir administração remota</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Permitir aos usuários cancelar qualquer trabalho (não apenas os seus próprios)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Preservar o histórico de trabalhos</LABEL><BR> Máximo de trabalhos (0 para sem limite)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Reter metadados\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Reter documentos\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Salvar informação de depuração para solução de problemas<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Salvar informação de depuração para solução de problemas</LABEL><BR> Tamanho máximo do arquivo de log\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -66,12 +66,12 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Avançado <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartilhar impressoras conectadas a este sistema<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir impressão a partir da Internet<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administração remota<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir aos usuários cancelar qualquer trabalho (não apenas seus próprios)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Salvar informações de depuração para solução de problemas</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Compartilhar impressoras conectadas a este sistema</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Permitir impressão a partir da Internet</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Permitir administração remota</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Permitir aos usuários cancelar qualquer trabalho (não apenas seus próprios)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Salvar informações de depuração para solução de problemas</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Alterar configurações"></P> diff --git a/templates/pt_BR/choose-device.tmpl b/templates/pt_BR/choose-device.tmpl index 11781d589..fa8f74bd0 100644 --- a/templates/pt_BR/choose-device.tmpl +++ b/templates/pt_BR/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Conexão atual\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Impressoras locais\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Impressoras de rede descobertas\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Outras impressoras de rede\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/pt_BR/modify-printer.tmpl b/templates/pt_BR/modify-printer.tmpl index efdef5475..bb753afc1 100644 --- a/templates/pt_BR/modify-printer.tmpl +++ b/templates/pt_BR/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Compartilhamento:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Compartilhar esta impressora</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Compartilhar esta impressora</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/pt_BR/option-boolean.tmpl b/templates/pt_BR/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/pt_BR/option-boolean.tmpl +++ b/templates/pt_BR/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/pt_BR/samba-export.tmpl b/templates/pt_BR/samba-export.tmpl index d420ac336..d8badd927 100644 --- a/templates/pt_BR/samba-export.tmpl +++ b/templates/pt_BR/samba-export.tmpl @@ -33,8 +33,8 @@ impressora PostScript do Windows como descrito na página de manual do <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Exportar todas as impressoras +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exportar todas as impressoras</LABEL> </TD> </TR> <TR> diff --git a/templates/pt_BR/users.tmpl b/templates/pt_BR/users.tmpl index 5053f9015..f6c93116b 100644 --- a/templates/pt_BR/users.tmpl +++ b/templates/pt_BR/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Permitir que estes usuários imprimam -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Impedir que estes usuários imprimam +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Permitir que estes usuários imprimam</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Impedir que estes usuários imprimam</LABEL> </TD> </TR> <TR> diff --git a/templates/ru/add-printer.tmpl b/templates/ru/add-printer.tmpl index 824b913c6..9a6d043e1 100644 --- a/templates/ru/add-printer.tmpl +++ b/templates/ru/add-printer.tmpl @@ -32,8 +32,8 @@ </TR> <TR> <TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Разрешить совместный доступ к этому принтеру</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Разрешить совместный доступ к этому принтеру</LABEL></TD> </TR> <TR> <TD></TD> diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl index e6d7445e2..3d807ce20 100644 --- a/templates/ru/admin.tmpl +++ b/templates/ru/admin.tmpl @@ -42,22 +42,22 @@ <P><A HREF="/admin/">Дополнительные параметры<SMALL>▼</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенным к этой системе<BR> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Разрешить совместный доступ к принтерам, подключенным к этой системе</LABEL><BR> Максимум клиентов\: <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из интернет<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Разрешить доступ через веб-интерфейс<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешать пользователям отменять любое задание(не только их собственные)<BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Вести журнал заданий<BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Разрешить печать из интернет</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" ID="BROWSE_WEB_IF" {?browse_web_if}><LABEL FOR="BROWSE_WEB_IF"> Разрешить доступ через веб-интерфейс</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Разрешить удаленное администрирование</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Разрешать пользователям отменять любое задание(не только их собственные)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" ID="PRESERVE_JOBS" {?preserve_jobs}><LABEL FOR="PRESERVE_JOBS"> Вести журнал заданий</LABEL><BR> Количество заданий (0 без ограничений)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> Записывать метаданные(Retain Metadata)\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> Существующие документы(Retain Documents)\: <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале<BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Сохранять отладочную информацию в журнале</LABEL><BR> Максимальный размер журнала\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> @@ -65,13 +65,13 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенным к этой системе<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из - интернет<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR> - {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} - <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешить пользователям отменять любое задание(не только их собственные)<BR> - <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале</P> + <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" ID="SHARE_PRINTERS" {?share_printers}><LABEL FOR="SHARE_PRINTERS"> Разрешить совместный доступ к принтерам, подключенным к этой системе</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" ID="REMOTE_ANY" {?remote_any}><LABEL FOR="REMOTE_ANY"> Разрешить печать из + интернет</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" ID="REMOTE_ADMIN" {?remote_admin}><LABEL FOR="REMOTE_ADMIN"> Разрешить удаленное администрирование</LABEL><BR> + {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" ID="KERBEROS" {?kerberos}><LABEL FOR="KERBEROS"> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)</LABEL><BR>:} + <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" ID="USER_CANCEL_ANY" {?user_cancel_any}><LABEL FOR="USER_CANCEL_ANY"> Разрешить пользователям отменять любое задание(не только их собственные)</LABEL><BR> + <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" ID="DEBUG_LOGGING" {?debug_logging}><LABEL FOR="DEBUG_LOGGING"> Сохранять отладочную информацию в журнале</LABEL></P> } <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Сохранить"></P> diff --git a/templates/ru/choose-device.tmpl b/templates/ru/choose-device.tmpl index 8b63ac611..539c60136 100644 --- a/templates/ru/choose-device.tmpl +++ b/templates/ru/choose-device.tmpl @@ -8,24 +8,24 @@ <TABLE> {op=add-printer?:<TR> <TH CLASS="label">Сейчас подключен\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> +<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{current_device_uri}" VALUE="{current_device_uri}" CHECKED> +<LABEL FOR="{current_device_uri}">{current_device_uri}</LABEL></TD> </TR>} <TR> <TH CLASS="label">Установленные принтеры\:</TH> <TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}} </TD> </TR> <TR> <TH CLASS="label">Найденные сетевые принтеры\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> :}:}} </TD> </TR> @@ -33,9 +33,9 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> <TR> <TH CLASS="label">Другие сетевые принтеры\:</TH> <TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" +{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> +<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR> }:}} </TD> </TR> diff --git a/templates/ru/modify-printer.tmpl b/templates/ru/modify-printer.tmpl index b7371f822..811c2d8cc 100644 --- a/templates/ru/modify-printer.tmpl +++ b/templates/ru/modify-printer.tmpl @@ -26,8 +26,8 @@ </TR> <TR> <TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Разрешить совместный доступ к этому принтеру</TD> +<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" ID="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> +<LABEL FOR="PRINTER_IS_SHARED">Разрешить совместный доступ к этому принтеру</LABEL></TD> </TR> <TR> <TR> diff --git a/templates/ru/option-boolean.tmpl b/templates/ru/option-boolean.tmpl index e832ee102..ce9b6afe8 100644 --- a/templates/ru/option-boolean.tmpl +++ b/templates/ru/option-boolean.tmpl @@ -1,6 +1,6 @@ <TR> <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> <TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} +{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" ID="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}"><LABEL FOR="{keyword-1}">{text}</LABEL>} </TD> </TR> diff --git a/templates/ru/samba-export.tmpl b/templates/ru/samba-export.tmpl index 641ca0b01..39d025972 100644 --- a/templates/ru/samba-export.tmpl +++ b/templates/ru/samba-export.tmpl @@ -32,8 +32,8 @@ TARGET="_blank">cupsaddsmb(8)</A>.</P>} <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Экспортировать все принтеры +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Экспортировать все принтеры</LABEL> </TD> </TR> <TR> diff --git a/templates/ru/users.tmpl b/templates/ru/users.tmpl index 6f3aca573..71db8920a 100644 --- a/templates/ru/users.tmpl +++ b/templates/ru/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Разрешить этим пользователям печатать -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Запретить этим пользователям печатать +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Разрешить этим пользователям печатать</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Запретить этим пользователям печатать</LABEL> </TD> </TR> <TR> diff --git a/templates/samba-export.tmpl b/templates/samba-export.tmpl index 6515a4d3a..da4b1caf1 100644 --- a/templates/samba-export.tmpl +++ b/templates/samba-export.tmpl @@ -34,8 +34,8 @@ TARGET="_blank">cupsaddsmb(8)</A> man page.</P>} <SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> {[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} </SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Export All Printers +<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:} +onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Export All Printers</LABEL> </TD> </TR> <TR> diff --git a/templates/users.tmpl b/templates/users.tmpl index c88e03313..a97b313c0 100644 --- a/templates/users.tmpl +++ b/templates/users.tmpl @@ -12,8 +12,8 @@ <TD> <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> <BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Allow these users to print -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Prevent these users from printing +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' ID='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}><LABEL FOR='requesting-user-name-allowed'>Allow these users to print</LABEL> +<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' ID='requesting-user-name-denied' {requesting_user_name_denied?checked:}><LABEL FOR='requesting-user-name-denied'>Prevent these users from printing</LABEL> </TD> </TR> <TR> |