Fix reporting of printed pages in the web interface (Issue #4924)

diff --git a/CHANGES.txt b/CHANGES.txt
index 707adc565abd5de7b646dbfa2d5f014a921855c2..b35b9af78f4f637989abddecb83e5bcad94cb656 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@ CHANGES IN CUPS V2.2.2
          printer (<rdar://problem/29268474>)
        - Let's Encrypt certificates did not work when the hostname contained
          uppercase letters (Issue #4919)
+       - Fixed reporting of printed pages in the web interface (Issue #4924)
        - Updated systemd config files (Issue #4935)
         - Updated documentation (PR #4896)
         - Updated localizations (PR #4894, PR #4895, PR #4904, PR #4908,

diff --git a/templates/de/jobs.tmpl b/templates/de/jobs.tmpl
index 107982a5619951a022eb8ffe3c4cc0f1dcb3f043..52eff2bf3bff593a2e386228988b8a7701284cd8 100644 (file)
--- a/templates/de/jobs.tmpl
+++ b/templates/de/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?Unbekannt:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Zurückbehalten:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Unbekannt:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?Unbekannt:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?unerledigt seit<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?angehalten seit<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
 {job_state=5?verarbeitet seit<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?angehalten:
 {job_state=7?gelöscht am<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?abgebrochen:beendet am<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>

diff --git a/templates/es/jobs.tmpl b/templates/es/jobs.tmpl
index 90c60c94d367e96310bd7ef8bad17f737028f6fa..ac21a42acc856f073736cabcf6e0fdb3d9ea81fd 100644 (file)
--- a/templates/es/jobs.tmpl
+++ b/templates/es/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?Desconocido:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Retenido:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Desconocido:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?Desconocido:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?pendiente desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?retenido desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
 {job_state=5?en proceso desde<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?parado:
 {job_state=7?cancelado el<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?interrumpido:completado el<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>

diff --git a/templates/ja/jobs.tmpl b/templates/ja/jobs.tmpl
index 6904df4ee4d09ba82c916d364da9f5ec1402e8ed..a420f0aeba6079f447b67da6a4fb3a627cee3745 100644 (file)
--- a/templates/ja/jobs.tmpl
+++ b/templates/ja/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?未知:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?隠匿:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?不明:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?不明:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?{?time_at_creation=?Unknown:{time_at_creation}}<BR>から保留中:{job_state=4?{?time_at_creation=?Unknown:{time_at_creation}}<BR>から保留中:
 {job_state=5?{?time_at_processing=?Unknown:{time_at_processing}}<BR>から処理中:{job_state=6?に停止:
 {job_state=7?{?time_at_completed=?Unknown:{time_at_completed}}<BR>にキャンセル:{job_state=8?に中断:{?time_at_completed=?Unknown:{time_at_completed}}<BR>に完了}}}}}}&nbsp;{job_printer_state_message?<BR>

diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl
index 2f62855947c3a3c018508ee4cf816b2a754f8d05..032619eb01decb980a4db1096cf6a1a7c9ed0ac0 100644 (file)
--- a/templates/jobs.tmpl
+++ b/templates/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?Unknown:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Withheld:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Unknown:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?Unknown:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?pending since<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?held since<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
 {job_state=5?processing since<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?stopped:
 {job_state=7?canceled at<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?aborted:completed at<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>

diff --git a/templates/pt_BR/jobs.tmpl b/templates/pt_BR/jobs.tmpl
index 9f99dc766ef74ba7c07db1be14e3bd8e26a6ef32..af5826ff403f2e971f0c13654b81ccead3788cc8 100644 (file)
--- a/templates/pt_BR/jobs.tmpl
+++ b/templates/pt_BR/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?Desconhecido:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Retido:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Desconhecido:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?Desconhecido:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?Pendente desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?Retido desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
 {job_state=5?Processando desde<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?parado:
 {job_state=7?Cancelado em<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?Abortado:Conclu&iacute;do em<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>

diff --git a/templates/ru/jobs.tmpl b/templates/ru/jobs.tmpl
index 0359c3458055469d28e3dc59d4d3acdb10c62675..9340f1cea824be48ddf8e1e44eaf97a3730ac0a1 100644 (file)
--- a/templates/ru/jobs.tmpl
+++ b/templates/ru/jobs.tmpl
@@ -10,7 +10,7 @@
 <TD>{?job_name=?Неизвестное:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Приостановлено пользователем:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Неизвестно:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_impressions_completed=0?Неизвестно:{?job_impressions_completed}}&nbsp;</TD>
 <TD>{job_state=3?В очереди<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?Приостановлено с<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
 {job_state=5?Создано<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?Остановлено:
 {job_state=7?Отменено<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?Прервано:Завершено<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>