Fixed the "cancel all jobs" function in the web interface for several languages ...

diff --git a/CHANGES.md b/CHANGES.md
index e8d4df6d832d51572142990f7dc459e491288819..c1ea15a255e383e7dbeb22adf2f4ce1925151f9b 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.4 - 2017-05-01
+CHANGES - 2.2.4 - 2017-05-16
 ============================
 
 CHANGES IN CUPS V2.2.4
@@ -11,6 +11,8 @@ CHANGES IN CUPS V2.2.4
 - Added a new CUPS Programming Manual to replace the aging API documentation.
 - Added the cupsAddIntegerOption and cupsGetIntegerOption functions
   (Issue #4992)
+- Fixed the "cancel all jobs" function in the web interface for several
+  languages (Issue #4999)
 
 
 CHANGES IN CUPS V2.2.3

diff --git a/templates/de/printer.tmpl b/templates/de/printer.tmpl
index 454627fd522f168e879cc8a0675e5642a4f0944d..89206acf74e83094dde807d1e790080aabcb5012 100644 (file)
--- a/templates/de/printer.tmpl
+++ b/templates/de/printer.tmpl
@@ -13,7 +13,7 @@
 {printer_state=5?<OPTION VALUE="start-printer">Drucker starten</OPTION>:<OPTION VALUE="stop-printer">Drucker anhalten</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge annehmen</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
 <OPTION VALUE="move-jobs">Alle Aufträge verschieben</OPTION>
-<OPTION VALUE="purge-jobs">Alle Aufträge abbrechen</OPTION>
+<OPTION VALUE="cancel-jobs">Alle Aufträge abbrechen</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Go"></NOSCRIPT>
 </FORM>

diff --git a/templates/ja/printer.tmpl b/templates/ja/printer.tmpl
index 2b82c61df6998f5b98367e5fb1973c6fcf2c8bf2..184bba2bd172636597e9ea6263afd9e9b1eaecfc 100644 (file)
--- a/templates/ja/printer.tmpl
+++ b/templates/ja/printer.tmpl
@@ -13,7 +13,7 @@
 {printer_state=5?<OPTION VALUE="start-printer">プリンターを開始</OPTION>:<OPTION VALUE="stop-printer">プリンターの停止</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">ジョブを受け付け</OPTION>:<OPTION VALUE="reject-jobs">ジョブを拒否</OPTION>}
 <OPTION VALUE="move-jobs">すべてのジョブの移動</OPTION>
-<OPTION VALUE="purge-jobs">すべてのジョブをキャンセル</OPTION>
+<OPTION VALUE="cancel-jobs">すべてのジョブをキャンセル</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="進む"></NOSCRIPT>
 </FORM>

diff --git a/templates/pt_BR/printer.tmpl b/templates/pt_BR/printer.tmpl
index 922d4b4ee8dc0552100ffbff4b664b2c4c568efc..996b4a4060c8ddab4171fe42aa2ccd000eee6fb4 100644 (file)
--- a/templates/pt_BR/printer.tmpl
+++ b/templates/pt_BR/printer.tmpl
@@ -13,7 +13,7 @@
 {printer_state=5?<OPTION VALUE="start-printer">Pausar impressora</OPTION>:<OPTION VALUE="stop-printer">Pausar impressora</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceitar trabalhos</OPTION>:<OPTION VALUE="reject-jobs">Rejeitar trabalhos</OPTION>}
 <OPTION VALUE="move-jobs">Mover todos trabalhos</OPTION>
-<OPTION VALUE="purge-jobs">Cancelar todos trabalhos</OPTION>
+<OPTION VALUE="cancel-jobs">Cancelar todos trabalhos</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Ir"></NOSCRIPT>
 </FORM>

diff --git a/templates/ru/printer.tmpl b/templates/ru/printer.tmpl
index a2e9b40d3d199c214cc8d2f9fea66a3f8e36bfea..105e643cb77d266a4e8c067ef0adc0d05784cc51 100644 (file)
--- a/templates/ru/printer.tmpl
+++ b/templates/ru/printer.tmpl
@@ -13,7 +13,7 @@
 {printer_state=5?<OPTION VALUE="start-printer">Восстановить печать</OPTION>:<OPTION VALUE="stop-printer">Приостановить принтер</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>}
 <OPTION VALUE="move-jobs">Переместить все задания</OPTION>
-<OPTION VALUE="purge-jobs">Отменить все задания</OPTION>
+<OPTION VALUE="cancel-jobs">Отменить все задания</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Go"></NOSCRIPT>
 </FORM>