From 143286bced7e3ce33b054671267077e85db002f9 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 16 May 2017 14:35:54 -0400
Subject: [PATCH] Fixed the "cancel all jobs" function in the web interface for
 several languages (Issue #4999)

---
 CHANGES.md                   | 4 +++-
 templates/de/printer.tmpl    | 2 +-
 templates/ja/printer.tmpl    | 2 +-
 templates/pt_BR/printer.tmpl | 2 +-
 templates/ru/printer.tmpl    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e8d4df6d8..c1ea15a25 100644
--- 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 454627fd5..89206acf7 100644
--- 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 2b82c61df..184bba2bd 100644
--- 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 922d4b4ee..996b4a406 100644
--- 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 a2e9b40d3..105e643cb 100644
--- 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>
-- 
2.39.5