The web interface always showed support for 2-sided printing (STR #4595)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12605 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 2d6dd8e1d163173b212f4a709c9eb0adc20dcb8f..08d1ca39ccfe02b50f52b9c9457dea3f03a96d97 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -10,6 +10,8 @@ CHANGES IN CUPS V2.0.3
        - Fixed a gzip processing bug (#4602)
        - Fixed <Limit> inside <Location> (STR #4575)
        - Fixed lpadmin when both -m and -o are used (STR #4578)
+       - The web interface always showed support for 2-sided printing
+         (STR #4595)
        - Added Russian translation (STR #4577)
 
 

diff --git a/templates/es/printer.tmpl b/templates/es/printer.tmpl
index f9838c4fa9a292e8bea213b223d386221fa2479f..7171289143d18f01b9d2783b56a28e67d735af84 100644 (file)
--- a/templates/es/printer.tmpl
+++ b/templates/es/printer.tmpl
@@ -35,7 +35,7 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Descripci&oacute;n:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Ubicaci&oacute;n:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Controlador:</TH><TD>{printer_make_and_model} ({color_supported=1?color:escala de grises}{sides_supported?, d&uacute;plex:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Controlador:</TH><TD>{printer_make_and_model} ({color_supported=1?color:escala de grises}{sides_supported=one-sided?:, d&uacute;plex})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Conexi&oacute;n:</TH><TD>{device_uri}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Opciones predeterminadas:</TH><TD>job-sheets={job_sheets_default}
 media={media_default?{media_default}:desconocido}

diff --git a/templates/ja/printer.tmpl b/templates/ja/printer.tmpl
index 84699907043695ccdecc6ba9b19be19cc9badfc0..2b82c61df6998f5b98367e5fb1973c6fcf2c8bf2 100644 (file)
--- a/templates/ja/printer.tmpl
+++ b/templates/ja/printer.tmpl
@@ -35,7 +35,7 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">説明:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">場所:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">プリンタードライバー:</TH><TD>{printer_make_and_model} ({color_supported=1?カラー:白黒}{sides_supported?, 両面可:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">プリンタードライバー:</TH><TD>{printer_make_and_model} ({color_supported=1?カラー:白黒}{sides_supported=one-sided?:, 両面可})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">接続:</TH><TD>{device_uri}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">デフォルト設定:</TH><TD>バナー={job_sheets_default}
 用紙サイズ={media_default?{media_default}:不明}

diff --git a/templates/printer.tmpl b/templates/printer.tmpl
index ee8d7746057acc2d5af5e2544b1e0f31550e8fb4..705f69f13eca340ee044b92a33001bf89bf7a45d 100644 (file)
--- a/templates/printer.tmpl
+++ b/templates/printer.tmpl
@@ -35,7 +35,7 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Description:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Location:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Driver:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Driver:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported=one-sided?:, 2-sided printing})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Connection:</TH><TD>{device_uri}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Defaults:</TH><TD>job-sheets={job_sheets_default}
 media={media_default?{media_default}:unknown}

diff --git a/templates/ru/printer.tmpl b/templates/ru/printer.tmpl
index 2c2f4c9b0d0acdb88b6afead94d32a3a942c7ef1..a2e9b40d3d199c214cc8d2f9fea66a3f8e36bfea 100644 (file)
--- a/templates/ru/printer.tmpl
+++ b/templates/ru/printer.tmpl
@@ -35,7 +35,7 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Драйвер:</TH><TD>{printer_make_and_model} ({color_supported=1?цветной:черно-белый}{sides_supported?, дуплексная печать:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Драйвер:</TH><TD>{printer_make_and_model} ({color_supported=1?цветной:черно-белый}{sides_supported=one-sided?:, дуплексная печать})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Подключение:</TH><TD>{device_uri}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default}
 media={media_default?{media_default}:unknown}