Imported Upstream version 2.2.4upstream/2.2.4

Change-Id: I6e6af59f8c880d483a83eb33c963ac9fb5ec2e4d
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

5 files changed, 5 insertions, 4 deletions

diff --git a/templates/de/printer.tmpl b/templates/de/printer.tmpl
index 454627f..89206ac 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/es/jobs.tmpl b/templates/es/jobs.tmpl
index ac21a42..aba2c51 100644
--- a/templates/es/jobs.tmpl
+++ b/templates/es/jobs.tmpl
@@ -18,6 +18,7 @@
 <TD>
 {job_preserved>0?{job_state>5?
 <FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Reimprimir trabajo"></FORM>:}:}
 {job_state=4?
 <FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
 <INPUT TYPE="SUBMIT" VALUE="Liberar trabajo"></FORM>:}
diff --git a/templates/ja/printer.tmpl b/templates/ja/printer.tmpl
index 2b82c61..184bba2 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 922d4b4..996b4a4 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 a2e9b40..105e643 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>