From: Michael R Sweet Date: Mon, 16 Jan 2017 21:38:21 +0000 (-0500) Subject: Fix reporting of printed pages in the web interface (Issue #4924) X-Git-Tag: v2.2.2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cd31069e2fa11e4a4cdcf92680d6ef6cda2073d;p=thirdparty%2Fcups.git Fix reporting of printed pages in the web interface (Issue #4924) --- diff --git a/CHANGES.txt b/CHANGES.txt index 707adc565a..b35b9af78f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -24,6 +24,7 @@ CHANGES IN CUPS V2.2.2 printer () - 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 107982a561..52eff2bf3b 100644 --- a/templates/de/jobs.tmpl +++ b/templates/de/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?Unbekannt:{job_name}}  {?job_originating_user_name=?Zurückbehalten:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?Unbekannt:{?job_media_sheets_completed}}  +{job_impressions_completed=0?Unbekannt:{?job_impressions_completed}}  {job_state=3?unerledigt seit
{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?angehalten seit
{?time_at_creation=?Unknown:{time_at_creation}}: {job_state=5?verarbeitet seit
{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?angehalten: {job_state=7?gelöscht am
{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?abgebrochen:beendet am
{?time_at_completed=?Unknown:{time_at_completed}}}}}}}} {job_printer_state_message?
diff --git a/templates/es/jobs.tmpl b/templates/es/jobs.tmpl index 90c60c94d3..ac21a42acc 100644 --- a/templates/es/jobs.tmpl +++ b/templates/es/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?Desconocido:{job_name}}  {?job_originating_user_name=?Retenido:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?Desconocido:{?job_media_sheets_completed}}  +{job_impressions_completed=0?Desconocido:{?job_impressions_completed}}  {job_state=3?pendiente desde
{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?retenido desde
{?time_at_creation=?Unknown:{time_at_creation}}: {job_state=5?en proceso desde
{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?parado: {job_state=7?cancelado el
{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?interrumpido:completado el
{?time_at_completed=?Unknown:{time_at_completed}}}}}}}} {job_printer_state_message?
diff --git a/templates/ja/jobs.tmpl b/templates/ja/jobs.tmpl index 6904df4ee4..a420f0aeba 100644 --- a/templates/ja/jobs.tmpl +++ b/templates/ja/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?未知:{job_name}}  {?job_originating_user_name=?隠匿:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?不明:{?job_media_sheets_completed}}  +{job_impressions_completed=0?不明:{?job_impressions_completed}}  {job_state=3?{?time_at_creation=?Unknown:{time_at_creation}}
から保留中:{job_state=4?{?time_at_creation=?Unknown:{time_at_creation}}
から保留中: {job_state=5?{?time_at_processing=?Unknown:{time_at_processing}}
から処理中:{job_state=6?に停止: {job_state=7?{?time_at_completed=?Unknown:{time_at_completed}}
にキャンセル:{job_state=8?に中断:{?time_at_completed=?Unknown:{time_at_completed}}
に完了}}}}}} {job_printer_state_message?
diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl index 2f62855947..032619eb01 100644 --- a/templates/jobs.tmpl +++ b/templates/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?Unknown:{job_name}}  {?job_originating_user_name=?Withheld:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?Unknown:{?job_media_sheets_completed}}  +{job_impressions_completed=0?Unknown:{?job_impressions_completed}}  {job_state=3?pending since
{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?held since
{?time_at_creation=?Unknown:{time_at_creation}}: {job_state=5?processing since
{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?stopped: {job_state=7?canceled at
{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?aborted:completed at
{?time_at_completed=?Unknown:{time_at_completed}}}}}}}} {job_printer_state_message?
diff --git a/templates/pt_BR/jobs.tmpl b/templates/pt_BR/jobs.tmpl index 9f99dc766e..af5826ff40 100644 --- a/templates/pt_BR/jobs.tmpl +++ b/templates/pt_BR/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?Desconhecido:{job_name}}  {?job_originating_user_name=?Retido:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?Desconhecido:{?job_media_sheets_completed}}  +{job_impressions_completed=0?Desconhecido:{?job_impressions_completed}}  {job_state=3?Pendente desde
{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?Retido desde
{?time_at_creation=?Unknown:{time_at_creation}}: {job_state=5?Processando desde
{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?parado: {job_state=7?Cancelado em
{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?Abortado:Concluído em
{?time_at_completed=?Unknown:{time_at_completed}}}}}}}} {job_printer_state_message?
diff --git a/templates/ru/jobs.tmpl b/templates/ru/jobs.tmpl index 0359c34580..9340f1cea8 100644 --- a/templates/ru/jobs.tmpl +++ b/templates/ru/jobs.tmpl @@ -10,7 +10,7 @@ {?job_name=?Неизвестное:{job_name}}  {?job_originating_user_name=?Приостановлено пользователем:{job_originating_user_name}}  {job_k_octets}k  -{job_media_sheets_completed=0?Неизвестно:{?job_media_sheets_completed}}  +{job_impressions_completed=0?Неизвестно:{?job_impressions_completed}}  {job_state=3?В очереди
{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?Приостановлено с
{?time_at_creation=?Unknown:{time_at_creation}}: {job_state=5?Создано
{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?Остановлено: {job_state=7?Отменено
{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?Прервано:Завершено
{?time_at_completed=?Unknown:{time_at_completed}}}}}}}} {job_printer_state_message?