Merge changes from CUPS trunk, r6739.

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

23 files changed, 246 insertions, 1014 deletions

diff --git a/templates/admin.tmpl b/templates/admin.tmpl
index 91aafc469..d6d4a8fe5 100644
--- a/templates/admin.tmpl
+++ b/templates/admin.tmpl
@@ -6,9 +6,9 @@
 <P>
 <A HREF="/admin?op=add-printer"><IMG
 SRC="/images/button-add-printer.gif" ALT="Add Printer" CLASS="button"></A>
-<A HREF="/admin?op=list-available-printers"><IMG
-SRC="/images/button-list-available-printers.gif"
-ALT="List Available Printers" CLASS="button"></A>
+<A HREF="/admin?op=find-new-printers"><IMG
+SRC="/images/button-find-new-printers.gif"
+ALT="Find New Printers" CLASS="button"></A>
 <A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
 ALT="Manage Printers" CLASS="button"></A>
 {have_samba?<A HREF="/admin/?op=export-samba"><IMG
@@ -63,7 +63,7 @@ CLASS="button"></A>
 <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share published printers connected to this system<BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<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<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>
 
diff --git a/templates/de/edit-config.tmpl b/templates/de/edit-config.tmpl
new file mode 100644
index 000000000..88c4aef57
--- /dev/null
+++ b/templates/de/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Server Konfigurationsdatei</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="&Auml;nderungen speichern"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Standard Konfigurationsdatei verwenden"></A></P>
+
+</FORM>
diff --git a/templates/de/edit-config.tmpl.in b/templates/de/edit-config.tmpl.in
deleted file mode 100644
index e9763177d..000000000
--- a/templates/de/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Server Konfigurationsdatei</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="&Auml;nderungen speichern"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Standard Konfigurationsdatei verwenden"></A></P>
-
-</FORM>
diff --git a/templates/edit-config.tmpl b/templates/edit-config.tmpl
new file mode 100644
index 000000000..884fea6e1
--- /dev/null
+++ b/templates/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Server Configuration File</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Save Changes"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Use Default Configuration File"></A></P>
+
+</FORM>
diff --git a/templates/edit-config.tmpl.in b/templates/edit-config.tmpl.in
deleted file mode 100644
index 31dd725d3..000000000
--- a/templates/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Server Configuration File</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Save Changes"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Use Default Configuration File"></A></P>
-
-</FORM>
diff --git a/templates/es/edit-config.tmpl b/templates/es/edit-config.tmpl
new file mode 100644
index 000000000..59f7b3c9c
--- /dev/null
+++ b/templates/es/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Archivo de configuraci&oacute;n del servidor</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Guardar cambios"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Usar archivo de configuraci&oacute;n predeterminado"></A></P>
+
+</FORM>
diff --git a/templates/es/edit-config.tmpl.in b/templates/es/edit-config.tmpl.in
deleted file mode 100644
index a8d981ab6..000000000
--- a/templates/es/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Archivo de configuraci&oacute;n del servidor</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Guardar cambios"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Usar archivo de configuraci&oacute;n predeterminado"></A></P>
-
-</FORM>
diff --git a/templates/et/edit-config.tmpl b/templates/et/edit-config.tmpl
new file mode 100644
index 000000000..b5f77c686
--- /dev/null
+++ b/templates/et/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Serveri seadistustefail</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Salvesta muudatused"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Kasuta vaikimisi seadistustefaili"></A></P>
+
+</FORM>
diff --git a/templates/et/edit-config.tmpl.in b/templates/et/edit-config.tmpl.in
deleted file mode 100644
index ff5cf413a..000000000
--- a/templates/et/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Serveri seadistustefail</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Salvesta muudatused"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Kasuta vaikimisi seadistustefaili"></A></P>
-
-</FORM>
diff --git a/templates/fr/edit-config.tmpl b/templates/fr/edit-config.tmpl
new file mode 100644
index 000000000..39ed9f068
--- /dev/null
+++ b/templates/fr/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Ficher de configuration du serveur</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Enregistrer les modifications"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Utiliser la configuration par défaut"></A></P>
+
+</FORM>
diff --git a/templates/fr/edit-config.tmpl.in b/templates/fr/edit-config.tmpl.in
deleted file mode 100644
index 9bcb18abe..000000000
--- a/templates/fr/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Écrire des informations générales dans error_log - changez \\"info\\" en \\"debug\\"\\n" +
-"# pour la résolution de problème...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Groupe des utilisateurs UNIX pour les administrateurs CUPS...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# N'accepter que les connexions de la machine locale.\\n" +
-"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Publier les imprimantes partagées sur le réseau local.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# S'authentifier par défaut via les comptes UNIX...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restreindre l'accès au serveur...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restreindre l'accès aux pages d'administration...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restreindre l'accès au ficher de configuration...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Définir la politique par défaut des tâches d'impression...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Seuls le propriétaire et un administrateur peuvent annuler ou authentifier une tâche...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Ficher de configuration du serveur</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Enregistrer les modifications"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Utiliser la configuration par défaut"></A></P>
-
-</FORM>
diff --git a/templates/he/edit-config.tmpl b/templates/he/edit-config.tmpl
new file mode 100644
index 000000000..74f7be9ff
--- /dev/null
+++ b/templates/he/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">קובץ הגדרות של השרת</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25" dir=ltr>{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="שמור שינויים"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="השתמש בקובץ הגדרות התחלתי"></A></P>
+
+</FORM>
diff --git a/templates/he/edit-config.tmpl.in b/templates/he/edit-config.tmpl.in
deleted file mode 100644
index 5dac27565..000000000
--- a/templates/he/edit-config.tmpl.in
+++ /dev/null
@@ -1,91 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow @LOCAL\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">קובץ הגדרות של השרת</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25" dir=ltr>{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="שמור שינויים"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="השתמש בקובץ הגדרות התחלתי"></A></P>
-
-</FORM>
diff --git a/templates/it/edit-config.tmpl b/templates/it/edit-config.tmpl
new file mode 100644
index 000000000..3ae718591
--- /dev/null
+++ b/templates/it/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">File di configurazione del server</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Salva le modifiche"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Usa il file di configurazione predefinito"></A></P>
+
+</FORM>
diff --git a/templates/it/edit-config.tmpl.in b/templates/it/edit-config.tmpl.in
deleted file mode 100644
index 4fbc04c35..000000000
--- a/templates/it/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">File di configurazione del server</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Salva le modifiche"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Usa il file di configurazione predefinito"></A></P>
-
-</FORM>
diff --git a/templates/ja/edit-config.tmpl b/templates/ja/edit-config.tmpl
new file mode 100644
index 000000000..524159c88
--- /dev/null
+++ b/templates/ja/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">サーバ設定ファイル</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="変更を保存"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="デフォルトの設定ファイルを使用"></A></P>
+
+</FORM>
diff --git a/templates/ja/edit-config.tmpl.in b/templates/ja/edit-config.tmpl.in
deleted file mode 100644
index d059c03d1..000000000
--- a/templates/ja/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">サーバ設定ファイル</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="変更を保存"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="デフォルトの設定ファイルを使用"></A></P>
-
-</FORM>
diff --git a/templates/pl/edit-config.tmpl b/templates/pl/edit-config.tmpl
new file mode 100644
index 000000000..f96715172
--- /dev/null
+++ b/templates/pl/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Plik Konfiguracji Serwera</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Zachowaj Zmiany"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Użyj Domyślnego Pliku Konfiguracji"></A></P>
+
+</FORM>
diff --git a/templates/pl/edit-config.tmpl.in b/templates/pl/edit-config.tmpl.in
deleted file mode 100644
index 59539606d..000000000
--- a/templates/pl/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Plik Konfiguracji Serwera</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Zachowaj Zmiany"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Użyj Domyślnego Pliku Konfiguracji"></A></P>
-
-</FORM>
diff --git a/templates/sv/edit-config.tmpl b/templates/sv/edit-config.tmpl
new file mode 100644
index 000000000..1673e50c4
--- /dev/null
+++ b/templates/sv/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Serverkonfigurationsfil</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Spara ändringar"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Använd standardkonfigurationsfil"></A></P>
+
+</FORM>
diff --git a/templates/sv/edit-config.tmpl.in b/templates/sv/edit-config.tmpl.in
deleted file mode 100644
index 39cd08f30..000000000
--- a/templates/sv/edit-config.tmpl.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">Serverkonfigurationsfil</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="Spara ändringar"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="Använd standardkonfigurationsfil"></A></P>
-
-</FORM>
diff --git a/templates/zh_TW/edit-config.tmpl b/templates/zh_TW/edit-config.tmpl
new file mode 100644
index 000000000..e83a93d58
--- /dev/null
+++ b/templates/zh_TW/edit-config.tmpl
@@ -0,0 +1,22 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<H2 CLASS="title">伺服器配置檔案</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="儲存變更"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="使用預設配置檔案"></A></P>
+
+</FORM>
diff --git a/templates/zh_TW/edit-config.tmpl.in b/templates/zh_TW/edit-config.tmpl.in
deleted file mode 100644
index f0c26bda3..000000000
--- a/templates/zh_TW/edit-config.tmpl.in
+++ /dev/null
@@ -1,91 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value =
-"# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
-"# troubleshooting...\\n" +
-"LogLevel info\\n" +
-"\\n" +
-"\\n" +
-"# Administrator user group...\\n" +
-"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"\\n" +
-"\\n" +
-"# Only listen for connections from the local machine.\\n" +
-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
-"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
-"\\n" +
-"\\n" +
-"# Show shared printers on the local network.\\n" +
-"Browsing On\\n" +
-"BrowseOrder allow,deny\\n" +
-"BrowseAllow @LOCAL\\n" +
-"\\n" +
-"\\n" +
-"# Authenticate against system accounts by default...\\n" +
-"DefaultAuthType Basic\\n" +
-"\\n" +
-"# Restrict access to the server...\\n" +
-"<Location />\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to the admin pages...\\n" +
-"<Location /admin>\\n" +
-"@ENCRYPTION_REQUIRED@\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Restrict access to configuration files...\\n" +
-"<Location /admin/conf>\\n" +
-"  AuthType Default\\n" +
-"  Require user @SYSTEM\\n" +
-"  Order allow,deny\\n" +
-"  Allow localhost\\n" +
-"</Location>\\n" +
-"\\n" +
-"# Set the default printer/job policies...\\n" +
-"<Policy default>\\n" +
-"  # Job-related operations must be done by the owner or an administrator...\\n" +
-"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # All administration operations require an administrator to authenticate...\\n" +
-"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
-"    AuthType Default\\n" +
-"    Require user @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  # Only the owner or an administrator can cancel or authenticate a job...\\n" +
-"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
-"    Require user @OWNER @SYSTEM\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"\\n" +
-"  <Limit All>\\n" +
-"    Order deny,allow\\n" +
-"  </Limit>\\n" +
-"</Policy>\\n";
-}
-</SCRIPT>
-
-<H2 CLASS="title">伺服器配置檔案</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
-ALT="儲存變更"> <A
-HREF="javascript:reset_config();"><IMG
-SRC="/images/button-use-default-config.gif" CLASS="button"
-ALT="使用預設配置檔案"></A></P>
-
-</FORM>