- Documentation updates (STR #2785, STR #2861, STR #2862)
- The IPP backend did not relay marker-* attributes.
+ - The CUPS GNOME/KDE menu item was not localized for
+ Chinese (STR #2880)
- The CUPS GNOME/KDE menu item was not localized for
Japanese (STR #2876)
- The cupstestppd utility reported mixed line endings for
else \
rm -rf clang/*; \
fi
- $(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" clean all
+ $(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" \
+ CXX="scan-build -o ../clang $(CXX)" clean all
+ test `ls -1 clang | wc -l` != 0 || exit 1
#
* Clear all conflicts...
*/
- conflicts = 0;
-
for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
o->conflicted = 0;
*option; /* Current option */
- if (!options)
+ if (!s)
return;
options = NULL;
X-KDE-Username=
Name=Manage Printing
Comment=CUPS Web Interface
+Name[de]=Druckerverwaltung
+Comment[de]=CUPS Webinterface
Name[en_US]=Manage Printing
Comment[en_US]=CUPS Web Interface
Name[es]=Administrar impresión
Comment[et]=CUPS-i veebiliides
Name[fr]=Gestionnaire d'impression
Comment[fr]=Interface Web de CUPS
-Name[pl]=Zarządzanie drukowaniem
-Comment[pl]=Interfejs WWW CUPS
+Name[he]=נהל הדפסות
+Comment[he]=ממשק דפדפן של CUPS
+Name[id]=Manajemen Pencetakan
+Comment[id]=Antarmuka Web CUPS
Name[it]=Gestione stampa
Comment[it]=Interfaccia web di CUPS
Name[ja]=印刷の管理
Comment[ja]=CUPS Web インタフェース
-Name[he]=נהל הדפסות
-Comment[he]=ממשק דפדפן של CUPS
+Name[pl]=Zarządzanie drukowaniem
+Comment[pl]=Interfejs WWW CUPS
+Name[zh]=打印机管理
+Comment[zh]=CUPS网页界面
Name[zh_TW]=印表管理
Comment[zh_TW]=CUPS 網頁介面
-Name[de]=Druckerverwaltung
-Comment[de]=CUPS Webinterface
-Name[id]=Manajemen Pencetakan
-Comment[id]=Antarmuka Web CUPS
}
}
}
- else
+ else if (p)
cupsdLogMessage(CUPSD_LOG_DEBUG2,
"process_browse_data: %s found, type=%x, hostname=%s...",
name, p->type, p->hostname ? p->hostname : "(nil)");
!strcmp(attr->name, "job-detailed-status-messages") ||
!strcmp(attr->name, "job-document-access-errors") ||
!strcmp(attr->name, "job-id") ||
+ !strcmp(attr->name, "job-impressions-completed") ||
!strcmp(attr->name, "job-k-octets") ||
!strcmp(attr->name, "job-originating-host-name") ||
!strcmp(attr->name, "job-originating-user-name") ||
!strcmp(attr->name, "number-of-intervening-jobs") ||
!strcmp(attr->name, "output-device-assigned") ||
!strncmp(attr->name, "date-time-at-", 13) ||
- !strncmp(attr->name, "job-impressions", 15) ||
!strncmp(attr->name, "job-k-octets", 12) ||
!strncmp(attr->name, "job-media-sheets", 16) ||
!strncmp(attr->name, "time-at-", 8))
continue;
if (!strncmp(attr->name, "job-", 4) && strcmp(attr->name, "job-uuid") &&
+ strcmp(attr->name, "job-impressions") &&
+ strcmp(attr->name, "job-originating-host-name") &&
!(printer->type & CUPS_PRINTER_REMOTE))
continue;
if (!strncmp(attr->name, "job-", 4) &&
strcmp(attr->name, "job-uuid") &&
strcmp(attr->name, "job-billing") &&
+ strcmp(attr->name, "job-impressions") &&
strcmp(attr->name, "job-sheets") &&
strcmp(attr->name, "job-hold-until") &&
strcmp(attr->name, "job-priority"))
continue;
- if ((!strcmp(attr->name, "page-label") ||
+ if ((!strcmp(attr->name, "job-impressions") ||
+ !strcmp(attr->name, "page-label") ||
!strcmp(attr->name, "page-border") ||
!strncmp(attr->name, "number-up", 9) ||
!strcmp(attr->name, "page-ranges") ||