merge patched-debian/experimental into debian/experimental

114 files changed, 7527 insertions, 13245 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 397dca5bc..ce57fe2fc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,49 @@
-CHANGES - 2.3rc1 - 2019-05-21
-=============================
+CHANGES - 2.3.0 - 2019-08-23
+============================
+
+
+Changes in CUPS v2.3.0
+----------------------
+
+- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251)
+- Added a GPL2/LGPL2 exception to the new CUPS license terms.
+- Documentation updates (Issue #5604)
+- Localization updates (Issue #5637)
+- Fixed a bug in the scheduler job cleanup code (Issue #5588)
+- Fixed builds when there is no TLS library (Issue #5590)
+- Eliminated some new GCC compiler warnings (Issue #5591)
+- Removed dead code from the scheduler (Issue #5593)
+- "make" failed with GZIP options (Issue #5595)
+- Fixed potential excess logging from the scheduler when removing job files
+  (Issue #5597)
+- Fixed a NULL pointer dereference bug in `httpGetSubField2` (Issue #5598)
+- Added FIPS-140 workarounds for GNU TLS (Issue #5601, Issue #5622)
+- The scheduler no longer provides a default value for the description
+  (Issue #5603)
+- The scheduler now logs jobs held for authentication using the error level so
+  it is clear what happened (Issue #5604)
+- The `lpadmin` command did not always update the PPD file for changes to the
+  `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
+- The scheduler now uses both the group's membership list as well as the
+  various OS-specific membership functions to determine whether a user belongs
+  to a named group (Issue #5613)
+- Added USB quirks rule for HP LaserJet 1015 (Issue #5617)
+- Fixed some PPD parser issues (Issue #5623, Issue #5624)
+- The IPP parser no longer allows invalid member attributes in collections
+  (Issue #5630)
+- The configure script now treats the "wheel" group as a potential system
+  group (Issue #5638)
+- Fixed a USB printing issue on macOS (rdar://31433931)
+- Fixed IPP buffer overflow (rdar://50035411)
+- Fixed memory disclosure issue in the scheduler (rdar://51373853)
+- Fixed DoS issues in the scheduler (rdar://51373929)
+- Fixed an issue with unsupported "sides" values in the IPP backend
+  (rdar://51775322)
+- The scheduler would restart continuously when idle and printers were not
+  shared (rdar://52561199)
+- Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
+- Fixed a command ordering issue in the Zebra ZPL driver.
+- Fixed a memory leak in `ppdOpen`.
 
 
 Changes in CUPS v2.3rc1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be2ab40d5..2421d0d9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,13 +2,14 @@ Contributing to CUPS
 ====================
 
 CUPS is developed by Apple Inc. and distributed as open source software under
-the Apache License, Version 2.0.  Significant contributions to CUPS must be
-licensed to Apple using the Apple Contributor Agreement:
+the Apache License, Version 2.0 with exceptions to allow linking to GPL2/LGPL2
+code.  Significant contributions to CUPS must be licensed to Apple using the
+Apple Contributor Agreement:
 
     https://www.cups.org/AppleContributorAgreement_2011-03-10.pdf
 
-Contributions should be submitted as attachments to bug reports on the CUPS web
-site.  Changes to existing source files should be submitted as unified diffs
-(both Subversion and Git produce this format by default) while new source files
+Contributions should be submitted as attachments to bug reports on the
+[CUPS Github project](https://github.com/apple/cups).  Changes to existing
+source files should be submitted as unified diffs while new source files
 should be provided as-is or in an archive.  Github pull requests can also be
 used to submit changes.
diff --git a/CREDITS.md b/CREDITS.md
index 7d5a8b9c5..8b1a15df8 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,4 +1,4 @@
-CREDITS - 2017-05-01
+CREDITS - 2019-08-21
 ====================
 
 Few projects are completed by one person, and CUPS is no exception.  We'd like
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 027ddc12f..df76323c8 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -63,7 +63,9 @@ major, minor, and patch release numbers.  Major release numbers indicate large
 design changes or backwards-incompatible changes to the CUPS API or CUPS
 Imaging API.  Minor release numbers indicate new features and other smaller
 changes which are backwards-compatible with previous CUPS releases.  Patch
-numbers indicate bug fixes to the previous feature or patch release.
+numbers indicate bug fixes to the previous feature or patch release.  This
+version numbering scheme is consistent with the
+[Semantic Versioning](http://semver.org) specification.
 
 > Note:
 >
@@ -114,6 +116,10 @@ Contributed source code must follow the guidelines below.  While the examples
 are for C and C++ source files, source code for other languages should conform
 to the same guidelines as allowed by the language.
 
+Source code comments provide the reference portion of the CUPS Programming
+Manual, which is generated using the [codedoc](https://www.msweet.org/codedoc)
+software.
+
 
 ### Source Files
 
@@ -270,15 +276,17 @@ Return/output values are indicated using an "O" prefix, input values are
 indicated using the "I" prefix, and values that are both input and output use
 the "IO" prefix for the corresponding in-line comment.
 
-The Mini-XML documentation generator also understands the following special
-text in the function description comment:
+The [codedoc](https://www.msweet.org/codedoc) documentation generator also
+understands the following special text in the function description comment:
 
-    @deprecated@         - Marks the function as deprecated (not recommended
-                           for new development and scheduled for removal)
+    @deprecated@         - Marks the function as deprecated: not recommended
+                           for new development and scheduled for removal.
+    @link name@          - Provides a hyperlink to the corresponding function
+                           or type definition.
     @since CUPS version@ - Marks the function as new in the specified version
                            of CUPS.
-    @private@            - Marks the function as private (same as starting the
-                           function name with an underscore)
+    @private@            - Marks the function as private so it will not be
+                           included in the documentation.
 
 
 ### Variables
diff --git a/INSTALL.md b/INSTALL.md
index b38e48bc1..d2afc4cf9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.3rc1 - 2019-05-21
-===================================
+INSTALL - CUPS v2.3.0 - 2019-08-21
+==================================
 
 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.md".  A complete change log can
diff --git a/Makedefs.in b/Makedefs.in
index 7b99dab98..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -27,7 +27,7 @@ CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
 DSOXX		=	@DSOXX@
-GZIP		=	@GZIP@
+GZIPPROG	=	@GZIPPROG@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
 LD_CC		=	@LD_CC@
@@ -264,7 +264,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
 	echo Compiling $<...
diff --git a/NOTICE b/NOTICE
index 5393010d2..bf088fdb0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 CUPS
 
-Copyright © 2007-2018 by Apple Inc.
+Copyright © 2007-2019 by Apple Inc.
 Copyright © 1997-2007 by Easy Software Products.
 
 CUPS and the CUPS logo are trademarks of Apple Inc.
@@ -32,3 +32,20 @@ the following restrictions:
   2. Altered source versions must be plainly marked as such, and must not be
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
+
+
+-- CUPS Exceptions to the Apache 2.0 License --
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
diff --git a/README.md b/README.md
index d2048c9a4..3d3ddb9a4 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,9 @@
-README - CUPS v2.3rc1 - 2019-05-21
-==================================
-
-> **Note:** CUPS v2.3b8 is not production code.  Do not use on production
-> systems.  For a production version of CUPS, please see the CUPS 2.2.x
-> releases.  **Do not use CUPS v2.3b8 on production systems.**
-
-
-Looking for compile instructions?  Read the file `INSTALL.md` instead...
-
+README - CUPS v2.3.0 - 2019-08-21
+=================================
 
 INTRODUCTION
 ------------
 
-
 CUPS is a standards-based, open source printing system developed by Apple Inc.
 for macOS® and other UNIX®-like operating systems.  CUPS uses the Internet
 Printing Protocol ("IPP") and provides System V and Berkeley command-line
@@ -34,8 +25,21 @@ CUPS is licensed under the Apache License Version 2.0.  See the file
 READING THE DOCUMENTATION
 -------------------------
 
+Initial documentation to get you started is provided in the root directory of
+the CUPS sources:
+
+- `CHANGES.md`: A list of changes in the current major release of CUPS.
+- `CONTRIBUTING.md`: Guidelines for contributing to the CUPS project.
+- `CREDITS.md`: A list of past contributors to the CUPS project.
+- `DEVELOPING.md`: Guidelines for developing code for the CUPS project.
+- `INSTALL.md`: Instructions for building and installing CUPS.
+- `LICENSE`: The CUPS license agreement (Apache 2.0).
+- `NOTICE`: Copyright notices and exceptions to the CUPS license agreement.
+- `README.md`: This file.
+
 Once you have installed the software you can access the documentation (and a
-bunch of other stuff) online at <http://localhost:631/>.
+bunch of other stuff) online at <http://localhost:631/> and using the `man`
+command, for example `man cups`.
 
 If you're having trouble getting that far, the documentation is located under
 the `doc/help` and `man` directories.
@@ -81,22 +85,22 @@ printer at address 11.22.33.44:
 
 CUPS also includes several sample PPD files you can use for "legacy" printers:
 
-    Driver                         PPD Name
-    -----------------------------  ------------------------------
-    Dymo Label Printers            drv:///sample.drv/dymo.ppd
-    Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
-    EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
-    EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
-    Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
-    Generic PostScript Printer     drv:///sample.drv/generic.ppd
-    HP DeskJet Series              drv:///sample.drv/deskjet.ppd
-    HP LaserJet Series             drv:///sample.drv/laserjet.ppd
-    OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
-    OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
-    Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
-    Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
-    Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
-    Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
+   Driver                         | PPD Name
+   -----------------------------  | ------------------------------
+   Dymo Label Printers            | drv:///sample.drv/dymo.ppd
+   Intellitech Intellibar         | drv:///sample.drv/intelbar.ppd
+   EPSON 9-pin Series             | drv:///sample.drv/epson9.ppd
+   EPSON 24-pin Series            | drv:///sample.drv/epson24.ppd
+   Generic PCL Laser Printer      | drv:///sample.drv/generpcl.ppd
+   Generic PostScript Printer     | drv:///sample.drv/generic.ppd
+   HP DeskJet Series              | drv:///sample.drv/deskjet.ppd
+   HP LaserJet Series             | drv:///sample.drv/laserjet.ppd
+   OKIDATA 9-Pin Series           | drv:///sample.drv/okidata9.ppd
+   OKIDATA 24-Pin Series          | drv:///sample.drv/okidat24.ppd
+   Zebra CPCL Label Printer       | drv:///sample.drv/zebracpl.ppd
+   Zebra EPL1 Label Printer       | drv:///sample.drv/zebraep1.ppd
+   Zebra EPL2 Label Printer       | drv:///sample.drv/zebraep2.ppd
+   Zebra ZPL Label Printer        | drv:///sample.drv/zebra.ppd
 
 You can run the `lpinfo -m` command to list all of the available drivers:
 
@@ -156,9 +160,9 @@ LEGAL STUFF
 Copyright © 2007-2019 by Apple Inc.
 Copyright © 1997-2007 by Easy Software Products.
 
-CUPS is provided under the terms of the Apache License, Version 2.0.  A copy of
-this license can be found in the file `LICENSE`.  Additional legal information
-is provided in the file `NOTICE`.
+CUPS is provided under the terms of the Apache License, Version 2.0 with
+exceptions for GPL2/LGPL2 software.  A copy of this license can be found in the
+file `LICENSE`.  Additional legal information is provided in the file `NOTICE`.
 
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
diff --git a/backend/ipp.c b/backend/ipp.c
index 08a61960b..5902dd6cb 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1504,7 +1504,7 @@ main(int  argc,				/* I - Number of command-line args */
 
         const char *sides = cupsGetOption("sides", num_options, options);
 
-        if (!strncmp(sides, "two-sided-", 10))
+        if (!sides || !strncmp(sides, "two-sided-", 10))
         {
           fputs("DEBUG: Unable to do two-sided printing, setting sides to 'one-sided'.\n", stderr);
           num_options = cupsAddOption("sides", "one-sided", num_options, &options);
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 44d6bb8cb..cd684d33f 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -242,6 +242,9 @@
 # All Intermec devices (Issue #4553)
 0x067e no-reattach
 
+# HP LaserJet 1015 (Issue #5617)
+0x03f0 0x0e17 delay-close
+
 # HP LaserJet 1150 (Issue #4549)
 0x03f0 0x0f17 delay-close
 
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index d6ad5875d..1c412da6f 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1280,6 +1280,9 @@ static Boolean find_device_cb(io_service_t obj, printer_interface_t printerIntf,
         (*printerIntf)->GetInterfaceNumber(printerIntf, &intfNumber);
         (*printerIntf)->GetLocationID(printerIntf, &intfLocation);
 
+        if (intfProtocol == kUSBPrintingProtocolIPP)
+            return keepLooking;
+
         if (g.serial != NULL && CFStringGetLength(g.serial) > 0)
         {
           if (serial != NULL && CFStringCompare(serial, g.serial, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
@@ -1287,12 +1290,9 @@ static Boolean find_device_cb(io_service_t obj, printer_interface_t printerIntf,
             g.interfaceProtocol = intfProtocol;
             g.location = intfLocation;
             g.alternateSetting = intfAltSetting;
-            if (intfProtocol != kUSBPrintingProtocolIPP)
-            {
-              g.printer_obj = obj;
-              IOObjectRetain(obj);
-            }
-            keepLooking = (intfProtocol == kUSBPrintingProtocolIPP);
+            g.printer_obj = obj;
+            IOObjectRetain(obj);
+            keepLooking = false;
           }
         }
         else
@@ -1300,14 +1300,14 @@ static Boolean find_device_cb(io_service_t obj, printer_interface_t printerIntf,
           if (g.printer_obj != 0)
             IOObjectRelease(g.printer_obj);
 
+            if (g.location == 0 || g.location == intfLocation)
+                keepLooking = false;
+
             g.location = intfLocation;
             g.alternateSetting = intfAltSetting;
             g.interfaceProtocol = intfProtocol;
             g.printer_obj = obj;
             IOObjectRetain(obj);
-
-            if (g.location == 0 || g.location == intfLocation)
-              keepLooking = false;
         }
 
         if (!keepLooking)
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index fa4d82c2d..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -2933,6 +2933,9 @@ do_set_options(http_t *http,		/* I - HTTP connection */
 
 	      switch (cparam->type)
 	      {
+	        case PPD_CUSTOM_UNKNOWN :
+	            break;
+
 		case PPD_CUSTOM_POINTS :
 		    if (!_cups_strncasecmp(option->defchoice, "Custom.", 7))
 		    {
@@ -3532,6 +3535,9 @@ get_option_value(
 
     switch (cparam->type)
     {
+      case PPD_CUSTOM_UNKNOWN :
+	  break;
+
       case PPD_CUSTOM_CURVE :
       case PPD_CUSTOM_INVCURVE :
       case PPD_CUSTOM_REAL :
@@ -3610,6 +3616,9 @@ get_option_value(
 
       switch (cparam->type)
       {
+	case PPD_CUSTOM_UNKNOWN :
+	    break;
+
 	case PPD_CUSTOM_CURVE :
 	case PPD_CUSTOM_INVCURVE :
 	case PPD_CUSTOM_REAL :
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 0d5a432e3..87264d850 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -39,7 +39,11 @@ AC_PROG_CXX(clang++ c++ g++)
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(GZIP,gzip)
+AC_PATH_PROG(GZIPPROG,gzip)
+AC_MSG_CHECKING(for install-sh script)
+INSTALL="`pwd`/install-sh"
+AC_SUBST(INSTALL)
+AC_MSG_RESULT(using $INSTALL)
 AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MKDIR,mkdir)
@@ -48,6 +52,7 @@ AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
 AC_PATH_PROG(XDGOPEN,xdg-open)
+
 if test "x$XDGOPEN" = x; then
 	CUPS_HTMLVIEW="htmlview"
 else
@@ -55,11 +60,6 @@ else
 fi
 AC_SUBST(CUPS_HTMLVIEW)
 
-AC_MSG_CHECKING(for install-sh script)
-INSTALL="`pwd`/install-sh"
-AC_SUBST(INSTALL)
-AC_MSG_RESULT(using $INSTALL)
-
 if test "x$AR" = x; then
 	AC_MSG_ERROR([Unable to find required library archive command.])
 fi
@@ -253,14 +253,14 @@ dnl ZLIB
 INSTALL_GZIP=""
 LIBZ=""
 AC_CHECK_HEADER(zlib.h,
-    AC_CHECK_LIB(z, gzgets,
+    AC_CHECK_LIB(z, gzgets,[
 	AC_DEFINE(HAVE_LIBZ)
 	LIBZ="-lz"
 	LIBS="$LIBS -lz"
 	AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY))
-	if test "x$GZIP" != z; then
+	if test "x$GZIPPROG" != x; then
 		INSTALL_GZIP="-z"
-	fi))
+	fi]))
 AC_SUBST(INSTALL_GZIP)
 AC_SUBST(LIBZ)
 
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 86e8bc488..63ea1f470 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -175,8 +175,10 @@ if test -n "$GCC"; then
 	# doesn't trigger...
 	gccversion=`$CC --version | head -1 | awk '{print $NF}'`
 	case "$gccversion" in
-		7.* | 8.*)
-			WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-tautological-compare"
+		1.* | 2.* | 3.* | 4.* | 5.* | 6.* | \(clang-*)
+			;;
+		*)
+			WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-format-overflow -Wno-tautological-compare"
 			;;
 	esac
 
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index b3d96ef0a..517539e1f 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -245,7 +245,7 @@ AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups
 		AC_MSG_CHECKING(for default system groups)
 		if test -f /etc/group; then
 			CUPS_SYSTEM_GROUPS=""
-			GROUP_LIST="lpadmin sys system root"
+			GROUP_LIST="lpadmin sys system root wheel"
 			for group in $GROUP_LIST; do
 				if test "`grep \^${group}: /etc/group`" != ""; then
 					if test "x$CUPS_SYSTEM_GROUPS" = x; then
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index c1648b1c1..4ce926f51 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -58,6 +58,7 @@ if test x$enable_ssl != xno; then
 
 	    SAVELIBS="$LIBS"
 	    LIBS="$LIBS $SSLLIBS"
+	    AC_CHECK_FUNC(gnutls_fips140_set_mode, AC_DEFINE(HAVE_GNUTLS_FIPS140_SET_MODE))
 	    AC_CHECK_FUNC(gnutls_transport_set_pull_timeout_function, AC_DEFINE(HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION))
 	    AC_CHECK_FUNC(gnutls_priority_set_direct, AC_DEFINE(HAVE_GNUTLS_PRIORITY_SET_DIRECT))
 	    LIBS="$SAVELIBS"
diff --git a/config.h.in b/config.h.in
index 1c2d7a826..5e93a9dac 100644
--- a/config.h.in
+++ b/config.h.in
@@ -302,6 +302,13 @@
 
 
 /*
+ * Do we have the gnutls_fips140_set_mode function?
+ */
+
+#undef HAVE_GNUTLS_FIPS140_SET_MODE
+
+
+/*
  * Do we have the gnutls_transport_set_pull_timeout_function function?
  */
 
diff --git a/configure b/configure
index 84bce5fd2..d3df145bc 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.3rc1.
+# Generated by GNU Autoconf 2.69 for CUPS 2.3.0.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.3rc1'
-PACKAGE_STRING='CUPS 2.3rc1'
+PACKAGE_VERSION='2.3.0'
+PACKAGE_STRING='CUPS 2.3.0'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -731,7 +751,6 @@ LIBPAPER
 LIBMALLOC
 PKGCONFIG
 INSTALLSTATIC
-INSTALL
 CUPS_HTMLVIEW
 XDGOPEN
 SED
@@ -741,7 +760,8 @@ MV
 MKDIR
 LN
 LD
-GZIP
+INSTALL
+GZIPPROG
 CHMOD
 AR
 RANLIB
@@ -1362,8 +1382,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1449,7 +1467,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.3rc1 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1514,7 +1532,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.3rc1:";;
+     short | recursive ) echo "Configuration of CUPS 2.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1695,10 +1713,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.3rc1
-generated by GNU Autoconf 2.68
+CUPS configure 2.3.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1849,7 +1867,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2159,8 +2177,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.3rc1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by CUPS $as_me 2.3.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2646,7 +2664,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CODE_SIGN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2676,7 +2694,7 @@ done
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.3rc1"
+CUPS_VERSION="2.3.0"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -2722,7 +2740,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2770,7 +2788,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2814,7 +2832,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3258,8 +3276,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3509,7 +3526,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3553,7 +3570,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3755,7 +3772,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3795,7 +3812,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3848,7 +3865,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3888,7 +3905,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3914,12 +3931,12 @@ fi
 set dummy gzip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GZIP+:} false; then :
+if ${ac_cv_path_GZIPPROG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GZIP in
+  case $GZIPPROG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
+  ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3928,8 +3945,8 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GZIPPROG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3940,16 +3957,22 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
+GZIPPROG=$ac_cv_path_GZIPPROG
+if test -n "$GZIPPROG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIPPROG" >&5
+$as_echo "$GZIPPROG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5
+$as_echo_n "checking for install-sh script... " >&6; }
+INSTALL="`pwd`/install-sh"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5
+$as_echo "using $INSTALL" >&6; }
 # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -3968,7 +3991,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4008,7 +4031,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4048,7 +4071,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4088,7 +4111,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4128,7 +4151,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4168,7 +4191,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4208,7 +4231,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4248,7 +4271,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4270,6 +4293,7 @@ $as_echo "no" >&6; }
 fi
 
 
+
 if test "x$XDGOPEN" = x; then
 	CUPS_HTMLVIEW="htmlview"
 else
@@ -4277,13 +4301,6 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5
-$as_echo_n "checking for install-sh script... " >&6; }
-INSTALL="`pwd`/install-sh"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5
-$as_echo "using $INSTALL" >&6; }
-
 if test "x$AR" = x; then
 	as_fn_error $? "Unable to find required library archive command." "$LINENO" 5
 fi
@@ -4324,7 +4341,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4367,7 +4384,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4777,7 +4794,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4843,7 +4860,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5616,7 +5633,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
 $as_echo "$ac_cv_lib_z_gzgets" >&6; }
 if test "x$ac_cv_lib_z_gzgets" = xyes; then :
-  $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+	$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
 
 	LIBZ="-lz"
 	LIBS="$LIBS -lz"
@@ -5661,7 +5679,7 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
 
 fi
 
-	if test "x$GZIP" != z; then
+	if test "x$GZIPPROG" != x; then
 		INSTALL_GZIP="-z"
 	fi
 fi
@@ -6893,8 +6911,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	# doesn't trigger...
 	gccversion=`$CC --version | head -1 | awk '{print $NF}'`
 	case "$gccversion" in
-		7.* | 8.*)
-			WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-tautological-compare"
+		1.* | 2.* | 3.* | 4.* | 5.* | 6.* | \(clang-*)
+			;;
+		*)
+			WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-format-overflow -Wno-tautological-compare"
 			;;
 	esac
 
@@ -7637,7 +7657,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7680,7 +7700,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8186,7 +8206,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8229,7 +8249,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8288,6 +8308,12 @@ fi
 
 	    SAVELIBS="$LIBS"
 	    LIBS="$LIBS $SSLLIBS"
+	    ac_fn_c_check_func "$LINENO" "gnutls_fips140_set_mode" "ac_cv_func_gnutls_fips140_set_mode"
+if test "x$ac_cv_func_gnutls_fips140_set_mode" = xyes; then :
+  $as_echo "#define HAVE_GNUTLS_FIPS140_SET_MODE 1" >>confdefs.h
+
+fi
+
 	    ac_fn_c_check_func "$LINENO" "gnutls_transport_set_pull_timeout_function" "ac_cv_func_gnutls_transport_set_pull_timeout_function"
 if test "x$ac_cv_func_gnutls_transport_set_pull_timeout_function" = xyes; then :
   $as_echo "#define HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION 1" >>confdefs.h
@@ -8800,6 +8826,8 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 
@@ -9573,7 +9601,7 @@ else
 $as_echo_n "checking for default system groups... " >&6; }
 		if test -f /etc/group; then
 			CUPS_SYSTEM_GROUPS=""
-			GROUP_LIST="lpadmin sys system root"
+			GROUP_LIST="lpadmin sys system root wheel"
 			for group in $GROUP_LIST; do
 				if test "`grep \^${group}: /etc/group`" != ""; then
 					if test "x$CUPS_SYSTEM_GROUPS" = x; then
@@ -10266,16 +10294,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10335,28 +10363,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10377,8 +10393,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.3rc1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by CUPS $as_me 2.3.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10440,11 +10456,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.3rc1
-configured by $0, generated by GNU Autoconf 2.68,
+CUPS config.status 2.3.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10533,7 +10549,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff --git a/configure.ac b/configure.ac
index 8ca5393ef..2dfdbb93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.3rc1], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.3.0], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
diff --git a/cups/dest-options.c b/cups/dest-options.c
index f4d75105c..8c5fe666c 100644
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -59,7 +59,7 @@ static void		cups_update_ready(http_t *http, cups_dinfo_t *dinfo);
 /*
  * 'cupsAddDestMediaOptions()' - Add the option corresponding to the specified media size.
  *
- * @since CUPS 2.3@
+ * @since CUPS 2.3/macOS 10.14@
  */
 
 int					/* O  - New number of options */
diff --git a/cups/encode.c b/cups/encode.c
index bda910be7..2469406e2 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,7 +1,7 @@
 /*
  * Option encoding routines for CUPS.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -673,7 +673,7 @@ _cupsEncodeOption(
 /*
  * 'cupsEncodeOption()' - Encode a single option into an IPP attribute.
  *
- * @since CUPS 2.3@
+ * @since CUPS 2.3/macOS 10.14@
  */
 
 ipp_attribute_t	*			/* O - New attribute or @code NULL@ on error */
diff --git a/cups/hash.c b/cups/hash.c
index 061486076..7b3ea818e 100644
--- a/cups/hash.c
+++ b/cups/hash.c
@@ -185,6 +185,13 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
   unsigned char	temp[64];		/* Temporary hash buffer */
   size_t	tempsize = 0;		/* Truncate to this size? */
 
+
+#  ifdef HAVE_GNUTLS_FIPS140_SET_MODE
+  unsigned oldmode = gnutls_fips140_mode_enabled();
+
+  gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
+#  endif /* HAVE_GNUTLS_FIPS140_SET_MODE */
+
   if (!strcmp(algorithm, "md5"))
     alg = GNUTLS_DIG_MD5;
   else if (!strcmp(algorithm, "sha"))
@@ -222,6 +229,10 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
       gnutls_hash_fast(alg, data, datalen, temp);
       memcpy(hash, temp, tempsize);
 
+#  ifdef HAVE_GNUTLS_FIPS140_SET_MODE
+      gnutls_fips140_set_mode(oldmode, GNUTLS_FIPS140_SET_MODE_THREAD);
+#  endif /* HAVE_GNUTLS_FIPS140_SET_MODE */
+
       return ((ssize_t)tempsize);
     }
 
@@ -230,9 +241,17 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
 
     gnutls_hash_fast(alg, data, datalen, hash);
 
+#  ifdef HAVE_GNUTLS_FIPS140_SET_MODE
+    gnutls_fips140_set_mode(oldmode, GNUTLS_FIPS140_SET_MODE_THREAD);
+#  endif /* HAVE_GNUTLS_FIPS140_SET_MODE */
+
     return ((ssize_t)gnutls_hash_get_len(alg));
   }
 
+#  ifdef HAVE_GNUTLS_FIPS140_SET_MODE
+  gnutls_fips140_set_mode(oldmode, GNUTLS_FIPS140_SET_MODE_THREAD);
+#  endif /* HAVE_GNUTLS_FIPS140_SET_MODE */
+
 #else
  /*
   * No hash support beyond MD5 without CommonCrypto or GNU TLS...
@@ -266,6 +285,10 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
 
   too_small:
 
+#ifdef HAVE_GNUTLS_FIPS140_SET_MODE
+  gnutls_fips140_set_mode(oldmode, GNUTLS_FIPS140_SET_MODE_THREAD);
+#endif /* HAVE_GNUTLS_FIPS140_SET_MODE */
+
   _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hash buffer too small."), 1);
   return (-1);
 }
diff --git a/cups/http.c b/cups/http.c
index ff8f6918f..fbb1bf13c 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,8 +1,8 @@
 /*
  * HTTP routines for CUPS.
  *
- * Copyright 2007-2018 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
  * This file contains Kerberos support code, copyright 2006 by
  * Jelmer Vernooij.
@@ -1345,8 +1345,11 @@ httpGetSubField2(http_t       *http,	/* I - HTTP connection */
 
   DEBUG_printf(("2httpGetSubField2(http=%p, field=%d, name=\"%s\", value=%p, valuelen=%d)", (void *)http, field, name, (void *)value, valuelen));
 
+  if (value)
+    *value = '\0';
+
   if (!http || !name || !value || valuelen < 2 ||
-      field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX)
+      field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX || !http->fields[field])
     return (NULL);
 
   end = value + valuelen - 1;
@@ -1857,7 +1860,7 @@ httpPrintf(http_t     *http,		/* I - HTTP connection */
 	   ...)				/* I - Additional args as needed */
 {
   ssize_t	bytes;			/* Number of bytes to write */
-  char		buf[16384];		/* Buffer for formatted string */
+  char		buf[65536];		/* Buffer for formatted string */
   va_list	ap;			/* Variable argument pointer */
 
 
@@ -1869,7 +1872,12 @@ httpPrintf(http_t     *http,		/* I - HTTP connection */
 
   DEBUG_printf(("3httpPrintf: (" CUPS_LLFMT " bytes) %s", CUPS_LLCAST bytes, buf));
 
-  if (http->data_encoding == HTTP_ENCODING_FIELDS)
+  if (bytes > (ssize_t)(sizeof(buf) - 1))
+  {
+    http->error = ENOMEM;
+    return (-1);
+  }
+  else if (http->data_encoding == HTTP_ENCODING_FIELDS)
     return ((int)httpWrite2(http, buf, (size_t)bytes));
   else
   {
diff --git a/cups/ipp.c b/cups/ipp.c
index 0248cb9d2..1bd59cef1 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -3040,8 +3040,13 @@ ippReadIO(void       *src,		/* I - Data source */
 
           DEBUG_printf(("2ippReadIO: name length=%d", n));
 
-          if (n == 0 && tag != IPP_TAG_MEMBERNAME &&
-	      tag != IPP_TAG_END_COLLECTION)
+          if (n && parent)
+          {
+            _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid named IPP attribute in collection."), 1);
+            DEBUG_puts("1ippReadIO: bad attribute name in collection.");
+            return (IPP_STATE_ERROR);
+          }
+          else if (n == 0 && tag != IPP_TAG_MEMBERNAME && tag != IPP_TAG_END_COLLECTION)
 	  {
 	   /*
 	    * More values for current attribute...
@@ -4545,9 +4550,7 @@ ippSetValueTag(
         break;
 
     case IPP_TAG_NAME :
-        if (temp_tag != IPP_TAG_KEYWORD && temp_tag != IPP_TAG_URI &&
-            temp_tag != IPP_TAG_URISCHEME && temp_tag != IPP_TAG_LANGUAGE &&
-            temp_tag != IPP_TAG_MIMETYPE)
+        if (temp_tag != IPP_TAG_KEYWORD)
           return (0);
 
         (*attr)->value_tag = (ipp_tag_t)(IPP_TAG_NAME | ((*attr)->value_tag & IPP_TAG_CUPS_CONST));
@@ -4555,10 +4558,7 @@ ippSetValueTag(
 
     case IPP_TAG_NAMELANG :
     case IPP_TAG_TEXTLANG :
-        if (value_tag == IPP_TAG_NAMELANG &&
-            (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD &&
-             temp_tag != IPP_TAG_URI && temp_tag != IPP_TAG_URISCHEME &&
-             temp_tag != IPP_TAG_LANGUAGE && temp_tag != IPP_TAG_MIMETYPE))
+        if (value_tag == IPP_TAG_NAMELANG && (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD))
           return (0);
 
         if (value_tag == IPP_TAG_TEXTLANG && temp_tag != IPP_TAG_TEXT)
diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c
index b9b0e5ad0..8bffb2bc3 100644
--- a/cups/ppd-emit.c
+++ b/cups/ppd-emit.c
@@ -664,6 +664,9 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	{
           switch (cparam->type)
 	  {
+	    case PPD_CUSTOM_UNKNOWN :
+	        break;
+
 	    case PPD_CUSTOM_CURVE :
 	    case PPD_CUSTOM_INVCURVE :
 	    case PPD_CUSTOM_POINTS :
@@ -710,6 +713,9 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	{
           switch (cparam->type)
 	  {
+	    case PPD_CUSTOM_UNKNOWN :
+	        break;
+
 	    case PPD_CUSTOM_CURVE :
 	    case PPD_CUSTOM_INVCURVE :
 	    case PPD_CUSTOM_POINTS :
@@ -805,6 +811,9 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	      {
 	        switch (cparam->type)
 		{
+		  case PPD_CUSTOM_UNKNOWN :
+		      break;
+
 		  case PPD_CUSTOM_CURVE :
 		  case PPD_CUSTOM_INVCURVE :
 		  case PPD_CUSTOM_POINTS :
@@ -1007,6 +1016,9 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	{
           switch (cparam->type)
 	  {
+	    case PPD_CUSTOM_UNKNOWN :
+	        break;
+
 	    case PPD_CUSTOM_CURVE :
 	    case PPD_CUSTOM_INVCURVE :
 	    case PPD_CUSTOM_POINTS :
diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c
index 9eca0cec7..7ec0df473 100644
--- a/cups/ppd-mark.c
+++ b/cups/ppd-mark.c
@@ -851,6 +851,9 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 
         switch (cparam->type)
 	{
+	  case PPD_CUSTOM_UNKNOWN :
+	      break;
+
 	  case PPD_CUSTOM_CURVE :
 	  case PPD_CUSTOM_INVCURVE :
 	  case PPD_CUSTOM_REAL :
@@ -928,6 +931,9 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 
 	switch (cparam->type)
 	{
+	  case PPD_CUSTOM_UNKNOWN :
+	      break;
+
 	  case PPD_CUSTOM_CURVE :
 	  case PPD_CUSTOM_INVCURVE :
 	  case PPD_CUSTOM_REAL :
diff --git a/cups/ppd.c b/cups/ppd.c
index 862201127..fae19c42e 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -705,6 +705,8 @@ _ppdOpen(
 	   strncmp(ll, keyword, ll_len)))
       {
 	DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));
+	free(string);
+	string = NULL;
 	continue;
       }
       else if (localization == _PPD_LOCALIZATION_ICC_PROFILES)
@@ -724,6 +726,8 @@ _ppdOpen(
 	if (i >= (int)(sizeof(color_keywords) / sizeof(color_keywords[0])))
 	{
 	  DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));
+	  free(string);
+	  string = NULL;
 	  continue;
 	}
       }
@@ -988,6 +992,13 @@ _ppdOpen(
 	goto error;
       }
 
+      if (cparam->type != PPD_CUSTOM_UNKNOWN)
+      {
+        pg->ppd_status = PPD_BAD_CUSTOM_PARAM;
+
+        goto error;
+      }
+
      /*
       * Get the parameter data...
       */
@@ -1861,6 +1872,13 @@ _ppdOpen(
     }
     else if (!strcmp(keyword, "PaperDimension"))
     {
+      if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7))
+      {
+        pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD;
+
+        goto error;
+      }
+
       if ((size = ppdPageSize(ppd, name)) == NULL)
 	size = ppd_add_size(ppd, name);
 
@@ -1883,6 +1901,13 @@ _ppdOpen(
     }
     else if (!strcmp(keyword, "ImageableArea"))
     {
+      if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7))
+      {
+        pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD;
+
+        goto error;
+      }
+
       if ((size = ppdPageSize(ppd, name)) == NULL)
 	size = ppd_add_size(ppd, name);
 
@@ -1912,6 +1937,13 @@ _ppdOpen(
     {
       DEBUG_printf(("2_ppdOpen: group=%p, subgroup=%p", group, subgroup));
 
+      if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7))
+      {
+        pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD;
+
+        goto error;
+      }
+
       if (!strcmp(keyword, "PageSize"))
       {
        /*
@@ -2636,6 +2668,7 @@ ppd_get_cparam(ppd_coption_t *opt,	/* I - PPD file */
   if ((cparam = calloc(1, sizeof(ppd_cparam_t))) == NULL)
     return (NULL);
 
+  cparam->type = PPD_CUSTOM_UNKNOWN;
   strlcpy(cparam->name, param, sizeof(cparam->name));
   strlcpy(cparam->text, text[0] ? text : param, sizeof(cparam->text));
 
diff --git a/cups/ppd.h b/cups/ppd.h
index 108f20e2a..f2ba50db8 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -226,6 +226,7 @@ typedef struct ppd_profile_s		/**** sRGB Color Profiles @deprecated@ ****/
 /**** New in CUPS 1.2/macOS 10.5 ****/
 typedef enum ppd_cptype_e		/**** Custom Parameter Type @deprecated@ ****/
 {
+  PPD_CUSTOM_UNKNOWN = -1,		/* Unknown type (error) */
   PPD_CUSTOM_CURVE,			/* Curve value for f(x) = x^value */
   PPD_CUSTOM_INT,			/* Integer number value */
   PPD_CUSTOM_INVCURVE,			/* Curve value for f(x) = x^(1/value) */
diff --git a/cups/snmp.c b/cups/snmp.c
index 5cefee454..1d9da01f2 100644
--- a/cups/snmp.c
+++ b/cups/snmp.c
@@ -1233,6 +1233,9 @@ asn1_get_integer(
   int	value;				/* Integer value */
 
 
+  if (*buffer >= bufend)
+    return (0);
+
   if (length > sizeof(int))
   {
     (*buffer) += length;
@@ -1259,6 +1262,9 @@ asn1_get_length(unsigned char **buffer,	/* IO - Pointer in buffer */
   unsigned	length;			/* Length */
 
 
+  if (*buffer >= bufend)
+    return (0);
+
   length = **buffer;
   (*buffer) ++;
 
@@ -1301,6 +1307,9 @@ asn1_get_oid(
   int		number;			/* OID number */
 
 
+  if (*buffer >= bufend)
+    return (0);
+
   valend = *buffer + length;
   oidptr = oid;
   oidend = oid + oidsize - 1;
@@ -1349,9 +1358,12 @@ asn1_get_packed(
   int	value;				/* Value */
 
 
+  if (*buffer >= bufend)
+    return (0);
+
   value = 0;
 
-  while ((**buffer & 128) && *buffer < bufend)
+  while (*buffer < bufend && (**buffer & 128))
   {
     value = (value << 7) | (**buffer & 127);
     (*buffer) ++;
@@ -1379,6 +1391,9 @@ asn1_get_string(
     char          *string,		/* I  - String buffer */
     size_t        strsize)		/* I  - String buffer size */
 {
+  if (*buffer >= bufend)
+    return (NULL);
+
   if (length > (unsigned)(bufend - *buffer))
     length = (unsigned)(bufend - *buffer);
 
@@ -1421,6 +1436,9 @@ asn1_get_type(unsigned char **buffer,	/* IO - Pointer in buffer */
   int	type;				/* Type */
 
 
+  if (*buffer >= bufend)
+    return (0);
+
   type = **buffer;
   (*buffer) ++;
 
diff --git a/cups/testipp.c b/cups/testipp.c
index 3514b94d5..aad53e46f 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,10 +1,11 @@
 /*
  * IPP test program for CUPS.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2005 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -44,7 +45,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		  0x01, 0x01,		/* IPP version */
 		  0x00, 0x02,		/* Print-Job operation */
 		  0x00, 0x00, 0x00, 0x01,
-		  			/* Request ID */
+					/* Request ID */
 
 		  IPP_TAG_OPERATION,
 
@@ -74,7 +75,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		  IPP_TAG_JOB,		/* job group tag */
 
 		  IPP_TAG_BEGIN_COLLECTION,
-		  			/* begCollection tag */
+					/* begCollection tag */
 		  0x00, 0x09,		/* Name length + name */
 		  'm', 'e', 'd', 'i', 'a', '-', 'c', 'o', 'l',
 		  0x00, 0x00,		/* No value */
@@ -83,11 +84,11 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		    0x00, 0x0a,		/* Value length + value */
 		    'm', 'e', 'd', 'i', 'a', '-', 's', 'i', 'z', 'e',
 		    IPP_TAG_BEGIN_COLLECTION,
-		    			/* begCollection tag */
+					/* begCollection tag */
 		    0x00, 0x00,		/* Name length + name */
 		    0x00, 0x00,		/* No value */
 		      IPP_TAG_MEMBERNAME,
-		      			/* memberAttrName tag */
+					/* memberAttrName tag */
 		      0x00, 0x00,	/* No name */
 		      0x00, 0x0b,	/* Value length + value */
 		      'x', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
@@ -96,7 +97,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		      0x00, 0x04,	/* Value length + value */
 		      0x00, 0x00, 0x54, 0x56,
 		      IPP_TAG_MEMBERNAME,
-		      			/* memberAttrName tag */
+					/* memberAttrName tag */
 		      0x00, 0x00,	/* No name */
 		      0x00, 0x0b,	/* Value length + value */
 		      'y', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
@@ -105,7 +106,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		      0x00, 0x04,	/* Value length + value */
 		      0x00, 0x00, 0x6d, 0x24,
 		    IPP_TAG_END_COLLECTION,
-		    			/* endCollection tag */
+					/* endCollection tag */
 		    0x00, 0x00,		/* No name */
 		    0x00, 0x00,		/* No value */
 		    IPP_TAG_MEMBERNAME,	/* memberAttrName tag */
@@ -126,12 +127,12 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		    0x00, 0x05,		/* Value length + value */
 		    'p', 'l', 'a', 'i', 'n',
 		  IPP_TAG_END_COLLECTION,
-		  			/* endCollection tag */
+					/* endCollection tag */
 		  0x00, 0x00,		/* No name */
 		  0x00, 0x00,		/* No value */
 
 		  IPP_TAG_BEGIN_COLLECTION,
-		  			/* begCollection tag */
+					/* begCollection tag */
 		  0x00, 0x00,		/* No name */
 		  0x00, 0x00,		/* No value */
 		    IPP_TAG_MEMBERNAME,	/* memberAttrName tag */
@@ -139,11 +140,11 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		    0x00, 0x0a,		/* Value length + value */
 		    'm', 'e', 'd', 'i', 'a', '-', 's', 'i', 'z', 'e',
 		    IPP_TAG_BEGIN_COLLECTION,
-		    			/* begCollection tag */
+					/* begCollection tag */
 		    0x00, 0x00,		/* Name length + name */
 		    0x00, 0x00,		/* No value */
 		      IPP_TAG_MEMBERNAME,
-		      			/* memberAttrName tag */
+					/* memberAttrName tag */
 		      0x00, 0x00,	/* No name */
 		      0x00, 0x0b,	/* Value length + value */
 		      'x', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
@@ -152,7 +153,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		      0x00, 0x04,	/* Value length + value */
 		      0x00, 0x00, 0x52, 0x08,
 		      IPP_TAG_MEMBERNAME,
-		      			/* memberAttrName tag */
+					/* memberAttrName tag */
 		      0x00, 0x00,	/* No name */
 		      0x00, 0x0b,	/* Value length + value */
 		      'y', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
@@ -161,7 +162,7 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		      0x00, 0x04,	/* Value length + value */
 		      0x00, 0x00, 0x74, 0x04,
 		    IPP_TAG_END_COLLECTION,
-		    			/* endCollection tag */
+					/* endCollection tag */
 		    0x00, 0x00,		/* No name */
 		    0x00, 0x00,		/* No value */
 		    IPP_TAG_MEMBERNAME,	/* memberAttrName tag */
@@ -182,7 +183,72 @@ static ipp_uchar_t collection[] =	/* Collection buffer */
 		    0x00, 0x06,		/* Value length + value */
 		    'g', 'l', 'o', 's', 's', 'y',
 		  IPP_TAG_END_COLLECTION,
-		  			/* endCollection tag */
+					/* endCollection tag */
+		  0x00, 0x00,		/* No name */
+		  0x00, 0x00,		/* No value */
+
+		  IPP_TAG_END		/* end tag */
+		};
+static ipp_uchar_t bad_collection[] =	/* Collection buffer (bad encoding) */
+		{
+		  0x01, 0x01,		/* IPP version */
+		  0x00, 0x02,		/* Print-Job operation */
+		  0x00, 0x00, 0x00, 0x01,
+					/* Request ID */
+
+		  IPP_TAG_OPERATION,
+
+		  IPP_TAG_CHARSET,
+		  0x00, 0x12,		/* Name length + name */
+		  'a','t','t','r','i','b','u','t','e','s','-',
+		  'c','h','a','r','s','e','t',
+		  0x00, 0x05,		/* Value length + value */
+		  'u','t','f','-','8',
+
+		  IPP_TAG_LANGUAGE,
+		  0x00, 0x1b,		/* Name length + name */
+		  'a','t','t','r','i','b','u','t','e','s','-',
+		  'n','a','t','u','r','a','l','-','l','a','n',
+		  'g','u','a','g','e',
+		  0x00, 0x02,		/* Value length + value */
+		  'e','n',
+
+		  IPP_TAG_URI,
+		  0x00, 0x0b,		/* Name length + name */
+		  'p','r','i','n','t','e','r','-','u','r','i',
+		  0x00, 0x1c,			/* Value length + value */
+		  'i','p','p',':','/','/','l','o','c','a','l',
+		  'h','o','s','t','/','p','r','i','n','t','e',
+		  'r','s','/','f','o','o',
+
+		  IPP_TAG_JOB,		/* job group tag */
+
+		  IPP_TAG_BEGIN_COLLECTION,
+					/* begCollection tag */
+		  0x00, 0x09,		/* Name length + name */
+		  'm', 'e', 'd', 'i', 'a', '-', 'c', 'o', 'l',
+		  0x00, 0x00,		/* No value */
+		    IPP_TAG_BEGIN_COLLECTION,
+					/* begCollection tag */
+		    0x00, 0x0a,		/* Name length + name */
+		    'm', 'e', 'd', 'i', 'a', '-', 's', 'i', 'z', 'e',
+		    0x00, 0x00,		/* No value */
+		      IPP_TAG_INTEGER,	/* integer tag */
+		      0x00, 0x0b,	/* Name length + name */
+		      'x', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
+		      0x00, 0x04,	/* Value length + value */
+		      0x00, 0x00, 0x54, 0x56,
+		      IPP_TAG_INTEGER,	/* integer tag */
+		      0x00, 0x0b,	/* Name length + name */
+		      'y', '-', 'd', 'i', 'm', 'e', 'n', 's', 'i', 'o', 'n',
+		      0x00, 0x04,	/* Value length + value */
+		      0x00, 0x00, 0x6d, 0x24,
+		    IPP_TAG_END_COLLECTION,
+					/* endCollection tag */
+		    0x00, 0x00,		/* No name */
+		    0x00, 0x00,		/* No value */
+		  IPP_TAG_END_COLLECTION,
+					/* endCollection tag */
 		  0x00, 0x00,		/* No name */
 		  0x00, 0x00,		/* No value */
 
@@ -194,7 +260,7 @@ static ipp_uchar_t mixed[] =		/* Mixed value buffer */
 		  0x01, 0x01,		/* IPP version */
 		  0x00, 0x02,		/* Print-Job operation */
 		  0x00, 0x00, 0x00, 0x01,
-		  			/* Request ID */
+					/* Request ID */
 
 		  IPP_TAG_OPERATION,
 
@@ -223,6 +289,7 @@ static ipp_uchar_t mixed[] =		/* Mixed value buffer */
 void	hex_dump(const char *title, ipp_uchar_t *buffer, size_t bytes);
 void	print_attributes(ipp_t *ipp, int indent);
 ssize_t	read_cb(_ippdata_t *data, ipp_uchar_t *buffer, size_t bytes);
+ssize_t	read_hex(cups_file_t *fp, ipp_uchar_t *buffer, size_t bytes);
 int	token_cb(_ipp_file_t *f, _ipp_vars_t *v, void *user_data, const char *token);
 ssize_t	write_cb(_ippdata_t *data, ipp_uchar_t *buffer, size_t bytes);
 
@@ -585,11 +652,32 @@ main(int  argc,			/* I - Number of command-line arguments */
     ippDelete(request);
 
    /*
+    * Read the bad collection data and confirm we get an error...
+    */
+
+    fputs("Read Bad Collection from Memory: ", stdout);
+
+    request = ippNew();
+    data.rpos    = 0;
+    data.wused   = sizeof(bad_collection);
+    data.wsize   = sizeof(bad_collection);
+    data.wbuffer = bad_collection;
+
+    while ((state = ippReadIO(&data, (ipp_iocb_t)read_cb, 1, NULL, request)) != IPP_STATE_DATA)
+      if (state == IPP_STATE_ERROR)
+	break;
+
+    if (state != IPP_STATE_ERROR)
+      puts("FAIL (read successful)");
+    else
+      puts("PASS");
+
+   /*
     * Read the mixed data and confirm we converted everything to rangeOfInteger
     * values...
     */
 
-    printf("Read Mixed integer/rangeOfInteger from Memory: ");
+    fputs("Read Mixed integer/rangeOfInteger from Memory: ", stdout);
 
     request = ippNew();
     data.rpos    = 0;
@@ -719,6 +807,33 @@ main(int  argc,			/* I - Number of command-line arguments */
         request = _ippFileParse(&v, argv[i], NULL);
         _ippVarsDeinit(&v);
       }
+      else if (strlen(argv[i]) > 4 && !strcmp(argv[i] + strlen(argv[i]) - 4, ".hex"))
+      {
+       /*
+        * Read a hex-encoded IPP message...
+        */
+
+	if ((fp = cupsFileOpen(argv[i], "r")) == NULL)
+	{
+	  printf("Unable to open \"%s\" - %s\n", argv[i], strerror(errno));
+	  status = 1;
+	  continue;
+	}
+
+	request = ippNew();
+	while ((state = ippReadIO(fp, (ipp_iocb_t)read_hex, 1, NULL, request)) == IPP_STATE_ATTRIBUTE);
+
+	if (state != IPP_STATE_DATA)
+	{
+	  printf("Error reading IPP message from \"%s\": %s\n", argv[i], cupsLastErrorString());
+	  status = 1;
+
+	  ippDelete(request);
+	  request = NULL;
+	}
+
+        cupsFileClose(fp);
+      }
       else
       {
        /*
@@ -887,6 +1002,48 @@ read_cb(_ippdata_t   *data,		/* I - Data */
 
 
 /*
+ * 'read_hex()' - Read a hex dump of an IPP request.
+ */
+
+ssize_t					/* O - Number of bytes read */
+read_hex(cups_file_t *fp,		/* I - File to read from */
+         ipp_uchar_t *buffer,		/* I - Buffer to read */
+         size_t      bytes)		/* I - Number of bytes to read */
+{
+  size_t	total = 0;		/* Total bytes read */
+  static char	hex[256] = "";		/* Line from file */
+  static char	*hexptr = NULL;		/* Pointer in line */
+
+
+  while (total < bytes)
+  {
+    if (!hexptr || (isspace(hexptr[0] & 255) && isspace(hexptr[1] & 255)))
+    {
+      if (!cupsFileGets(fp, hex, sizeof(hex)))
+        break;
+
+      hexptr = hex;
+      while (isxdigit(*hexptr & 255))
+        hexptr ++;
+      while (isspace(*hexptr & 255))
+        hexptr ++;
+
+      if (!isxdigit(*hexptr & 255))
+      {
+        hexptr = NULL;
+        continue;
+      }
+    }
+
+    *buffer++ = (ipp_uchar_t)strtol(hexptr, &hexptr, 16);
+    total ++;
+  }
+
+  return (total == 0 ? -1 : (ssize_t)total);
+}
+
+
+/*
  * 'token_cb()' - Token callback for ASCII IPP data file parser.
  */
 
diff --git a/cups/testppd.c b/cups/testppd.c
index 13598c91b..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1253,6 +1253,10 @@ main(int  argc,				/* I - Number of command-line arguments */
             {
 	      switch (cparam->type)
 	      {
+	        case PPD_CUSTOM_UNKNOWN :
+		    printf("              %s(%s): PPD_CUSTOM_UNKNOWN (error)\n", cparam->name, cparam->text);
+	            break;
+
 	        case PPD_CUSTOM_CURVE :
 		    printf("              %s(%s): PPD_CUSTOM_CURVE (%g to %g)\n",
 		           cparam->name, cparam->text,
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index f18ff215f..e8c4fb713 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -15,32 +15,7 @@
  */
 
 #include <spawn.h>
-
-extern char **environ;
-
-
-#ifndef _SECURITY_VERSION_GREATER_THAN_57610_
-typedef CF_OPTIONS(uint32_t, SecKeyUsage) {
-    kSecKeyUsageAll              = 0x7FFFFFFF
-};
-#endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */
-extern const void * kSecCSRChallengePassword;
-extern const void * kSecSubjectAltName;
-extern const void * kSecCertificateKeyUsage;
-extern const void * kSecCSRBasicContraintsPathLen;
-extern const void * kSecCertificateExtensions;
-extern const void * kSecCertificateExtensionsEncoded;
-extern const void * kSecOidCommonName;
-extern const void * kSecOidCountryName;
-extern const void * kSecOidStateProvinceName;
-extern const void * kSecOidLocalityName;
-extern const void * kSecOidOrganization;
-extern const void * kSecOidOrganizationalUnit;
-extern bool SecCertificateIsValid(SecCertificateRef certificate, CFAbsoluteTime verifyTime);
-extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate);
-extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef publicKey, SecKeyRef privateKey);
-extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey);
-
+#include "tls-darwin.h"
 
 /*
  * Constants, very secure stuff...
diff --git a/cups/tls-darwin.h b/cups/tls-darwin.h
new file mode 100644
index 000000000..ca4136e3a
--- /dev/null
+++ b/cups/tls-darwin.h
@@ -0,0 +1,35 @@
+/*
+ * TLS support header for CUPS on macOS.
+ *
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
+ *
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
+ */
+
+/**** This file is included from tls-darwin.c ****/
+
+extern char **environ;
+
+#ifndef _SECURITY_VERSION_GREATER_THAN_57610_
+typedef CF_OPTIONS(uint32_t, SecKeyUsage) {
+    kSecKeyUsageAll              = 0x7FFFFFFF
+};
+#endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */
+extern const void * kSecCSRChallengePassword;
+extern const void * kSecSubjectAltName;
+extern const void * kSecCertificateKeyUsage;
+extern const void * kSecCSRBasicContraintsPathLen;
+extern const void * kSecCertificateExtensions;
+extern const void * kSecCertificateExtensionsEncoded;
+extern const void * kSecOidCommonName;
+extern const void * kSecOidCountryName;
+extern const void * kSecOidStateProvinceName;
+extern const void * kSecOidLocalityName;
+extern const void * kSecOidOrganization;
+extern const void * kSecOidOrganizationalUnit;
+extern bool SecCertificateIsValid(SecCertificateRef certificate, CFAbsoluteTime verifyTime);
+extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate);
+extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef publicKey, SecKeyRef privateKey);
+extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey);
diff --git a/cups/versioning.h b/cups/versioning.h
index aae2138e8..14c218fee 100644
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -116,9 +116,9 @@
 #    define _CUPS_API_1_7 API_AVAILABLE(macos(10.9), ios(11.0)) _CUPS_PUBLIC
 #    define _CUPS_API_2_0 API_AVAILABLE(macos(10.10), ios(11.0)) _CUPS_PUBLIC
 #    define _CUPS_API_2_2 API_AVAILABLE(macos(10.12), ios(11.0)) _CUPS_PUBLIC
-#    define _CUPS_API_2_2_4 API_AVAILABLE(macos(10.13), ios(11.0)) _CUPS_PUBLIC
-#    define _CUPS_API_2_2_7 API_AVAILABLE(macos(10.14), ios(11.0)) _CUPS_PUBLIC
-#    define _CUPS_API_2_3 _CUPS_PUBLIC
+#    define _CUPS_API_2_2_4 API_AVAILABLE(macos(10.13), ios(12.0)) _CUPS_PUBLIC
+#    define _CUPS_API_2_2_7 API_AVAILABLE(macos(10.14), ios(13.0)) _CUPS_PUBLIC
+#    define _CUPS_API_2_3 API_AVAILABLE(macos(10.14), ios(13.0)) _CUPS_PUBLIC
 #  else
 #    define _CUPS_API_1_1_19 _CUPS_PUBLIC
 #    define _CUPS_API_1_1_20 _CUPS_PUBLIC
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 8b80e8e80..6bc98c806 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-d73fa697171b2a2e1dba7f1bfb519beb38625375
-d73fa697171b2a2e1dba7f1bfb519beb38625375
-0450ddd4f003de8aa8d8e7a54d181a992607d031
+28d60c4020cb2d40bfe203f3a25e5ea529a56c24
+28d60c4020cb2d40bfe203f3a25e5ea529a56c24
+820f9bee82ab0efa5c0a58deab195190964eeb45
 820f9bee82ab0efa5c0a58deab195190964eeb45
 cups_2.3.0.orig.tar.gz
 ccdce595a90d768968b1e908684594738eba3a91
diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
index ba5255581..7f52322ff 100644
--- a/debian/patches/0003-Install-root-backends-world-readable.patch
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -1,3 +1,4 @@
+From 7e6fcb571a7307a595de2e1214dbf7b474d64b3a Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:06 +0200
 Subject: Install root backends world-readable
@@ -16,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/410171
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/backend/Makefile b/backend/Makefile
-index e3ce49b..b734458 100644
+index e3ce49be6..b73445857 100644
 --- a/backend/Makefile
 +++ b/backend/Makefile
 @@ -13,7 +13,7 @@ include ../Makedefs
@@ -38,7 +39,7 @@ index e3ce49b..b734458 100644
  	for file in $(UBACKENDS); do \
  		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
 diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
-index 77703b9..14478fd 100644
+index 77703b983..14478fd99 100644
 --- a/scheduler/cups-deviced.c
 +++ b/scheduler/cups-deviced.c
 @@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
@@ -51,7 +52,7 @@ index 77703b9..14478fd 100644
  
    cupsDirClose(dir);
 diff --git a/scheduler/job.c b/scheduler/job.c
-index 33ad702..81acecd 100644
+index 2cfb1b03d..515fc8b5e 100644
 --- a/scheduler/job.c
 +++ b/scheduler/job.c
 @@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
diff --git a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index 9f41361a3..bd70c63f2 100644
--- a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,8 +1,9 @@
+From 2474a5970d84faed3cc688a6748461cb2b5c7fd4 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:30 +0200
 Subject: Let snmp backend also use manufacturer-specific MIBs
 MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
  … of HP and Ricoh to obtain the device IDs of network-connected
@@ -17,7 +18,7 @@ Bug: https://www.cups.org/str.php?L3552
  1 file changed, 8 insertions(+)
 
 diff --git a/backend/snmp.c b/backend/snmp.c
-index 66ac884..9572822 100644
+index 66ac884c6..9572822a8 100644
 --- a/backend/snmp.c
 +++ b/backend/snmp.c
 @@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
diff --git a/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
index dc0e15b54..c459271e0 100644
--- a/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ b/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -1,3 +1,4 @@
+From 1fa058eaa7d4fc4127a687edcaf5ada96f76bcd1 Mon Sep 17 00:00:00 2001
 From: Helmut Grohne <helmut@subdivi.de>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Build mantohtml with the build architecture compiler
@@ -17,7 +18,7 @@ Bug-Debian: https://bugs.debian.org/837936
  4 files changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/Makedefs.in b/Makedefs.in
-index c71e813..7b99dab 100644
+index 038bb9451..291099cf2 100644
 --- a/Makedefs.in
 +++ b/Makedefs.in
 @@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
@@ -29,7 +30,7 @@ index c71e813..7b99dab 100644
  CXX		=	@LIBTOOL_CXX@ @CXX@
  DSO		=	@DSO@
 diff --git a/configure.ac b/configure.ac
-index c7f58b6..8ca5393 100644
+index 7eca9e37f..2dfdbb93c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
@@ -49,7 +50,7 @@ index c7f58b6..8ca5393 100644
  sinclude(config-scripts/cups-libtool.m4)
  sinclude(config-scripts/cups-compiler.m4)
 diff --git a/man/Makefile b/man/Makefile
-index 621fe60..e01591a 100644
+index 621fe60c1..e01591a93 100644
 --- a/man/Makefile
 +++ b/man/Makefile
 @@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
@@ -62,7 +63,7 @@ index 621fe60..e01591a 100644
 +mantohtml:	mantohtml.c
 +	$(CC_FOR_BUILD) -o $@ $<
 diff --git a/man/mantohtml.c b/man/mantohtml.c
-index 2a9353a..6223f17 100644
+index 2a9353a9f..6223f17d2 100644
 --- a/man/mantohtml.c
 +++ b/man/mantohtml.c
 @@ -11,8 +11,10 @@
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index b3eaaf773..242eaff81 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,7 +1,8 @@
+From aaf1b2a721086ece6a680eec900ba2976000e398 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:29 +0200
-Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
- iPod Touch to a CUPS server)
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
+ Touch to a CUPS server)
 
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
@@ -19,7 +20,7 @@ Patch-Name: airprint-support.patch
  5 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/conf/mime.convs.in b/conf/mime.convs.in
-index 57b459d..e042e01 100644
+index 57b459d73..e042e0129 100644
 --- a/conf/mime.convs.in
 +++ b/conf/mime.convs.in
 @@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
@@ -33,7 +34,7 @@ index 57b459d..e042e01 100644
  #
  # Raw filter...
 diff --git a/conf/mime.types b/conf/mime.types
-index fcd6b6e..ebb0525 100644
+index fcd6b6eff..ebb05257e 100644
 --- a/conf/mime.types
 +++ b/conf/mime.types
 @@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
@@ -47,7 +48,7 @@ index fcd6b6e..ebb0525 100644
  #
  # Text files...
 diff --git a/scheduler/conf.c b/scheduler/conf.c
-index bb6049b..bb4f9d2 100644
+index bb6049b2c..bb4f9d215 100644
 --- a/scheduler/conf.c
 +++ b/scheduler/conf.c
 @@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
@@ -60,7 +61,7 @@ index bb6049b..bb4f9d2 100644
  #endif /* HAVE_DNSSD || HAVE_AVAHI */
  
 diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
-index ddd3701..fb2a305 100644
+index ddd3701e0..fb2a30526 100644
 --- a/scheduler/dirsvc.c
 +++ b/scheduler/dirsvc.c
 @@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
@@ -77,10 +78,10 @@ index ddd3701..fb2a305 100644
      {
        keyvalue[count  ][0] = "air";
 diff --git a/scheduler/printers.c b/scheduler/printers.c
-index 1984a65..2578aa7 100644
+index 542523760..b366bf588 100644
 --- a/scheduler/printers.c
 +++ b/scheduler/printers.c
-@@ -3811,7 +3811,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
        }
        else if (!_cups_strcasecmp(type->super, "image"))
        {
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
index 524090f2b..61e38896f 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,3 +1,4 @@
+From e61a3fa6794d59e1868b982ded16f37df0fbc50f Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:41 +0200
 Subject: Do not mess with the permissions of cupsd.conf.
@@ -10,7 +11,7 @@ Patch-Name: confdirperms.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/scheduler/conf.c b/scheduler/conf.c
-index b73d33f..31eedbf 100644
+index b73d33f93..31eedbf71 100644
 --- a/scheduler/conf.c
 +++ b/scheduler/conf.c
 @@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
index ae394c561..49b4aad77 100644
--- a/debian/patches/cups-set-default-error-policy-retry-job.patch
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -1,3 +1,4 @@
+From 80ca9110d73f5128b16032f5a35723bc8665313e Mon Sep 17 00:00:00 2001
 From: Martin Pitt <martin.pitt@ubuntu.com>
 Date: Tue, 9 Aug 2016 18:11:47 +0200
 Subject: Set default job error policy to "retry-job", since it is less
@@ -17,7 +18,7 @@ Patch-Name: cups-set-default-error-policy-retry-job.patch
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
-index 10101db..9889166 100644
+index 1668eee8a..7d161edd2 100644
 --- a/doc/help/man-cupsd.conf.html
 +++ b/doc/help/man-cupsd.conf.html
 @@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
@@ -33,7 +34,7 @@ index 10101db..9889166 100644
  <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
  A limit of 0 disables filter limiting.
 diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
-index 5788265..79f17ea 100644
+index 49fdb06b1..6d3d8e393 100644
 --- a/man/cupsd.conf.5
 +++ b/man/cupsd.conf.5
 @@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
@@ -50,7 +51,7 @@ index 5788265..79f17ea 100644
  .TP 5
  \fBFilterLimit \fIlimit\fR
 diff --git a/scheduler/conf.c b/scheduler/conf.c
-index f2924f8..944655e 100644
+index f2924f844..944655ecb 100644
 --- a/scheduler/conf.c
 +++ b/scheduler/conf.c
 @@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
index 7352732b2..68aff3a72 100644
--- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -1,3 +1,4 @@
+From 9049c3015d0fe5add9d2d0de24366283f9df7ede Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:46 +0200
 Subject: Set the default for SyncOnClose to Yes
@@ -13,7 +14,7 @@ Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
-index 4a78ba6..a3d088d 100644
+index 4a78ba615..a3d088da5 100644
 --- a/conf/cups-files.conf.in
 +++ b/conf/cups-files.conf.in
 @@ -7,7 +7,7 @@
@@ -26,7 +27,7 @@ index 4a78ba6..a3d088d 100644
  # Default user and group for filters/backends/helper programs; this cannot be
  # any user or group that resolves to ID 0 for security reasons...
 diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
-index c567cbb..f2f6802 100644
+index c567cbba7..f2f6802e6 100644
 --- a/doc/help/man-cups-files.conf.html
 +++ b/doc/help/man-cups-files.conf.html
 @@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
@@ -39,7 +40,7 @@ index c567cbb..f2f6802 100644
  <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
  The default contains "admin", "lpadmin", "root", "sys", and/or "system".
 diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
-index 7249406..955f47b 100644
+index 72494065c..955f47b55 100644
 --- a/man/cups-files.conf.5
 +++ b/man/cups-files.conf.5
 @@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
@@ -52,7 +53,7 @@ index 7249406..955f47b 100644
  .TP 5
  \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
 diff --git a/scheduler/conf.c b/scheduler/conf.c
-index 31eedbf..f2924f8 100644
+index 31eedbf71..f2924f844 100644
 --- a/scheduler/conf.c
 +++ b/scheduler/conf.c
 @@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
index 05e6037ef..d2cec1110 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,3 +1,4 @@
+From 4ae7f022cbd6bf3ce0db078ad847c13f876de1d5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Use dpkg-architecture in cups-config to make it
@@ -17,7 +18,7 @@ Patch-Name: debianize_cups-config.patch
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/cups-config.in b/cups-config.in
-index 9dd094d..b073a07 100755
+index 9dd094d16..b073a074a 100755
 --- a/cups-config.in
 +++ b/cups-config.in
 @@ -17,7 +17,7 @@ prefix=@prefix@
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
index fca2bee7c..fcc62bc41 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,3 +1,4 @@
+From 7a56ba79974cab424dce061f8fdbabda54d11af7 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:40 +0200
 Subject: Deactivate CUPS' own log rotating as the system already provides a
@@ -11,7 +12,7 @@ Patch-Name: default_log_settings.patch
  1 file changed, 4 insertions(+)
 
 diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
-index ab37ca6..78189e5 100644
+index ab37ca68c..78189e535 100644
 --- a/conf/cupsd.conf.in
 +++ b/conf/cupsd.conf.in
 @@ -8,6 +8,10 @@
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
index 339a35266..e327baddf 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,3 +1,4 @@
+From 69c18bbfd8b929d8dc3e4fd06ae672cc1073e4fb Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:35 +0200
 Subject: Do not use host names for broadcasting print queues and
@@ -12,7 +13,7 @@ Patch-Name: do-not-broadcast-with-hostnames.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scheduler/conf.c b/scheduler/conf.c
-index bb4f9d2..b73d33f 100644
+index bb4f9d215..b73d33f93 100644
 --- a/scheduler/conf.c
 +++ b/scheduler/conf.c
 @@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
index 55c7b16d5..e2126cdc8 100644
--- a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -1,3 +1,4 @@
+From 37869bd8f18d81325b189315c9b1949ba74253df Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:07 +0200
 Subject: Fix jobs with multiple files or multiple formats
@@ -11,7 +12,7 @@ Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/backend/ipp.c b/backend/ipp.c
-index 7851956..08a6196 100644
+index 8226acc7b..5902dd6cb 100644
 --- a/backend/ipp.c
 +++ b/backend/ipp.c
 @@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index e72ba5836..f335bbe4d 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,3 +1,4 @@
+From 7ac113c693bddb95bac40bb945eb296969781c1d Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:38 +0200
 Subject: Make log files readable to group "adm", if present.
@@ -11,7 +12,7 @@ Patch-Name: logfiles_adm_readable.patch
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/scheduler/log.c b/scheduler/log.c
-index cdb5437..d53d140 100644
+index cdb5437dc..d53d1401c 100644
 --- a/scheduler/log.c
 +++ b/scheduler/log.c
 @@ -21,6 +21,7 @@
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
index 711f28dff..e62ad8b0e 100644
--- a/debian/patches/man-cups-lpd-drop-dangling-references.patch
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -1,4 +1,5 @@
-From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+From e592e92ab6c05bb920898e5371c6ef246ae67e18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
 Date: Tue, 9 Aug 2016 18:11:48 +0200
 Subject: Drop dangling references from cups-lpd.man
 
@@ -10,7 +11,7 @@ Patch-Name: man-cups-lpd-drop-dangling-references.patch
  1 file changed, 2 deletions(-)
 
 diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
-index 344d2af..e998df3 100644
+index 344d2af2b..e998df361 100644
 --- a/man/cups-lpd.8
 +++ b/man/cups-lpd.8
 @@ -109,9 +109,7 @@ Simply enable the
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
index 92d130057..1993a567e 100644
--- a/debian/patches/manpage-hyphen-minus.patch
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -1,3 +1,4 @@
+From df131bf9aa20180603b678a2daa39881164b725a Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:05 +0200
 Subject: Fix hyphen-used-as-minus-sign manpage errors
@@ -35,7 +36,7 @@ Patch-Name: manpage-hyphen-minus.patch
  21 files changed, 65 insertions(+), 65 deletions(-)
 
 diff --git a/man/backend.7 b/man/backend.7
-index 5a70326..3c42631 100644
+index 5a7032650..3c426310c 100644
 --- a/man/backend.7
 +++ b/man/backend.7
 @@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
@@ -57,7 +58,7 @@ index 5a70326..3c42631 100644
  for more information.
  .SH NOTES
 diff --git a/man/client.conf.5 b/man/client.conf.5
-index 8805561..92f1d95 100644
+index 8805561db..92f1d9575 100644
 --- a/man/client.conf.5
 +++ b/man/client.conf.5
 @@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
@@ -79,7 +80,7 @@ index 8805561..92f1d95 100644
  defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
  .fi
 diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
-index b451e2f..7249406 100644
+index b451e2f92..72494065c 100644
 --- a/man/cups-files.conf.5
 +++ b/man/cups-files.conf.5
 @@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
@@ -92,7 +93,7 @@ index b451e2f..7249406 100644
  Writing to directories is not supported.
  .\"#FontPath
 diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
-index e8ce325..344d2af 100644
+index e8ce3251f..344d2af2b 100644
 --- a/man/cups-lpd.8
 +++ b/man/cups-lpd.8
 @@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
@@ -117,7 +118,7 @@ index e8ce325..344d2af 100644
  .B cups-lpd
  will try to discover the hostname of the client via a reverse DNS lookup.
 diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
-index 4ca20f2..bb77c73 100644
+index 4ca20f24f..bb77c7342 100644
 --- a/man/cups-snmp.conf.5
 +++ b/man/cups-snmp.conf.5
 @@ -16,7 +16,7 @@ The
@@ -130,7 +131,7 @@ index 4ca20f2..bb77c73 100644
  .SH DIRECTIVES
  The following directives are understood by the CUPS network backends:
 diff --git a/man/cups.1 b/man/cups.1
-index 706620d..b0c51a7 100644
+index 706620d7c..b0c51a738 100644
 --- a/man/cups.1
 +++ b/man/cups.1
 @@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
@@ -143,7 +144,7 @@ index 706620d..b0c51a7 100644
  Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
  .LP
 diff --git a/man/cupsctl.8 b/man/cupsctl.8
-index 791954c..c88eb22 100644
+index 791954c19..c88eb22ec 100644
 --- a/man/cupsctl.8
 +++ b/man/cupsctl.8
 @@ -73,19 +73,19 @@ Display the current settings:
@@ -170,7 +171,7 @@ index 791954c..c88eb22 100644
  .SH KNOWN ISSUES
  You cannot set the Listen or Port directives using \fBcupsctl\fR.
 diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
-index 2070be9..a912c46 100644
+index 2070be9a5..a912c4693 100644
 --- a/man/cupsd-logs.5
 +++ b/man/cupsd-logs.5
 @@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
@@ -254,7 +255,7 @@ index 2070be9..a912c46 100644
  .BR cupsd (8),
  .BR cupsd.conf (5),
 diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
-index 75d0602..5788265 100644
+index 00b1a22d6..49fdb06b1 100644
 --- a/man/cupsd.conf.5
 +++ b/man/cupsd.conf.5
 @@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
@@ -267,7 +268,7 @@ index 75d0602..5788265 100644
  The \fIMaxTLS\fR options set the maximum TLS version to support.
  Not all operating systems support TLS 1.3 at this time.
 diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
-index c655c21..fe4c5a2 100644
+index c655c21c0..fe4c5a2cf 100644
 --- a/man/cupsfilter.8
 +++ b/man/cupsfilter.8
 @@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
@@ -280,7 +281,7 @@ index c655c21..fe4c5a2 100644
  .SH SEE ALSO
  .BR cups (1),
 diff --git a/man/filter.7 b/man/filter.7
-index dbc3150..8cb79bb 100644
+index dbc3150c8..8cb79bbf9 100644
 --- a/man/filter.7
 +++ b/man/filter.7
 @@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
@@ -293,7 +294,7 @@ index dbc3150..8cb79bb 100644
  .TP 5
  \fBWARNING:\fI message\fR
 diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
-index 5753c69..2fcda8b 100644
+index 5753c69da..2fcda8b9f 100644
 --- a/man/ippeveprinter.1
 +++ b/man/ippeveprinter.1
 @@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
@@ -317,7 +318,7 @@ index 5753c69..2fcda8b 100644
  .TP 5
  \fBSTATE: +\fIkeyword[,keyword,...]\fR
 diff --git a/man/ippfind.1 b/man/ippfind.1
-index 32f2e6f..d77ef75 100644
+index 32f2e6f8b..d77ef75cc 100644
 --- a/man/ippfind.1
 +++ b/man/ippfind.1
 @@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
@@ -348,16 +349,16 @@ index 32f2e6f..d77ef75 100644
  Expressions may also contain modifiers:
  .TP 5
 diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
-index 5ef6219..9cd6403 100644
+index 700101773..576323291 100644
 --- a/man/ipptoolfile.5
 +++ b/man/ipptoolfile.5
 @@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
  \fBATTR \fItag attribute-name value(s)\fR
  Adds an attribute to the test request.
  Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
--Values for other tags are separated by the comma (",") character - escape commas using the "\" character.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
 -Common attributes and values are listed in the IANA IPP registry - see references below.
-+Values for other tags are separated by the comma (",") character \- escape commas using the "\" character.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
 +Common attributes and values are listed in the IANA IPP registry \- see references below.
  .TP 5
  \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
@@ -381,7 +382,7 @@ index 5ef6219..9cd6403 100644
  \fBTEST\-ID "\fIidentifier\fR"
  Specifies an identifier string for the current test.
 diff --git a/man/lp.1 b/man/lp.1
-index cbea3b8..839a482 100644
+index cbea3b840..839a48278 100644
 --- a/man/lp.1
 +++ b/man/lp.1
 @@ -83,7 +83,7 @@ lp \- print files
@@ -435,7 +436,7 @@ index cbea3b8..839a482 100644
  .SH SEE ALSO
  .BR cancel (1),
 diff --git a/man/lpadmin.8 b/man/lpadmin.8
-index 1b8c91b..ce6a698 100644
+index 1b8c91ba4..ce6a698ff 100644
 --- a/man/lpadmin.8
 +++ b/man/lpadmin.8
 @@ -120,7 +120,7 @@ command.
@@ -466,7 +467,7 @@ index 1b8c91b..ce6a698 100644
  .fi
  .SH SEE ALSO
 diff --git a/man/lpoptions.1 b/man/lpoptions.1
-index a34fd01..7550d9a 100644
+index a34fd01dc..7550d9afb 100644
 --- a/man/lpoptions.1
 +++ b/man/lpoptions.1
 @@ -102,9 +102,9 @@ Destinations can only be removed using the
@@ -482,7 +483,7 @@ index a34fd01..7550d9a 100644
  The \fBlpoptions\fR command is unique to CUPS.
  .SH SEE ALSO
 diff --git a/man/lpr.1 b/man/lpr.1
-index f367cd9..635d126 100644
+index f367cd97c..635d126d6 100644
 --- a/man/lpr.1
 +++ b/man/lpr.1
 @@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
@@ -518,7 +519,7 @@ index f367cd9..635d126 100644
  .SH SEE ALSO
  .BR cancel (1),
 diff --git a/man/mime.convs.5 b/man/mime.convs.5
-index 25a6f76..04ba394 100644
+index 25a6f7653..04ba39494 100644
 --- a/man/mime.convs.5
 +++ b/man/mime.convs.5
 @@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
@@ -537,7 +538,7 @@ index 25a6f76..04ba394 100644
  Define a filter that converts PostScript documents to CUPS Raster format:
  .nf
 diff --git a/man/mime.types.5 b/man/mime.types.5
-index 7e83de1..3572726 100644
+index 7e83de16a..3572726f5 100644
 --- a/man/mime.types.5
 +++ b/man/mime.types.5
 @@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
@@ -559,7 +560,7 @@ index 7e83de1..3572726 100644
  Define two MIME media types for raster data, with one being a subset with higher priority:
  .nf
 diff --git a/man/ppdc.1 b/man/ppdc.1
-index 44e9d24..38e2669 100644
+index 44e9d2448..38e266978 100644
 --- a/man/ppdc.1
 +++ b/man/ppdc.1
 @@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
index 575d4c653..f0ef0fcff 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,8 +1,9 @@
+From 28d60c4020cb2d40bfe203f3a25e5ea529a56c24 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:50 +0200
 Subject: po4a infrastructure and translations for manpages.
 MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
@@ -12,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/478597
 Patch-Name: manpage-translations.patch
 ---
  man/Makefile      |  17 +++-
- man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++
  man/de/Makefile   |   7 ++
  man/fr/Makefile   |   7 ++
  4 files changed, 264 insertions(+), 2 deletions(-)
@@ -21,7 +22,7 @@ Patch-Name: manpage-translations.patch
  create mode 100644 man/fr/Makefile
 
 diff --git a/man/Makefile b/man/Makefile
-index e01591a..48f06c4 100644
+index e01591a93..48f06c48a 100644
 --- a/man/Makefile
 +++ b/man/Makefile
 @@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
@@ -76,7 +77,7 @@ index e01591a..48f06c4 100644
  #
 diff --git a/man/Makefile.l10n b/man/Makefile.l10n
 new file mode 100644
-index 0000000..08390f5
+index 000000000..08390f5dc
 --- /dev/null
 +++ b/man/Makefile.l10n
 @@ -0,0 +1,235 @@
@@ -317,7 +318,7 @@ index 0000000..08390f5
 +	$(CC_FOR_BUILD) -o $@ $<
 diff --git a/man/de/Makefile b/man/de/Makefile
 new file mode 100644
-index 0000000..7c23784
+index 000000000..7c237840e
 --- /dev/null
 +++ b/man/de/Makefile
 @@ -0,0 +1,7 @@
@@ -330,7 +331,7 @@ index 0000000..7c23784
 +include ../Makefile.l10n
 diff --git a/man/fr/Makefile b/man/fr/Makefile
 new file mode 100644
-index 0000000..6a50e93
+index 000000000..6a50e9348
 --- /dev/null
 +++ b/man/fr/Makefile
 @@ -0,0 +1,7 @@
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
index 59c3c09e0..505d7fd22 100644
--- a/debian/patches/move-cupsd-conf-default-to-share.patch
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -1,3 +1,4 @@
+From 07f2a4581effba6b7ee88cc89ca15c679d5155db Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:24 +0200
 Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
@@ -14,7 +15,7 @@ Patch-Name: move-cupsd-conf-default-to-share.patch
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
-index f8c5763..fa4d82c 100644
+index f087809f7..6e9a64a7c 100644
 --- a/cgi-bin/admin.c
 +++ b/cgi-bin/admin.c
 @@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
@@ -38,7 +39,7 @@ index f8c5763..fa4d82c 100644
      if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
          (cupsd = cupsFileOpen(filename, "r")) != NULL)
 diff --git a/conf/Makefile b/conf/Makefile
-index e249e60..42a123f 100644
+index e249e6069..42a123f75 100644
 --- a/conf/Makefile
 +++ b/conf/Makefile
 @@ -70,7 +70,7 @@ install-data:
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
index 9a099f0f4..60be402ba 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,7 +1,8 @@
+From 1adcbd790f2a304c91a674520d3e50d83e9ddca8 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joeyh@debian.org>
 Date: Tue, 9 Aug 2016 18:11:31 +0200
-Subject: Disable time stamps in conffiles,
- to avoid ever-changing files in /etc.
+Subject: Disable time stamps in conffiles, to avoid ever-changing files in
+ /etc.
 
 Bug: https://github.com/apple/cups/issues/3067
 Bug-Debian: https://bugs.debian.org/549673
@@ -15,7 +16,7 @@ Patch-Name: no-conffile-timestamp.patch
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/scheduler/classes.c b/scheduler/classes.c
-index 776e79a..ec6357f 100644
+index 776e79a91..ec6357ffe 100644
 --- a/scheduler/classes.c
 +++ b/scheduler/classes.c
 @@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
@@ -28,7 +29,7 @@ index 776e79a..ec6357f 100644
  
   /*
 diff --git a/scheduler/job.c b/scheduler/job.c
-index 81acecd..c39bd09 100644
+index 515fc8b5e..9c197efc9 100644
 --- a/scheduler/job.c
 +++ b/scheduler/job.c
 @@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
@@ -41,10 +42,10 @@ index 81acecd..c39bd09 100644
  
   /*
 diff --git a/scheduler/printers.c b/scheduler/printers.c
-index 2578aa7..149eaac 100644
+index b366bf588..10ae91234 100644
 --- a/scheduler/printers.c
 +++ b/scheduler/printers.c
-@@ -1508,7 +1508,7 @@ cupsdSaveAllPrinters(void)
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
    strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
  
    cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
@@ -54,10 +55,10 @@ index 2578aa7..149eaac 100644
  
    cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
 diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
-index 0908f3c..71892c7 100644
+index 3267a2ff6..2542ab148 100644
 --- a/scheduler/subscriptions.c
 +++ b/scheduler/subscriptions.c
-@@ -1084,7 +1084,7 @@ cupsdSaveAllSubscriptions(void)
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
    strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
  
    cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
index 8c7662a31..8d3592262 100644
--- a/debian/patches/pwg-raster-attributes.patch
+++ b/debian/patches/pwg-raster-attributes.patch
@@ -1,3 +1,4 @@
+From 4b15ee733bb3f40197333f8fbad1eef6a1142109 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:04 +0200
 Subject: For PWG Raster, add required IPP attributes
@@ -9,14 +10,14 @@ Bug-Upstream: https://www.cups.org/str.php?L4428
 Last-Update: 2015-02-10
 Patch-Name: pwg-raster-attributes.patch
 ---
- scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 76 insertions(+), 1 deletion(-)
 
 diff --git a/scheduler/printers.c b/scheduler/printers.c
-index e4841c0..1984a65 100644
+index 75ef4c0d2..542523760 100644
 --- a/scheduler/printers.c
 +++ b/scheduler/printers.c
-@@ -2254,9 +2254,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
    cupsd_location_t *auth;		/* Pointer to authentication element */
    const char	*auth_supported;	/* Authentication supported */
    ipp_t		*oldattrs;		/* Old printer attributes */
@@ -28,7 +29,7 @@ index e4841c0..1984a65 100644
  
  
   /*
-@@ -2589,6 +2590,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
  
    add_printer_formats(p);
  
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
index 382f384a2..e4f0e402c 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,3 +1,4 @@
+From 1118aeef013fa7864534de69b699210598915cc2 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:36 +0200
 Subject: CUPS removes the "(recommended)" comments of the NickNames of
@@ -12,7 +13,7 @@ Patch-Name: reactivate_recommended_driver.patch
  1 file changed, 10 deletions(-)
 
 diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
-index 85516eb..874eb3c 100644
+index 85516eb8c..874eb3c07 100644
 --- a/scheduler/cups-driverd.cxx
 +++ b/scheduler/cups-driverd.cxx
 @@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
index 1925abf85..8335fdea1 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,3 +1,4 @@
+From e9de51045546ba63ef57979ddbe88e865c2ced26 Mon Sep 17 00:00:00 2001
 From: Kenshi Muto <kmuto@debian.org>
 Date: Tue, 9 Aug 2016 18:11:33 +0200
 Subject: Do not write VCS tags into installed conffiles
@@ -13,7 +14,7 @@ Patch-Name: removecvstag.patch
  1 file changed, 4 insertions(+)
 
 diff --git a/conf/Makefile b/conf/Makefile
-index 42a123f..db0060d 100644
+index 42a123f75..db0060d75 100644
 --- a/conf/Makefile
 +++ b/conf/Makefile
 @@ -69,8 +69,12 @@ install-data:
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
index 4d2456ab1..f15f320bf 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,3 +1,4 @@
+From c347ff881f6abdc44b7aeeb03170a16dec777aae Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:34 +0200
 Subject: Rename the systemd service file from org.cups.cups.* to cups.*
@@ -11,7 +12,7 @@ Patch-Name: rename-systemd-units.patch
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
-index ed23f9d..eb84459 100644
+index ed23f9dfd..eb8445905 100644
 --- a/scheduler/org.cups.cups-lpd.socket
 +++ b/scheduler/org.cups.cups-lpd.socket
 @@ -1,6 +1,6 @@
@@ -23,7 +24,7 @@ index ed23f9d..eb84459 100644
  [Socket]
  ListenStream=515
 diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-index 0f1cc46..7c8509f 100644
+index 0f1cc46f2..7c8509fa6 100644
 --- a/scheduler/org.cups.cupsd.path.in
 +++ b/scheduler/org.cups.cupsd.path.in
 @@ -1,6 +1,6 @@
@@ -35,7 +36,7 @@ index 0f1cc46..7c8509f 100644
  [Path]
  PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
 diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 5273762..cd23343 100644
+index 5273762fb..cd2334396 100644
 --- a/scheduler/org.cups.cupsd.service.in
 +++ b/scheduler/org.cups.cupsd.service.in
 @@ -9,5 +9,5 @@ Type=simple
@@ -46,7 +47,7 @@ index 5273762..cd23343 100644
 +Also=cups.socket cups.path
  WantedBy=printer.target
 diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
-index 613b977..3c37d72 100644
+index 613b977a6..3c37d7213 100644
 --- a/scheduler/org.cups.cupsd.socket.in
 +++ b/scheduler/org.cups.cupsd.socket.in
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index 5ebddb187..72e9ce168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,7 @@ tests-make-lpstat-call-reproducible.patch
 tests-no-pdftourf.patch
 move-cupsd-conf-default-to-share.patch
 airprint-support.patch
-0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 no-conffile-timestamp.patch
 removecvstag.patch
 rename-systemd-units.patch
@@ -29,5 +29,5 @@ cupsd-set-default-for-SyncOnClose-to-Yes.patch
 cups-set-default-error-policy-retry-job.patch
 man-cups-lpd-drop-dangling-references.patch
 debianize_cups-config.patch
-0035-Build-mantohtml-with-the-build-architecture-compiler.patch
+0032-Build-mantohtml-with-the-build-architecture-compiler.patch
 manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index cb1c50ac9..993ececa5 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,23 +1,22 @@
+From 6826016f93b9327994d050b67344fceb5736df08 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:43 +0200
 Subject: Show compile command lines
 
 Patch-Name: show-compile-command-lines.patch
 ---
- Makedefs.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/Makedefs.in b/Makedefs.in
-index 65ae345..c71e813 100644
+index 9ee75856d..038bb9451 100644
 --- a/Makedefs.in
 +++ b/Makedefs.in
-@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
  # Rules...
  #
  
 -.SILENT:
--.SUFFIXES:	.a .c .cxx .h .o
-+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ .SUFFIXES:	.a .c .cxx .h .o
  
  .c.o:
- 	echo Compiling $<...
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
index 0024719b8..496cffc37 100644
--- a/debian/patches/test-i18n-nonlinux.patch
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -1,7 +1,8 @@
+From 69215a096afb42f03e239b2586f1efc16de0a486 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:16 +0200
-Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
- as glibc's iconv behavior is different than what the test expects.
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
+ glibc's iconv behavior is different than what the test expects.
 
 Bug-Debian: http://bugs.debian.org/662996
 
@@ -12,7 +13,7 @@ Patch-Name: test-i18n-nonlinux.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cups/testi18n.c b/cups/testi18n.c
-index 45e1cab..449670c 100644
+index 45e1cab35..449670c44 100644
 --- a/cups/testi18n.c
 +++ b/cups/testi18n.c
 @@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
index f4134d10f..05af302fa 100644
--- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -1,3 +1,4 @@
+From 62edc4e78c5831c3d3e35b9676cbecc9f9b0c686 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:18 +0200
 Subject: Tests: Force LC_* environment variables when testing (non)
@@ -12,7 +13,7 @@ Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
  1 file changed, 8 insertions(+)
 
 diff --git a/cups/testppd.c b/cups/testppd.c
-index 914abbd..13598c9 100644
+index 36707f29a..a4ab7bfaa 100644
 --- a/cups/testppd.c
 +++ b/cups/testppd.c
 @@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
index 2d0271089..b982218ef 100644
--- a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -1,3 +1,4 @@
+From 68d005026cb34fffc3634c9f20b358fbf9973878 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:33:56 +0200
 Subject: Tests: ignore errors triggered on ipv6-deprived hosts
@@ -12,7 +13,7 @@ Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index f5a98dd..f3a4321 100755
+index f5a98dd64..f3a432155 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
index eea2bfe8a..2a42d9ef6 100644
--- a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -1,3 +1,4 @@
+From 77abc6f2c098f7381be9e4fa5fa9ddd4a1180b4c Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:30:48 +0200
 Subject: Tests: ignore loadFile failures
@@ -12,7 +13,7 @@ Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 8bde425..f5a98dd 100755
+index 8bde425d6..f5a98dd64 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1028,6 +1028,8 @@ fi
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
index e6280a925..23c341213 100644
--- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -1,3 +1,4 @@
+From 57e7deea1b458b94d14dc133046adf4103240488 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:36:02 +0200
 Subject: Tests: ignore the failure to write uncompressed data
@@ -13,7 +14,7 @@ Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index f3a4321..c072ad8 100755
+index f3a432155..c072ad88d 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
index 1a0f41289..12a0f7f1b 100644
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -1,3 +1,4 @@
+From 5279167dfd4cbf564fe80c945d874fd53cc4b1f1 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:10 +0200
 Subject: Tests: ignore usb & dnssd backend unexpected exits
@@ -16,7 +17,7 @@ Patch-Name: tests-ignore-usb-crash.patch
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index a601581..8bde425 100755
+index a60158156..8bde425d6 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1025,7 +1025,10 @@ else
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
index 25fb5ee30..516a98592 100644
--- a/debian/patches/tests-ignore-warnings.patch
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -1,3 +1,4 @@
+From 0b429c446dee90330c2367f801f7f13c7347dcb0 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:09 +0200
 Subject: Tests: Ignore warnings from colord and Avahi
@@ -12,7 +13,7 @@ Patch-Name: tests-ignore-warnings.patch
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 2f9630f..a601581 100755
+index 2f9630f52..a60158156 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1040,7 +1040,11 @@ else
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
index a342c06a0..69786bf4c 100644
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -1,3 +1,4 @@
+From 7a57b1e7f9f04d05a9e6075abd887093d5d319d3 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:22 +0200
 Subject: Tests: Force LC_ALL=C environment variable when grepping the output
@@ -12,7 +13,7 @@ Patch-Name: tests-make-lpstat-call-reproducible.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 3f0becd..baebdee 100755
+index 3f0becde9..baebdeec9 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
index f0da622f1..af6499ea6 100644
--- a/debian/patches/tests-no-pdftourf.patch
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -1,3 +1,4 @@
+From 9dd262ab1d018195771b45af250fa01268c8433e Mon Sep 17 00:00:00 2001
 From: Michael Sweet <michael.r.sweet@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:23 +0200
 Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
@@ -17,7 +18,7 @@ Patch-Name: tests-no-pdftourf.patch
  delete mode 100644 test/test.types
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index baebdee..001e2f6 100755
+index baebdeec9..001e2f61f 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -268,7 +268,7 @@ case "$usedebugprintfs" in
@@ -45,7 +46,7 @@ index baebdee..001e2f6 100755
  	instfilter pstocupsraster pstoraster raster
  else
 diff --git a/test/test.convs b/test/test.convs
-index 77a9ce0..57540aa 100644
+index 77a9ce01e..57540aac4 100644
 --- a/test/test.convs
 +++ b/test/test.convs
 @@ -2,7 +2,6 @@
@@ -58,7 +59,7 @@ index 77a9ce0..57540aa 100644
  text/plain application/pdf 100 texttopdf
 diff --git a/test/test.types b/test/test.types
 deleted file mode 100644
-index 914081c..0000000
+index 914081c7f..000000000
 --- a/test/test.types
 +++ /dev/null
 @@ -1,2 +0,0 @@
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
index f6ff7165f..0df28da83 100644
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -1,3 +1,4 @@
+From 1e063279ac30fe50296a85f9d87b794377b823db Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:21 +0200
 Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
@@ -14,7 +15,7 @@ Patch-Name: tests-use-ipv4-lo-address.patch
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
-index 7efc398..08b8c50 100644
+index 7efc39892..08b8c508f 100644
 --- a/test/5.1-lpadmin.sh
 +++ b/test/5.1-lpadmin.sh
 @@ -52,8 +52,8 @@ echo ""
@@ -29,7 +30,7 @@ index 7efc398..08b8c50 100644
  	echo "    FAILED"
  	exit 1
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 4929820..3f0becd 100755
+index 492982005..3f0becde9 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -490,7 +490,7 @@ fi
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
index f29cb785b..b9844fb74 100644
--- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -1,3 +1,4 @@
+From a6a69d9950c167a62d47ec0c251c2ead3c7db441 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:17 +0200
 Subject: Tests: Make sure that all scheduled jobs are finished before
@@ -13,7 +14,7 @@ Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
  1 file changed, 5 insertions(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index c072ad8..4929820 100755
+index c072ad88d..492982005 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html
index f9969d4a9..7e6b40702 100644
--- a/doc/help/api-admin.html
+++ b/doc/help/api-admin.html
@@ -5,7 +5,7 @@
     <title>Administration APIs</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   Administrative API header for CUPS.
 
@@ -481,6 +482,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html
index eddd06389..961f4623a 100644
--- a/doc/help/api-filter.html
+++ b/doc/help/api-filter.html
@@ -5,7 +5,7 @@
     <title>Filter and Backend Programming</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   Filter and backend programming header for CUPS.
 
@@ -487,6 +488,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html
index 4ddb11ae7..623a3a8e0 100644
--- a/doc/help/api-ppd.html
+++ b/doc/help/api-ppd.html
@@ -5,7 +5,7 @@
     <title>PPD API (DEPRECATED)</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   PPD API header for CUPS.
 
@@ -486,6 +487,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
@@ -2125,6 +2127,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <tr><th>PPD_CUSTOM_POINTS </th>        <td class="description">Measurement value in points</td></tr>
         <tr><th>PPD_CUSTOM_REAL </th>        <td class="description">Real number value</td></tr>
         <tr><th>PPD_CUSTOM_STRING </th>        <td class="description">String of characters</td></tr>
+        <tr><th>PPD_CUSTOM_UNKNOWN </th>        <td class="description">Unknown type (error)</td></tr>
 </tbody></table>
       <h3 class="enumeration"><a id="ppd_cs_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cs_e</a></h3>
         <p class="description">Colorspaces </p>
diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html
index 6eccab791..6a9e76385 100644
--- a/doc/help/api-raster.html
+++ b/doc/help/api-raster.html
@@ -5,7 +5,7 @@
     <title>Raster API</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   Raster API documentation for CUPS.
 
@@ -481,6 +482,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/cupspm.epub b/doc/help/cupspm.epub
index 5cd742cd1..1a8c38823 100644
--- a/doc/help/cupspm.epub
+++ b/doc/help/cupspm.epub
diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html
index 4c68087f5..fa1a87681 100644
--- a/doc/help/cupspm.html
+++ b/doc/help/cupspm.html
@@ -5,91 +5,62 @@
     <title>CUPS Programming Manual</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Michael R Sweet">
     <meta name="copyright" content="Copyright &#xa9; 2007-2019 by Apple Inc. All Rights Reserved.">
     <meta name="version" content="2.3.0">
     <style type="text/css"><!--
-body, p, h1, h2, h3, h4 {
+body, p, h1, h2, h3, h4, h5, h6 {
   font-family: sans-serif;
+  line-height: 1.4;
 }
-div.body h1 {
-  font-size: 250%;
+h1, h2, h3, h4, h5, h6 {
   font-weight: bold;
+  page-break-inside: avoid;
+}
+h1 {
+  font-size: 250%;
   margin: 0;
 }
-div.body h2 {
+h2 {
   font-size: 250%;
   margin-top: 1.5em;
 }
-div.body h3 {
-  font-size: 150%;
+h3 {
+  font-size: 200%;
   margin-bottom: 0.5em;
   margin-top: 1.5em;
 }
-div.body h4 {
-  font-size: 110%;
+h4 {
+  font-size: 150%;
   margin-bottom: 0.5em;
   margin-top: 1.5em;
 }
-div.body h5 {
-  font-size: 100%;
+h5 {
+  font-size: 125%;
   margin-bottom: 0.5em;
   margin-top: 1.5em;
 }
-div.contents {
-  background: #e8e8e8;
-  border: solid thin black;
-  padding: 10px;
-}
-div.contents h1 {
+h6 {
   font-size: 110%;
+  margin-bottom: 0.5em;
+  margin-top: 1.5em;
 }
-div.contents h2 {
-  font-size: 100%;
+div.header h1, div.header p {
+  text-align: center;
 }
-div.contents ul.contents {
-  font-size: 80%;
+div.contents, div.body, div.footer {
+  page-break-before: always;
 }
-.class {
+.class, .enumeration, .function, .struct, .typedef, .union {
   border-bottom: solid 2px gray;
 }
-.constants {
-}
 .description {
   margin-top: 0.5em;
 }
-.discussion {
-}
-.enumeration {
-  border-bottom: solid 2px gray;
-}
 .function {
-  border-bottom: solid 2px gray;
   margin-bottom: 0;
 }
-.members {
-}
-.method {
-}
-.parameters {
-}
-.returnvalue {
-}
-.struct {
-  border-bottom: solid 2px gray;
-}
-.typedef {
-  border-bottom: solid 2px gray;
-}
-.union {
-  border-bottom: solid 2px gray;
-}
-.variable {
-}
-h1, h2, h3, h4, h5, h6 {
-  page-break-inside: avoid;
-}
 blockquote {
   border: solid thin gray;
   box-shadow: 3px 3px 5px rgba(0,0,0,0.5);
@@ -97,19 +68,15 @@ blockquote {
   page-break-inside: avoid;
 }
 p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
-  border: thin dotted gray;
   font-family: monospace;
-  font-size: 90%;
   hyphens: manual;
   -webkit-hyphens: manual;
-  page-break-inside: avoid;
 }
 p.code, pre, ul.code li {
+  background: rgba(127,127,127,0.1);
+  border: thin dotted gray;
   padding: 10px;
-}
-p code, li code {
-  padding: 2px 5px;
+  page-break-inside: avoid;
 }
 a:link, a:visited {
   text-decoration: none;
@@ -123,7 +90,7 @@ span.info {
   font-weight: bold;
   white-space: nowrap;
 }
-h3 span.info, h4 span.info {
+h1 span.info, h2 span.info, h3 span.info, h4 span.info {
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
   float: right;
@@ -143,13 +110,38 @@ ul.contents > li {
 ul.contents li ul.code, ul.contents li ul.subcontents {
   padding-left: 2em;
 }
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+td {
+  border: solid 1px #666;
+  padding: 5px 10px;
+  vertical-align: top;
+}
+td.left {
+  text-align: left;
+}
+td.center {
+  text-align: center;
+}
+td.right {
+  text-align: right;
+}
+th {
+  border-bottom: solid 2px #000;
+  padding: 1px 5px;
+  text-align: center;
+  vertical-align: bottom;
+}
+tr:nth-child(even) {
+  background: rgba(127,127,127,0.1);n}
 table.list {
   border-collapse: collapse;
   width: 100%;
 }
-table.list tr:nth-child(even) {
-  background: rgba(127,127,127,0.1);]n}
 table.list th {
+  border-bottom: none;
   border-right: 2px solid gray;
   font-family: monospace;
   padding: 5px 10px 5px 2px;
@@ -157,24 +149,22 @@ table.list th {
   vertical-align: top;
 }
 table.list td {
+  border: none;
   padding: 5px 2px 5px 10px;
   text-align: left;
   vertical-align: top;
 }
-h1.title {
-}
-h2.title {
-  border-bottom: solid 2px black;
-}
-h3.title {
+h2.title, h3.title {
   border-bottom: solid 2px black;
 }
 --></style>
   </head>
   <body>
-    <h1 class="title">CUPS Programming Manual</h1>
-    <p>Michael R Sweet</p>
-    <p>Copyright &#xa9; 2007-2019 by Apple Inc. All Rights Reserved.</p>
+    <div class="header">
+      <h1 class="title">CUPS Programming Manual</h1>
+      <p>Michael R Sweet</p>
+      <p>Copyright &#xa9; 2007-2019 by Apple Inc. All Rights Reserved.</p>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
@@ -197,7 +187,6 @@ h3.title {
           <li><a href="#authentication">Authentication</a></li>
         </ul></li>
         <li><a href="#FUNCTIONS">Functions</a><ul class="subcontents">
-          <li><a href="#CF_OPTIONS">CF_OPTIONS</a></li>
           <li><a href="#cupsAddDest">cupsAddDest</a></li>
           <li><a href="#cupsAddDestMediaOptions">cupsAddDestMediaOptions</a></li>
           <li><a href="#cupsAddIntegerOption">cupsAddIntegerOption</a></li>
@@ -487,9 +476,6 @@ h3.title {
           <li><a href="#cups_option_s">cups_option_s</a></li>
           <li><a href="#cups_size_s">cups_size_s</a></li>
         </ul></li>
-        <li><a href="#VARIABLES">Variables</a><ul class="subcontents">
-          <li><a href="#kSecOidOrganizationalUnit">kSecOidOrganizationalUnit</a></li>
-        </ul></li>
         <li><a href="#ENUMERATIONS">Enumerations</a><ul class="subcontents">
           <li><a href="#cups_ptype_e">cups_ptype_e</a></li>
           <li><a href="#http_encoding_e">http_encoding_e</a></li>
@@ -520,16 +506,20 @@ h3.title {
     <blockquote>
     <p>Please <a href="https://github.com/apple/cups/issues">file issues on Github</a> to provide feedback on this document.</p>
 </blockquote>
-    <h2><a id="introduction">Introduction</a></h2>
+    <h2 class="title" id="introduction">Introduction</h2>
     <p>CUPS provides the &quot;cups&quot; library to talk to the different parts of CUPS and with Internet Printing Protocol (IPP) printers. The &quot;cups&quot; library functions are accessed by including the <code>&lt;cups/cups.h&gt;</code> header.</p>
     <p>CUPS is based on the Internet Printing Protocol (&quot;IPP&quot;), which allows clients (applications) to communicate with a server (the scheduler, printers, etc.) to get a list of destinations, send print jobs, and so forth. You identify which server you want to communicate with using a pointer to the opaque structure <code>http_t</code>. The <code>CUPS_HTTP_DEFAULT</code> constant can be used when you want to talk to the CUPS scheduler.</p>
-    <h3><a id="guidelines">Guidelines</a></h3>
+    <h3 class="title" id="guidelines">Guidelines</h3>
     <p>When writing software (other than printer drivers) that uses the &quot;cups&quot; library:</p>
     <ul>
-    <li>Do not use undocumented or deprecated APIs,</li>
-    <li>Do not rely on pre-configured printers,</li>
-    <li>Do not assume that printers support specific features or formats, and</li>
-    <li>Do not rely on implementation details (PPDs, etc.)</li>
+    <li>    <p>Do not use undocumented or deprecated APIs,</p>
+</li>
+    <li>    <p>Do not rely on pre-configured printers,</p>
+</li>
+    <li>    <p>Do not assume that printers support specific features or formats, and</p>
+</li>
+    <li>    <p>Do not rely on implementation details (PPDs, etc.)</p>
+</li>
 </ul>
     <p>CUPS is designed to insulate users and developers from the implementation details of printers and file formats. The goal is to allow an application to supply a print file in a standard format with the user intent (&quot;print four copies, two-sided on A4 media, and staple each copy&quot;) and have the printing system manage the printer communication and format conversion needed.</p>
     <p>Similarly, printer and job management applications can use standard query operations to obtain the status information in a common, generic form and use standard management operations to control the state of those printers and jobs.</p>
@@ -537,9 +527,9 @@ h3.title {
     <p><strong>Note:</strong></p>
     <p>CUPS printer drivers necessarily depend on specific file formats and certain implementation details of the CUPS software. Please consult the Postscript and raster printer driver developer documentation on <a href="https://www.cups.org/documentation.html">CUPS.org</a> for more information.</p>
 </blockquote>
-    <h3><a id="terms-used-in-this-document">Terms Used in This Document</a></h3>
-    <p>A <em>Destination</em> is a printer or print queue that accepts print jobs. A <em>Print</em> <em>Job</em> is a collection of one or more documents that are processed by a destination using options supplied when creating the job. A <em>Document</em> is a file (JPEG image, PDF file, etc.) suitable for printing. An <em>Option</em> controls some aspect of printing, such as the media used. <em>Media</em> is the sheets or roll that is printed on. An <em>Attribute</em> is an option encoded for an Internet Printing Protocol (IPP) request.</p>
-    <h3><a id="compiling-programs-that-use-the-cups-api">Compiling Programs That Use the CUPS API</a></h3>
+    <h3 class="title" id="terms-used-in-this-document">Terms Used in This Document</h3>
+    <p>A <em>Destination</em> is a printer or print queue that accepts print jobs. A <em>Print Job</em> is a collection of one or more documents that are processed by a destination using options supplied when creating the job. A <em>Document</em> is a file (JPEG image, PDF file, etc.) suitable for printing. An <em>Option</em> controls some aspect of printing, such as the media used. <em>Media</em> is the sheets or roll that is printed on. An <em>Attribute</em> is an option encoded for an Internet Printing Protocol (IPP) request.</p>
+    <h3 class="title" id="compiling-programs-that-use-the-cups-api">Compiling Programs That Use the CUPS API</h3>
     <p>The CUPS libraries can be used from any C, C++, or Objective C program. The method of compiling against the libraries varies depending on the operating system and installation of CUPS. The following sections show how to compile a simple program (shown below) in two common environments.</p>
     <p>The following simple program lists the available destinations:</p>
     <pre><code>#include &lt;stdio.h&gt;
@@ -562,20 +552,20 @@ int main(void)
   return (0);
 }
 </code></pre>
-    <h4><a id="compiling-with-xcode">Compiling with Xcode</a></h4>
-    <p>In Xcode, choose <em>New</em> <em>Project...</em> from the <em>File</em> menu (or press SHIFT+CMD+N), then select the <em>Command</em> <em>Line</em> <em>Tool</em> under the macOS Application project type. Click <em>Next</em> and enter a name for the project, for example &quot;firstcups&quot;. Click <em>Next</em> and choose a project directory. The click <em>Next</em> to create the project.</p>
-    <p>In the project window, click on the <em>Build</em> <em>Phases</em> group and expand the <em>Link</em> <em>Binary</em> <em>with</em> <em>Libraries</em> section. Click <em>+</em>, type &quot;libcups&quot; to show the library, and then double-click on <code>libcups.tbd</code>.</p>
+    <h4 id="compiling-with-xcode">Compiling with Xcode</h4>
+    <p>In Xcode, choose <em>New Project...</em> from the <em>File</em> menu (or press SHIFT+CMD+N), then select the <em>Command Line Tool</em> under the macOS Application project type. Click <em>Next</em> and enter a name for the project, for example &quot;firstcups&quot;. Click <em>Next</em> and choose a project directory. The click <em>Next</em> to create the project.</p>
+    <p>In the project window, click on the <em>Build Phases</em> group and expand the <em>Link Binary with Libraries</em> section. Click <em>+</em>, type &quot;libcups&quot; to show the library, and then double-click on <code>libcups.tbd</code>.</p>
     <p>Finally, click on the <code>main.c</code> file in the sidebar and copy the example program to the file. Build and run (CMD+R) to see the list of destinations.</p>
-    <h4><a id="compiling-with-gcc">Compiling with GCC</a></h4>
+    <h4 id="compiling-with-gcc">Compiling with GCC</h4>
     <p>From the command-line, create a file called <code>sample.c</code> using your favorite editor, copy the example to this file, and save. Then run the following command to compile it with GCC and run it:</p>
     <pre><code>gcc -o simple `cups-config --cflags` simple.c `cups-config --libs`
 ./simple
 </code></pre>
     <p>The <code>cups-config</code> command provides the compiler flags (<code>cups-config --cflags</code>) and libraries (<code>cups-config --libs</code>) needed for the local system.</p>
-    <h2><a id="working-with-destinations">Working with Destinations</a></h2>
+    <h2 class="title" id="working-with-destinations">Working with Destinations</h2>
     <p>Destinations, which in CUPS represent individual printers or classes (collections or pools) of printers, are represented by the <code>cups_dest_t</code> structure which includes the name (<code>name</code>), instance (<code>instance</code>, saved options/settings), whether the destination is the default for the user (<code>is_default</code>), and the options and basic information associated with that destination (<code>num_options</code> and <code>options</code>).</p>
     <p>Historically destinations have been manually maintained by the administrator of a system or network, but CUPS also supports dynamic discovery of destinations on the current network.</p>
-    <h3><a id="finding-available-destinations">Finding Available Destinations</a></h3>
+    <h3 class="title" id="finding-available-destinations">Finding Available Destinations</h3>
     <p>The <code>cupsEnumDests</code> function finds all of the available destinations:</p>
     <pre><code> int
  cupsEnumDests(unsigned flags, int msec, int *cancel,
@@ -587,24 +577,42 @@ int main(void)
     <p>The <code>cancel</code> argument points to an integer variable that, when set to a non-zero value, will cause enumeration to stop as soon as possible. It can be <code>NULL</code> if not needed.</p>
     <p>The <code>type</code> and <code>mask</code> arguments are bitfields that allow the caller to filter the destinations based on categories and/or capabilities. The destination's &quot;printer-type&quot; value is masked by the <code>mask</code> value and compared to the <code>type</code> value when filtering. For example, to only enumerate destinations that are hosted on the local system, pass <code>CUPS_PRINTER_LOCAL</code> for the <code>type</code> argument and <code>CUPS_PRINTER_DISCOVERED</code> for the <code>mask</code> argument. The following constants can be used for filtering:</p>
     <ul>
-    <li><code>CUPS_PRINTER_CLASS</code>: A collection of destinations.</li>
-    <li><code>CUPS_PRINTER_FAX</code>: A facsimile device.</li>
-    <li><code>CUPS_PRINTER_LOCAL</code>: A local printer or class. This constant has the value 0 (no bits set) and is only used for the <code>type</code> argument and is paired with the <code>CUPS_PRINTER_REMOTE</code> or <code>CUPS_PRINTER_DISCOVERED</code> constant passed in the <code>mask</code> argument.</li>
-    <li><code>CUPS_PRINTER_REMOTE</code>: A remote (shared) printer or class.</li>
-    <li><code>CUPS_PRINTER_DISCOVERED</code>: An available network printer or class.</li>
-    <li><code>CUPS_PRINTER_BW</code>: Can do B&amp;W printing.</li>
-    <li><code>CUPS_PRINTER_COLOR</code>: Can do color printing.</li>
-    <li><code>CUPS_PRINTER_DUPLEX</code>: Can do two-sided printing.</li>
-    <li><code>CUPS_PRINTER_STAPLE</code>: Can staple output.</li>
-    <li><code>CUPS_PRINTER_COLLATE</code>: Can quickly collate copies.</li>
-    <li><code>CUPS_PRINTER_PUNCH</code>: Can punch output.</li>
-    <li><code>CUPS_PRINTER_COVER</code>: Can cover output.</li>
-    <li><code>CUPS_PRINTER_BIND</code>: Can bind output.</li>
-    <li><code>CUPS_PRINTER_SORT</code>: Can sort output (mailboxes, etc.)</li>
-    <li><code>CUPS_PRINTER_SMALL</code>: Can print on Letter/Legal/A4-size media.</li>
-    <li><code>CUPS_PRINTER_MEDIUM</code>: Can print on Tabloid/B/C/A3/A2-size media.</li>
-    <li><code>CUPS_PRINTER_LARGE</code>: Can print on D/E/A1/A0-size media.</li>
-    <li><code>CUPS_PRINTER_VARIABLE</code>: Can print on rolls and custom-size media.</li>
+    <li>    <p><code>CUPS_PRINTER_CLASS</code>: A collection of destinations.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_FAX</code>: A facsimile device.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_LOCAL</code>: A local printer or class. This constant has the value 0 (no bits set) and is only used for the <code>type</code> argument and is paired with the <code>CUPS_PRINTER_REMOTE</code> or <code>CUPS_PRINTER_DISCOVERED</code> constant passed in the <code>mask</code> argument.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_REMOTE</code>: A remote (shared) printer or class.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_DISCOVERED</code>: An available network printer or class.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_BW</code>: Can do B&amp;W printing.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_COLOR</code>: Can do color printing.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_DUPLEX</code>: Can do two-sided printing.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_STAPLE</code>: Can staple output.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_COLLATE</code>: Can quickly collate copies.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_PUNCH</code>: Can punch output.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_COVER</code>: Can cover output.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_BIND</code>: Can bind output.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_SORT</code>: Can sort output (mailboxes, etc.)</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_SMALL</code>: Can print on Letter/Legal/A4-size media.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_MEDIUM</code>: Can print on Tabloid/B/C/A3/A2-size media.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_LARGE</code>: Can print on D/E/A1/A0-size media.</p>
+</li>
+    <li>    <p><code>CUPS_PRINTER_VARIABLE</code>: Can print on rolls and custom-size media.</p>
+</li>
 </ul>
     <p>The <code>cb</code> argument specifies a function to call for every destination that is found:</p>
     <pre><code>typedef int (*cups_dest_cb_t)(void *user_data,
@@ -613,9 +621,12 @@ int main(void)
 </code></pre>
     <p>The callback function receives a copy of the <code>user_data</code> argument along with a bitfield (<code>flags</code>) and the destination that was found. The <code>flags</code> argument can have any of the following constant (bit) values set:</p>
     <ul>
-    <li><code>CUPS_DEST_FLAGS_MORE</code>: There are more destinations coming.</li>
-    <li><code>CUPS_DEST_FLAGS_REMOVED</code>: The destination has gone away and should be removed from the list of destinations a user can select.</li>
-    <li><code>CUPS_DEST_FLAGS_ERROR</code>: An error occurred. The reason for the error can be found by calling the <code>cupsLastError</code> and/or <code>cupsLastErrorString</code> functions.</li>
+    <li>    <p><code>CUPS_DEST_FLAGS_MORE</code>: There are more destinations coming.</p>
+</li>
+    <li>    <p><code>CUPS_DEST_FLAGS_REMOVED</code>: The destination has gone away and should be removed from the list of destinations a user can select.</p>
+</li>
+    <li>    <p><code>CUPS_DEST_FLAGS_ERROR</code>: An error occurred. The reason for the error can be found by calling the <code>cupsLastError</code> and/or <code>cupsLastErrorString</code> functions.</p>
+</li>
 </ul>
     <p>The callback function returns 0 to stop enumeration or 1 to continue.</p>
     <blockquote>
@@ -689,34 +700,45 @@ my_get_dests(cups_ptype_t type, cups_ptype_t mask,
   return (user_data.num_dests);
 }
 </code></pre>
-    <h3><a id="basic-destination-information">Basic Destination Information</a></h3>
+    <h3 class="title" id="basic-destination-information">Basic Destination Information</h3>
     <p>The <code>num_options</code> and <code>options</code> members of the <code>cups_dest_t</code> structure provide basic attributes about the destination in addition to the user default options and values for that destination. The following names are predefined for various destination attributes:</p>
     <ul>
-    <li>&quot;auth-info-required&quot;: The type of authentication required for printing to this destination: &quot;none&quot;, &quot;username,password&quot;, &quot;domain,username,password&quot;, or &quot;negotiate&quot; (Kerberos).</li>
-    <li>&quot;printer-info&quot;: The human-readable description of the destination such as &quot;My Laser Printer&quot;.</li>
-    <li>&quot;printer-is-accepting-jobs&quot;: &quot;true&quot; if the destination is accepting new jobs, &quot;false&quot; otherwise.</li>
-    <li>&quot;printer-is-shared&quot;: &quot;true&quot; if the destination is being shared with other computers, &quot;false&quot; otherwise.</li>
-    <li>&quot;printer-location&quot;: The human-readable location of the destination such as &quot;Lab 4&quot;.</li>
-    <li>&quot;printer-make-and-model&quot;: The human-readable make and model of the destination such as &quot;ExampleCorp LaserPrinter 4000 Series&quot;.</li>
-    <li>&quot;printer-state&quot;: &quot;3&quot; if the destination is idle, &quot;4&quot; if the destination is printing a job, and &quot;5&quot; if the destination is stopped.</li>
-    <li>&quot;printer-state-change-time&quot;: The UNIX time when the destination entered the current state.</li>
-    <li>&quot;printer-state-reasons&quot;: Additional comma-delimited state keywords for the destination such as &quot;media-tray-empty-error&quot; and &quot;toner-low-warning&quot;.</li>
-    <li>&quot;printer-type&quot;: The <code>cups_ptype_t</code> value associated with the destination.</li>
-    <li>&quot;printer-uri-supported&quot;: The URI associated with the destination; if not set, this destination was discovered but is not yet setup as a local printer.</li>
+    <li>    <p>&quot;auth-info-required&quot;: The type of authentication required for printing to this destination: &quot;none&quot;, &quot;username,password&quot;, &quot;domain,username,password&quot;, or &quot;negotiate&quot; (Kerberos).</p>
+</li>
+    <li>    <p>&quot;printer-info&quot;: The human-readable description of the destination such as &quot;My Laser Printer&quot;.</p>
+</li>
+    <li>    <p>&quot;printer-is-accepting-jobs&quot;: &quot;true&quot; if the destination is accepting new jobs, &quot;false&quot; otherwise.</p>
+</li>
+    <li>    <p>&quot;printer-is-shared&quot;: &quot;true&quot; if the destination is being shared with other computers, &quot;false&quot; otherwise.</p>
+</li>
+    <li>    <p>&quot;printer-location&quot;: The human-readable location of the destination such as &quot;Lab 4&quot;.</p>
+</li>
+    <li>    <p>&quot;printer-make-and-model&quot;: The human-readable make and model of the destination such as &quot;ExampleCorp LaserPrinter 4000 Series&quot;.</p>
+</li>
+    <li>    <p>&quot;printer-state&quot;: &quot;3&quot; if the destination is idle, &quot;4&quot; if the destination is printing a job, and &quot;5&quot; if the destination is stopped.</p>
+</li>
+    <li>    <p>&quot;printer-state-change-time&quot;: The UNIX time when the destination entered the current state.</p>
+</li>
+    <li>    <p>&quot;printer-state-reasons&quot;: Additional comma-delimited state keywords for the destination such as &quot;media-tray-empty-error&quot; and &quot;toner-low-warning&quot;.</p>
+</li>
+    <li>    <p>&quot;printer-type&quot;: The <code>cups_ptype_t</code> value associated with the destination.</p>
+</li>
+    <li>    <p>&quot;printer-uri-supported&quot;: The URI associated with the destination; if not set, this destination was discovered but is not yet setup as a local printer.</p>
+</li>
 </ul>
     <p>Use the <code>cupsGetOption</code> function to retrieve the value. For example, the following code gets the make and model of a destination:</p>
     <pre><code>const char *model = cupsGetOption(&quot;printer-make-and-model&quot;,
                                   dest-&gt;num_options,
                                   dest-&gt;options);
 </code></pre>
-    <h3><a id="detailed-destination-information">Detailed Destination Information</a></h3>
+    <h3 class="title" id="detailed-destination-information">Detailed Destination Information</h3>
     <p>Once a destination has been chosen, the <code>cupsCopyDestInfo</code> function can be used to gather detailed information about the destination:</p>
     <pre><code>cups_dinfo_t *
 cupsCopyDestInfo(http_t *http, cups_dest_t *dest);
 </code></pre>
     <p>The <code>http</code> argument specifies a connection to the CUPS scheduler and is typically the constant <code>CUPS_HTTP_DEFAULT</code>. The <code>dest</code> argument specifies the destination to query.</p>
     <p>The <code>cups_dinfo_t</code> structure that is returned contains a snapshot of the supported options and their supported, ready, and default values. It also can report constraints between different options and values, and recommend changes to resolve those constraints.</p>
-    <h4><a id="getting-supported-options-and-values">Getting Supported Options and Values</a></h4>
+    <h4 id="getting-supported-options-and-values">Getting Supported Options and Values</h4>
     <p>The <code>cupsCheckDestSupported</code> function can be used to test whether a particular option or option and value is supported:</p>
     <pre><code>int
 cupsCheckDestSupported(http_t *http, cups_dest_t *dest,
@@ -726,16 +748,26 @@ cupsCheckDestSupported(http_t *http, cups_dest_t *dest,
 </code></pre>
     <p>The <code>option</code> argument specifies the name of the option to check. The following constants can be used to check the various standard options:</p>
     <ul>
-    <li><code>CUPS_COPIES</code>: Controls the number of copies that are produced.</li>
-    <li><code>CUPS_FINISHINGS</code>: A comma-delimited list of integer constants that control the finishing processes that are applied to the job, including stapling, punching, and folding.</li>
-    <li><code>CUPS_MEDIA</code>: Controls the media size that is used, typically one of the following: <code>CUPS_MEDIA_3X5</code>, <code>CUPS_MEDIA_4X6</code>, <code>CUPS_MEDIA_5X7</code>, <code>CUPS_MEDIA_8X10</code>, <code>CUPS_MEDIA_A3</code>, <code>CUPS_MEDIA_A4</code>, <code>CUPS_MEDIA_A5</code>, <code>CUPS_MEDIA_A6</code>, <code>CUPS_MEDIA_ENV10</code>, <code>CUPS_MEDIA_ENVDL</code>, <code>CUPS_MEDIA_LEGAL</code>, <code>CUPS_MEDIA_LETTER</code>, <code>CUPS_MEDIA_PHOTO_L</code>, <code>CUPS_MEDIA_SUPERBA3</code>, or <code>CUPS_MEDIA_TABLOID</code>.</li>
-    <li><code>CUPS_MEDIA_SOURCE</code>: Controls where the media is pulled from, typically either <code>CUPS_MEDIA_SOURCE_AUTO</code> or <code>CUPS_MEDIA_SOURCE_MANUAL</code>.</li>
-    <li><code>CUPS_MEDIA_TYPE</code>: Controls the type of media that is used, typically one of the following: <code>CUPS_MEDIA_TYPE_AUTO</code>, <code>CUPS_MEDIA_TYPE_ENVELOPE</code>, <code>CUPS_MEDIA_TYPE_LABELS</code>, <code>CUPS_MEDIA_TYPE_LETTERHEAD</code>, <code>CUPS_MEDIA_TYPE_PHOTO</code>, <code>CUPS_MEDIA_TYPE_PHOTO_GLOSSY</code>, <code>CUPS_MEDIA_TYPE_PHOTO_MATTE</code>, <code>CUPS_MEDIA_TYPE_PLAIN</code>, or <code>CUPS_MEDIA_TYPE_TRANSPARENCY</code>.</li>
-    <li><code>CUPS_NUMBER_UP</code>: Controls the number of document pages that are placed on each media side.</li>
-    <li><code>CUPS_ORIENTATION</code>: Controls the orientation of document pages placed on the media: <code>CUPS_ORIENTATION_PORTRAIT</code> or <code>CUPS_ORIENTATION_LANDSCAPE</code>.</li>
-    <li><code>CUPS_PRINT_COLOR_MODE</code>: Controls whether the output is in color (<code>CUPS_PRINT_COLOR_MODE_COLOR</code>), grayscale (<code>CUPS_PRINT_COLOR_MODE_MONOCHROME</code>), or either (<code>CUPS_PRINT_COLOR_MODE_AUTO</code>).</li>
-    <li><code>CUPS_PRINT_QUALITY</code>: Controls the generate quality of the output: <code>CUPS_PRINT_QUALITY_DRAFT</code>, <code>CUPS_PRINT_QUALITY_NORMAL</code>, or <code>CUPS_PRINT_QUALITY_HIGH</code>.</li>
-    <li><code>CUPS_SIDES</code>: Controls whether prints are placed on one or both sides of the media: <code>CUPS_SIDES_ONE_SIDED</code>, <code>CUPS_SIDES_TWO_SIDED_PORTRAIT</code>, or <code>CUPS_SIDES_TWO_SIDED_LANDSCAPE</code>.</li>
+    <li>    <p><code>CUPS_COPIES</code>: Controls the number of copies that are produced.</p>
+</li>
+    <li>    <p><code>CUPS_FINISHINGS</code>: A comma-delimited list of integer constants that control the finishing processes that are applied to the job, including stapling, punching, and folding.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA</code>: Controls the media size that is used, typically one of the following: <code>CUPS_MEDIA_3X5</code>, <code>CUPS_MEDIA_4X6</code>, <code>CUPS_MEDIA_5X7</code>, <code>CUPS_MEDIA_8X10</code>, <code>CUPS_MEDIA_A3</code>, <code>CUPS_MEDIA_A4</code>, <code>CUPS_MEDIA_A5</code>, <code>CUPS_MEDIA_A6</code>, <code>CUPS_MEDIA_ENV10</code>, <code>CUPS_MEDIA_ENVDL</code>, <code>CUPS_MEDIA_LEGAL</code>, <code>CUPS_MEDIA_LETTER</code>, <code>CUPS_MEDIA_PHOTO_L</code>, <code>CUPS_MEDIA_SUPERBA3</code>, or <code>CUPS_MEDIA_TABLOID</code>.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_SOURCE</code>: Controls where the media is pulled from, typically either <code>CUPS_MEDIA_SOURCE_AUTO</code> or <code>CUPS_MEDIA_SOURCE_MANUAL</code>.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_TYPE</code>: Controls the type of media that is used, typically one of the following: <code>CUPS_MEDIA_TYPE_AUTO</code>, <code>CUPS_MEDIA_TYPE_ENVELOPE</code>, <code>CUPS_MEDIA_TYPE_LABELS</code>, <code>CUPS_MEDIA_TYPE_LETTERHEAD</code>, <code>CUPS_MEDIA_TYPE_PHOTO</code>, <code>CUPS_MEDIA_TYPE_PHOTO_GLOSSY</code>, <code>CUPS_MEDIA_TYPE_PHOTO_MATTE</code>, <code>CUPS_MEDIA_TYPE_PLAIN</code>, or <code>CUPS_MEDIA_TYPE_TRANSPARENCY</code>.</p>
+</li>
+    <li>    <p><code>CUPS_NUMBER_UP</code>: Controls the number of document pages that are placed on each media side.</p>
+</li>
+    <li>    <p><code>CUPS_ORIENTATION</code>: Controls the orientation of document pages placed on the media: <code>CUPS_ORIENTATION_PORTRAIT</code> or <code>CUPS_ORIENTATION_LANDSCAPE</code>.</p>
+</li>
+    <li>    <p><code>CUPS_PRINT_COLOR_MODE</code>: Controls whether the output is in color (<code>CUPS_PRINT_COLOR_MODE_COLOR</code>), grayscale (<code>CUPS_PRINT_COLOR_MODE_MONOCHROME</code>), or either (<code>CUPS_PRINT_COLOR_MODE_AUTO</code>).</p>
+</li>
+    <li>    <p><code>CUPS_PRINT_QUALITY</code>: Controls the generate quality of the output: <code>CUPS_PRINT_QUALITY_DRAFT</code>, <code>CUPS_PRINT_QUALITY_NORMAL</code>, or <code>CUPS_PRINT_QUALITY_HIGH</code>.</p>
+</li>
+    <li>    <p><code>CUPS_SIDES</code>: Controls whether prints are placed on one or both sides of the media: <code>CUPS_SIDES_ONE_SIDED</code>, <code>CUPS_SIDES_TWO_SIDED_PORTRAIT</code>, or <code>CUPS_SIDES_TWO_SIDED_LANDSCAPE</code>.</p>
+</li>
 </ul>
     <p>If the <code>value</code> argument is <code>NULL</code>, the <code>cupsCheckDestSupported</code> function returns whether the option is supported by the destination. Otherwise, the function returns whether the specified value of the option is supported.</p>
     <p>The <code>cupsFindDestSupported</code> function returns the IPP attribute containing the supported values for a given option:</p>
@@ -772,7 +804,7 @@ int i, count = ippGetCount(attrs);
 for (i = 0; i &lt; count; i ++)
   puts(ippGetString(attrs, i, NULL));
 </code></pre>
-    <h4><a id="getting-default-values">Getting Default Values</a></h4>
+    <h4 id="getting-default-values">Getting Default Values</h4>
     <p>There are two sets of default values - user defaults that are available via the <code>num_options</code> and <code>options</code> members of the <code>cups_dest_t</code> structure, and destination defaults that available via the <code>cups_dinfo_t</code> structure and the <code>cupsFindDestDefault</code> function which returns the IPP attribute containing the default value(s) for a given option:</p>
     <pre><code>ipp_attribute_t *
 cupsFindDestDefault(http_t *http, cups_dest_t *dest,
@@ -802,7 +834,7 @@ else
   putchar('\n');
 }
 </code></pre>
-    <h4><a id="getting-ready-loaded-values">Getting Ready (Loaded) Values</a></h4>
+    <h4 id="getting-ready-loaded-values">Getting Ready (Loaded) Values</h4>
     <p>The finishings and media options also support queries for the ready, or loaded, values. For example, a printer may have punch and staple finishers installed but be out of staples - the supported values will list both punch and staple finishing processes but the ready values will only list the punch processes. Similarly, a printer may support hundreds of different sizes of media but only have a single size loaded at any given time - the ready values are limited to the media that is actually in the printer.</p>
     <p>The <code>cupsFindDestReady</code> function finds the IPP attribute containing the ready values for a given option:</p>
     <pre><code>ipp_attribute_t *
@@ -825,7 +857,7 @@ if (ready_finishings != NULL)
 else
   puts(&quot;no finishings are ready.&quot;);
 </code></pre>
-    <h4><a id="media-size-options">Media Size Options</a></h4>
+    <h4 id="media-size-options">Media Size Options</h4>
     <p>CUPS provides functions for querying the dimensions and margins for each of the supported media size options. The <code>cups_size_t</code> structure is used to describe a media size:</p>
     <pre><code>typedef struct cups_size_s
 {
@@ -850,11 +882,16 @@ cupsGetDestMediaBySize(http_t *http, cups_dest_t *dest,
 </code></pre>
     <p>The <code>media</code>, <code>width</code>, and <code>length</code> arguments specify the size to lookup. The <code>flags</code> argument specifies a bitfield controlling various lookup options:</p>
     <ul>
-    <li><code>CUPS_MEDIA_FLAGS_DEFAULT</code>: Find the closest size supported by the printer.</li>
-    <li><code>CUPS_MEDIA_FLAGS_BORDERLESS</code>: Find a borderless size.</li>
-    <li><code>CUPS_MEDIA_FLAGS_DUPLEX</code>: Find a size compatible with two-sided printing.</li>
-    <li><code>CUPS_MEDIA_FLAGS_EXACT</code>: Find an exact match for the size.</li>
-    <li><code>CUPS_MEDIA_FLAGS_READY</code>: If the printer supports media sensing or configuration of the media in each tray/source, find the size amongst the &quot;ready&quot; media.</li>
+    <li>    <p><code>CUPS_MEDIA_FLAGS_DEFAULT</code>: Find the closest size supported by the printer.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_FLAGS_BORDERLESS</code>: Find a borderless size.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_FLAGS_DUPLEX</code>: Find a size compatible with two-sided printing.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_FLAGS_EXACT</code>: Find an exact match for the size.</p>
+</li>
+    <li>    <p><code>CUPS_MEDIA_FLAGS_READY</code>: If the printer supports media sensing or configuration of the media in each tray/source, find the size amongst the &quot;ready&quot; media.</p>
+</li>
 </ul>
     <p>If a matching size is found for the destination, the size information is stored in the structure pointed to by the <code>size</code> argument and 1 is returned. Otherwise 0 is returned.</p>
     <p>For example, the following code prints the margins for two-sided printing on US Letter media:</p>
@@ -912,7 +949,7 @@ cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest,
                         cups_dinfo_t *dinfo, unsigned flags,
                         cups_size_t *size);
 </code></pre>
-    <h4><a id="localizing-options-and-values">Localizing Options and Values</a></h4>
+    <h4 id="localizing-options-and-values">Localizing Options and Values</h4>
     <p>CUPS provides three functions to get localized, human-readable strings in the user's current locale for options and values: <code>cupsLocalizeDestMedia</code>, <code>cupsLocalizeDestOption</code>, and <code>cupsLocalizeDestValue</code>:</p>
     <pre><code>const char *
 cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest,
@@ -929,7 +966,7 @@ cupsLocalizeDestValue(http_t *http, cups_dest_t *dest,
                       cups_dinfo_t *info,
                       const char *option, const char *value);
 </code></pre>
-    <h3><a id="submitting-a-print-job">Submitting a Print Job</a></h3>
+    <h3 class="title" id="submitting-a-print-job">Submitting a Print Job</h3>
     <p>Once you are ready to submit a print job, you create a job using the <code>cupsCreateDestJob</code> function:</p>
     <pre><code>ipp_status_t
 cupsCreateDestJob(http_t *http, cups_dest_t *dest,
@@ -980,10 +1017,14 @@ cupsFinishDestDocument(http_t *http, cups_dest_t *dest,
 </code></pre>
     <p>The <code>docname</code> argument specifies the name of the document, typically the original filename. The <code>format</code> argument specifies the MIME media type of the document, including the following constants:</p>
     <ul>
-    <li><code>CUPS_FORMAT_JPEG</code>: &quot;image/jpeg&quot;</li>
-    <li><code>CUPS_FORMAT_PDF</code>: &quot;application/pdf&quot;</li>
-    <li><code>CUPS_FORMAT_POSTSCRIPT</code>: &quot;application/postscript&quot;</li>
-    <li><code>CUPS_FORMAT_TEXT</code>: &quot;text/plain&quot;</li>
+    <li>    <p><code>CUPS_FORMAT_JPEG</code>: &quot;image/jpeg&quot;</p>
+</li>
+    <li>    <p><code>CUPS_FORMAT_PDF</code>: &quot;application/pdf&quot;</p>
+</li>
+    <li>    <p><code>CUPS_FORMAT_POSTSCRIPT</code>: &quot;application/postscript&quot;</p>
+</li>
+    <li>    <p><code>CUPS_FORMAT_TEXT</code>: &quot;text/plain&quot;</p>
+</li>
 </ul>
     <p>The <code>num_options</code> and <code>options</code> arguments specify per-document print options, which at present must be 0 and <code>NULL</code>. The <code>last_document</code> argument specifies whether this is the last document in the job.</p>
     <p>For example, the following code submits a PDF file to the job that was just created:</p>
@@ -1010,9 +1051,9 @@ if (cupsStartDestDocument(CUPS_HTTP_DEFAULT, dest, info,
 
 fclose(fp);
 </code></pre>
-    <h2><a id="sending-ipp-requests">Sending IPP Requests</a></h2>
+    <h2 class="title" id="sending-ipp-requests">Sending IPP Requests</h2>
     <p>CUPS provides a rich API for sending IPP requests to the scheduler or printers, typically from management or utility applications whose primary purpose is not to send print jobs.</p>
-    <h3><a id="connecting-to-the-scheduler-or-printer">Connecting to the Scheduler or Printer</a></h3>
+    <h3 class="title" id="connecting-to-the-scheduler-or-printer">Connecting to the Scheduler or Printer</h3>
     <p>The connection to the scheduler or printer is represented by the HTTP connection type <code>http_t</code>. The <code>cupsConnectDest</code> function connects to the scheduler or printer associated with the destination:</p>
     <pre><code>http_t *
 cupsConnectDest(cups_dest_t *dest, unsigned flags, int msec,
@@ -1033,7 +1074,7 @@ http_t *http = cupsConnectDest(dest, CUPS_DEST_FLAGS_DEVICE,
                                30000, NULL, resource,
                                sizeof(resource), NULL, NULL);
 </code></pre>
-    <h3><a id="creating-an-ipp-request">Creating an IPP Request</a></h3>
+    <h3 class="title" id="creating-an-ipp-request">Creating an IPP Request</h3>
     <p>IPP requests are represented by the IPP message type <code>ipp_t</code> and each IPP attribute in the request is representing using the type <code>ipp_attribute_t</code>. Each IPP request includes an operation code (<code>IPP_OP_CREATE_JOB</code>, <code>IPP_OP_GET_PRINTER_ATTRIBUTES</code>, etc.) and a 32-bit integer identifier.</p>
     <p>The <code>ippNewRequest</code> function creates a new IPP request:</p>
     <pre><code>ipp_t *
@@ -1071,19 +1112,30 @@ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
     <p>The <code>ippAddStrings</code> function adds an attribute with one or more strings, in this case three. The <code>IPP_TAG_KEYWORD</code> argument specifies that the strings are keyword values, which are used for attribute names. All strings use the same language (<code>NULL</code>), and the attribute will contain the three strings in the array <code>requested_attributes</code>.</p>
     <p>CUPS provides many functions to adding attributes of different types:</p>
     <ul>
-    <li><code>ippAddBoolean</code> adds a boolean (<code>IPP_TAG_BOOLEAN</code>) attribute with one value.</li>
-    <li><code>ippAddInteger</code> adds an enum (<code>IPP_TAG_ENUM</code>) or integer (<code>IPP_TAG_INTEGER</code>) attribute with one value.</li>
-    <li><code>ippAddIntegers</code> adds an enum or integer attribute with one or more values.</li>
-    <li><code>ippAddOctetString</code> adds an octetString attribute with one value.</li>
-    <li><code>ippAddOutOfBand</code> adds a admin-defined (<code>IPP_TAG_ADMINDEFINE</code>), default (<code>IPP_TAG_DEFAULT</code>), delete-attribute (<code>IPP_TAG_DELETEATTR</code>), no-value (<code>IPP_TAG_NOVALUE</code>), not-settable (<code>IPP_TAG_NOTSETTABLE</code>), unknown (<code>IPP_TAG_UNKNOWN</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_VALUE</code>) out-of-band attribute.</li>
-    <li><code>ippAddRange</code> adds a rangeOfInteger attribute with one range.</li>
-    <li><code>ippAddRanges</code> adds a rangeOfInteger attribute with one or more ranges.</li>
-    <li><code>ippAddResolution</code> adds a resolution attribute with one resolution.</li>
-    <li><code>ippAddResolutions</code> adds a resolution attribute with one or more resolutions.</li>
-    <li><code>ippAddString</code> adds a charset (<code>IPP_TAG_CHARSET</code>), keyword (<code>IPP_TAG_KEYWORD</code>), mimeMediaType (<code>IPP_TAG_MIMETYPE</code>), name (<code>IPP_TAG_NAME</code> and <code>IPP_TAG_NAMELANG</code>), naturalLanguage (<code>IPP_TAG_NATURAL_LANGUAGE</code>), text (<code>IPP_TAG_TEXT</code> and <code>IPP_TAG_TEXTLANG</code>), uri (<code>IPP_TAG_URI</code>), or uriScheme (<code>IPP_TAG_URISCHEME</code>) attribute with one value.</li>
-    <li><code>ippAddStrings</code> adds a charset, keyword, mimeMediaType, name, naturalLanguage, text, uri, or uriScheme attribute with one or more values.</li>
+    <li>    <p><code>ippAddBoolean</code> adds a boolean (<code>IPP_TAG_BOOLEAN</code>) attribute with one value.</p>
+</li>
+    <li>    <p><code>ippAddInteger</code> adds an enum (<code>IPP_TAG_ENUM</code>) or integer (<code>IPP_TAG_INTEGER</code>) attribute with one value.</p>
+</li>
+    <li>    <p><code>ippAddIntegers</code> adds an enum or integer attribute with one or more values.</p>
+</li>
+    <li>    <p><code>ippAddOctetString</code> adds an octetString attribute with one value.</p>
+</li>
+    <li>    <p><code>ippAddOutOfBand</code> adds a admin-defined (<code>IPP_TAG_ADMINDEFINE</code>), default (<code>IPP_TAG_DEFAULT</code>), delete-attribute (<code>IPP_TAG_DELETEATTR</code>), no-value (<code>IPP_TAG_NOVALUE</code>), not-settable (<code>IPP_TAG_NOTSETTABLE</code>), unknown (<code>IPP_TAG_UNKNOWN</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_VALUE</code>) out-of-band attribute.</p>
+</li>
+    <li>    <p><code>ippAddRange</code> adds a rangeOfInteger attribute with one range.</p>
+</li>
+    <li>    <p><code>ippAddRanges</code> adds a rangeOfInteger attribute with one or more ranges.</p>
+</li>
+    <li>    <p><code>ippAddResolution</code> adds a resolution attribute with one resolution.</p>
+</li>
+    <li>    <p><code>ippAddResolutions</code> adds a resolution attribute with one or more resolutions.</p>
+</li>
+    <li>    <p><code>ippAddString</code> adds a charset (<code>IPP_TAG_CHARSET</code>), keyword (<code>IPP_TAG_KEYWORD</code>), mimeMediaType (<code>IPP_TAG_MIMETYPE</code>), name (<code>IPP_TAG_NAME</code> and <code>IPP_TAG_NAMELANG</code>), naturalLanguage (<code>IPP_TAG_NATURAL_LANGUAGE</code>), text (<code>IPP_TAG_TEXT</code> and <code>IPP_TAG_TEXTLANG</code>), uri (<code>IPP_TAG_URI</code>), or uriScheme (<code>IPP_TAG_URISCHEME</code>) attribute with one value.</p>
+</li>
+    <li>    <p><code>ippAddStrings</code> adds a charset, keyword, mimeMediaType, name, naturalLanguage, text, uri, or uriScheme attribute with one or more values.</p>
+</li>
 </ul>
-    <h3><a id="sending-the-ipp-request">Sending the IPP Request</a></h3>
+    <h3 class="title" id="sending-the-ipp-request">Sending the IPP Request</h3>
     <p>Once you have created the IPP request, you can send it using the <code>cupsDoRequest</code> function. For example, the following code sends the IPP Get-Printer-Attributes request to the destination and saves the response:</p>
     <pre><code>ipp_t *response = cupsDoRequest(http, request, resource);
 </code></pre>
@@ -1105,7 +1157,7 @@ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
   printf(&quot;Request failed: %s\n&quot;, cupsLastErrorString());
 }
 </code></pre>
-    <h3><a id="processing-the-ipp-response">Processing the IPP Response</a></h3>
+    <h3 class="title" id="processing-the-ipp-response">Processing the IPP Response</h3>
     <p>Each response to an IPP request is also an IPP message (<code>ipp_t</code>) with its own IPP attributes (<code>ipp_attribute_t</code>) that includes a status code (<code>IPP_STATUS_OK</code>, <code>IPP_STATUS_ERROR_BAD_REQUEST</code>, etc.) and the corresponding 32-bit integer identifier from the request.</p>
     <p>For example, the following code finds the printer state attributes and prints their values:</p>
     <pre><code>ipp_attribute_t *attr;
@@ -1142,7 +1194,7 @@ if ((attr = ippFindAttribute(response, &quot;printer-state-reasons&quot;,
     <p>Once you are done using the IPP response message, free it using the <code>ippDelete</code> function:</p>
     <pre><code>ippDelete(response);
 </code></pre>
-    <h3><a id="authentication">Authentication</a></h3>
+    <h3 class="title" id="authentication">Authentication</h3>
     <p>CUPS normally handles authentication through the console. GUI applications should set a password callback using the <code>cupsSetPasswordCB2</code> function:</p>
     <pre><code>void
 cupsSetPasswordCB2(cups_password_cb2_t cb, void *user_data);
@@ -1159,19 +1211,6 @@ cups_password_cb2(const char *prompt, http_t *http,
     <p>The <code>resource</code> argument specifies the path used for the request.</p>
     <p>The <code>user_data</code> argument provides the user data pointer from the <code>cupsSetPasswordCB2</code> call.</p>
       <h2 class="title"><a id="FUNCTIONS">Functions</a></h2>
-<h3 class="function"><a id="CF_OPTIONS">CF_OPTIONS</a></h3>
-        <p class="description"></p>
-<p class="code">
-typedef CF_OPTIONS(uint32_t, SecKeyUsage);</p>
-<h4 class="parameters">Parameters</h4>
-<table class="list"><tbody>
-<tr><th>uint32_t</th>
-</tr>
-<tr><th>SecKeyUsage</th>
-</tr>
-</tbody></table>
-<h4 class="returnvalue">Return Value</h4>
-        <p class="description"></p>
 <h3 class="function"><a id="cupsAddDest">cupsAddDest</a></h3>
         <p class="description">Add a destination to the list of destinations.</p>
 <p class="code">
@@ -1200,7 +1239,7 @@ a copy of that destination's options.<br>
 <br>
 Use the <a href="#cupsSaveDests"><code>cupsSaveDests</code></a> function to save the updated list of
 destinations to the user's lpoptions file.</p>
-<h3 class="function"><span class="info">&#160;CUPS 2.3&#160;</span><a id="cupsAddDestMediaOptions">cupsAddDestMediaOptions</a></h3>
+<h3 class="function"><span class="info">&#160;CUPS 2.3/macOS 10.14&#160;</span><a id="cupsAddDestMediaOptions">cupsAddDestMediaOptions</a></h3>
         <p class="description">Add the option corresponding to the specified media size.</p>
 <p class="code">
 int cupsAddDestMediaOptions(<a href="#http_t">http_t</a> *http, <a href="#cups_dest_t">cups_dest_t</a> *dest, <a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo, unsigned flags, <a href="#cups_size_t">cups_size_t</a> *size, int num_options, <a href="#cups_option_t">cups_option_t</a> **options);</p>
@@ -1511,7 +1550,7 @@ int cupsDoAuthentication(<a href="#http_t">http_t</a> *http, const char *method,
 status, prior to resubmitting your request.
 
 </p>
-<h3 class="function"><span class="info">&#160;CUPS 2.3&#160;</span><a id="cupsEncodeOption">cupsEncodeOption</a></h3>
+<h3 class="function"><span class="info">&#160;CUPS 2.3/macOS 10.14&#160;</span><a id="cupsEncodeOption">cupsEncodeOption</a></h3>
         <p class="description">Encode a single option into an IPP attribute.</p>
 <p class="code">
 <a href="#ipp_attribute_t">ipp_attribute_t</a> *cupsEncodeOption(<a href="#ipp_t">ipp_t</a> *ipp, ipp_tag_t group_tag, const char *name, const char *value);</p>
@@ -6071,10 +6110,6 @@ typedef struct _ipp_s ipp_t;
         <td class="description">Top margin in hundredths of
 millimeters</td></tr>
 </tbody></table>
-      <h2 class="title"><a id="VARIABLES">Variables</a></h2>
-      <h3 class="variable"><a id="kSecOidOrganizationalUnit">kSecOidOrganizationalUnit</a></h3>
-        <p class="description">Constants, very secure stuff...</p>
-      <p class="code">extern const void *kSecOidOrganizationalUnit;</p>
       <h2 class="title"><a id="ENUMERATIONS">Constants</a></h2>
       <h3 class="enumeration"><a id="cups_ptype_e">cups_ptype_e</a></h3>
         <p class="description">Printer type/capability bit
diff --git a/doc/help/license.html b/doc/help/license.html
index 9c98b279a..8086c6eac 100644
--- a/doc/help/license.html
+++ b/doc/help/license.html
@@ -187,5 +187,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 </pre>
 
+<h2>CUPS Exceptions to the Apache 2.0 License</h2>
+
+<p>As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.</p>
+
+<p>In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.</p>
+
 </BODY>
 </HTML>
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 988916678..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -457,6 +457,8 @@ The following directives may be placed inside Location and Limit sections in the
 <dd style="margin-left: 5.0em"><dt><b>Allow @IF(</b><i>name</i><b>)</b>
 <dd style="margin-left: 5.0em"><dt><b>Allow @LOCAL</b>
 <dd style="margin-left: 5.0em">Allows access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
 The Order directive controls whether Allow lines are evaluated before or after Deny lines.
 <dt><b>AuthType None</b>
 <dd style="margin-left: 5.0em"><dt><b>AuthType Basic</b>
@@ -476,6 +478,8 @@ The value "Default" corresponds to the DefaultAuthType value.
 <dd style="margin-left: 5.0em"><dt><b>Deny @IF(</b><i>name</i><b>)</b>
 <dd style="margin-left: 5.0em"><dt><b>Deny @LOCAL</b>
 <dd style="margin-left: 5.0em">Denies access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
 The Order directive controls whether Deny lines are evaluated before or after Allow lines.
 <dt><b>Encryption IfRequested</b>
 <dd style="margin-left: 5.0em"><dt><b>Encryption Never</b>
@@ -585,6 +589,9 @@ On Linux this is typically done using the
 command, while on macOS the
 <b>launchctl</b>(8)
 command is used instead.
+<p>The @LOCAL macro name can be confusing since the system running
+<b>cupsd</b>
+often belongs to a different set of subnets from its clients.
 <h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
 The <b>cupsd.conf</b> file format is based on the Apache HTTP Server configuration file format.
 <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 341b1fdcd..e0f6727d7 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -143,7 +143,7 @@ The following directives are understood within a <i>test</i>:
 <dd style="margin-left: 5.0em"><dt><b>ATTR </b><i>tag attribute-name value(s)</i>
 <dd style="margin-left: 5.0em">Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are separated by the comma (",") character - escape commas using the "" character.
+Values for other tags are delimited by the comma (",") character - escape commas using the "\" character.
 Common attributes and values are listed in the IANA IPP registry - see references below.
 <dt><b>ATTR collection </b><i>attribute-name </i><b>{ MEMBER </b><i>tag member-name value(s) ... </i><b>}</b> [ <i>... </i><b>,{ </b><i>... </i><b>} </b>]
 <dd style="margin-left: 5.0em">Adds a collection attribute to the test request.
@@ -230,7 +230,7 @@ The following predicates are understood following the <b>EXPECT</b> test directi
 <dd style="margin-left: 5.0em">Makes the <b>EXPECT</b> conditions apply only if the specified variable is not defined.
 <dt><b>IN-GROUP </b><i>tag</i>
 <dd style="margin-left: 5.0em">Requires the <b>EXPECT</b> attribute to be in the specified group tag.
-<dt><b>OF-TYPE </b><i>tag[,tag,...]</i>
+<dt><b>OF-TYPE </b><i>tag[|tag,...]</i>
 <dd style="margin-left: 5.0em">Requires the <b>EXPECT</b> attribute to use one of the specified value tag(s).
 <dt><b>REPEAT-LIMIT </b><i>number</i>
 <dd style="margin-left: 5.0em"><br>
diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html
index f94fa72fd..59832ebdc 100644
--- a/doc/help/postscript-driver.html
+++ b/doc/help/postscript-driver.html
@@ -5,7 +5,7 @@
     <title>Developing PostScript Printer Drivers</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   PostScript printer driver documentation for CUPS.
 
@@ -477,6 +478,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html
index b33ca2d27..f85ebc2d4 100644
--- a/doc/help/ppd-compiler.html
+++ b/doc/help/ppd-compiler.html
@@ -5,7 +5,7 @@
     <title>Introduction to the PPD Compiler</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   PPD compiler documentation for CUPS.
 
@@ -485,6 +486,7 @@ that describe the features and capabilities of one or more printers.</P>
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html
index de573c616..9b7c84e3f 100644
--- a/doc/help/raster-driver.html
+++ b/doc/help/raster-driver.html
@@ -5,7 +5,7 @@
     <title>Developing Raster Printer Drivers</title>
     <meta name="keywords" content="Programming">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   Raster printer driver documentation for CUPS.
 
@@ -477,6 +478,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 3782eb7ca..e0ed28603 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -5,7 +5,7 @@
     <title>CUPS PPD Extensions</title>
     <meta name="keywords" content="Specifications">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <meta name="creator" content="codedoc v3.1">
+    <meta name="creator" content="codedoc v3.2">
     <meta name="author" content="Unknown">
     <meta name="copyright" content="Unknown">
     <meta name="version" content="0.0">
@@ -450,6 +450,7 @@ h3.title {
 --></style>
   </head>
   <body>
+    <div class="header">
 <!--
   PPD extension documentation for CUPS.
 
@@ -477,6 +478,7 @@ h3.title {
 </tr>
 </tbody>
 </table></div>
+    </div>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 226a3740f..35d678db7 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,10 +1,11 @@
 /*
  * Label printer filter for CUPS.
  *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 2001-2007 by Easy Software Products.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2001-2007 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -613,7 +614,14 @@ EndPage(ppd_file_t          *ppd,	/* I - PPD file */
 	*/
 
 	puts("^XZ");
+
+       /*
+        * Delete the label image...
+        */
+
+	puts("^XA");
         puts("^IDR:CUPS.GRF^FS");
+	puts("^XZ");
 
        /*
         * Cut the label as needed...
diff --git a/locale/cups.pot b/locale/cups.pot
index 2aa98ab0b..fd2ddd07b 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -23,9 +23,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CUPS 2.3b8\n"
+"Project-Id-Version: CUPS 2.3.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1267,7 +1267,7 @@ msgstr ""
 msgid "%s accepting requests since %s"
 msgstr ""
 
-#: scheduler/ipp.c:10336
+#: scheduler/ipp.c:10327
 #, c-format
 msgid "%s cannot be changed."
 msgstr ""
@@ -1293,7 +1293,7 @@ msgid "%s is ready and printing"
 msgstr ""
 
 #: filter/rastertoepson.c:999 filter/rastertohp.c:668
-#: filter/rastertolabel.c:1112
+#: filter/rastertolabel.c:1120
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr ""
@@ -1327,7 +1327,7 @@ msgstr ""
 #: cups/langprintf.c:70 scheduler/cupsfilter.c:720 systemv/lpadmin.c:795
 #: systemv/lpadmin.c:844 systemv/lpadmin.c:892 systemv/lpadmin.c:945
 #: systemv/lpadmin.c:1043 systemv/lpadmin.c:1095 systemv/lpadmin.c:1136
-#: systemv/lpadmin.c:1150 systemv/lpadmin.c:1594
+#: systemv/lpadmin.c:1150 systemv/lpadmin.c:1599
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -2052,7 +2052,7 @@ msgstr ""
 msgid "-C                      Send requests using chunking (default)"
 msgstr ""
 
-#: systemv/lpadmin.c:1618
+#: systemv/lpadmin.c:1623
 msgid "-D description          Specify the textual description of the printer"
 msgstr ""
 
@@ -2060,13 +2060,13 @@ msgstr ""
 msgid "-D device-uri           Set the device URI for the printer"
 msgstr ""
 
-#: systemv/lpadmin.c:1620
+#: systemv/lpadmin.c:1625
 msgid "-E                      Enable and accept jobs on the printer (after -p)"
 msgstr ""
 
 #: berkeley/lpq.c:644 berkeley/lpr.c:433 berkeley/lprm.c:234
 #: systemv/cancel.c:403 systemv/cupsaccept.c:244 systemv/cupsctl.c:233
-#: systemv/lp.c:752 systemv/lpadmin.c:1619 systemv/lpinfo.c:498
+#: systemv/lp.c:752 systemv/lpadmin.c:1624 systemv/lpinfo.c:498
 #: systemv/lpmove.c:217 systemv/lpoptions.c:540 systemv/lpstat.c:2045
 msgid "-E                      Encrypt the connection to the server"
 msgstr ""
@@ -2075,7 +2075,7 @@ msgstr ""
 msgid "-E                      Test with encryption using HTTP Upgrade to TLS"
 msgstr ""
 
-#: scheduler/main.c:2115
+#: scheduler/main.c:2136
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""
 
@@ -2129,7 +2129,7 @@ msgstr ""
 msgid "-L                      Send requests using content-length"
 msgstr ""
 
-#: systemv/lpadmin.c:1623
+#: systemv/lpadmin.c:1628
 msgid "-L location             Specify the textual location of the printer"
 msgstr ""
 
@@ -2165,7 +2165,7 @@ msgstr ""
 msgid "-R                      Show the ranking of jobs"
 msgstr ""
 
-#: systemv/lpadmin.c:1643
+#: systemv/lpadmin.c:1648
 msgid "-R name-default         Remove the default value for the named option"
 msgstr ""
 
@@ -2191,7 +2191,7 @@ msgstr ""
 
 #: berkeley/lpq.c:648 berkeley/lpr.c:452 berkeley/lprm.c:237
 #: systemv/cancel.c:406 systemv/cupsaccept.c:247 systemv/lp.c:778
-#: systemv/lpadmin.c:1647 systemv/lpinfo.c:502 systemv/lpmove.c:219
+#: systemv/lpadmin.c:1652 systemv/lpinfo.c:502 systemv/lpmove.c:219
 #: systemv/lpoptions.c:545 systemv/lpstat.c:2048
 msgid "-U username             Specify the username to use for authentication"
 msgstr ""
@@ -2250,7 +2250,7 @@ msgstr ""
 msgid "-c [class(es)]          Show classes and their member printers"
 msgstr ""
 
-#: systemv/lpadmin.c:1616
+#: systemv/lpadmin.c:1621
 msgid "-c class                Add the named destination to a class"
 msgstr ""
 
@@ -2258,7 +2258,7 @@ msgstr ""
 msgid "-c command              Set print command"
 msgstr ""
 
-#: scheduler/main.c:2113
+#: scheduler/main.c:2134
 msgid "-c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
@@ -2270,7 +2270,7 @@ msgstr ""
 msgid "-d destination          Set default destination"
 msgstr ""
 
-#: systemv/lpadmin.c:1617
+#: systemv/lpadmin.c:1622
 msgid "-d destination          Set the named destination as the server default"
 msgstr ""
 
@@ -2290,7 +2290,7 @@ msgstr ""
 msgid "-e                      Show available destinations on the network"
 msgstr ""
 
-#: scheduler/main.c:2114
+#: scheduler/main.c:2135
 msgid "-f                      Run in the foreground."
 msgstr ""
 
@@ -2302,7 +2302,7 @@ msgstr ""
 msgid "-f type/subtype[,...]   Set supported file types"
 msgstr ""
 
-#: scheduler/main.c:2116
+#: scheduler/main.c:2137
 msgid "-h                      Show this usage message."
 msgstr ""
 
@@ -2316,7 +2316,7 @@ msgstr ""
 
 #: berkeley/lpq.c:645 berkeley/lprm.c:235 systemv/cancel.c:404
 #: systemv/cupsaccept.c:245 systemv/cupsctl.c:234 systemv/lp.c:753
-#: systemv/lpadmin.c:1621 systemv/lpinfo.c:499 systemv/lpmove.c:218
+#: systemv/lpadmin.c:1626 systemv/lpinfo.c:499 systemv/lpmove.c:218
 #: systemv/lpoptions.c:541 systemv/lpstat.c:2046
 msgid "-h server[:port]        Connect to the named server and port"
 msgstr ""
@@ -2329,7 +2329,7 @@ msgstr ""
 msgid "-i id                   Specify an existing job ID to modify"
 msgstr ""
 
-#: systemv/lpadmin.c:1622
+#: systemv/lpadmin.c:1627
 msgid "-i ppd-file             Specify a PPD file for the printer"
 msgstr ""
 
@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "-l                      Produce plain text output"
 msgstr ""
 
-#: scheduler/main.c:2118
+#: scheduler/main.c:2139
 msgid "-l                      Run cupsd on demand."
 msgstr ""
 
@@ -2373,7 +2373,7 @@ msgstr ""
 msgid "-m                      Show models"
 msgstr ""
 
-#: systemv/lpadmin.c:1625
+#: systemv/lpadmin.c:1630
 msgid "-m everywhere           Specify the printer is compatible with IPP Everywhere"
 msgstr ""
 
@@ -2381,7 +2381,7 @@ msgstr ""
 msgid "-m model                Set model name (default=Printer)"
 msgstr ""
 
-#: systemv/lpadmin.c:1624
+#: systemv/lpadmin.c:1629
 msgid "-m model                Specify a standard model/PPD file for the printer"
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr ""
 msgid "-n regex                Match service name to regular expression"
 msgstr ""
 
-#: systemv/lpadmin.c:1627
+#: systemv/lpadmin.c:1632
 msgid "-o Name=Value           Specify the default value for the named PPD option "
 msgstr ""
 
@@ -2409,27 +2409,27 @@ msgstr ""
 msgid "-o [destination(s)]     Show jobs"
 msgstr ""
 
-#: systemv/lpadmin.c:1628
+#: systemv/lpadmin.c:1633
 msgid ""
 "-o cupsIPPSupplies=false\n"
 "                        Disable supply level reporting via IPP"
 msgstr ""
 
-#: systemv/lpadmin.c:1630
+#: systemv/lpadmin.c:1635
 msgid ""
 "-o cupsSNMPSupplies=false\n"
 "                        Disable supply level reporting via SNMP"
 msgstr ""
 
-#: systemv/lpadmin.c:1632
+#: systemv/lpadmin.c:1637
 msgid "-o job-k-limit=N        Specify the kilobyte limit for per-user quotas"
 msgstr ""
 
-#: systemv/lpadmin.c:1633
+#: systemv/lpadmin.c:1638
 msgid "-o job-page-limit=N     Specify the page limit for per-user quotas"
 msgstr ""
 
-#: systemv/lpadmin.c:1634
+#: systemv/lpadmin.c:1639
 msgid "-o job-quota-period=N   Specify the per-user quota period in seconds"
 msgstr ""
 
@@ -2441,7 +2441,7 @@ msgstr ""
 msgid "-o media=size           Specify the media size to use"
 msgstr ""
 
-#: systemv/lpadmin.c:1626
+#: systemv/lpadmin.c:1631
 msgid "-o name-default=value   Specify the default value for the named option"
 msgstr ""
 
@@ -2467,19 +2467,19 @@ msgstr ""
 msgid "-o print-quality=N      Specify the print quality - draft (3), normal (4), or best (5)"
 msgstr ""
 
-#: systemv/lpadmin.c:1635
+#: systemv/lpadmin.c:1640
 msgid ""
 "-o printer-error-policy=name\n"
 "                        Specify the printer error policy"
 msgstr ""
 
-#: systemv/lpadmin.c:1637
+#: systemv/lpadmin.c:1642
 msgid ""
 "-o printer-is-shared=true\n"
 "                        Share the printer"
 msgstr ""
 
-#: systemv/lpadmin.c:1639
+#: systemv/lpadmin.c:1644
 msgid ""
 "-o printer-op-policy=name\n"
 "                        Specify the printer operation policy"
@@ -2513,7 +2513,7 @@ msgstr ""
 msgid "-p destination          Specify a destination"
 msgstr ""
 
-#: systemv/lpadmin.c:1641
+#: systemv/lpadmin.c:1646
 msgid "-p destination          Specify/add the named destination"
 msgstr ""
 
@@ -2553,7 +2553,7 @@ msgstr ""
 msgid "-r                      Use 'relaxed' open mode"
 msgstr ""
 
-#: systemv/lpadmin.c:1642
+#: systemv/lpadmin.c:1647
 msgid "-r class                Remove the named destination from a class"
 msgstr ""
 
@@ -2577,7 +2577,7 @@ msgstr ""
 msgid "-s                      Show a status summary"
 msgstr ""
 
-#: scheduler/main.c:2120
+#: scheduler/main.c:2141
 msgid "-s cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
@@ -2593,7 +2593,7 @@ msgstr ""
 msgid "-t                      Show all status information"
 msgstr ""
 
-#: scheduler/main.c:2121
+#: scheduler/main.c:2142
 msgid "-t                      Test the configuration file."
 msgstr ""
 
@@ -2609,15 +2609,15 @@ msgstr ""
 msgid "-u [user(s)]            Show jobs queued by the current or specified users"
 msgstr ""
 
-#: systemv/lpadmin.c:1644
+#: systemv/lpadmin.c:1649
 msgid "-u allow:all            Allow all users to print"
 msgstr ""
 
-#: systemv/lpadmin.c:1645
+#: systemv/lpadmin.c:1650
 msgid "-u allow:list           Allow the list of users or groups (@name) to print"
 msgstr ""
 
-#: systemv/lpadmin.c:1646
+#: systemv/lpadmin.c:1651
 msgid "-u deny:list            Prevent the list of users or groups (@name) to print"
 msgstr ""
 
@@ -2641,7 +2641,7 @@ msgstr ""
 msgid "-v [printer(s)]         Show the devices for each destination"
 msgstr ""
 
-#: systemv/lpadmin.c:1648
+#: systemv/lpadmin.c:1653
 msgid "-v device-uri           Specify the device URI for the printer"
 msgstr ""
 
@@ -2657,7 +2657,7 @@ msgstr ""
 msgid "-x destination          Remove default options for destination"
 msgstr ""
 
-#: systemv/lpadmin.c:1649
+#: systemv/lpadmin.c:1654
 msgid "-x destination          Remove the named destination"
 msgstr ""
 
@@ -3319,7 +3319,7 @@ msgstr ""
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: scheduler/ipp.c:2287
+#: scheduler/ipp.c:2283
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
@@ -3506,12 +3506,12 @@ msgstr ""
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 
-#: scheduler/ipp.c:5427 scheduler/ipp.c:5453
+#: scheduler/ipp.c:5422 scheduler/ipp.c:5448
 #, c-format
 msgid "Attribute \"%s\" is in the wrong group."
 msgstr ""
 
-#: scheduler/ipp.c:5429 scheduler/ipp.c:5455
+#: scheduler/ipp.c:5424 scheduler/ipp.c:5450
 #, c-format
 msgid "Attribute \"%s\" is the wrong value type."
 msgstr ""
@@ -3569,17 +3569,17 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: scheduler/ipp.c:7509
+#: scheduler/ipp.c:7504
 #, c-format
 msgid "Bad \"printer-id\" value %d."
 msgstr ""
 
-#: scheduler/ipp.c:10345
+#: scheduler/ipp.c:10336
 #, c-format
 msgid "Bad '%s' value."
 msgstr ""
 
-#: scheduler/ipp.c:11293
+#: scheduler/ipp.c:11284
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -3617,7 +3617,7 @@ msgstr ""
 msgid "Bad PPD cache file."
 msgstr ""
 
-#: scheduler/ipp.c:2663
+#: scheduler/ipp.c:2659
 msgid "Bad PPD file."
 msgstr ""
 
@@ -3650,22 +3650,22 @@ msgstr ""
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1746 scheduler/ipp.c:2369
+#: cups/http-support.c:1746 scheduler/ipp.c:2365
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2414
+#: scheduler/ipp.c:2410
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8491 scheduler/ipp.c:8509 scheduler/ipp.c:9737
+#: scheduler/ipp.c:8486 scheduler/ipp.c:8504 scheduler/ipp.c:9732
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9755
+#: scheduler/ipp.c:9750
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
@@ -3687,7 +3687,7 @@ msgstr ""
 msgid "Bad job-name value: Wrong type or count."
 msgstr ""
 
-#: scheduler/ipp.c:10383
+#: scheduler/ipp.c:10374
 msgid "Bad job-priority value."
 msgstr ""
 
@@ -3700,29 +3700,29 @@ msgstr ""
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:10413
+#: scheduler/ipp.c:10404
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:3010 scheduler/ipp.c:3472 scheduler/ipp.c:6258
-#: scheduler/ipp.c:6405 scheduler/ipp.c:7917 scheduler/ipp.c:8189
-#: scheduler/ipp.c:9055 scheduler/ipp.c:9279 scheduler/ipp.c:9631
-#: scheduler/ipp.c:10244
+#: scheduler/ipp.c:3006 scheduler/ipp.c:3468 scheduler/ipp.c:6253
+#: scheduler/ipp.c:6400 scheduler/ipp.c:7912 scheduler/ipp.c:8184
+#: scheduler/ipp.c:9050 scheduler/ipp.c:9274 scheduler/ipp.c:9626
+#: scheduler/ipp.c:10235
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2053 scheduler/ipp.c:5778
+#: scheduler/ipp.c:2049 scheduler/ipp.c:5773
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2018 scheduler/ipp.c:5742
+#: scheduler/ipp.c:2014 scheduler/ipp.c:5737
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:5853
+#: scheduler/ipp.c:5848
 #, c-format
 msgid "Bad notify-user-data \"%s\"."
 msgstr ""
@@ -3741,12 +3741,12 @@ msgstr ""
 msgid "Bad port number in URI"
 msgstr ""
 
-#: scheduler/ipp.c:2460
+#: scheduler/ipp.c:2456
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2541
+#: scheduler/ipp.c:2537
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr ""
@@ -3785,7 +3785,7 @@ msgstr ""
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cgi-bin/admin.c:2794 cgi-bin/admin.c:3040
+#: cgi-bin/admin.c:2794 cgi-bin/admin.c:3043
 msgid "Banners"
 msgstr ""
 
@@ -3822,11 +3822,11 @@ msgstr ""
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:963 scheduler/ipp.c:2516
+#: scheduler/ipp.c:963 scheduler/ipp.c:2512
 msgid "Cannot change printer-is-shared for remote queues."
 msgstr ""
 
-#: scheduler/ipp.c:2503
+#: scheduler/ipp.c:2499
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
@@ -3839,7 +3839,7 @@ msgstr ""
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2065 scheduler/ipp.c:5790
+#: scheduler/ipp.c:2061 scheduler/ipp.c:5785
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
@@ -3852,7 +3852,7 @@ msgstr ""
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:3924
+#: scheduler/ipp.c:3920
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
@@ -3911,7 +3911,7 @@ msgstr ""
 msgid "Credentials have expired."
 msgstr ""
 
-#: cups/ppd.c:1122 cups/ppd.c:1162 cups/ppd.c:1371 cups/ppd.c:1474
+#: cups/ppd.c:1133 cups/ppd.c:1173 cups/ppd.c:1382 cups/ppd.c:1485
 msgid "Custom"
 msgstr ""
 
@@ -4024,7 +4024,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: scheduler/ipp.c:6307
+#: scheduler/ipp.c:6302
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
@@ -4056,12 +4056,12 @@ msgstr ""
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/http.c:4641
+#: cups/http.c:4649
 msgid "Encryption is not supported."
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3065
+#: cgi-bin/admin.c:3068
 msgid "Ending Banner"
 msgstr ""
 
@@ -4069,7 +4069,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: scheduler/client.c:1980
+#: scheduler/client.c:1981
 msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."
 msgstr ""
 
@@ -4293,7 +4293,7 @@ msgstr ""
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3108
+#: cgi-bin/admin.c:3111
 msgid "Error Policy"
 msgstr ""
 
@@ -4403,13 +4403,13 @@ msgstr ""
 msgid "File Folder"
 msgstr ""
 
-#: scheduler/ipp.c:2390
+#: scheduler/ipp.c:2386
 #, c-format
 msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
 #: filter/rastertoepson.c:1131 filter/rastertohp.c:802
-#: filter/rastertolabel.c:1251
+#: filter/rastertolabel.c:1259
 #, c-format
 msgid "Finished page %d."
 msgstr ""
@@ -4434,7 +4434,7 @@ msgstr ""
 msgid "Found"
 msgstr ""
 
-#: cups/ppd.c:753 cups/ppd.c:1275
+#: cups/ppd.c:757 cups/ppd.c:1286
 msgid "General"
 msgstr ""
 
@@ -4450,10 +4450,10 @@ msgstr ""
 msgid "Glossy Paper"
 msgstr ""
 
-#: scheduler/ipp.c:2988 scheduler/ipp.c:3398 scheduler/ipp.c:3936
-#: scheduler/ipp.c:6236 scheduler/ipp.c:6383 scheduler/ipp.c:7894
-#: scheduler/ipp.c:9033 scheduler/ipp.c:9257 scheduler/ipp.c:9609
-#: scheduler/ipp.c:10222
+#: scheduler/ipp.c:2984 scheduler/ipp.c:3394 scheduler/ipp.c:3932
+#: scheduler/ipp.c:6231 scheduler/ipp.c:6378 scheduler/ipp.c:7889
+#: scheduler/ipp.c:9028 scheduler/ipp.c:9252 scheduler/ipp.c:9604
+#: scheduler/ipp.c:10213
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
@@ -4469,7 +4469,7 @@ msgstr ""
 msgid "Hanging Folder"
 msgstr ""
 
-#: cups/hash.c:269
+#: cups/hash.c:292
 msgid "Hash buffer too small."
 msgstr ""
 
@@ -4481,11 +4481,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: cups/ipp.c:3089 cups/ipp.c:3116 cups/ipp.c:3139
+#: cups/ipp.c:3094 cups/ipp.c:3121 cups/ipp.c:3144
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:3052
+#: cups/ipp.c:3057
 msgid "IPP attribute has no name."
 msgstr ""
 
@@ -4493,23 +4493,23 @@ msgstr ""
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3502
+#: cups/ipp.c:3507
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3280
+#: cups/ipp.c:3285
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:3345
+#: cups/ipp.c:3350
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3523
+#: cups/ipp.c:3528
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3255
+#: cups/ipp.c:3260
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
@@ -4517,27 +4517,27 @@ msgstr ""
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:3252
+#: cups/ipp.c:3257
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3455
+#: cups/ipp.c:3460
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3464
+#: cups/ipp.c:3469
 msgid "IPP language length too large."
 msgstr ""
 
-#: cups/ipp.c:3166
+#: cups/ipp.c:3171
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:3549
+#: cups/ipp.c:3554
 msgid "IPP memberName value is empty."
 msgstr ""
 
-#: cups/ipp.c:3541
+#: cups/ipp.c:3546
 msgid "IPP memberName with no attribute."
 msgstr ""
 
@@ -4545,31 +4545,31 @@ msgstr ""
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:3422
+#: cups/ipp.c:3427
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3580
+#: cups/ipp.c:3585
 msgid "IPP octetString length too large."
 msgstr ""
 
-#: cups/ipp.c:3390
+#: cups/ipp.c:3395
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:3363
+#: cups/ipp.c:3368
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3482
+#: cups/ipp.c:3487
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3418
+#: cups/ipp.c:3423
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3238
+#: cups/ipp.c:3243
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -4679,7 +4679,11 @@ msgstr ""
 msgid "Invalid media size."
 msgstr ""
 
-#: scheduler/ipp.c:2709 scheduler/ipp.c:7050
+#: cups/ipp.c:3045
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
+#: scheduler/ipp.c:2705 scheduler/ipp.c:7045
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -4688,7 +4692,7 @@ msgstr ""
 msgid "Invalid printer command \"%s\"."
 msgstr ""
 
-#: cups/ppd.c:1393
+#: cups/ppd.c:1404
 msgid "JCL"
 msgstr ""
 
@@ -4748,52 +4752,52 @@ msgstr ""
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:9329
+#: scheduler/ipp.c:9324
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:3028 scheduler/ipp.c:3262 scheduler/ipp.c:3321
-#: scheduler/ipp.c:3500 scheduler/ipp.c:3946 scheduler/ipp.c:5895
-#: scheduler/ipp.c:6276 scheduler/ipp.c:6423 scheduler/ipp.c:6760
-#: scheduler/ipp.c:7735 scheduler/ipp.c:7757 scheduler/ipp.c:7935
-#: scheduler/ipp.c:8163 scheduler/ipp.c:8206 scheduler/ipp.c:9073
-#: scheduler/ipp.c:9297 scheduler/ipp.c:9649 scheduler/ipp.c:10262
+#: scheduler/ipp.c:3024 scheduler/ipp.c:3258 scheduler/ipp.c:3317
+#: scheduler/ipp.c:3496 scheduler/ipp.c:3942 scheduler/ipp.c:5890
+#: scheduler/ipp.c:6271 scheduler/ipp.c:6418 scheduler/ipp.c:6755
+#: scheduler/ipp.c:7730 scheduler/ipp.c:7752 scheduler/ipp.c:7930
+#: scheduler/ipp.c:8158 scheduler/ipp.c:8201 scheduler/ipp.c:9068
+#: scheduler/ipp.c:9292 scheduler/ipp.c:9644 scheduler/ipp.c:10253
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:3532
+#: scheduler/ipp.c:3528
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3526
+#: scheduler/ipp.c:3522
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3538
+#: scheduler/ipp.c:3534
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:7961 scheduler/ipp.c:8248 scheduler/ipp.c:10277
+#: scheduler/ipp.c:7956 scheduler/ipp.c:8243 scheduler/ipp.c:10268
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:9311
+#: scheduler/ipp.c:9306
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:3043
+#: scheduler/ipp.c:3039
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:9087
+#: scheduler/ipp.c:9082
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
@@ -4814,7 +4818,7 @@ msgstr ""
 msgid "Job Stopped"
 msgstr ""
 
-#: scheduler/ipp.c:10391
+#: scheduler/ipp.c:10382
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
@@ -4822,11 +4826,11 @@ msgstr ""
 msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:10427 scheduler/ipp.c:10444 scheduler/ipp.c:10455
+#: scheduler/ipp.c:10418 scheduler/ipp.c:10435 scheduler/ipp.c:10446
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:9177
+#: scheduler/ipp.c:9172
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
@@ -4850,7 +4854,7 @@ msgstr ""
 msgid "Label Top"
 msgstr ""
 
-#: scheduler/ipp.c:2074 scheduler/ipp.c:5799
+#: scheduler/ipp.c:2070 scheduler/ipp.c:5794
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -4888,7 +4892,7 @@ msgstr ""
 msgid "Listening on port %d."
 msgstr ""
 
-#: scheduler/ipp.c:5508
+#: scheduler/ipp.c:5503
 msgid "Local printer created."
 msgstr ""
 
@@ -4904,11 +4908,11 @@ msgstr ""
 msgid "Manual Feed"
 msgstr ""
 
-#: cups/ppd.c:800 cups/ppd.c:1330
+#: cups/ppd.c:804 cups/ppd.c:1341
 msgid "Media Size"
 msgstr ""
 
-#: cups/ppd.c:804 cups/ppd.c:1334 ppdc/sample.c:254
+#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:254
 msgid "Media Source"
 msgstr ""
 
@@ -4916,7 +4920,7 @@ msgstr ""
 msgid "Media Tracking"
 msgstr ""
 
-#: cups/ppd.c:802 cups/ppd.c:1332 ppdc/sample.c:280
+#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:280
 msgid "Media Type"
 msgstr ""
 
@@ -4944,17 +4948,17 @@ msgstr ""
 msgid "Missing asterisk in column 1"
 msgstr ""
 
-#: scheduler/ipp.c:6299
+#: scheduler/ipp.c:6294
 msgid "Missing document-number attribute."
 msgstr ""
 
 #: cgi-bin/admin.c:502 cgi-bin/admin.c:1798 cgi-bin/admin.c:1883
 #: cgi-bin/admin.c:2289 cgi-bin/admin.c:2543 cgi-bin/admin.c:2654
-#: cgi-bin/admin.c:3364
+#: cgi-bin/admin.c:3367
 msgid "Missing form variable"
 msgstr ""
 
-#: scheduler/ipp.c:9703
+#: scheduler/ipp.c:9698
 msgid "Missing last-document attribute in request."
 msgstr ""
 
@@ -4966,7 +4970,7 @@ msgstr ""
 msgid "Missing media-size in media-col."
 msgstr ""
 
-#: scheduler/ipp.c:6900
+#: scheduler/ipp.c:6895
 msgid "Missing notify-subscription-ids attribute."
 msgstr ""
 
@@ -4974,11 +4978,11 @@ msgstr ""
 msgid "Missing option keyword"
 msgstr ""
 
-#: scheduler/ipp.c:3169 scheduler/ipp.c:3194
+#: scheduler/ipp.c:3165 scheduler/ipp.c:3190
 msgid "Missing requesting-user-name attribute."
 msgstr ""
 
-#: scheduler/ipp.c:5425 scheduler/ipp.c:5451
+#: scheduler/ipp.c:5420 scheduler/ipp.c:5446
 #, c-format
 msgid "Missing required attribute \"%s\"."
 msgstr ""
@@ -5064,7 +5068,7 @@ msgstr ""
 msgid "New credentials are older than stored credentials."
 msgstr ""
 
-#: cups/ppd.c:1942
+#: cups/ppd.c:1974
 msgid "No"
 msgstr ""
 
@@ -5092,7 +5096,7 @@ msgstr ""
 msgid "No active connection."
 msgstr ""
 
-#: scheduler/ipp.c:3449
+#: scheduler/ipp.c:3445
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
@@ -5101,7 +5105,7 @@ msgstr ""
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:3070
+#: scheduler/ipp.c:3066
 msgid "No authentication information provided."
 msgstr ""
 
@@ -5117,11 +5121,11 @@ msgstr ""
 msgid "No default destination."
 msgstr ""
 
-#: scheduler/ipp.c:6099
+#: scheduler/ipp.c:6094
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:418 scheduler/ipp.c:7481
+#: cgi-bin/ipp-var.c:418 scheduler/ipp.c:7476
 msgid "No destinations added."
 msgstr ""
 
@@ -5137,7 +5141,7 @@ msgstr ""
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:8453 scheduler/ipp.c:9717
+#: scheduler/ipp.c:8448 scheduler/ipp.c:9712
 msgid "No file in print request."
 msgstr ""
 
@@ -5150,7 +5154,7 @@ msgid "No name OID"
 msgstr ""
 
 #: filter/rastertoepson.c:1161 filter/rastertohp.c:833
-#: filter/rastertolabel.c:1280
+#: filter/rastertolabel.c:1288
 msgid "No pages were found."
 msgstr ""
 
@@ -5166,15 +5170,15 @@ msgstr ""
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:6506
+#: scheduler/ipp.c:6501
 msgid "No printer-uri in request."
 msgstr ""
 
-#: cups/http.c:2209
+#: cups/http.c:2217
 msgid "No request URI."
 msgstr ""
 
-#: cups/http.c:2226
+#: cups/http.c:2234
 msgid "No request protocol version."
 msgstr ""
 
@@ -5190,11 +5194,11 @@ msgstr ""
 msgid "No stored credentials, not valid for name."
 msgstr ""
 
-#: scheduler/ipp.c:5684
+#: scheduler/ipp.c:5679
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:7834
+#: scheduler/ipp.c:7829
 msgid "No subscriptions found."
 msgstr ""
 
@@ -5244,7 +5248,7 @@ msgstr ""
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1510 scheduler/ipp.c:10988
+#: scheduler/ipp.c:1510 scheduler/ipp.c:10979
 msgid "Not allowed to print."
 msgstr ""
 
@@ -5268,7 +5272,7 @@ msgstr ""
 msgid "Online Help"
 msgstr ""
 
-#: scheduler/ipp.c:5404
+#: scheduler/ipp.c:5399
 msgid "Only local users can create a local printer."
 msgstr ""
 
@@ -5285,7 +5289,7 @@ msgstr ""
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3135
+#: cgi-bin/admin.c:3138
 msgid "Operation Policy"
 msgstr ""
 
@@ -5299,9 +5303,9 @@ msgid "Options Installed"
 msgstr ""
 
 #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232
-#: scheduler/cupsfilter.c:1476 scheduler/main.c:2112 systemv/cancel.c:401
+#: scheduler/cupsfilter.c:1476 scheduler/main.c:2133 systemv/cancel.c:401
 #: systemv/cupsaccept.c:243 systemv/cupsctl.c:232 systemv/cupstestppd.c:3857
-#: systemv/lp.c:750 systemv/lpadmin.c:1615 systemv/lpinfo.c:497
+#: systemv/lp.c:750 systemv/lpadmin.c:1620 systemv/lpinfo.c:497
 #: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044
 #: tools/ippeveprinter.c:7664 tools/ippfind.c:2765 tools/ipptool.c:4307
 #: ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119
@@ -5325,7 +5329,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr ""
 
-#: cups/ppd.c:806 cups/ppd.c:1336
+#: cups/ppd.c:810 cups/ppd.c:1347
 msgid "Output Mode"
 msgstr ""
 
@@ -5406,11 +5410,11 @@ msgstr ""
 msgid "Plain Paper"
 msgstr ""
 
-#: cgi-bin/admin.c:2803 cgi-bin/admin.c:3084
+#: cgi-bin/admin.c:2803 cgi-bin/admin.c:3087
 msgid "Policies"
 msgstr ""
 
-#: cgi-bin/admin.c:2810 cgi-bin/admin.c:3153 cgi-bin/admin.c:3166
+#: cgi-bin/admin.c:2810 cgi-bin/admin.c:3156 cgi-bin/admin.c:3169
 msgid "Port Monitor"
 msgstr ""
 
@@ -5494,7 +5498,7 @@ msgstr ""
 msgid "Print job was not accepted."
 msgstr ""
 
-#: scheduler/ipp.c:5470
+#: scheduler/ipp.c:5465
 #, c-format
 msgid "Printer \"%s\" already exists."
 msgstr ""
@@ -5544,7 +5548,7 @@ msgid "Printers"
 msgstr ""
 
 #: filter/rastertoepson.c:1107 filter/rastertohp.c:774
-#: filter/rastertolabel.c:1227
+#: filter/rastertolabel.c:1235
 #, c-format
 msgid "Printing page %d, %u%% complete."
 msgstr ""
@@ -5557,7 +5561,7 @@ msgstr ""
 msgid "Quarto"
 msgstr ""
 
-#: scheduler/ipp.c:1505 scheduler/ipp.c:10983
+#: scheduler/ipp.c:1505 scheduler/ipp.c:10974
 msgid "Quota limit reached."
 msgstr ""
 
@@ -5587,7 +5591,7 @@ msgstr ""
 msgid "Request Entity Too Large"
 msgstr ""
 
-#: cups/ppd.c:808 cups/ppd.c:1338 ppdc/sample.c:231
+#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:231
 msgid "Resolution"
 msgstr ""
 
@@ -5619,7 +5623,7 @@ msgstr ""
 msgid "See Other"
 msgstr ""
 
-#: scheduler/ipp.c:7104 scheduler/ipp.c:7123
+#: scheduler/ipp.c:7099 scheduler/ipp.c:7118
 msgid "See remote printer."
 msgstr ""
 
@@ -5668,11 +5672,11 @@ msgstr ""
 msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/admin.c:2639 cgi-bin/admin.c:2813 cgi-bin/admin.c:3195
+#: cgi-bin/admin.c:2639 cgi-bin/admin.c:2813 cgi-bin/admin.c:3198
 msgid "Set Printer Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3365 cgi-bin/admin.c:3409 cgi-bin/admin.c:3427
+#: cgi-bin/admin.c:3368 cgi-bin/admin.c:3412 cgi-bin/admin.c:3430
 msgid "Set Publishing"
 msgstr ""
 
@@ -5702,12 +5706,12 @@ msgid "Staple"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3056
+#: cgi-bin/admin.c:3059
 msgid "Starting Banner"
 msgstr ""
 
 #: filter/rastertoepson.c:1083 filter/rastertohp.c:750
-#: filter/rastertolabel.c:1203
+#: filter/rastertolabel.c:1211
 #, c-format
 msgid "Starting page %d."
 msgstr ""
@@ -5716,8 +5720,8 @@ msgstr ""
 msgid "Statement"
 msgstr ""
 
-#: scheduler/ipp.c:3595 scheduler/ipp.c:6916 scheduler/ipp.c:7641
-#: scheduler/ipp.c:9165
+#: scheduler/ipp.c:3591 scheduler/ipp.c:6911 scheduler/ipp.c:7636
+#: scheduler/ipp.c:9160
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -5771,8 +5775,8 @@ msgstr ""
 msgid "The \"%s\" attribute is required for print jobs."
 msgstr ""
 
-#: scheduler/ipp.c:6577 scheduler/ipp.c:6657 scheduler/ipp.c:6670
-#: scheduler/ipp.c:6682 scheduler/ipp.c:6697
+#: scheduler/ipp.c:6572 scheduler/ipp.c:6652 scheduler/ipp.c:6665
+#: scheduler/ipp.c:6677 scheduler/ipp.c:6692
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
@@ -5782,23 +5786,23 @@ msgstr ""
 msgid "The '%s' Job Status attribute cannot be supplied in a job creation request."
 msgstr ""
 
-#: scheduler/ipp.c:5199
+#: scheduler/ipp.c:5194
 #, c-format
 msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:7146
+#: scheduler/ipp.c:7141
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:7135
+#: scheduler/ipp.c:7130
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
 
 #: filter/rastertoepson.c:1052 filter/rastertohp.c:721
-#: filter/rastertolabel.c:1167
+#: filter/rastertolabel.c:1175
 msgid "The PPD file could not be opened."
 msgstr ""
 
@@ -5806,11 +5810,11 @@ msgstr ""
 msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/ipp.c:2101
+#: scheduler/ipp.c:2097
 msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: scheduler/ipp.c:2084 scheduler/ipp.c:5809
+#: scheduler/ipp.c:2080 scheduler/ipp.c:5804
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
@@ -5862,14 +5866,14 @@ msgstr ""
 msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/ipp.c:762 scheduler/ipp.c:1047 scheduler/ipp.c:3234
-#: scheduler/ipp.c:3415 scheduler/ipp.c:5182 scheduler/ipp.c:5643
-#: scheduler/ipp.c:5977 scheduler/ipp.c:6543 scheduler/ipp.c:7350
-#: scheduler/ipp.c:7406 scheduler/ipp.c:7747 scheduler/ipp.c:8022
-#: scheduler/ipp.c:8111 scheduler/ipp.c:8144 scheduler/ipp.c:8468
-#: scheduler/ipp.c:8875 scheduler/ipp.c:8957 scheduler/ipp.c:10131
-#: scheduler/ipp.c:10593 scheduler/ipp.c:10946 scheduler/ipp.c:11028
-#: scheduler/ipp.c:11357
+#: scheduler/ipp.c:762 scheduler/ipp.c:1047 scheduler/ipp.c:3230
+#: scheduler/ipp.c:3411 scheduler/ipp.c:5177 scheduler/ipp.c:5638
+#: scheduler/ipp.c:5972 scheduler/ipp.c:6538 scheduler/ipp.c:7345
+#: scheduler/ipp.c:7401 scheduler/ipp.c:7742 scheduler/ipp.c:8017
+#: scheduler/ipp.c:8106 scheduler/ipp.c:8139 scheduler/ipp.c:8463
+#: scheduler/ipp.c:8870 scheduler/ipp.c:8952 scheduler/ipp.c:10122
+#: scheduler/ipp.c:10584 scheduler/ipp.c:10937 scheduler/ipp.c:11019
+#: scheduler/ipp.c:11348
 msgid "The printer or class does not exist."
 msgstr ""
 
@@ -5877,12 +5881,12 @@ msgstr ""
 msgid "The printer or class is not shared."
 msgstr ""
 
-#: scheduler/ipp.c:868 scheduler/ipp.c:2265
+#: scheduler/ipp.c:868 scheduler/ipp.c:2261
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:3211
+#: scheduler/ipp.c:3207
 msgid "The printer-uri attribute is required."
 msgstr ""
 
@@ -5890,20 +5894,20 @@ msgstr ""
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2249
+#: scheduler/ipp.c:2245
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
-#: scheduler/client.c:2002
+#: scheduler/client.c:2003
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
-#: scheduler/ipp.c:6641
+#: scheduler/ipp.c:6636
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:5906
+#: scheduler/ipp.c:5901
 msgid "There are too many subscriptions."
 msgstr ""
 
@@ -5925,7 +5929,7 @@ msgstr ""
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
 
-#: scheduler/ipp.c:2578
+#: scheduler/ipp.c:2574
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
@@ -6052,7 +6056,7 @@ msgstr ""
 msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:3410
+#: cgi-bin/admin.c:3413
 msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
@@ -6083,12 +6087,12 @@ msgstr ""
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: scheduler/ipp.c:2680
+#: scheduler/ipp.c:2676
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
-#: scheduler/ipp.c:2725
+#: scheduler/ipp.c:2721
 msgid "Unable to copy PPD file."
 msgstr ""
 
@@ -6100,7 +6104,7 @@ msgstr ""
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: scheduler/ipp.c:5480
+#: scheduler/ipp.c:5475
 msgid "Unable to create printer."
 msgstr ""
 
@@ -6261,7 +6265,7 @@ msgstr ""
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:6320
+#: scheduler/ipp.c:6315
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
@@ -6277,7 +6281,7 @@ msgid "Unable to open print file"
 msgstr ""
 
 #: filter/rastertoepson.c:1012 filter/rastertohp.c:681
-#: filter/rastertolabel.c:1125
+#: filter/rastertolabel.c:1133
 msgid "Unable to open raster file"
 msgstr ""
 
@@ -6296,7 +6300,7 @@ msgstr ""
 msgid "Unable to register \"%s.%s\": %d"
 msgstr ""
 
-#: scheduler/ipp.c:8627 scheduler/ipp.c:9870
+#: scheduler/ipp.c:8622 scheduler/ipp.c:9865
 msgid "Unable to rename job document file."
 msgstr ""
 
@@ -6316,7 +6320,7 @@ msgstr ""
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: cgi-bin/admin.c:3311
+#: cgi-bin/admin.c:3314
 msgid "Unable to set options"
 msgstr ""
 
@@ -6349,7 +6353,7 @@ msgstr ""
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3007
+#: cgi-bin/admin.c:3010
 msgid "Units"
 msgstr ""
 
@@ -6382,7 +6386,7 @@ msgstr ""
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/hash.c:259
+#: cups/hash.c:278
 msgid "Unknown hash algorithm."
 msgstr ""
 
@@ -6405,21 +6409,21 @@ msgstr ""
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10815
+#: scheduler/ipp.c:10806
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10798
+#: scheduler/ipp.c:10789
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: cups/http.c:2258
+#: cups/http.c:2266
 msgid "Unknown request method."
 msgstr ""
 
-#: cups/http.c:2278
+#: cups/http.c:2286
 msgid "Unknown request version."
 msgstr ""
 
@@ -6436,21 +6440,21 @@ msgstr ""
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11274
+#: scheduler/ipp.c:11265
 #, c-format
 msgid "Unsupported 'compression' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11304
+#: scheduler/ipp.c:11295
 #, c-format
 msgid "Unsupported 'document-format' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:7974 scheduler/ipp.c:10357 scheduler/ipp.c:11318
+#: scheduler/ipp.c:7969 scheduler/ipp.c:10348 scheduler/ipp.c:11309
 msgid "Unsupported 'job-hold-until' value."
 msgstr ""
 
-#: scheduler/ipp.c:11334
+#: scheduler/ipp.c:11325
 msgid "Unsupported 'job-name' value."
 msgstr ""
 
@@ -6459,17 +6463,17 @@ msgstr ""
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8434 scheduler/ipp.c:9682
+#: scheduler/ipp.c:8429 scheduler/ipp.c:9677
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8570 scheduler/ipp.c:9835
+#: scheduler/ipp.c:8565 scheduler/ipp.c:9830
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9818
+#: scheduler/ipp.c:9813
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
@@ -6539,7 +6543,7 @@ msgstr ""
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2111
+#: scheduler/main.c:2132
 msgid "Usage: cupsd [options]"
 msgstr ""
 
@@ -6575,7 +6579,7 @@ msgid ""
 "       lp [options] -i id"
 msgstr ""
 
-#: systemv/lpadmin.c:1610
+#: systemv/lpadmin.c:1615
 msgid ""
 "Usage: lpadmin [options] -d destination\n"
 "       lpadmin [options] -p destination\n"
@@ -6683,20 +6687,20 @@ msgstr ""
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd.c:1940
+#: cups/ppd.c:1972
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:1990
+#: scheduler/client.c:1991
 msgid "You cannot access this page."
 msgstr ""
 
-#: scheduler/client.c:1996
+#: scheduler/client.c:1997
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr ""
 
-#: scheduler/client.c:1988
+#: scheduler/client.c:1989
 msgid "Your account does not have the necessary privileges."
 msgstr ""
 
@@ -7065,11 +7069,11 @@ msgstr ""
 msgid "covering-name.pre-printed"
 msgstr ""
 
-#: scheduler/ipp.c:6192
+#: scheduler/ipp.c:6187
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:7078 scheduler/ipp.c:7317
+#: scheduler/ipp.c:7073 scheduler/ipp.c:7312
 msgid "cups-driverd failed to execute."
 msgstr ""
 
@@ -7449,11 +7453,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-#: locale/ipp-strings.c:254
-msgid "end-power-state"
-msgstr ""
-
 #: cups/snmp.c:990
 msgid "error-index uses indefinite length"
 msgstr ""
@@ -7479,1247 +7478,1247 @@ msgid "expression expression   Logical AND"
 msgstr ""
 
 #. TRANSLATORS: Feed Orientation
-#: locale/ipp-strings.c:256
+#: locale/ipp-strings.c:254
 msgid "feed-orientation"
 msgstr ""
 
 #. TRANSLATORS: Long Edge First
-#: locale/ipp-strings.c:258
+#: locale/ipp-strings.c:256
 msgid "feed-orientation.long-edge-first"
 msgstr ""
 
 #. TRANSLATORS: Short Edge First
-#: locale/ipp-strings.c:260
+#: locale/ipp-strings.c:258
 msgid "feed-orientation.short-edge-first"
 msgstr ""
 
 #. TRANSLATORS: Fetch Status Code
-#: locale/ipp-strings.c:262
+#: locale/ipp-strings.c:260
 msgid "fetch-status-code"
 msgstr ""
 
 #. TRANSLATORS: Finishing Template
-#: locale/ipp-strings.c:264
+#: locale/ipp-strings.c:262
 msgid "finishing-template"
 msgstr ""
 
 #. TRANSLATORS: Bale
-#: locale/ipp-strings.c:266
+#: locale/ipp-strings.c:264
 msgid "finishing-template.bale"
 msgstr ""
 
 #. TRANSLATORS: Bind
-#: locale/ipp-strings.c:268
+#: locale/ipp-strings.c:266
 msgid "finishing-template.bind"
 msgstr ""
 
 #. TRANSLATORS: Bind Bottom
-#: locale/ipp-strings.c:270
+#: locale/ipp-strings.c:268
 msgid "finishing-template.bind-bottom"
 msgstr ""
 
 #. TRANSLATORS: Bind Left
-#: locale/ipp-strings.c:272
+#: locale/ipp-strings.c:270
 msgid "finishing-template.bind-left"
 msgstr ""
 
 #. TRANSLATORS: Bind Right
-#: locale/ipp-strings.c:274
+#: locale/ipp-strings.c:272
 msgid "finishing-template.bind-right"
 msgstr ""
 
 #. TRANSLATORS: Bind Top
-#: locale/ipp-strings.c:276
+#: locale/ipp-strings.c:274
 msgid "finishing-template.bind-top"
 msgstr ""
 
 #. TRANSLATORS: Booklet Maker
-#: locale/ipp-strings.c:278
+#: locale/ipp-strings.c:276
 msgid "finishing-template.booklet-maker"
 msgstr ""
 
 #. TRANSLATORS: Coat
-#: locale/ipp-strings.c:280
+#: locale/ipp-strings.c:278
 msgid "finishing-template.coat"
 msgstr ""
 
 #. TRANSLATORS: Cover
-#: locale/ipp-strings.c:282
+#: locale/ipp-strings.c:280
 msgid "finishing-template.cover"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch
-#: locale/ipp-strings.c:284
+#: locale/ipp-strings.c:282
 msgid "finishing-template.edge-stitch"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Bottom
-#: locale/ipp-strings.c:286
+#: locale/ipp-strings.c:284
 msgid "finishing-template.edge-stitch-bottom"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Left
-#: locale/ipp-strings.c:288
+#: locale/ipp-strings.c:286
 msgid "finishing-template.edge-stitch-left"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Right
-#: locale/ipp-strings.c:290
+#: locale/ipp-strings.c:288
 msgid "finishing-template.edge-stitch-right"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Top
-#: locale/ipp-strings.c:292
+#: locale/ipp-strings.c:290
 msgid "finishing-template.edge-stitch-top"
 msgstr ""
 
 #. TRANSLATORS: Fold
-#: locale/ipp-strings.c:294
+#: locale/ipp-strings.c:292
 msgid "finishing-template.fold"
 msgstr ""
 
 #. TRANSLATORS: Accordion Fold
-#: locale/ipp-strings.c:296
+#: locale/ipp-strings.c:294
 msgid "finishing-template.fold-accordion"
 msgstr ""
 
 #. TRANSLATORS: Double Gate Fold
-#: locale/ipp-strings.c:298
+#: locale/ipp-strings.c:296
 msgid "finishing-template.fold-double-gate"
 msgstr ""
 
 #. TRANSLATORS: Engineering Z Fold
-#: locale/ipp-strings.c:300
+#: locale/ipp-strings.c:298
 msgid "finishing-template.fold-engineering-z"
 msgstr ""
 
 #. TRANSLATORS: Gate Fold
-#: locale/ipp-strings.c:302
+#: locale/ipp-strings.c:300
 msgid "finishing-template.fold-gate"
 msgstr ""
 
 #. TRANSLATORS: Half Fold
-#: locale/ipp-strings.c:304
+#: locale/ipp-strings.c:302
 msgid "finishing-template.fold-half"
 msgstr ""
 
 #. TRANSLATORS: Half Z Fold
-#: locale/ipp-strings.c:306
+#: locale/ipp-strings.c:304
 msgid "finishing-template.fold-half-z"
 msgstr ""
 
 #. TRANSLATORS: Left Gate Fold
-#: locale/ipp-strings.c:308
+#: locale/ipp-strings.c:306
 msgid "finishing-template.fold-left-gate"
 msgstr ""
 
 #. TRANSLATORS: Letter Fold
-#: locale/ipp-strings.c:310
+#: locale/ipp-strings.c:308
 msgid "finishing-template.fold-letter"
 msgstr ""
 
 #. TRANSLATORS: Parallel Fold
-#: locale/ipp-strings.c:312
+#: locale/ipp-strings.c:310
 msgid "finishing-template.fold-parallel"
 msgstr ""
 
 #. TRANSLATORS: Poster Fold
-#: locale/ipp-strings.c:314
+#: locale/ipp-strings.c:312
 msgid "finishing-template.fold-poster"
 msgstr ""
 
 #. TRANSLATORS: Right Gate Fold
-#: locale/ipp-strings.c:316
+#: locale/ipp-strings.c:314
 msgid "finishing-template.fold-right-gate"
 msgstr ""
 
 #. TRANSLATORS: Z Fold
-#: locale/ipp-strings.c:318
+#: locale/ipp-strings.c:316
 msgid "finishing-template.fold-z"
 msgstr ""
 
 #. TRANSLATORS: JDF F10-1
-#: locale/ipp-strings.c:320
+#: locale/ipp-strings.c:318
 msgid "finishing-template.jdf-f10-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F10-2
-#: locale/ipp-strings.c:322
+#: locale/ipp-strings.c:320
 msgid "finishing-template.jdf-f10-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F10-3
-#: locale/ipp-strings.c:324
+#: locale/ipp-strings.c:322
 msgid "finishing-template.jdf-f10-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-1
-#: locale/ipp-strings.c:326
+#: locale/ipp-strings.c:324
 msgid "finishing-template.jdf-f12-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-10
-#: locale/ipp-strings.c:328
+#: locale/ipp-strings.c:326
 msgid "finishing-template.jdf-f12-10"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-11
-#: locale/ipp-strings.c:330
+#: locale/ipp-strings.c:328
 msgid "finishing-template.jdf-f12-11"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-12
-#: locale/ipp-strings.c:332
+#: locale/ipp-strings.c:330
 msgid "finishing-template.jdf-f12-12"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-13
-#: locale/ipp-strings.c:334
+#: locale/ipp-strings.c:332
 msgid "finishing-template.jdf-f12-13"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-14
-#: locale/ipp-strings.c:336
+#: locale/ipp-strings.c:334
 msgid "finishing-template.jdf-f12-14"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-2
-#: locale/ipp-strings.c:338
+#: locale/ipp-strings.c:336
 msgid "finishing-template.jdf-f12-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-3
-#: locale/ipp-strings.c:340
+#: locale/ipp-strings.c:338
 msgid "finishing-template.jdf-f12-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-4
-#: locale/ipp-strings.c:342
+#: locale/ipp-strings.c:340
 msgid "finishing-template.jdf-f12-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-5
-#: locale/ipp-strings.c:344
+#: locale/ipp-strings.c:342
 msgid "finishing-template.jdf-f12-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-6
-#: locale/ipp-strings.c:346
+#: locale/ipp-strings.c:344
 msgid "finishing-template.jdf-f12-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-7
-#: locale/ipp-strings.c:348
+#: locale/ipp-strings.c:346
 msgid "finishing-template.jdf-f12-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-8
-#: locale/ipp-strings.c:350
+#: locale/ipp-strings.c:348
 msgid "finishing-template.jdf-f12-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F12-9
-#: locale/ipp-strings.c:352
+#: locale/ipp-strings.c:350
 msgid "finishing-template.jdf-f12-9"
 msgstr ""
 
 #. TRANSLATORS: JDF F14-1
-#: locale/ipp-strings.c:354
+#: locale/ipp-strings.c:352
 msgid "finishing-template.jdf-f14-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-1
-#: locale/ipp-strings.c:356
+#: locale/ipp-strings.c:354
 msgid "finishing-template.jdf-f16-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-10
-#: locale/ipp-strings.c:358
+#: locale/ipp-strings.c:356
 msgid "finishing-template.jdf-f16-10"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-11
-#: locale/ipp-strings.c:360
+#: locale/ipp-strings.c:358
 msgid "finishing-template.jdf-f16-11"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-12
-#: locale/ipp-strings.c:362
+#: locale/ipp-strings.c:360
 msgid "finishing-template.jdf-f16-12"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-13
-#: locale/ipp-strings.c:364
+#: locale/ipp-strings.c:362
 msgid "finishing-template.jdf-f16-13"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-14
-#: locale/ipp-strings.c:366
+#: locale/ipp-strings.c:364
 msgid "finishing-template.jdf-f16-14"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-2
-#: locale/ipp-strings.c:368
+#: locale/ipp-strings.c:366
 msgid "finishing-template.jdf-f16-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-3
-#: locale/ipp-strings.c:370
+#: locale/ipp-strings.c:368
 msgid "finishing-template.jdf-f16-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-4
-#: locale/ipp-strings.c:372
+#: locale/ipp-strings.c:370
 msgid "finishing-template.jdf-f16-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-5
-#: locale/ipp-strings.c:374
+#: locale/ipp-strings.c:372
 msgid "finishing-template.jdf-f16-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-6
-#: locale/ipp-strings.c:376
+#: locale/ipp-strings.c:374
 msgid "finishing-template.jdf-f16-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-7
-#: locale/ipp-strings.c:378
+#: locale/ipp-strings.c:376
 msgid "finishing-template.jdf-f16-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-8
-#: locale/ipp-strings.c:380
+#: locale/ipp-strings.c:378
 msgid "finishing-template.jdf-f16-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F16-9
-#: locale/ipp-strings.c:382
+#: locale/ipp-strings.c:380
 msgid "finishing-template.jdf-f16-9"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-1
-#: locale/ipp-strings.c:384
+#: locale/ipp-strings.c:382
 msgid "finishing-template.jdf-f18-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-2
-#: locale/ipp-strings.c:386
+#: locale/ipp-strings.c:384
 msgid "finishing-template.jdf-f18-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-3
-#: locale/ipp-strings.c:388
+#: locale/ipp-strings.c:386
 msgid "finishing-template.jdf-f18-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-4
-#: locale/ipp-strings.c:390
+#: locale/ipp-strings.c:388
 msgid "finishing-template.jdf-f18-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-5
-#: locale/ipp-strings.c:392
+#: locale/ipp-strings.c:390
 msgid "finishing-template.jdf-f18-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-6
-#: locale/ipp-strings.c:394
+#: locale/ipp-strings.c:392
 msgid "finishing-template.jdf-f18-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-7
-#: locale/ipp-strings.c:396
+#: locale/ipp-strings.c:394
 msgid "finishing-template.jdf-f18-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-8
-#: locale/ipp-strings.c:398
+#: locale/ipp-strings.c:396
 msgid "finishing-template.jdf-f18-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F18-9
-#: locale/ipp-strings.c:400
+#: locale/ipp-strings.c:398
 msgid "finishing-template.jdf-f18-9"
 msgstr ""
 
 #. TRANSLATORS: JDF F2-1
-#: locale/ipp-strings.c:402
+#: locale/ipp-strings.c:400
 msgid "finishing-template.jdf-f2-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F20-1
-#: locale/ipp-strings.c:404
+#: locale/ipp-strings.c:402
 msgid "finishing-template.jdf-f20-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F20-2
-#: locale/ipp-strings.c:406
+#: locale/ipp-strings.c:404
 msgid "finishing-template.jdf-f20-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-1
-#: locale/ipp-strings.c:408
+#: locale/ipp-strings.c:406
 msgid "finishing-template.jdf-f24-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-10
-#: locale/ipp-strings.c:410
+#: locale/ipp-strings.c:408
 msgid "finishing-template.jdf-f24-10"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-11
-#: locale/ipp-strings.c:412
+#: locale/ipp-strings.c:410
 msgid "finishing-template.jdf-f24-11"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-2
-#: locale/ipp-strings.c:414
+#: locale/ipp-strings.c:412
 msgid "finishing-template.jdf-f24-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-3
-#: locale/ipp-strings.c:416
+#: locale/ipp-strings.c:414
 msgid "finishing-template.jdf-f24-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-4
-#: locale/ipp-strings.c:418
+#: locale/ipp-strings.c:416
 msgid "finishing-template.jdf-f24-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-5
-#: locale/ipp-strings.c:420
+#: locale/ipp-strings.c:418
 msgid "finishing-template.jdf-f24-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-6
-#: locale/ipp-strings.c:422
+#: locale/ipp-strings.c:420
 msgid "finishing-template.jdf-f24-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-7
-#: locale/ipp-strings.c:424
+#: locale/ipp-strings.c:422
 msgid "finishing-template.jdf-f24-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-8
-#: locale/ipp-strings.c:426
+#: locale/ipp-strings.c:424
 msgid "finishing-template.jdf-f24-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F24-9
-#: locale/ipp-strings.c:428
+#: locale/ipp-strings.c:426
 msgid "finishing-template.jdf-f24-9"
 msgstr ""
 
 #. TRANSLATORS: JDF F28-1
-#: locale/ipp-strings.c:430
+#: locale/ipp-strings.c:428
 msgid "finishing-template.jdf-f28-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-1
-#: locale/ipp-strings.c:432
+#: locale/ipp-strings.c:430
 msgid "finishing-template.jdf-f32-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-2
-#: locale/ipp-strings.c:434
+#: locale/ipp-strings.c:432
 msgid "finishing-template.jdf-f32-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-3
-#: locale/ipp-strings.c:436
+#: locale/ipp-strings.c:434
 msgid "finishing-template.jdf-f32-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-4
-#: locale/ipp-strings.c:438
+#: locale/ipp-strings.c:436
 msgid "finishing-template.jdf-f32-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-5
-#: locale/ipp-strings.c:440
+#: locale/ipp-strings.c:438
 msgid "finishing-template.jdf-f32-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-6
-#: locale/ipp-strings.c:442
+#: locale/ipp-strings.c:440
 msgid "finishing-template.jdf-f32-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-7
-#: locale/ipp-strings.c:444
+#: locale/ipp-strings.c:442
 msgid "finishing-template.jdf-f32-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-8
-#: locale/ipp-strings.c:446
+#: locale/ipp-strings.c:444
 msgid "finishing-template.jdf-f32-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F32-9
-#: locale/ipp-strings.c:448
+#: locale/ipp-strings.c:446
 msgid "finishing-template.jdf-f32-9"
 msgstr ""
 
 #. TRANSLATORS: JDF F36-1
-#: locale/ipp-strings.c:450
+#: locale/ipp-strings.c:448
 msgid "finishing-template.jdf-f36-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F36-2
-#: locale/ipp-strings.c:452
+#: locale/ipp-strings.c:450
 msgid "finishing-template.jdf-f36-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F4-1
-#: locale/ipp-strings.c:454
+#: locale/ipp-strings.c:452
 msgid "finishing-template.jdf-f4-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F4-2
-#: locale/ipp-strings.c:456
+#: locale/ipp-strings.c:454
 msgid "finishing-template.jdf-f4-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F40-1
-#: locale/ipp-strings.c:458
+#: locale/ipp-strings.c:456
 msgid "finishing-template.jdf-f40-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F48-1
-#: locale/ipp-strings.c:460
+#: locale/ipp-strings.c:458
 msgid "finishing-template.jdf-f48-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F48-2
-#: locale/ipp-strings.c:462
+#: locale/ipp-strings.c:460
 msgid "finishing-template.jdf-f48-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-1
-#: locale/ipp-strings.c:464
+#: locale/ipp-strings.c:462
 msgid "finishing-template.jdf-f6-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-2
-#: locale/ipp-strings.c:466
+#: locale/ipp-strings.c:464
 msgid "finishing-template.jdf-f6-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-3
-#: locale/ipp-strings.c:468
+#: locale/ipp-strings.c:466
 msgid "finishing-template.jdf-f6-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-4
-#: locale/ipp-strings.c:470
+#: locale/ipp-strings.c:468
 msgid "finishing-template.jdf-f6-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-5
-#: locale/ipp-strings.c:472
+#: locale/ipp-strings.c:470
 msgid "finishing-template.jdf-f6-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-6
-#: locale/ipp-strings.c:474
+#: locale/ipp-strings.c:472
 msgid "finishing-template.jdf-f6-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-7
-#: locale/ipp-strings.c:476
+#: locale/ipp-strings.c:474
 msgid "finishing-template.jdf-f6-7"
 msgstr ""
 
 #. TRANSLATORS: JDF F6-8
-#: locale/ipp-strings.c:478
+#: locale/ipp-strings.c:476
 msgid "finishing-template.jdf-f6-8"
 msgstr ""
 
 #. TRANSLATORS: JDF F64-1
-#: locale/ipp-strings.c:480
+#: locale/ipp-strings.c:478
 msgid "finishing-template.jdf-f64-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F64-2
-#: locale/ipp-strings.c:482
+#: locale/ipp-strings.c:480
 msgid "finishing-template.jdf-f64-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-1
-#: locale/ipp-strings.c:484
+#: locale/ipp-strings.c:482
 msgid "finishing-template.jdf-f8-1"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-2
-#: locale/ipp-strings.c:486
+#: locale/ipp-strings.c:484
 msgid "finishing-template.jdf-f8-2"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-3
-#: locale/ipp-strings.c:488
+#: locale/ipp-strings.c:486
 msgid "finishing-template.jdf-f8-3"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-4
-#: locale/ipp-strings.c:490
+#: locale/ipp-strings.c:488
 msgid "finishing-template.jdf-f8-4"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-5
-#: locale/ipp-strings.c:492
+#: locale/ipp-strings.c:490
 msgid "finishing-template.jdf-f8-5"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-6
-#: locale/ipp-strings.c:494
+#: locale/ipp-strings.c:492
 msgid "finishing-template.jdf-f8-6"
 msgstr ""
 
 #. TRANSLATORS: JDF F8-7
-#: locale/ipp-strings.c:496
+#: locale/ipp-strings.c:494
 msgid "finishing-template.jdf-f8-7"
 msgstr ""
 
 #. TRANSLATORS: Jog Offset
-#: locale/ipp-strings.c:498
+#: locale/ipp-strings.c:496
 msgid "finishing-template.jog-offset"
 msgstr ""
 
 #. TRANSLATORS: Laminate
-#: locale/ipp-strings.c:500
+#: locale/ipp-strings.c:498
 msgid "finishing-template.laminate"
 msgstr ""
 
 #. TRANSLATORS: Punch
-#: locale/ipp-strings.c:502
+#: locale/ipp-strings.c:500
 msgid "finishing-template.punch"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Left
-#: locale/ipp-strings.c:504
+#: locale/ipp-strings.c:502
 msgid "finishing-template.punch-bottom-left"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Right
-#: locale/ipp-strings.c:506
+#: locale/ipp-strings.c:504
 msgid "finishing-template.punch-bottom-right"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Bottom
-#: locale/ipp-strings.c:508
+#: locale/ipp-strings.c:506
 msgid "finishing-template.punch-dual-bottom"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Left
-#: locale/ipp-strings.c:510
+#: locale/ipp-strings.c:508
 msgid "finishing-template.punch-dual-left"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Right
-#: locale/ipp-strings.c:512
+#: locale/ipp-strings.c:510
 msgid "finishing-template.punch-dual-right"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Top
-#: locale/ipp-strings.c:514
+#: locale/ipp-strings.c:512
 msgid "finishing-template.punch-dual-top"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Bottom
-#: locale/ipp-strings.c:516
+#: locale/ipp-strings.c:514
 msgid "finishing-template.punch-multiple-bottom"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Left
-#: locale/ipp-strings.c:518
+#: locale/ipp-strings.c:516
 msgid "finishing-template.punch-multiple-left"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Right
-#: locale/ipp-strings.c:520
+#: locale/ipp-strings.c:518
 msgid "finishing-template.punch-multiple-right"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Top
-#: locale/ipp-strings.c:522
+#: locale/ipp-strings.c:520
 msgid "finishing-template.punch-multiple-top"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Bottom
-#: locale/ipp-strings.c:524
+#: locale/ipp-strings.c:522
 msgid "finishing-template.punch-quad-bottom"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Left
-#: locale/ipp-strings.c:526
+#: locale/ipp-strings.c:524
 msgid "finishing-template.punch-quad-left"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Right
-#: locale/ipp-strings.c:528
+#: locale/ipp-strings.c:526
 msgid "finishing-template.punch-quad-right"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Top
-#: locale/ipp-strings.c:530
+#: locale/ipp-strings.c:528
 msgid "finishing-template.punch-quad-top"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Left
-#: locale/ipp-strings.c:532
+#: locale/ipp-strings.c:530
 msgid "finishing-template.punch-top-left"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Right
-#: locale/ipp-strings.c:534
+#: locale/ipp-strings.c:532
 msgid "finishing-template.punch-top-right"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Bottom
-#: locale/ipp-strings.c:536
+#: locale/ipp-strings.c:534
 msgid "finishing-template.punch-triple-bottom"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Left
-#: locale/ipp-strings.c:538
+#: locale/ipp-strings.c:536
 msgid "finishing-template.punch-triple-left"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Right
-#: locale/ipp-strings.c:540
+#: locale/ipp-strings.c:538
 msgid "finishing-template.punch-triple-right"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Top
-#: locale/ipp-strings.c:542
+#: locale/ipp-strings.c:540
 msgid "finishing-template.punch-triple-top"
 msgstr ""
 
 #. TRANSLATORS: Saddle Stitch
-#: locale/ipp-strings.c:544
+#: locale/ipp-strings.c:542
 msgid "finishing-template.saddle-stitch"
 msgstr ""
 
 #. TRANSLATORS: Staple
-#: locale/ipp-strings.c:546
+#: locale/ipp-strings.c:544
 msgid "finishing-template.staple"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Left
-#: locale/ipp-strings.c:548
+#: locale/ipp-strings.c:546
 msgid "finishing-template.staple-bottom-left"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Right
-#: locale/ipp-strings.c:550
+#: locale/ipp-strings.c:548
 msgid "finishing-template.staple-bottom-right"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Bottom
-#: locale/ipp-strings.c:552
+#: locale/ipp-strings.c:550
 msgid "finishing-template.staple-dual-bottom"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Left
-#: locale/ipp-strings.c:554
+#: locale/ipp-strings.c:552
 msgid "finishing-template.staple-dual-left"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Right
-#: locale/ipp-strings.c:556
+#: locale/ipp-strings.c:554
 msgid "finishing-template.staple-dual-right"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Top
-#: locale/ipp-strings.c:558
+#: locale/ipp-strings.c:556
 msgid "finishing-template.staple-dual-top"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Left
-#: locale/ipp-strings.c:560
+#: locale/ipp-strings.c:558
 msgid "finishing-template.staple-top-left"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Right
-#: locale/ipp-strings.c:562
+#: locale/ipp-strings.c:560
 msgid "finishing-template.staple-top-right"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Bottom
-#: locale/ipp-strings.c:564
+#: locale/ipp-strings.c:562
 msgid "finishing-template.staple-triple-bottom"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Left
-#: locale/ipp-strings.c:566
+#: locale/ipp-strings.c:564
 msgid "finishing-template.staple-triple-left"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Right
-#: locale/ipp-strings.c:568
+#: locale/ipp-strings.c:566
 msgid "finishing-template.staple-triple-right"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Top
-#: locale/ipp-strings.c:570
+#: locale/ipp-strings.c:568
 msgid "finishing-template.staple-triple-top"
 msgstr ""
 
 #. TRANSLATORS: Trim
-#: locale/ipp-strings.c:572
+#: locale/ipp-strings.c:570
 msgid "finishing-template.trim"
 msgstr ""
 
 #. TRANSLATORS: Trim After Every Set
-#: locale/ipp-strings.c:574
+#: locale/ipp-strings.c:572
 msgid "finishing-template.trim-after-copies"
 msgstr ""
 
 #. TRANSLATORS: Trim After Every Document
-#: locale/ipp-strings.c:576
+#: locale/ipp-strings.c:574
 msgid "finishing-template.trim-after-documents"
 msgstr ""
 
 #. TRANSLATORS: Trim After Job
-#: locale/ipp-strings.c:578
+#: locale/ipp-strings.c:576
 msgid "finishing-template.trim-after-job"
 msgstr ""
 
 #. TRANSLATORS: Trim After Every Page
-#: locale/ipp-strings.c:580
+#: locale/ipp-strings.c:578
 msgid "finishing-template.trim-after-pages"
 msgstr ""
 
 #. TRANSLATORS: Finishings
-#: locale/ipp-strings.c:582
+#: locale/ipp-strings.c:580
 msgid "finishings"
 msgstr ""
 
 #. TRANSLATORS: Finishings
-#: locale/ipp-strings.c:584
+#: locale/ipp-strings.c:582
 msgid "finishings-col"
 msgstr ""
 
 #. TRANSLATORS: Fold
-#: locale/ipp-strings.c:586
+#: locale/ipp-strings.c:584
 msgid "finishings.10"
 msgstr ""
 
 #. TRANSLATORS: Z Fold
-#: locale/ipp-strings.c:588
+#: locale/ipp-strings.c:586
 msgid "finishings.100"
 msgstr ""
 
 #. TRANSLATORS: Engineering Z Fold
-#: locale/ipp-strings.c:590
+#: locale/ipp-strings.c:588
 msgid "finishings.101"
 msgstr ""
 
 #. TRANSLATORS: Trim
-#: locale/ipp-strings.c:592
+#: locale/ipp-strings.c:590
 msgid "finishings.11"
 msgstr ""
 
 #. TRANSLATORS: Bale
-#: locale/ipp-strings.c:594
+#: locale/ipp-strings.c:592
 msgid "finishings.12"
 msgstr ""
 
 #. TRANSLATORS: Booklet Maker
-#: locale/ipp-strings.c:596
+#: locale/ipp-strings.c:594
 msgid "finishings.13"
 msgstr ""
 
 #. TRANSLATORS: Jog Offset
-#: locale/ipp-strings.c:598
+#: locale/ipp-strings.c:596
 msgid "finishings.14"
 msgstr ""
 
 #. TRANSLATORS: Coat
-#: locale/ipp-strings.c:600
+#: locale/ipp-strings.c:598
 msgid "finishings.15"
 msgstr ""
 
 #. TRANSLATORS: Laminate
-#: locale/ipp-strings.c:602
+#: locale/ipp-strings.c:600
 msgid "finishings.16"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Left
-#: locale/ipp-strings.c:604
+#: locale/ipp-strings.c:602
 msgid "finishings.20"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Left
-#: locale/ipp-strings.c:606
+#: locale/ipp-strings.c:604
 msgid "finishings.21"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Right
-#: locale/ipp-strings.c:608
+#: locale/ipp-strings.c:606
 msgid "finishings.22"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Right
-#: locale/ipp-strings.c:610
+#: locale/ipp-strings.c:608
 msgid "finishings.23"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Left
-#: locale/ipp-strings.c:612
+#: locale/ipp-strings.c:610
 msgid "finishings.24"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Top
-#: locale/ipp-strings.c:614
+#: locale/ipp-strings.c:612
 msgid "finishings.25"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Right
-#: locale/ipp-strings.c:616
+#: locale/ipp-strings.c:614
 msgid "finishings.26"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Bottom
-#: locale/ipp-strings.c:618
+#: locale/ipp-strings.c:616
 msgid "finishings.27"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Left
-#: locale/ipp-strings.c:620
+#: locale/ipp-strings.c:618
 msgid "finishings.28"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Top
-#: locale/ipp-strings.c:622
+#: locale/ipp-strings.c:620
 msgid "finishings.29"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:624
+#: locale/ipp-strings.c:622
 msgid "finishings.3"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Right
-#: locale/ipp-strings.c:626
+#: locale/ipp-strings.c:624
 msgid "finishings.30"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Bottom
-#: locale/ipp-strings.c:628
+#: locale/ipp-strings.c:626
 msgid "finishings.31"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Left
-#: locale/ipp-strings.c:630
+#: locale/ipp-strings.c:628
 msgid "finishings.32"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Top
-#: locale/ipp-strings.c:632
+#: locale/ipp-strings.c:630
 msgid "finishings.33"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Right
-#: locale/ipp-strings.c:634
+#: locale/ipp-strings.c:632
 msgid "finishings.34"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Bottom
-#: locale/ipp-strings.c:636
+#: locale/ipp-strings.c:634
 msgid "finishings.35"
 msgstr ""
 
 #. TRANSLATORS: Staple
-#: locale/ipp-strings.c:638
+#: locale/ipp-strings.c:636
 msgid "finishings.4"
 msgstr ""
 
 #. TRANSLATORS: Punch
-#: locale/ipp-strings.c:640
+#: locale/ipp-strings.c:638
 msgid "finishings.5"
 msgstr ""
 
 #. TRANSLATORS: Bind Left
-#: locale/ipp-strings.c:642
+#: locale/ipp-strings.c:640
 msgid "finishings.50"
 msgstr ""
 
 #. TRANSLATORS: Bind Top
-#: locale/ipp-strings.c:644
+#: locale/ipp-strings.c:642
 msgid "finishings.51"
 msgstr ""
 
 #. TRANSLATORS: Bind Right
-#: locale/ipp-strings.c:646
+#: locale/ipp-strings.c:644
 msgid "finishings.52"
 msgstr ""
 
 #. TRANSLATORS: Bind Bottom
-#: locale/ipp-strings.c:648
+#: locale/ipp-strings.c:646
 msgid "finishings.53"
 msgstr ""
 
 #. TRANSLATORS: Cover
-#: locale/ipp-strings.c:650
+#: locale/ipp-strings.c:648
 msgid "finishings.6"
 msgstr ""
 
 #. TRANSLATORS: Trim Pages
-#: locale/ipp-strings.c:652
+#: locale/ipp-strings.c:650
 msgid "finishings.60"
 msgstr ""
 
 #. TRANSLATORS: Trim Documents
-#: locale/ipp-strings.c:654
+#: locale/ipp-strings.c:652
 msgid "finishings.61"
 msgstr ""
 
 #. TRANSLATORS: Trim Copies
-#: locale/ipp-strings.c:656
+#: locale/ipp-strings.c:654
 msgid "finishings.62"
 msgstr ""
 
 #. TRANSLATORS: Trim Job
-#: locale/ipp-strings.c:658
+#: locale/ipp-strings.c:656
 msgid "finishings.63"
 msgstr ""
 
 #. TRANSLATORS: Bind
-#: locale/ipp-strings.c:660
+#: locale/ipp-strings.c:658
 msgid "finishings.7"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Left
-#: locale/ipp-strings.c:662
+#: locale/ipp-strings.c:660
 msgid "finishings.70"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Left
-#: locale/ipp-strings.c:664
+#: locale/ipp-strings.c:662
 msgid "finishings.71"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Right
-#: locale/ipp-strings.c:666
+#: locale/ipp-strings.c:664
 msgid "finishings.72"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Right
-#: locale/ipp-strings.c:668
+#: locale/ipp-strings.c:666
 msgid "finishings.73"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Left
-#: locale/ipp-strings.c:670
+#: locale/ipp-strings.c:668
 msgid "finishings.74"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Top
-#: locale/ipp-strings.c:672
+#: locale/ipp-strings.c:670
 msgid "finishings.75"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Right
-#: locale/ipp-strings.c:674
+#: locale/ipp-strings.c:672
 msgid "finishings.76"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Bottom
-#: locale/ipp-strings.c:676
+#: locale/ipp-strings.c:674
 msgid "finishings.77"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Left
-#: locale/ipp-strings.c:678
+#: locale/ipp-strings.c:676
 msgid "finishings.78"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Top
-#: locale/ipp-strings.c:680
+#: locale/ipp-strings.c:678
 msgid "finishings.79"
 msgstr ""
 
 #. TRANSLATORS: Saddle Stitch
-#: locale/ipp-strings.c:682
+#: locale/ipp-strings.c:680
 msgid "finishings.8"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Right
-#: locale/ipp-strings.c:684
+#: locale/ipp-strings.c:682
 msgid "finishings.80"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Bottom
-#: locale/ipp-strings.c:686
+#: locale/ipp-strings.c:684
 msgid "finishings.81"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Left
-#: locale/ipp-strings.c:688
+#: locale/ipp-strings.c:686
 msgid "finishings.82"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Top
-#: locale/ipp-strings.c:690
+#: locale/ipp-strings.c:688
 msgid "finishings.83"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Right
-#: locale/ipp-strings.c:692
+#: locale/ipp-strings.c:690
 msgid "finishings.84"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Bottom
-#: locale/ipp-strings.c:694
+#: locale/ipp-strings.c:692
 msgid "finishings.85"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Left
-#: locale/ipp-strings.c:696
+#: locale/ipp-strings.c:694
 msgid "finishings.86"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Top
-#: locale/ipp-strings.c:698
+#: locale/ipp-strings.c:696
 msgid "finishings.87"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Right
-#: locale/ipp-strings.c:700
+#: locale/ipp-strings.c:698
 msgid "finishings.88"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Bottom
-#: locale/ipp-strings.c:702
+#: locale/ipp-strings.c:700
 msgid "finishings.89"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch
-#: locale/ipp-strings.c:704
+#: locale/ipp-strings.c:702
 msgid "finishings.9"
 msgstr ""
 
 #. TRANSLATORS: Accordion Fold
-#: locale/ipp-strings.c:706
+#: locale/ipp-strings.c:704
 msgid "finishings.90"
 msgstr ""
 
 #. TRANSLATORS: Double Gate Fold
-#: locale/ipp-strings.c:708
+#: locale/ipp-strings.c:706
 msgid "finishings.91"
 msgstr ""
 
 #. TRANSLATORS: Gate Fold
-#: locale/ipp-strings.c:710
+#: locale/ipp-strings.c:708
 msgid "finishings.92"
 msgstr ""
 
 #. TRANSLATORS: Half Fold
-#: locale/ipp-strings.c:712
+#: locale/ipp-strings.c:710
 msgid "finishings.93"
 msgstr ""
 
 #. TRANSLATORS: Half Z Fold
-#: locale/ipp-strings.c:714
+#: locale/ipp-strings.c:712
 msgid "finishings.94"
 msgstr ""
 
 #. TRANSLATORS: Left Gate Fold
-#: locale/ipp-strings.c:716
+#: locale/ipp-strings.c:714
 msgid "finishings.95"
 msgstr ""
 
 #. TRANSLATORS: Letter Fold
-#: locale/ipp-strings.c:718
+#: locale/ipp-strings.c:716
 msgid "finishings.96"
 msgstr ""
 
 #. TRANSLATORS: Parallel Fold
-#: locale/ipp-strings.c:720
+#: locale/ipp-strings.c:718
 msgid "finishings.97"
 msgstr ""
 
 #. TRANSLATORS: Poster Fold
-#: locale/ipp-strings.c:722
+#: locale/ipp-strings.c:720
 msgid "finishings.98"
 msgstr ""
 
 #. TRANSLATORS: Right Gate Fold
-#: locale/ipp-strings.c:724
+#: locale/ipp-strings.c:722
 msgid "finishings.99"
 msgstr ""
 
 #. TRANSLATORS: Fold
-#: locale/ipp-strings.c:726
+#: locale/ipp-strings.c:724
 msgid "folding"
 msgstr ""
 
 #. TRANSLATORS: Fold Direction
-#: locale/ipp-strings.c:728
+#: locale/ipp-strings.c:726
 msgid "folding-direction"
 msgstr ""
 
 #. TRANSLATORS: Inward
-#: locale/ipp-strings.c:730
+#: locale/ipp-strings.c:728
 msgid "folding-direction.inward"
 msgstr ""
 
 #. TRANSLATORS: Outward
-#: locale/ipp-strings.c:732
+#: locale/ipp-strings.c:730
 msgid "folding-direction.outward"
 msgstr ""
 
 #. TRANSLATORS: Fold Position
-#: locale/ipp-strings.c:734
+#: locale/ipp-strings.c:732
 msgid "folding-offset"
 msgstr ""
 
 #. TRANSLATORS: Fold Edge
-#: locale/ipp-strings.c:736
+#: locale/ipp-strings.c:734
 msgid "folding-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:738
+#: locale/ipp-strings.c:736
 msgid "folding-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:740
+#: locale/ipp-strings.c:738
 msgid "folding-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:742
+#: locale/ipp-strings.c:740
 msgid "folding-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:744
+#: locale/ipp-strings.c:742
 msgid "folding-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Font Name
-#: locale/ipp-strings.c:746
+#: locale/ipp-strings.c:744
 msgid "font-name-requested"
 msgstr ""
 
 #. TRANSLATORS: Font Size
-#: locale/ipp-strings.c:748
+#: locale/ipp-strings.c:746
 msgid "font-size-requested"
 msgstr ""
 
 #. TRANSLATORS: Force Front Side
-#: locale/ipp-strings.c:750
+#: locale/ipp-strings.c:748
 msgid "force-front-side"
 msgstr ""
 
 #. TRANSLATORS: From Name
-#: locale/ipp-strings.c:752
+#: locale/ipp-strings.c:750
 msgid "from-name"
 msgstr ""
 
@@ -8736,267 +8735,32 @@ msgid "idle"
 msgstr ""
 
 #. TRANSLATORS: Imposition Template
-#: locale/ipp-strings.c:754
+#: locale/ipp-strings.c:752
 msgid "imposition-template"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:756
+#: locale/ipp-strings.c:754
 msgid "imposition-template.none"
 msgstr ""
 
 #. TRANSLATORS: Signature
-#: locale/ipp-strings.c:758
+#: locale/ipp-strings.c:756
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-#: locale/ipp-strings.c:760
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-#: locale/ipp-strings.c:762
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-#: locale/ipp-strings.c:764
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-#: locale/ipp-strings.c:766
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-#: locale/ipp-strings.c:768
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:770
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-#: locale/ipp-strings.c:772
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-#: locale/ipp-strings.c:774
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-#: locale/ipp-strings.c:776
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-#: locale/ipp-strings.c:778
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-#: locale/ipp-strings.c:780
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-#: locale/ipp-strings.c:782
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-#: locale/ipp-strings.c:784
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-#: locale/ipp-strings.c:786
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-#: locale/ipp-strings.c:788
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-#: locale/ipp-strings.c:790
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-#: locale/ipp-strings.c:792
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-#: locale/ipp-strings.c:794
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-#: locale/ipp-strings.c:796
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:798
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-#: locale/ipp-strings.c:800
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-#: locale/ipp-strings.c:802
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-#: locale/ipp-strings.c:804
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-#: locale/ipp-strings.c:806
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-#: locale/ipp-strings.c:808
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-#: locale/ipp-strings.c:810
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-#: locale/ipp-strings.c:812
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-#: locale/ipp-strings.c:814
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-#: locale/ipp-strings.c:816
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-#: locale/ipp-strings.c:818
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-#: locale/ipp-strings.c:820
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-#: locale/ipp-strings.c:822
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-#: locale/ipp-strings.c:824
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-#: locale/ipp-strings.c:826
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:828
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-#: locale/ipp-strings.c:830
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-#: locale/ipp-strings.c:832
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-#: locale/ipp-strings.c:834
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-#: locale/ipp-strings.c:836
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-#: locale/ipp-strings.c:838
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-#: locale/ipp-strings.c:840
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-#: locale/ipp-strings.c:842
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-#: locale/ipp-strings.c:844
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-#: locale/ipp-strings.c:846
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-#: locale/ipp-strings.c:848
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-#: locale/ipp-strings.c:850
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-#: locale/ipp-strings.c:852
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
-#: locale/ipp-strings.c:854
+#: locale/ipp-strings.c:758
 msgid "insert-after-page-number"
 msgstr ""
 
 #. TRANSLATORS: Insert Count
-#: locale/ipp-strings.c:856
+#: locale/ipp-strings.c:760
 msgid "insert-count"
 msgstr ""
 
 #. TRANSLATORS: Insert Sheet
-#: locale/ipp-strings.c:858
+#: locale/ipp-strings.c:762
 msgid "insert-sheet"
 msgstr ""
 
@@ -9156,876 +8920,896 @@ msgid "ipptool: URI required before test file."
 msgstr ""
 
 #. TRANSLATORS: Job Account ID
-#: locale/ipp-strings.c:860
+#: locale/ipp-strings.c:764
 msgid "job-account-id"
 msgstr ""
 
 #. TRANSLATORS: Job Account Type
-#: locale/ipp-strings.c:862
+#: locale/ipp-strings.c:766
 msgid "job-account-type"
 msgstr ""
 
 #. TRANSLATORS: General
-#: locale/ipp-strings.c:864
+#: locale/ipp-strings.c:768
 msgid "job-account-type.general"
 msgstr ""
 
 #. TRANSLATORS: Group
-#: locale/ipp-strings.c:866
+#: locale/ipp-strings.c:770
 msgid "job-account-type.group"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:868
+#: locale/ipp-strings.c:772
 msgid "job-account-type.none"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting Output Bin
-#: locale/ipp-strings.c:870
+#: locale/ipp-strings.c:774
 msgid "job-accounting-output-bin"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting Sheets
-#: locale/ipp-strings.c:872
+#: locale/ipp-strings.c:776
 msgid "job-accounting-sheets"
 msgstr ""
 
 #. TRANSLATORS: Type of Job Accounting Sheets
-#: locale/ipp-strings.c:874
+#: locale/ipp-strings.c:778
 msgid "job-accounting-sheets-type"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:876
+#: locale/ipp-strings.c:780
 msgid "job-accounting-sheets-type.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:878
+#: locale/ipp-strings.c:782
 msgid "job-accounting-sheets-type.standard"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting User ID
-#: locale/ipp-strings.c:880
+#: locale/ipp-strings.c:784
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-#: locale/ipp-strings.c:882
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-#: locale/ipp-strings.c:884
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-#: locale/ipp-strings.c:886
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-#: locale/ipp-strings.c:888
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+#: locale/ipp-strings.c:786
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
-#: locale/ipp-strings.c:890
+#: locale/ipp-strings.c:788
 msgid "job-copies"
 msgstr ""
 
 #. TRANSLATORS: Back Cover
-#: locale/ipp-strings.c:892
+#: locale/ipp-strings.c:790
 msgid "job-cover-back"
 msgstr ""
 
 #. TRANSLATORS: Front Cover
-#: locale/ipp-strings.c:894
+#: locale/ipp-strings.c:792
 msgid "job-cover-front"
 msgstr ""
 
 #. TRANSLATORS: Delay Output Until
-#: locale/ipp-strings.c:896
+#: locale/ipp-strings.c:794
 msgid "job-delay-output-until"
 msgstr ""
 
 #. TRANSLATORS: Delay Output Until
-#: locale/ipp-strings.c:898
+#: locale/ipp-strings.c:796
 msgid "job-delay-output-until-time"
 msgstr ""
 
 #. TRANSLATORS: Daytime
-#: locale/ipp-strings.c:900
+#: locale/ipp-strings.c:798
 msgid "job-delay-output-until.day-time"
 msgstr ""
 
 #. TRANSLATORS: Evening
-#: locale/ipp-strings.c:902
+#: locale/ipp-strings.c:800
 msgid "job-delay-output-until.evening"
 msgstr ""
 
 #. TRANSLATORS: Released
-#: locale/ipp-strings.c:904
+#: locale/ipp-strings.c:802
 msgid "job-delay-output-until.indefinite"
 msgstr ""
 
 #. TRANSLATORS: Night
-#: locale/ipp-strings.c:906
+#: locale/ipp-strings.c:804
 msgid "job-delay-output-until.night"
 msgstr ""
 
 #. TRANSLATORS: No Delay
-#: locale/ipp-strings.c:908
+#: locale/ipp-strings.c:806
 msgid "job-delay-output-until.no-delay-output"
 msgstr ""
 
 #. TRANSLATORS: Second Shift
-#: locale/ipp-strings.c:910
+#: locale/ipp-strings.c:808
 msgid "job-delay-output-until.second-shift"
 msgstr ""
 
 #. TRANSLATORS: Third Shift
-#: locale/ipp-strings.c:912
+#: locale/ipp-strings.c:810
 msgid "job-delay-output-until.third-shift"
 msgstr ""
 
 #. TRANSLATORS: Weekend
-#: locale/ipp-strings.c:914
+#: locale/ipp-strings.c:812
 msgid "job-delay-output-until.weekend"
 msgstr ""
 
 #. TRANSLATORS: On Error
-#: locale/ipp-strings.c:916
+#: locale/ipp-strings.c:814
 msgid "job-error-action"
 msgstr ""
 
 #. TRANSLATORS: Abort Job
-#: locale/ipp-strings.c:918
+#: locale/ipp-strings.c:816
 msgid "job-error-action.abort-job"
 msgstr ""
 
 #. TRANSLATORS: Cancel Job
-#: locale/ipp-strings.c:920
+#: locale/ipp-strings.c:818
 msgid "job-error-action.cancel-job"
 msgstr ""
 
 #. TRANSLATORS: Continue Job
-#: locale/ipp-strings.c:922
+#: locale/ipp-strings.c:820
 msgid "job-error-action.continue-job"
 msgstr ""
 
 #. TRANSLATORS: Suspend Job
-#: locale/ipp-strings.c:924
+#: locale/ipp-strings.c:822
 msgid "job-error-action.suspend-job"
 msgstr ""
 
 #. TRANSLATORS: Print Error Sheet
-#: locale/ipp-strings.c:926
+#: locale/ipp-strings.c:824
 msgid "job-error-sheet"
 msgstr ""
 
 #. TRANSLATORS: Type of Error Sheet
-#: locale/ipp-strings.c:928
+#: locale/ipp-strings.c:826
 msgid "job-error-sheet-type"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:930
+#: locale/ipp-strings.c:828
 msgid "job-error-sheet-type.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:932
+#: locale/ipp-strings.c:830
 msgid "job-error-sheet-type.standard"
 msgstr ""
 
 #. TRANSLATORS: Print Error Sheet
-#: locale/ipp-strings.c:934
+#: locale/ipp-strings.c:832
 msgid "job-error-sheet-when"
 msgstr ""
 
 #. TRANSLATORS: Always
-#: locale/ipp-strings.c:936
+#: locale/ipp-strings.c:834
 msgid "job-error-sheet-when.always"
 msgstr ""
 
 #. TRANSLATORS: On Error
-#: locale/ipp-strings.c:938
+#: locale/ipp-strings.c:836
 msgid "job-error-sheet-when.on-error"
 msgstr ""
 
 #. TRANSLATORS: Job Finishings
-#: locale/ipp-strings.c:940
+#: locale/ipp-strings.c:838
 msgid "job-finishings"
 msgstr ""
 
 #. TRANSLATORS: Hold Until
-#: locale/ipp-strings.c:942
+#: locale/ipp-strings.c:840
 msgid "job-hold-until"
 msgstr ""
 
 #. TRANSLATORS: Hold Until
-#: locale/ipp-strings.c:944
+#: locale/ipp-strings.c:842
 msgid "job-hold-until-time"
 msgstr ""
 
 #. TRANSLATORS: Daytime
-#: locale/ipp-strings.c:946
+#: locale/ipp-strings.c:844
 msgid "job-hold-until.day-time"
 msgstr ""
 
 #. TRANSLATORS: Evening
-#: locale/ipp-strings.c:948
+#: locale/ipp-strings.c:846
 msgid "job-hold-until.evening"
 msgstr ""
 
 #. TRANSLATORS: Released
-#: locale/ipp-strings.c:950
+#: locale/ipp-strings.c:848
 msgid "job-hold-until.indefinite"
 msgstr ""
 
 #. TRANSLATORS: Night
-#: locale/ipp-strings.c:952
+#: locale/ipp-strings.c:850
 msgid "job-hold-until.night"
 msgstr ""
 
 #. TRANSLATORS: No Hold
-#: locale/ipp-strings.c:954
+#: locale/ipp-strings.c:852
 msgid "job-hold-until.no-hold"
 msgstr ""
 
 #. TRANSLATORS: Second Shift
-#: locale/ipp-strings.c:956
+#: locale/ipp-strings.c:854
 msgid "job-hold-until.second-shift"
 msgstr ""
 
 #. TRANSLATORS: Third Shift
-#: locale/ipp-strings.c:958
+#: locale/ipp-strings.c:856
 msgid "job-hold-until.third-shift"
 msgstr ""
 
 #. TRANSLATORS: Weekend
-#: locale/ipp-strings.c:960
+#: locale/ipp-strings.c:858
 msgid "job-hold-until.weekend"
 msgstr ""
 
 #. TRANSLATORS: Job Mandatory Attributes
-#: locale/ipp-strings.c:962
+#: locale/ipp-strings.c:860
 msgid "job-mandatory-attributes"
 msgstr ""
 
 #. TRANSLATORS: Title
-#: locale/ipp-strings.c:964
+#: locale/ipp-strings.c:862
 msgid "job-name"
 msgstr ""
 
 #. TRANSLATORS: Job Pages
-#: locale/ipp-strings.c:966
+#: locale/ipp-strings.c:864
 msgid "job-pages"
 msgstr ""
 
 #. TRANSLATORS: Job Pages
-#: locale/ipp-strings.c:968
+#: locale/ipp-strings.c:866
 msgid "job-pages-col"
 msgstr ""
 
 #. TRANSLATORS: Job Phone Number
-#: locale/ipp-strings.c:970
+#: locale/ipp-strings.c:868
 msgid "job-phone-number"
 msgstr ""
 
-#: scheduler/ipp.c:8100
+#: scheduler/ipp.c:8095
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
 #. TRANSLATORS: Job Priority
-#: locale/ipp-strings.c:972
+#: locale/ipp-strings.c:870
 msgid "job-priority"
 msgstr ""
 
 #. TRANSLATORS: Job Privacy Attributes
-#: locale/ipp-strings.c:974
+#: locale/ipp-strings.c:872
 msgid "job-privacy-attributes"
 msgstr ""
 
 #. TRANSLATORS: All
-#: locale/ipp-strings.c:976
+#: locale/ipp-strings.c:874
 msgid "job-privacy-attributes.all"
 msgstr ""
 
 #. TRANSLATORS: Default
-#: locale/ipp-strings.c:978
+#: locale/ipp-strings.c:876
 msgid "job-privacy-attributes.default"
 msgstr ""
 
 #. TRANSLATORS: Job Description
-#: locale/ipp-strings.c:980
+#: locale/ipp-strings.c:878
 msgid "job-privacy-attributes.job-description"
 msgstr ""
 
 #. TRANSLATORS: Job Template
-#: locale/ipp-strings.c:982
+#: locale/ipp-strings.c:880
 msgid "job-privacy-attributes.job-template"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:984
+#: locale/ipp-strings.c:882
 msgid "job-privacy-attributes.none"
 msgstr ""
 
 #. TRANSLATORS: Job Privacy Scope
-#: locale/ipp-strings.c:986
+#: locale/ipp-strings.c:884
 msgid "job-privacy-scope"
 msgstr ""
 
 #. TRANSLATORS: All
-#: locale/ipp-strings.c:988
+#: locale/ipp-strings.c:886
 msgid "job-privacy-scope.all"
 msgstr ""
 
 #. TRANSLATORS: Default
-#: locale/ipp-strings.c:990
+#: locale/ipp-strings.c:888
 msgid "job-privacy-scope.default"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:992
+#: locale/ipp-strings.c:890
 msgid "job-privacy-scope.none"
 msgstr ""
 
 #. TRANSLATORS: Owner
-#: locale/ipp-strings.c:994
+#: locale/ipp-strings.c:892
 msgid "job-privacy-scope.owner"
 msgstr ""
 
 #. TRANSLATORS: Job Recipient Name
-#: locale/ipp-strings.c:996
+#: locale/ipp-strings.c:894
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-#: locale/ipp-strings.c:998
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+#: locale/ipp-strings.c:896
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+#: locale/ipp-strings.c:898
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+#: locale/ipp-strings.c:900
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+#: locale/ipp-strings.c:902
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+#: locale/ipp-strings.c:904
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+#: locale/ipp-strings.c:906
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+#: locale/ipp-strings.c:908
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+#: locale/ipp-strings.c:910
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
-#: locale/ipp-strings.c:1000
+#: locale/ipp-strings.c:912
 msgid "job-save-disposition"
 msgstr ""
 
 #. TRANSLATORS: Job Sheet Message
-#: locale/ipp-strings.c:1002
+#: locale/ipp-strings.c:914
 msgid "job-sheet-message"
 msgstr ""
 
 #. TRANSLATORS: Banner Page
-#: locale/ipp-strings.c:1004
+#: locale/ipp-strings.c:916
 msgid "job-sheets"
 msgstr ""
 
 #. TRANSLATORS: Banner Page
-#: locale/ipp-strings.c:1006
+#: locale/ipp-strings.c:918
 msgid "job-sheets-col"
 msgstr ""
 
 #. TRANSLATORS: First Page in Document
-#: locale/ipp-strings.c:1008
+#: locale/ipp-strings.c:920
 msgid "job-sheets.first-print-stream-page"
 msgstr ""
 
 #. TRANSLATORS: Start and End Sheets
-#: locale/ipp-strings.c:1010
+#: locale/ipp-strings.c:922
 msgid "job-sheets.job-both-sheet"
 msgstr ""
 
 #. TRANSLATORS: End Sheet
-#: locale/ipp-strings.c:1012
+#: locale/ipp-strings.c:924
 msgid "job-sheets.job-end-sheet"
 msgstr ""
 
 #. TRANSLATORS: Start Sheet
-#: locale/ipp-strings.c:1014
+#: locale/ipp-strings.c:926
 msgid "job-sheets.job-start-sheet"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1016
+#: locale/ipp-strings.c:928
 msgid "job-sheets.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:1018
+#: locale/ipp-strings.c:930
 msgid "job-sheets.standard"
 msgstr ""
 
 #. TRANSLATORS: Job State
-#: locale/ipp-strings.c:1020
+#: locale/ipp-strings.c:932
 msgid "job-state"
 msgstr ""
 
 #. TRANSLATORS: Job State Message
-#: locale/ipp-strings.c:1022
+#: locale/ipp-strings.c:934
 msgid "job-state-message"
 msgstr ""
 
 #. TRANSLATORS: Detailed Job State
-#: locale/ipp-strings.c:1024
+#: locale/ipp-strings.c:936
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
-#: locale/ipp-strings.c:1026
+#. TRANSLATORS: Stopping
+#: locale/ipp-strings.c:938
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
 #. TRANSLATORS: Account Authorization Failed
-#: locale/ipp-strings.c:1028
+#: locale/ipp-strings.c:940
 msgid "job-state-reasons.account-authorization-failed"
 msgstr ""
 
 #. TRANSLATORS: Account Closed
-#: locale/ipp-strings.c:1030
+#: locale/ipp-strings.c:942
 msgid "job-state-reasons.account-closed"
 msgstr ""
 
 #. TRANSLATORS: Account Info Needed
-#: locale/ipp-strings.c:1032
+#: locale/ipp-strings.c:944
 msgid "job-state-reasons.account-info-needed"
 msgstr ""
 
 #. TRANSLATORS: Account Limit Reached
-#: locale/ipp-strings.c:1034
+#: locale/ipp-strings.c:946
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
-#: locale/ipp-strings.c:1036
+#. TRANSLATORS: Decompression error
+#: locale/ipp-strings.c:948
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
 #. TRANSLATORS: Conflicting Attributes
-#: locale/ipp-strings.c:1038
+#: locale/ipp-strings.c:950
 msgid "job-state-reasons.conflicting-attributes"
 msgstr ""
 
 #. TRANSLATORS: Connected To Destination
-#: locale/ipp-strings.c:1040
+#: locale/ipp-strings.c:952
 msgid "job-state-reasons.connected-to-destination"
 msgstr ""
 
 #. TRANSLATORS: Connecting To Destination
-#: locale/ipp-strings.c:1042
+#: locale/ipp-strings.c:954
 msgid "job-state-reasons.connecting-to-destination"
 msgstr ""
 
 #. TRANSLATORS: Destination Uri Failed
-#: locale/ipp-strings.c:1044
+#: locale/ipp-strings.c:956
 msgid "job-state-reasons.destination-uri-failed"
 msgstr ""
 
 #. TRANSLATORS: Digital Signature Did Not Verify
-#: locale/ipp-strings.c:1046
+#: locale/ipp-strings.c:958
 msgid "job-state-reasons.digital-signature-did-not-verify"
 msgstr ""
 
 #. TRANSLATORS: Digital Signature Type Not Supported
-#: locale/ipp-strings.c:1048
+#: locale/ipp-strings.c:960
 msgid "job-state-reasons.digital-signature-type-not-supported"
 msgstr ""
 
 #. TRANSLATORS: Document Access Error
-#: locale/ipp-strings.c:1050
+#: locale/ipp-strings.c:962
 msgid "job-state-reasons.document-access-error"
 msgstr ""
 
 #. TRANSLATORS: Document Format Error
-#: locale/ipp-strings.c:1052
+#: locale/ipp-strings.c:964
 msgid "job-state-reasons.document-format-error"
 msgstr ""
 
 #. TRANSLATORS: Document Password Error
-#: locale/ipp-strings.c:1054
+#: locale/ipp-strings.c:966
 msgid "job-state-reasons.document-password-error"
 msgstr ""
 
 #. TRANSLATORS: Document Permission Error
-#: locale/ipp-strings.c:1056
+#: locale/ipp-strings.c:968
 msgid "job-state-reasons.document-permission-error"
 msgstr ""
 
 #. TRANSLATORS: Document Security Error
-#: locale/ipp-strings.c:1058
+#: locale/ipp-strings.c:970
 msgid "job-state-reasons.document-security-error"
 msgstr ""
 
 #. TRANSLATORS: Document Unprintable Error
-#: locale/ipp-strings.c:1060
+#: locale/ipp-strings.c:972
 msgid "job-state-reasons.document-unprintable-error"
 msgstr ""
 
 #. TRANSLATORS: Errors Detected
-#: locale/ipp-strings.c:1062
+#: locale/ipp-strings.c:974
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
-#: locale/ipp-strings.c:1064
+#. TRANSLATORS: Canceled at printer
+#: locale/ipp-strings.c:976
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
-#: locale/ipp-strings.c:1066
+#. TRANSLATORS: Canceled by operator
+#: locale/ipp-strings.c:978
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
-#: locale/ipp-strings.c:1068
+#. TRANSLATORS: Canceled by user
+#: locale/ipp-strings.c:980
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
-#: locale/ipp-strings.c:1070
+#. TRANSLATORS:
+#: locale/ipp-strings.c:982
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
-#: locale/ipp-strings.c:1072
+#. TRANSLATORS: Completed with errors
+#: locale/ipp-strings.c:984
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
-#: locale/ipp-strings.c:1074
+#. TRANSLATORS: Completed with warnings
+#: locale/ipp-strings.c:986
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
-#: locale/ipp-strings.c:1076
+#. TRANSLATORS: Insufficient data
+#: locale/ipp-strings.c:988
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
 #. TRANSLATORS: Job Delay Output Until Specified
-#: locale/ipp-strings.c:1078
+#: locale/ipp-strings.c:990
 msgid "job-state-reasons.job-delay-output-until-specified"
 msgstr ""
 
 #. TRANSLATORS: Job Digital Signature Wait
-#: locale/ipp-strings.c:1080
+#: locale/ipp-strings.c:992
 msgid "job-state-reasons.job-digital-signature-wait"
 msgstr ""
 
 #. TRANSLATORS: Job Fetchable
-#: locale/ipp-strings.c:1082
+#: locale/ipp-strings.c:994
 msgid "job-state-reasons.job-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Job Held For Review
-#: locale/ipp-strings.c:1084
+#: locale/ipp-strings.c:996
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
-#: locale/ipp-strings.c:1086
+#. TRANSLATORS: Job held
+#: locale/ipp-strings.c:998
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
-#: locale/ipp-strings.c:1088
+#. TRANSLATORS: Incoming
+#: locale/ipp-strings.c:1000
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
-#: locale/ipp-strings.c:1090
+#. TRANSLATORS: Interpreting
+#: locale/ipp-strings.c:1002
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
-#: locale/ipp-strings.c:1092
+#. TRANSLATORS: Outgoing
+#: locale/ipp-strings.c:1004
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
 #. TRANSLATORS: Job Password Wait
-#: locale/ipp-strings.c:1094
+#: locale/ipp-strings.c:1006
 msgid "job-state-reasons.job-password-wait"
 msgstr ""
 
 #. TRANSLATORS: Job Printed Successfully
-#: locale/ipp-strings.c:1096
+#: locale/ipp-strings.c:1008
 msgid "job-state-reasons.job-printed-successfully"
 msgstr ""
 
 #. TRANSLATORS: Job Printed With Errors
-#: locale/ipp-strings.c:1098
+#: locale/ipp-strings.c:1010
 msgid "job-state-reasons.job-printed-with-errors"
 msgstr ""
 
 #. TRANSLATORS: Job Printed With Warnings
-#: locale/ipp-strings.c:1100
+#: locale/ipp-strings.c:1012
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
-#: locale/ipp-strings.c:1102
+#. TRANSLATORS: Printing
+#: locale/ipp-strings.c:1014
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
-#: locale/ipp-strings.c:1104
+#. TRANSLATORS: Preparing to print
+#: locale/ipp-strings.c:1016
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
-#: locale/ipp-strings.c:1106
+#. TRANSLATORS: Processing document
+#: locale/ipp-strings.c:1018
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
 #. TRANSLATORS: Job Release Wait
-#: locale/ipp-strings.c:1108
+#: locale/ipp-strings.c:1020
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
-#: locale/ipp-strings.c:1110
+#. TRANSLATORS: Restartable
+#: locale/ipp-strings.c:1022
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
 #. TRANSLATORS: Job Resuming
-#: locale/ipp-strings.c:1112
+#: locale/ipp-strings.c:1024
 msgid "job-state-reasons.job-resuming"
 msgstr ""
 
 #. TRANSLATORS: Job Saved Successfully
-#: locale/ipp-strings.c:1114
+#: locale/ipp-strings.c:1026
 msgid "job-state-reasons.job-saved-successfully"
 msgstr ""
 
 #. TRANSLATORS: Job Saved With Errors
-#: locale/ipp-strings.c:1116
+#: locale/ipp-strings.c:1028
 msgid "job-state-reasons.job-saved-with-errors"
 msgstr ""
 
 #. TRANSLATORS: Job Saved With Warnings
-#: locale/ipp-strings.c:1118
+#: locale/ipp-strings.c:1030
 msgid "job-state-reasons.job-saved-with-warnings"
 msgstr ""
 
 #. TRANSLATORS: Job Saving
-#: locale/ipp-strings.c:1120
+#: locale/ipp-strings.c:1032
 msgid "job-state-reasons.job-saving"
 msgstr ""
 
 #. TRANSLATORS: Job Spooling
-#: locale/ipp-strings.c:1122
+#: locale/ipp-strings.c:1034
 msgid "job-state-reasons.job-spooling"
 msgstr ""
 
 #. TRANSLATORS: Job Streaming
-#: locale/ipp-strings.c:1124
+#: locale/ipp-strings.c:1036
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
-#: locale/ipp-strings.c:1126
+#. TRANSLATORS: Suspended
+#: locale/ipp-strings.c:1038
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By Operator
-#: locale/ipp-strings.c:1128
+#: locale/ipp-strings.c:1040
 msgid "job-state-reasons.job-suspended-by-operator"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By System
-#: locale/ipp-strings.c:1130
+#: locale/ipp-strings.c:1042
 msgid "job-state-reasons.job-suspended-by-system"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By User
-#: locale/ipp-strings.c:1132
+#: locale/ipp-strings.c:1044
 msgid "job-state-reasons.job-suspended-by-user"
 msgstr ""
 
 #. TRANSLATORS: Job Suspending
-#: locale/ipp-strings.c:1134
+#: locale/ipp-strings.c:1046
 msgid "job-state-reasons.job-suspending"
 msgstr ""
 
 #. TRANSLATORS: Job Transferring
-#: locale/ipp-strings.c:1136
+#: locale/ipp-strings.c:1048
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
-#: locale/ipp-strings.c:1138
+#. TRANSLATORS: Transforming
+#: locale/ipp-strings.c:1050
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1140
+#: locale/ipp-strings.c:1052
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
-#: locale/ipp-strings.c:1142
+#. TRANSLATORS: Printer offline
+#: locale/ipp-strings.c:1054
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
-#: locale/ipp-strings.c:1144
+#. TRANSLATORS: Printer partially stopped
+#: locale/ipp-strings.c:1056
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
-#: locale/ipp-strings.c:1146
+#. TRANSLATORS: Stopping
+#: locale/ipp-strings.c:1058
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
-#: locale/ipp-strings.c:1148
+#. TRANSLATORS: Ready
+#: locale/ipp-strings.c:1060
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
 #. TRANSLATORS: Resources Are Not Ready
-#: locale/ipp-strings.c:1150
+#: locale/ipp-strings.c:1062
 msgid "job-state-reasons.resources-are-not-ready"
 msgstr ""
 
 #. TRANSLATORS: Resources Are Not Supported
-#: locale/ipp-strings.c:1152
+#: locale/ipp-strings.c:1064
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
-#: locale/ipp-strings.c:1154
+#. TRANSLATORS: Service offline
+#: locale/ipp-strings.c:1066
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
 #. TRANSLATORS: Submission Interrupted
-#: locale/ipp-strings.c:1156
+#: locale/ipp-strings.c:1068
 msgid "job-state-reasons.submission-interrupted"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Attributes Or Values
-#: locale/ipp-strings.c:1158
+#: locale/ipp-strings.c:1070
 msgid "job-state-reasons.unsupported-attributes-or-values"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Compression
-#: locale/ipp-strings.c:1160
+#: locale/ipp-strings.c:1072
 msgid "job-state-reasons.unsupported-compression"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Document Format
-#: locale/ipp-strings.c:1162
+#: locale/ipp-strings.c:1074
 msgid "job-state-reasons.unsupported-document-format"
 msgstr ""
 
 #. TRANSLATORS: Waiting For User Action
-#: locale/ipp-strings.c:1164
+#: locale/ipp-strings.c:1076
 msgid "job-state-reasons.waiting-for-user-action"
 msgstr ""
 
 #. TRANSLATORS: Warnings Detected
-#: locale/ipp-strings.c:1166
+#: locale/ipp-strings.c:1078
 msgid "job-state-reasons.warnings-detected"
 msgstr ""
 
 #. TRANSLATORS: Pending
-#: locale/ipp-strings.c:1168
+#: locale/ipp-strings.c:1080
 msgid "job-state.3"
 msgstr ""
 
 #. TRANSLATORS: Held
-#: locale/ipp-strings.c:1170
+#: locale/ipp-strings.c:1082
 msgid "job-state.4"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:1172
+#: locale/ipp-strings.c:1084
 msgid "job-state.5"
 msgstr ""
 
 #. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:1174
+#: locale/ipp-strings.c:1086
 msgid "job-state.6"
 msgstr ""
 
 #. TRANSLATORS: Canceled
-#: locale/ipp-strings.c:1176
+#: locale/ipp-strings.c:1088
 msgid "job-state.7"
 msgstr ""
 
 #. TRANSLATORS: Aborted
-#: locale/ipp-strings.c:1178
+#: locale/ipp-strings.c:1090
 msgid "job-state.8"
 msgstr ""
 
 #. TRANSLATORS: Completed
-#: locale/ipp-strings.c:1180
+#: locale/ipp-strings.c:1092
 msgid "job-state.9"
 msgstr ""
 
 #. TRANSLATORS: Laminate Pages
-#: locale/ipp-strings.c:1182
+#: locale/ipp-strings.c:1094
 msgid "laminating"
 msgstr ""
 
 #. TRANSLATORS: Laminate
-#: locale/ipp-strings.c:1184
+#: locale/ipp-strings.c:1096
 msgid "laminating-sides"
 msgstr ""
 
 #. TRANSLATORS: Back Only
-#: locale/ipp-strings.c:1186
+#: locale/ipp-strings.c:1098
 msgid "laminating-sides.back"
 msgstr ""
 
 #. TRANSLATORS: Front and Back
-#: locale/ipp-strings.c:1188
+#: locale/ipp-strings.c:1100
 msgid "laminating-sides.both"
 msgstr ""
 
 #. TRANSLATORS: Front Only
-#: locale/ipp-strings.c:1190
+#: locale/ipp-strings.c:1102
 msgid "laminating-sides.front"
 msgstr ""
 
 #. TRANSLATORS: Type of Lamination
-#: locale/ipp-strings.c:1192
+#: locale/ipp-strings.c:1104
 msgid "laminating-type"
 msgstr ""
 
 #. TRANSLATORS: Archival
-#: locale/ipp-strings.c:1194
+#: locale/ipp-strings.c:1106
 msgid "laminating-type.archival"
 msgstr ""
 
 #. TRANSLATORS: Glossy
-#: locale/ipp-strings.c:1196
+#: locale/ipp-strings.c:1108
 msgid "laminating-type.glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss
-#: locale/ipp-strings.c:1198
+#: locale/ipp-strings.c:1110
 msgid "laminating-type.high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte
-#: locale/ipp-strings.c:1200
+#: locale/ipp-strings.c:1112
 msgid "laminating-type.matte"
 msgstr ""
 
 #. TRANSLATORS: Semi-gloss
-#: locale/ipp-strings.c:1202
+#: locale/ipp-strings.c:1114
 msgid "laminating-type.semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Translucent
-#: locale/ipp-strings.c:1204
+#: locale/ipp-strings.c:1116
 msgid "laminating-type.translucent"
 msgstr ""
 
 #. TRANSLATORS: Logo
-#: locale/ipp-strings.c:1206
+#: locale/ipp-strings.c:1118
 msgid "logo"
 msgstr ""
 
@@ -10267,2747 +10051,2752 @@ msgid "lpstat: error - %s environment variable names non-existent destination \"
 msgstr ""
 
 #. TRANSLATORS: Amount of Material
-#: locale/ipp-strings.c:1208
+#: locale/ipp-strings.c:1120
 msgid "material-amount"
 msgstr ""
 
 #. TRANSLATORS: Amount Units
-#: locale/ipp-strings.c:1210
+#: locale/ipp-strings.c:1122
 msgid "material-amount-units"
 msgstr ""
 
 #. TRANSLATORS: Grams
-#: locale/ipp-strings.c:1212
+#: locale/ipp-strings.c:1124
 msgid "material-amount-units.g"
 msgstr ""
 
 #. TRANSLATORS: Kilograms
-#: locale/ipp-strings.c:1214
+#: locale/ipp-strings.c:1126
 msgid "material-amount-units.kg"
 msgstr ""
 
 #. TRANSLATORS: Liters
-#: locale/ipp-strings.c:1216
+#: locale/ipp-strings.c:1128
 msgid "material-amount-units.l"
 msgstr ""
 
 #. TRANSLATORS: Meters
-#: locale/ipp-strings.c:1218
+#: locale/ipp-strings.c:1130
 msgid "material-amount-units.m"
 msgstr ""
 
 #. TRANSLATORS: Milliliters
-#: locale/ipp-strings.c:1220
+#: locale/ipp-strings.c:1132
 msgid "material-amount-units.ml"
 msgstr ""
 
 #. TRANSLATORS: Millimeters
-#: locale/ipp-strings.c:1222
+#: locale/ipp-strings.c:1134
 msgid "material-amount-units.mm"
 msgstr ""
 
 #. TRANSLATORS: Material Color
-#: locale/ipp-strings.c:1224
+#: locale/ipp-strings.c:1136
 msgid "material-color"
 msgstr ""
 
 #. TRANSLATORS: Material Diameter
-#: locale/ipp-strings.c:1226
+#: locale/ipp-strings.c:1138
 msgid "material-diameter"
 msgstr ""
 
 #. TRANSLATORS: Material Diameter Tolerance
-#: locale/ipp-strings.c:1228
+#: locale/ipp-strings.c:1140
 msgid "material-diameter-tolerance"
 msgstr ""
 
 #. TRANSLATORS: Material Fill Density
-#: locale/ipp-strings.c:1230
+#: locale/ipp-strings.c:1142
 msgid "material-fill-density"
 msgstr ""
 
 #. TRANSLATORS: Material Name
-#: locale/ipp-strings.c:1232
+#: locale/ipp-strings.c:1144
 msgid "material-name"
 msgstr ""
 
 #. TRANSLATORS: Material Nozzle Diameter
-#: locale/ipp-strings.c:1234
+#: locale/ipp-strings.c:1146
 msgid "material-nozzle-diameter"
 msgstr ""
 
 #. TRANSLATORS: Use Material For
-#: locale/ipp-strings.c:1236
+#: locale/ipp-strings.c:1148
 msgid "material-purpose"
 msgstr ""
 
 #. TRANSLATORS: Everything
-#: locale/ipp-strings.c:1238
+#: locale/ipp-strings.c:1150
 msgid "material-purpose.all"
 msgstr ""
 
 #. TRANSLATORS: Base
-#: locale/ipp-strings.c:1240
+#: locale/ipp-strings.c:1152
 msgid "material-purpose.base"
 msgstr ""
 
 #. TRANSLATORS: In-fill
-#: locale/ipp-strings.c:1242
+#: locale/ipp-strings.c:1154
 msgid "material-purpose.in-fill"
 msgstr ""
 
 #. TRANSLATORS: Shell
-#: locale/ipp-strings.c:1244
+#: locale/ipp-strings.c:1156
 msgid "material-purpose.shell"
 msgstr ""
 
 #. TRANSLATORS: Supports
-#: locale/ipp-strings.c:1246
+#: locale/ipp-strings.c:1158
 msgid "material-purpose.support"
 msgstr ""
 
 #. TRANSLATORS: Feed Rate
-#: locale/ipp-strings.c:1248
+#: locale/ipp-strings.c:1160
 msgid "material-rate"
 msgstr ""
 
 #. TRANSLATORS: Feed Rate Units
-#: locale/ipp-strings.c:1250
+#: locale/ipp-strings.c:1162
 msgid "material-rate-units"
 msgstr ""
 
 #. TRANSLATORS: Milligrams per second
-#: locale/ipp-strings.c:1252
+#: locale/ipp-strings.c:1164
 msgid "material-rate-units.mg_second"
 msgstr ""
 
 #. TRANSLATORS: Milliliters per second
-#: locale/ipp-strings.c:1254
+#: locale/ipp-strings.c:1166
 msgid "material-rate-units.ml_second"
 msgstr ""
 
 #. TRANSLATORS: Millimeters per second
-#: locale/ipp-strings.c:1256
+#: locale/ipp-strings.c:1168
 msgid "material-rate-units.mm_second"
 msgstr ""
 
 #. TRANSLATORS: Material Retraction
-#: locale/ipp-strings.c:1258
+#: locale/ipp-strings.c:1170
 msgid "material-retraction"
 msgstr ""
 
 #. TRANSLATORS: Material Shell Thickness
-#: locale/ipp-strings.c:1260
+#: locale/ipp-strings.c:1172
 msgid "material-shell-thickness"
 msgstr ""
 
 #. TRANSLATORS: Material Temperature
-#: locale/ipp-strings.c:1262
+#: locale/ipp-strings.c:1174
 msgid "material-temperature"
 msgstr ""
 
 #. TRANSLATORS: Material Type
-#: locale/ipp-strings.c:1264
+#: locale/ipp-strings.c:1176
 msgid "material-type"
 msgstr ""
 
 #. TRANSLATORS: ABS
-#: locale/ipp-strings.c:1266
+#: locale/ipp-strings.c:1178
 msgid "material-type.abs"
 msgstr ""
 
 #. TRANSLATORS: Carbon Fiber ABS
-#: locale/ipp-strings.c:1268
+#: locale/ipp-strings.c:1180
 msgid "material-type.abs-carbon-fiber"
 msgstr ""
 
 #. TRANSLATORS: Carbon Nanotube ABS
-#: locale/ipp-strings.c:1270
+#: locale/ipp-strings.c:1182
 msgid "material-type.abs-carbon-nanotube"
 msgstr ""
 
 #. TRANSLATORS: Chocolate
-#: locale/ipp-strings.c:1272
+#: locale/ipp-strings.c:1184
 msgid "material-type.chocolate"
 msgstr ""
 
 #. TRANSLATORS: Gold
-#: locale/ipp-strings.c:1274
+#: locale/ipp-strings.c:1186
 msgid "material-type.gold"
 msgstr ""
 
 #. TRANSLATORS: Nylon
-#: locale/ipp-strings.c:1276
+#: locale/ipp-strings.c:1188
 msgid "material-type.nylon"
 msgstr ""
 
 #. TRANSLATORS: Pet
-#: locale/ipp-strings.c:1278
+#: locale/ipp-strings.c:1190
 msgid "material-type.pet"
 msgstr ""
 
 #. TRANSLATORS: Photopolymer
-#: locale/ipp-strings.c:1280
+#: locale/ipp-strings.c:1192
 msgid "material-type.photopolymer"
 msgstr ""
 
 #. TRANSLATORS: PLA
-#: locale/ipp-strings.c:1282
+#: locale/ipp-strings.c:1194
 msgid "material-type.pla"
 msgstr ""
 
 #. TRANSLATORS: Conductive PLA
-#: locale/ipp-strings.c:1284
+#: locale/ipp-strings.c:1196
 msgid "material-type.pla-conductive"
 msgstr ""
 
 #. TRANSLATORS: Pla Dissolvable
-#: locale/ipp-strings.c:1286
+#: locale/ipp-strings.c:1198
 msgid "material-type.pla-dissolvable"
 msgstr ""
 
 #. TRANSLATORS: Flexible PLA
-#: locale/ipp-strings.c:1288
+#: locale/ipp-strings.c:1200
 msgid "material-type.pla-flexible"
 msgstr ""
 
 #. TRANSLATORS: Magnetic PLA
-#: locale/ipp-strings.c:1290
+#: locale/ipp-strings.c:1202
 msgid "material-type.pla-magnetic"
 msgstr ""
 
 #. TRANSLATORS: Steel PLA
-#: locale/ipp-strings.c:1292
+#: locale/ipp-strings.c:1204
 msgid "material-type.pla-steel"
 msgstr ""
 
 #. TRANSLATORS: Stone PLA
-#: locale/ipp-strings.c:1294
+#: locale/ipp-strings.c:1206
 msgid "material-type.pla-stone"
 msgstr ""
 
 #. TRANSLATORS: Wood PLA
-#: locale/ipp-strings.c:1296
+#: locale/ipp-strings.c:1208
 msgid "material-type.pla-wood"
 msgstr ""
 
 #. TRANSLATORS: Polycarbonate
-#: locale/ipp-strings.c:1298
+#: locale/ipp-strings.c:1210
 msgid "material-type.polycarbonate"
 msgstr ""
 
 #. TRANSLATORS: Dissolvable PVA
-#: locale/ipp-strings.c:1300
+#: locale/ipp-strings.c:1212
 msgid "material-type.pva-dissolvable"
 msgstr ""
 
 #. TRANSLATORS: Silver
-#: locale/ipp-strings.c:1302
+#: locale/ipp-strings.c:1214
 msgid "material-type.silver"
 msgstr ""
 
 #. TRANSLATORS: Titanium
-#: locale/ipp-strings.c:1304
+#: locale/ipp-strings.c:1216
 msgid "material-type.titanium"
 msgstr ""
 
 #. TRANSLATORS: Wax
-#: locale/ipp-strings.c:1306
+#: locale/ipp-strings.c:1218
 msgid "material-type.wax"
 msgstr ""
 
 #. TRANSLATORS: Materials
-#: locale/ipp-strings.c:1308
+#: locale/ipp-strings.c:1220
 msgid "materials-col"
 msgstr ""
 
 #. TRANSLATORS: Media
-#: locale/ipp-strings.c:1310
+#: locale/ipp-strings.c:1222
 msgid "media"
 msgstr ""
 
 #. TRANSLATORS: Back Coating of Media
-#: locale/ipp-strings.c:1312
+#: locale/ipp-strings.c:1224
 msgid "media-back-coating"
 msgstr ""
 
 #. TRANSLATORS: Glossy
-#: locale/ipp-strings.c:1314
+#: locale/ipp-strings.c:1226
 msgid "media-back-coating.glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss
-#: locale/ipp-strings.c:1316
+#: locale/ipp-strings.c:1228
 msgid "media-back-coating.high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte
-#: locale/ipp-strings.c:1318
+#: locale/ipp-strings.c:1230
 msgid "media-back-coating.matte"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1320
+#: locale/ipp-strings.c:1232
 msgid "media-back-coating.none"
 msgstr ""
 
 #. TRANSLATORS: Satin
-#: locale/ipp-strings.c:1322
+#: locale/ipp-strings.c:1234
 msgid "media-back-coating.satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-gloss
-#: locale/ipp-strings.c:1324
+#: locale/ipp-strings.c:1236
 msgid "media-back-coating.semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Media Bottom Margin
-#: locale/ipp-strings.c:1326
+#: locale/ipp-strings.c:1238
 msgid "media-bottom-margin"
 msgstr ""
 
 #. TRANSLATORS: Media
-#: locale/ipp-strings.c:1328
+#: locale/ipp-strings.c:1240
 msgid "media-col"
 msgstr ""
 
 #. TRANSLATORS: Media Color
-#: locale/ipp-strings.c:1330
+#: locale/ipp-strings.c:1242
 msgid "media-color"
 msgstr ""
 
 #. TRANSLATORS: Black
-#: locale/ipp-strings.c:1332
+#: locale/ipp-strings.c:1244
 msgid "media-color.black"
 msgstr ""
 
 #. TRANSLATORS: Blue
-#: locale/ipp-strings.c:1334
+#: locale/ipp-strings.c:1246
 msgid "media-color.blue"
 msgstr ""
 
 #. TRANSLATORS: Brown
-#: locale/ipp-strings.c:1336
+#: locale/ipp-strings.c:1248
 msgid "media-color.brown"
 msgstr ""
 
 #. TRANSLATORS: Buff
-#: locale/ipp-strings.c:1338
+#: locale/ipp-strings.c:1250
 msgid "media-color.buff"
 msgstr ""
 
 #. TRANSLATORS: Clear Black
-#: locale/ipp-strings.c:1340
+#: locale/ipp-strings.c:1252
 msgid "media-color.clear-black"
 msgstr ""
 
 #. TRANSLATORS: Clear Blue
-#: locale/ipp-strings.c:1342
+#: locale/ipp-strings.c:1254
 msgid "media-color.clear-blue"
 msgstr ""
 
 #. TRANSLATORS: Clear Brown
-#: locale/ipp-strings.c:1344
+#: locale/ipp-strings.c:1256
 msgid "media-color.clear-brown"
 msgstr ""
 
 #. TRANSLATORS: Clear Buff
-#: locale/ipp-strings.c:1346
+#: locale/ipp-strings.c:1258
 msgid "media-color.clear-buff"
 msgstr ""
 
 #. TRANSLATORS: Clear Cyan
-#: locale/ipp-strings.c:1348
+#: locale/ipp-strings.c:1260
 msgid "media-color.clear-cyan"
 msgstr ""
 
 #. TRANSLATORS: Clear Gold
-#: locale/ipp-strings.c:1350
+#: locale/ipp-strings.c:1262
 msgid "media-color.clear-gold"
 msgstr ""
 
 #. TRANSLATORS: Clear Goldenrod
-#: locale/ipp-strings.c:1352
+#: locale/ipp-strings.c:1264
 msgid "media-color.clear-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Clear Gray
-#: locale/ipp-strings.c:1354
+#: locale/ipp-strings.c:1266
 msgid "media-color.clear-gray"
 msgstr ""
 
 #. TRANSLATORS: Clear Green
-#: locale/ipp-strings.c:1356
+#: locale/ipp-strings.c:1268
 msgid "media-color.clear-green"
 msgstr ""
 
 #. TRANSLATORS: Clear Ivory
-#: locale/ipp-strings.c:1358
+#: locale/ipp-strings.c:1270
 msgid "media-color.clear-ivory"
 msgstr ""
 
 #. TRANSLATORS: Clear Magenta
-#: locale/ipp-strings.c:1360
+#: locale/ipp-strings.c:1272
 msgid "media-color.clear-magenta"
 msgstr ""
 
 #. TRANSLATORS: Clear Multi Color
-#: locale/ipp-strings.c:1362
+#: locale/ipp-strings.c:1274
 msgid "media-color.clear-multi-color"
 msgstr ""
 
 #. TRANSLATORS: Clear Mustard
-#: locale/ipp-strings.c:1364
+#: locale/ipp-strings.c:1276
 msgid "media-color.clear-mustard"
 msgstr ""
 
 #. TRANSLATORS: Clear Orange
-#: locale/ipp-strings.c:1366
+#: locale/ipp-strings.c:1278
 msgid "media-color.clear-orange"
 msgstr ""
 
 #. TRANSLATORS: Clear Pink
-#: locale/ipp-strings.c:1368
+#: locale/ipp-strings.c:1280
 msgid "media-color.clear-pink"
 msgstr ""
 
 #. TRANSLATORS: Clear Red
-#: locale/ipp-strings.c:1370
+#: locale/ipp-strings.c:1282
 msgid "media-color.clear-red"
 msgstr ""
 
 #. TRANSLATORS: Clear Silver
-#: locale/ipp-strings.c:1372
+#: locale/ipp-strings.c:1284
 msgid "media-color.clear-silver"
 msgstr ""
 
 #. TRANSLATORS: Clear Turquoise
-#: locale/ipp-strings.c:1374
+#: locale/ipp-strings.c:1286
 msgid "media-color.clear-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Clear Violet
-#: locale/ipp-strings.c:1376
+#: locale/ipp-strings.c:1288
 msgid "media-color.clear-violet"
 msgstr ""
 
 #. TRANSLATORS: Clear White
-#: locale/ipp-strings.c:1378
+#: locale/ipp-strings.c:1290
 msgid "media-color.clear-white"
 msgstr ""
 
 #. TRANSLATORS: Clear Yellow
-#: locale/ipp-strings.c:1380
+#: locale/ipp-strings.c:1292
 msgid "media-color.clear-yellow"
 msgstr ""
 
 #. TRANSLATORS: Cyan
-#: locale/ipp-strings.c:1382
+#: locale/ipp-strings.c:1294
 msgid "media-color.cyan"
 msgstr ""
 
 #. TRANSLATORS: Dark Blue
-#: locale/ipp-strings.c:1384
+#: locale/ipp-strings.c:1296
 msgid "media-color.dark-blue"
 msgstr ""
 
 #. TRANSLATORS: Dark Brown
-#: locale/ipp-strings.c:1386
+#: locale/ipp-strings.c:1298
 msgid "media-color.dark-brown"
 msgstr ""
 
 #. TRANSLATORS: Dark Buff
-#: locale/ipp-strings.c:1388
+#: locale/ipp-strings.c:1300
 msgid "media-color.dark-buff"
 msgstr ""
 
 #. TRANSLATORS: Dark Cyan
-#: locale/ipp-strings.c:1390
+#: locale/ipp-strings.c:1302
 msgid "media-color.dark-cyan"
 msgstr ""
 
 #. TRANSLATORS: Dark Gold
-#: locale/ipp-strings.c:1392
+#: locale/ipp-strings.c:1304
 msgid "media-color.dark-gold"
 msgstr ""
 
 #. TRANSLATORS: Dark Goldenrod
-#: locale/ipp-strings.c:1394
+#: locale/ipp-strings.c:1306
 msgid "media-color.dark-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Dark Gray
-#: locale/ipp-strings.c:1396
+#: locale/ipp-strings.c:1308
 msgid "media-color.dark-gray"
 msgstr ""
 
 #. TRANSLATORS: Dark Green
-#: locale/ipp-strings.c:1398
+#: locale/ipp-strings.c:1310
 msgid "media-color.dark-green"
 msgstr ""
 
 #. TRANSLATORS: Dark Ivory
-#: locale/ipp-strings.c:1400
+#: locale/ipp-strings.c:1312
 msgid "media-color.dark-ivory"
 msgstr ""
 
 #. TRANSLATORS: Dark Magenta
-#: locale/ipp-strings.c:1402
+#: locale/ipp-strings.c:1314
 msgid "media-color.dark-magenta"
 msgstr ""
 
 #. TRANSLATORS: Dark Mustard
-#: locale/ipp-strings.c:1404
+#: locale/ipp-strings.c:1316
 msgid "media-color.dark-mustard"
 msgstr ""
 
 #. TRANSLATORS: Dark Orange
-#: locale/ipp-strings.c:1406
+#: locale/ipp-strings.c:1318
 msgid "media-color.dark-orange"
 msgstr ""
 
 #. TRANSLATORS: Dark Pink
-#: locale/ipp-strings.c:1408
+#: locale/ipp-strings.c:1320
 msgid "media-color.dark-pink"
 msgstr ""
 
 #. TRANSLATORS: Dark Red
-#: locale/ipp-strings.c:1410
+#: locale/ipp-strings.c:1322
 msgid "media-color.dark-red"
 msgstr ""
 
 #. TRANSLATORS: Dark Silver
-#: locale/ipp-strings.c:1412
+#: locale/ipp-strings.c:1324
 msgid "media-color.dark-silver"
 msgstr ""
 
 #. TRANSLATORS: Dark Turquoise
-#: locale/ipp-strings.c:1414
+#: locale/ipp-strings.c:1326
 msgid "media-color.dark-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Dark Violet
-#: locale/ipp-strings.c:1416
+#: locale/ipp-strings.c:1328
 msgid "media-color.dark-violet"
 msgstr ""
 
 #. TRANSLATORS: Dark Yellow
-#: locale/ipp-strings.c:1418
+#: locale/ipp-strings.c:1330
 msgid "media-color.dark-yellow"
 msgstr ""
 
 #. TRANSLATORS: Gold
-#: locale/ipp-strings.c:1420
+#: locale/ipp-strings.c:1332
 msgid "media-color.gold"
 msgstr ""
 
 #. TRANSLATORS: Goldenrod
-#: locale/ipp-strings.c:1422
+#: locale/ipp-strings.c:1334
 msgid "media-color.goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Gray
-#: locale/ipp-strings.c:1424
+#: locale/ipp-strings.c:1336
 msgid "media-color.gray"
 msgstr ""
 
 #. TRANSLATORS: Green
-#: locale/ipp-strings.c:1426
+#: locale/ipp-strings.c:1338
 msgid "media-color.green"
 msgstr ""
 
 #. TRANSLATORS: Ivory
-#: locale/ipp-strings.c:1428
+#: locale/ipp-strings.c:1340
 msgid "media-color.ivory"
 msgstr ""
 
 #. TRANSLATORS: Light Black
-#: locale/ipp-strings.c:1430
+#: locale/ipp-strings.c:1342
 msgid "media-color.light-black"
 msgstr ""
 
 #. TRANSLATORS: Light Blue
-#: locale/ipp-strings.c:1432
+#: locale/ipp-strings.c:1344
 msgid "media-color.light-blue"
 msgstr ""
 
 #. TRANSLATORS: Light Brown
-#: locale/ipp-strings.c:1434
+#: locale/ipp-strings.c:1346
 msgid "media-color.light-brown"
 msgstr ""
 
 #. TRANSLATORS: Light Buff
-#: locale/ipp-strings.c:1436
+#: locale/ipp-strings.c:1348
 msgid "media-color.light-buff"
 msgstr ""
 
 #. TRANSLATORS: Light Cyan
-#: locale/ipp-strings.c:1438
+#: locale/ipp-strings.c:1350
 msgid "media-color.light-cyan"
 msgstr ""
 
 #. TRANSLATORS: Light Gold
-#: locale/ipp-strings.c:1440
+#: locale/ipp-strings.c:1352
 msgid "media-color.light-gold"
 msgstr ""
 
 #. TRANSLATORS: Light Goldenrod
-#: locale/ipp-strings.c:1442
+#: locale/ipp-strings.c:1354
 msgid "media-color.light-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Light Gray
-#: locale/ipp-strings.c:1444
+#: locale/ipp-strings.c:1356
 msgid "media-color.light-gray"
 msgstr ""
 
 #. TRANSLATORS: Light Green
-#: locale/ipp-strings.c:1446
+#: locale/ipp-strings.c:1358
 msgid "media-color.light-green"
 msgstr ""
 
 #. TRANSLATORS: Light Ivory
-#: locale/ipp-strings.c:1448
+#: locale/ipp-strings.c:1360
 msgid "media-color.light-ivory"
 msgstr ""
 
 #. TRANSLATORS: Light Magenta
-#: locale/ipp-strings.c:1450
+#: locale/ipp-strings.c:1362
 msgid "media-color.light-magenta"
 msgstr ""
 
 #. TRANSLATORS: Light Mustard
-#: locale/ipp-strings.c:1452
+#: locale/ipp-strings.c:1364
 msgid "media-color.light-mustard"
 msgstr ""
 
 #. TRANSLATORS: Light Orange
-#: locale/ipp-strings.c:1454
+#: locale/ipp-strings.c:1366
 msgid "media-color.light-orange"
 msgstr ""
 
 #. TRANSLATORS: Light Pink
-#: locale/ipp-strings.c:1456
+#: locale/ipp-strings.c:1368
 msgid "media-color.light-pink"
 msgstr ""
 
 #. TRANSLATORS: Light Red
-#: locale/ipp-strings.c:1458
+#: locale/ipp-strings.c:1370
 msgid "media-color.light-red"
 msgstr ""
 
 #. TRANSLATORS: Light Silver
-#: locale/ipp-strings.c:1460
+#: locale/ipp-strings.c:1372
 msgid "media-color.light-silver"
 msgstr ""
 
 #. TRANSLATORS: Light Turquoise
-#: locale/ipp-strings.c:1462
+#: locale/ipp-strings.c:1374
 msgid "media-color.light-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Light Violet
-#: locale/ipp-strings.c:1464
+#: locale/ipp-strings.c:1376
 msgid "media-color.light-violet"
 msgstr ""
 
 #. TRANSLATORS: Light Yellow
-#: locale/ipp-strings.c:1466
+#: locale/ipp-strings.c:1378
 msgid "media-color.light-yellow"
 msgstr ""
 
 #. TRANSLATORS: Magenta
-#: locale/ipp-strings.c:1468
+#: locale/ipp-strings.c:1380
 msgid "media-color.magenta"
 msgstr ""
 
 #. TRANSLATORS: Multi-color
-#: locale/ipp-strings.c:1470
+#: locale/ipp-strings.c:1382
 msgid "media-color.multi-color"
 msgstr ""
 
 #. TRANSLATORS: Mustard
-#: locale/ipp-strings.c:1472
+#: locale/ipp-strings.c:1384
 msgid "media-color.mustard"
 msgstr ""
 
 #. TRANSLATORS: No Color
-#: locale/ipp-strings.c:1474
+#: locale/ipp-strings.c:1386
 msgid "media-color.no-color"
 msgstr ""
 
 #. TRANSLATORS: Orange
-#: locale/ipp-strings.c:1476
+#: locale/ipp-strings.c:1388
 msgid "media-color.orange"
 msgstr ""
 
 #. TRANSLATORS: Pink
-#: locale/ipp-strings.c:1478
+#: locale/ipp-strings.c:1390
 msgid "media-color.pink"
 msgstr ""
 
 #. TRANSLATORS: Red
-#: locale/ipp-strings.c:1480
+#: locale/ipp-strings.c:1392
 msgid "media-color.red"
 msgstr ""
 
 #. TRANSLATORS: Silver
-#: locale/ipp-strings.c:1482
+#: locale/ipp-strings.c:1394
 msgid "media-color.silver"
 msgstr ""
 
 #. TRANSLATORS: Turquoise
-#: locale/ipp-strings.c:1484
+#: locale/ipp-strings.c:1396
 msgid "media-color.turquoise"
 msgstr ""
 
 #. TRANSLATORS: Violet
-#: locale/ipp-strings.c:1486
+#: locale/ipp-strings.c:1398
 msgid "media-color.violet"
 msgstr ""
 
 #. TRANSLATORS: White
-#: locale/ipp-strings.c:1488
+#: locale/ipp-strings.c:1400
 msgid "media-color.white"
 msgstr ""
 
 #. TRANSLATORS: Yellow
-#: locale/ipp-strings.c:1490
+#: locale/ipp-strings.c:1402
 msgid "media-color.yellow"
 msgstr ""
 
 #. TRANSLATORS: Front Coating of Media
-#: locale/ipp-strings.c:1492
+#: locale/ipp-strings.c:1404
 msgid "media-front-coating"
 msgstr ""
 
 #. TRANSLATORS: Media Grain
-#: locale/ipp-strings.c:1494
+#: locale/ipp-strings.c:1406
 msgid "media-grain"
 msgstr ""
 
 #. TRANSLATORS: Cross-Feed Direction
-#: locale/ipp-strings.c:1496
+#: locale/ipp-strings.c:1408
 msgid "media-grain.x-direction"
 msgstr ""
 
 #. TRANSLATORS: Feed Direction
-#: locale/ipp-strings.c:1498
+#: locale/ipp-strings.c:1410
 msgid "media-grain.y-direction"
 msgstr ""
 
 #. TRANSLATORS: Media Hole Count
-#: locale/ipp-strings.c:1500
+#: locale/ipp-strings.c:1412
 msgid "media-hole-count"
 msgstr ""
 
 #. TRANSLATORS: Media Info
-#: locale/ipp-strings.c:1502
+#: locale/ipp-strings.c:1414
 msgid "media-info"
 msgstr ""
 
 #. TRANSLATORS: Force Media
-#: locale/ipp-strings.c:1504
+#: locale/ipp-strings.c:1416
 msgid "media-input-tray-check"
 msgstr ""
 
 #. TRANSLATORS: Media Left Margin
-#: locale/ipp-strings.c:1506
+#: locale/ipp-strings.c:1418
 msgid "media-left-margin"
 msgstr ""
 
 #. TRANSLATORS: Pre-printed Media
-#: locale/ipp-strings.c:1508
+#: locale/ipp-strings.c:1420
 msgid "media-pre-printed"
 msgstr ""
 
 #. TRANSLATORS: Blank
-#: locale/ipp-strings.c:1510
+#: locale/ipp-strings.c:1422
 msgid "media-pre-printed.blank"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1512
+#: locale/ipp-strings.c:1424
 msgid "media-pre-printed.letter-head"
 msgstr ""
 
 #. TRANSLATORS: Pre-printed
-#: locale/ipp-strings.c:1514
+#: locale/ipp-strings.c:1426
 msgid "media-pre-printed.pre-printed"
 msgstr ""
 
 #. TRANSLATORS: Recycled Media
-#: locale/ipp-strings.c:1516
+#: locale/ipp-strings.c:1428
 msgid "media-recycled"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1518
+#: locale/ipp-strings.c:1430
 msgid "media-recycled.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:1520
+#: locale/ipp-strings.c:1432
 msgid "media-recycled.standard"
 msgstr ""
 
 #. TRANSLATORS: Media Right Margin
-#: locale/ipp-strings.c:1522
+#: locale/ipp-strings.c:1434
 msgid "media-right-margin"
 msgstr ""
 
 #. TRANSLATORS: Media Dimensions
-#: locale/ipp-strings.c:1524
+#: locale/ipp-strings.c:1436
 msgid "media-size"
 msgstr ""
 
 #. TRANSLATORS: Media Name
-#: locale/ipp-strings.c:1526
+#: locale/ipp-strings.c:1438
 msgid "media-size-name"
 msgstr ""
 
 #. TRANSLATORS: Media Source
-#: locale/ipp-strings.c:1528
+#: locale/ipp-strings.c:1440
 msgid "media-source"
 msgstr ""
 
 #. TRANSLATORS: Alternate
-#: locale/ipp-strings.c:1530
+#: locale/ipp-strings.c:1442
 msgid "media-source.alternate"
 msgstr ""
 
 #. TRANSLATORS: Alternate Roll
-#: locale/ipp-strings.c:1532
+#: locale/ipp-strings.c:1444
 msgid "media-source.alternate-roll"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:1534
+#: locale/ipp-strings.c:1446
 msgid "media-source.auto"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:1536
+#: locale/ipp-strings.c:1448
 msgid "media-source.bottom"
 msgstr ""
 
 #. TRANSLATORS: By-pass Tray
-#: locale/ipp-strings.c:1538
+#: locale/ipp-strings.c:1450
 msgid "media-source.by-pass-tray"
 msgstr ""
 
 #. TRANSLATORS: Center
-#: locale/ipp-strings.c:1540
+#: locale/ipp-strings.c:1452
 msgid "media-source.center"
 msgstr ""
 
 #. TRANSLATORS: Disc
-#: locale/ipp-strings.c:1542
+#: locale/ipp-strings.c:1454
 msgid "media-source.disc"
 msgstr ""
 
 #. TRANSLATORS: Envelope
-#: locale/ipp-strings.c:1544
+#: locale/ipp-strings.c:1456
 msgid "media-source.envelope"
 msgstr ""
 
 #. TRANSLATORS: Hagaki
-#: locale/ipp-strings.c:1546
+#: locale/ipp-strings.c:1458
 msgid "media-source.hagaki"
 msgstr ""
 
 #. TRANSLATORS: Large Capacity
-#: locale/ipp-strings.c:1548
+#: locale/ipp-strings.c:1460
 msgid "media-source.large-capacity"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:1550
+#: locale/ipp-strings.c:1462
 msgid "media-source.left"
 msgstr ""
 
 #. TRANSLATORS: Main
-#: locale/ipp-strings.c:1552
+#: locale/ipp-strings.c:1464
 msgid "media-source.main"
 msgstr ""
 
 #. TRANSLATORS: Main Roll
-#: locale/ipp-strings.c:1554
+#: locale/ipp-strings.c:1466
 msgid "media-source.main-roll"
 msgstr ""
 
 #. TRANSLATORS: Manual
-#: locale/ipp-strings.c:1556
+#: locale/ipp-strings.c:1468
 msgid "media-source.manual"
 msgstr ""
 
 #. TRANSLATORS: Middle
-#: locale/ipp-strings.c:1558
+#: locale/ipp-strings.c:1470
 msgid "media-source.middle"
 msgstr ""
 
 #. TRANSLATORS: Photo
-#: locale/ipp-strings.c:1560
+#: locale/ipp-strings.c:1472
 msgid "media-source.photo"
 msgstr ""
 
 #. TRANSLATORS: Rear
-#: locale/ipp-strings.c:1562
+#: locale/ipp-strings.c:1474
 msgid "media-source.rear"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:1564
+#: locale/ipp-strings.c:1476
 msgid "media-source.right"
 msgstr ""
 
 #. TRANSLATORS: Roll 1
-#: locale/ipp-strings.c:1566
+#: locale/ipp-strings.c:1478
 msgid "media-source.roll-1"
 msgstr ""
 
 #. TRANSLATORS: Roll 10
-#: locale/ipp-strings.c:1568
+#: locale/ipp-strings.c:1480
 msgid "media-source.roll-10"
 msgstr ""
 
 #. TRANSLATORS: Roll 2
-#: locale/ipp-strings.c:1570
+#: locale/ipp-strings.c:1482
 msgid "media-source.roll-2"
 msgstr ""
 
 #. TRANSLATORS: Roll 3
-#: locale/ipp-strings.c:1572
+#: locale/ipp-strings.c:1484
 msgid "media-source.roll-3"
 msgstr ""
 
 #. TRANSLATORS: Roll 4
-#: locale/ipp-strings.c:1574
+#: locale/ipp-strings.c:1486
 msgid "media-source.roll-4"
 msgstr ""
 
 #. TRANSLATORS: Roll 5
-#: locale/ipp-strings.c:1576
+#: locale/ipp-strings.c:1488
 msgid "media-source.roll-5"
 msgstr ""
 
 #. TRANSLATORS: Roll 6
-#: locale/ipp-strings.c:1578
+#: locale/ipp-strings.c:1490
 msgid "media-source.roll-6"
 msgstr ""
 
 #. TRANSLATORS: Roll 7
-#: locale/ipp-strings.c:1580
+#: locale/ipp-strings.c:1492
 msgid "media-source.roll-7"
 msgstr ""
 
 #. TRANSLATORS: Roll 8
-#: locale/ipp-strings.c:1582
+#: locale/ipp-strings.c:1494
 msgid "media-source.roll-8"
 msgstr ""
 
 #. TRANSLATORS: Roll 9
-#: locale/ipp-strings.c:1584
+#: locale/ipp-strings.c:1496
 msgid "media-source.roll-9"
 msgstr ""
 
 #. TRANSLATORS: Side
-#: locale/ipp-strings.c:1586
+#: locale/ipp-strings.c:1498
 msgid "media-source.side"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:1588
+#: locale/ipp-strings.c:1500
 msgid "media-source.top"
 msgstr ""
 
 #. TRANSLATORS: Tray 1
-#: locale/ipp-strings.c:1590
+#: locale/ipp-strings.c:1502
 msgid "media-source.tray-1"
 msgstr ""
 
 #. TRANSLATORS: Tray 10
-#: locale/ipp-strings.c:1592
+#: locale/ipp-strings.c:1504
 msgid "media-source.tray-10"
 msgstr ""
 
 #. TRANSLATORS: Tray 11
-#: locale/ipp-strings.c:1594
+#: locale/ipp-strings.c:1506
 msgid "media-source.tray-11"
 msgstr ""
 
 #. TRANSLATORS: Tray 12
-#: locale/ipp-strings.c:1596
+#: locale/ipp-strings.c:1508
 msgid "media-source.tray-12"
 msgstr ""
 
 #. TRANSLATORS: Tray 13
-#: locale/ipp-strings.c:1598
+#: locale/ipp-strings.c:1510
 msgid "media-source.tray-13"
 msgstr ""
 
 #. TRANSLATORS: Tray 14
-#: locale/ipp-strings.c:1600
+#: locale/ipp-strings.c:1512
 msgid "media-source.tray-14"
 msgstr ""
 
 #. TRANSLATORS: Tray 15
-#: locale/ipp-strings.c:1602
+#: locale/ipp-strings.c:1514
 msgid "media-source.tray-15"
 msgstr ""
 
 #. TRANSLATORS: Tray 16
-#: locale/ipp-strings.c:1604
+#: locale/ipp-strings.c:1516
 msgid "media-source.tray-16"
 msgstr ""
 
 #. TRANSLATORS: Tray 17
-#: locale/ipp-strings.c:1606
+#: locale/ipp-strings.c:1518
 msgid "media-source.tray-17"
 msgstr ""
 
 #. TRANSLATORS: Tray 18
-#: locale/ipp-strings.c:1608
+#: locale/ipp-strings.c:1520
 msgid "media-source.tray-18"
 msgstr ""
 
 #. TRANSLATORS: Tray 19
-#: locale/ipp-strings.c:1610
+#: locale/ipp-strings.c:1522
 msgid "media-source.tray-19"
 msgstr ""
 
 #. TRANSLATORS: Tray 2
-#: locale/ipp-strings.c:1612
+#: locale/ipp-strings.c:1524
 msgid "media-source.tray-2"
 msgstr ""
 
 #. TRANSLATORS: Tray 20
-#: locale/ipp-strings.c:1614
+#: locale/ipp-strings.c:1526
 msgid "media-source.tray-20"
 msgstr ""
 
 #. TRANSLATORS: Tray 3
-#: locale/ipp-strings.c:1616
+#: locale/ipp-strings.c:1528
 msgid "media-source.tray-3"
 msgstr ""
 
 #. TRANSLATORS: Tray 4
-#: locale/ipp-strings.c:1618
+#: locale/ipp-strings.c:1530
 msgid "media-source.tray-4"
 msgstr ""
 
 #. TRANSLATORS: Tray 5
-#: locale/ipp-strings.c:1620
+#: locale/ipp-strings.c:1532
 msgid "media-source.tray-5"
 msgstr ""
 
 #. TRANSLATORS: Tray 6
-#: locale/ipp-strings.c:1622
+#: locale/ipp-strings.c:1534
 msgid "media-source.tray-6"
 msgstr ""
 
 #. TRANSLATORS: Tray 7
-#: locale/ipp-strings.c:1624
+#: locale/ipp-strings.c:1536
 msgid "media-source.tray-7"
 msgstr ""
 
 #. TRANSLATORS: Tray 8
-#: locale/ipp-strings.c:1626
+#: locale/ipp-strings.c:1538
 msgid "media-source.tray-8"
 msgstr ""
 
 #. TRANSLATORS: Tray 9
-#: locale/ipp-strings.c:1628
+#: locale/ipp-strings.c:1540
 msgid "media-source.tray-9"
 msgstr ""
 
 #. TRANSLATORS: Media Thickness
-#: locale/ipp-strings.c:1630
+#: locale/ipp-strings.c:1542
 msgid "media-thickness"
 msgstr ""
 
 #. TRANSLATORS: Media Tooth (Texture)
-#: locale/ipp-strings.c:1632
+#: locale/ipp-strings.c:1544
 msgid "media-tooth"
 msgstr ""
 
 #. TRANSLATORS: Antique
-#: locale/ipp-strings.c:1634
+#: locale/ipp-strings.c:1546
 msgid "media-tooth.antique"
 msgstr ""
 
 #. TRANSLATORS: Extra Smooth
-#: locale/ipp-strings.c:1636
+#: locale/ipp-strings.c:1548
 msgid "media-tooth.calendared"
 msgstr ""
 
 #. TRANSLATORS: Coarse
-#: locale/ipp-strings.c:1638
+#: locale/ipp-strings.c:1550
 msgid "media-tooth.coarse"
 msgstr ""
 
 #. TRANSLATORS: Fine
-#: locale/ipp-strings.c:1640
+#: locale/ipp-strings.c:1552
 msgid "media-tooth.fine"
 msgstr ""
 
 #. TRANSLATORS: Linen
-#: locale/ipp-strings.c:1642
+#: locale/ipp-strings.c:1554
 msgid "media-tooth.linen"
 msgstr ""
 
 #. TRANSLATORS: Medium
-#: locale/ipp-strings.c:1644
+#: locale/ipp-strings.c:1556
 msgid "media-tooth.medium"
 msgstr ""
 
 #. TRANSLATORS: Smooth
-#: locale/ipp-strings.c:1646
+#: locale/ipp-strings.c:1558
 msgid "media-tooth.smooth"
 msgstr ""
 
 #. TRANSLATORS: Stipple
-#: locale/ipp-strings.c:1648
+#: locale/ipp-strings.c:1560
 msgid "media-tooth.stipple"
 msgstr ""
 
 #. TRANSLATORS: Rough
-#: locale/ipp-strings.c:1650
+#: locale/ipp-strings.c:1562
 msgid "media-tooth.uncalendared"
 msgstr ""
 
 #. TRANSLATORS: Vellum
-#: locale/ipp-strings.c:1652
+#: locale/ipp-strings.c:1564
 msgid "media-tooth.vellum"
 msgstr ""
 
 #. TRANSLATORS: Media Top Margin
-#: locale/ipp-strings.c:1654
+#: locale/ipp-strings.c:1566
 msgid "media-top-margin"
 msgstr ""
 
 #. TRANSLATORS: Media Type
-#: locale/ipp-strings.c:1656
+#: locale/ipp-strings.c:1568
 msgid "media-type"
 msgstr ""
 
 #. TRANSLATORS: Aluminum
-#: locale/ipp-strings.c:1658
+#: locale/ipp-strings.c:1570
 msgid "media-type.aluminum"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:1660
+#: locale/ipp-strings.c:1572
 msgid "media-type.auto"
 msgstr ""
 
 #. TRANSLATORS: Back Print Film
-#: locale/ipp-strings.c:1662
+#: locale/ipp-strings.c:1574
 msgid "media-type.back-print-film"
 msgstr ""
 
 #. TRANSLATORS: Cardboard
-#: locale/ipp-strings.c:1664
+#: locale/ipp-strings.c:1576
 msgid "media-type.cardboard"
 msgstr ""
 
 #. TRANSLATORS: Cardstock
-#: locale/ipp-strings.c:1666
+#: locale/ipp-strings.c:1578
 msgid "media-type.cardstock"
 msgstr ""
 
 #. TRANSLATORS: CD
-#: locale/ipp-strings.c:1668
+#: locale/ipp-strings.c:1580
 msgid "media-type.cd"
 msgstr ""
 
 #. TRANSLATORS: Continuous
-#: locale/ipp-strings.c:1670
+#: locale/ipp-strings.c:1582
 msgid "media-type.continuous"
 msgstr ""
 
 #. TRANSLATORS: Continuous Long
-#: locale/ipp-strings.c:1672
+#: locale/ipp-strings.c:1584
 msgid "media-type.continuous-long"
 msgstr ""
 
 #. TRANSLATORS: Continuous Short
-#: locale/ipp-strings.c:1674
+#: locale/ipp-strings.c:1586
 msgid "media-type.continuous-short"
 msgstr ""
 
 #. TRANSLATORS: Corrugated Board
-#: locale/ipp-strings.c:1676
+#: locale/ipp-strings.c:1588
 msgid "media-type.corrugated-board"
 msgstr ""
 
 #. TRANSLATORS: Optical Disc
-#: locale/ipp-strings.c:1678
+#: locale/ipp-strings.c:1590
 msgid "media-type.disc"
 msgstr ""
 
 #. TRANSLATORS: Glossy Optical Disc
-#: locale/ipp-strings.c:1680
+#: locale/ipp-strings.c:1592
 msgid "media-type.disc-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Optical Disc
-#: locale/ipp-strings.c:1682
+#: locale/ipp-strings.c:1594
 msgid "media-type.disc-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Optical Disc
-#: locale/ipp-strings.c:1684
+#: locale/ipp-strings.c:1596
 msgid "media-type.disc-matte"
 msgstr ""
 
 #. TRANSLATORS: Satin Optical Disc
-#: locale/ipp-strings.c:1686
+#: locale/ipp-strings.c:1598
 msgid "media-type.disc-satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Optical Disc
-#: locale/ipp-strings.c:1688
+#: locale/ipp-strings.c:1600
 msgid "media-type.disc-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Double Wall
-#: locale/ipp-strings.c:1690
+#: locale/ipp-strings.c:1602
 msgid "media-type.double-wall"
 msgstr ""
 
 #. TRANSLATORS: Dry Film
-#: locale/ipp-strings.c:1692
+#: locale/ipp-strings.c:1604
 msgid "media-type.dry-film"
 msgstr ""
 
 #. TRANSLATORS: DVD
-#: locale/ipp-strings.c:1694
+#: locale/ipp-strings.c:1606
 msgid "media-type.dvd"
 msgstr ""
 
 #. TRANSLATORS: Embossing Foil
-#: locale/ipp-strings.c:1696
+#: locale/ipp-strings.c:1608
 msgid "media-type.embossing-foil"
 msgstr ""
 
 #. TRANSLATORS: End Board
-#: locale/ipp-strings.c:1698
+#: locale/ipp-strings.c:1610
 msgid "media-type.end-board"
 msgstr ""
 
 #. TRANSLATORS: Envelope
-#: locale/ipp-strings.c:1700
+#: locale/ipp-strings.c:1612
 msgid "media-type.envelope"
 msgstr ""
 
 #. TRANSLATORS: Archival Envelope
-#: locale/ipp-strings.c:1702
+#: locale/ipp-strings.c:1614
 msgid "media-type.envelope-archival"
 msgstr ""
 
 #. TRANSLATORS: Bond Envelope
-#: locale/ipp-strings.c:1704
+#: locale/ipp-strings.c:1616
 msgid "media-type.envelope-bond"
 msgstr ""
 
 #. TRANSLATORS: Coated Envelope
-#: locale/ipp-strings.c:1706
+#: locale/ipp-strings.c:1618
 msgid "media-type.envelope-coated"
 msgstr ""
 
 #. TRANSLATORS: Cotton Envelope
-#: locale/ipp-strings.c:1708
+#: locale/ipp-strings.c:1620
 msgid "media-type.envelope-cotton"
 msgstr ""
 
 #. TRANSLATORS: Fine Envelope
-#: locale/ipp-strings.c:1710
+#: locale/ipp-strings.c:1622
 msgid "media-type.envelope-fine"
 msgstr ""
 
 #. TRANSLATORS: Heavyweight Envelope
-#: locale/ipp-strings.c:1712
+#: locale/ipp-strings.c:1624
 msgid "media-type.envelope-heavyweight"
 msgstr ""
 
 #. TRANSLATORS: Inkjet Envelope
-#: locale/ipp-strings.c:1714
+#: locale/ipp-strings.c:1626
 msgid "media-type.envelope-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Lightweight Envelope
-#: locale/ipp-strings.c:1716
+#: locale/ipp-strings.c:1628
 msgid "media-type.envelope-lightweight"
 msgstr ""
 
 #. TRANSLATORS: Plain Envelope
-#: locale/ipp-strings.c:1718
+#: locale/ipp-strings.c:1630
 msgid "media-type.envelope-plain"
 msgstr ""
 
 #. TRANSLATORS: Preprinted Envelope
-#: locale/ipp-strings.c:1720
+#: locale/ipp-strings.c:1632
 msgid "media-type.envelope-preprinted"
 msgstr ""
 
 #. TRANSLATORS: Windowed Envelope
-#: locale/ipp-strings.c:1722
+#: locale/ipp-strings.c:1634
 msgid "media-type.envelope-window"
 msgstr ""
 
 #. TRANSLATORS: Fabric
-#: locale/ipp-strings.c:1724
+#: locale/ipp-strings.c:1636
 msgid "media-type.fabric"
 msgstr ""
 
 #. TRANSLATORS: Archival Fabric
-#: locale/ipp-strings.c:1726
+#: locale/ipp-strings.c:1638
 msgid "media-type.fabric-archival"
 msgstr ""
 
 #. TRANSLATORS: Glossy Fabric
-#: locale/ipp-strings.c:1728
+#: locale/ipp-strings.c:1640
 msgid "media-type.fabric-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Fabric
-#: locale/ipp-strings.c:1730
+#: locale/ipp-strings.c:1642
 msgid "media-type.fabric-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Fabric
-#: locale/ipp-strings.c:1732
+#: locale/ipp-strings.c:1644
 msgid "media-type.fabric-matte"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Fabric
-#: locale/ipp-strings.c:1734
+#: locale/ipp-strings.c:1646
 msgid "media-type.fabric-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Waterproof Fabric
-#: locale/ipp-strings.c:1736
+#: locale/ipp-strings.c:1648
 msgid "media-type.fabric-waterproof"
 msgstr ""
 
 #. TRANSLATORS: Film
-#: locale/ipp-strings.c:1738
+#: locale/ipp-strings.c:1650
 msgid "media-type.film"
 msgstr ""
 
 #. TRANSLATORS: Flexo Base
-#: locale/ipp-strings.c:1740
+#: locale/ipp-strings.c:1652
 msgid "media-type.flexo-base"
 msgstr ""
 
 #. TRANSLATORS: Flexo Photo Polymer
-#: locale/ipp-strings.c:1742
+#: locale/ipp-strings.c:1654
 msgid "media-type.flexo-photo-polymer"
 msgstr ""
 
 #. TRANSLATORS: Flute
-#: locale/ipp-strings.c:1744
+#: locale/ipp-strings.c:1656
 msgid "media-type.flute"
 msgstr ""
 
 #. TRANSLATORS: Foil
-#: locale/ipp-strings.c:1746
+#: locale/ipp-strings.c:1658
 msgid "media-type.foil"
 msgstr ""
 
 #. TRANSLATORS: Full Cut Tabs
-#: locale/ipp-strings.c:1748
+#: locale/ipp-strings.c:1660
 msgid "media-type.full-cut-tabs"
 msgstr ""
 
 #. TRANSLATORS: Glass
-#: locale/ipp-strings.c:1750
+#: locale/ipp-strings.c:1662
 msgid "media-type.glass"
 msgstr ""
 
 #. TRANSLATORS: Glass Colored
-#: locale/ipp-strings.c:1752
+#: locale/ipp-strings.c:1664
 msgid "media-type.glass-colored"
 msgstr ""
 
 #. TRANSLATORS: Glass Opaque
-#: locale/ipp-strings.c:1754
+#: locale/ipp-strings.c:1666
 msgid "media-type.glass-opaque"
 msgstr ""
 
 #. TRANSLATORS: Glass Surfaced
-#: locale/ipp-strings.c:1756
+#: locale/ipp-strings.c:1668
 msgid "media-type.glass-surfaced"
 msgstr ""
 
 #. TRANSLATORS: Glass Textured
-#: locale/ipp-strings.c:1758
+#: locale/ipp-strings.c:1670
 msgid "media-type.glass-textured"
 msgstr ""
 
 #. TRANSLATORS: Gravure Cylinder
-#: locale/ipp-strings.c:1760
+#: locale/ipp-strings.c:1672
 msgid "media-type.gravure-cylinder"
 msgstr ""
 
 #. TRANSLATORS: Image Setter Paper
-#: locale/ipp-strings.c:1762
+#: locale/ipp-strings.c:1674
 msgid "media-type.image-setter-paper"
 msgstr ""
 
 #. TRANSLATORS: Imaging Cylinder
-#: locale/ipp-strings.c:1764
+#: locale/ipp-strings.c:1676
 msgid "media-type.imaging-cylinder"
 msgstr ""
 
 #. TRANSLATORS: Labels
-#: locale/ipp-strings.c:1766
+#: locale/ipp-strings.c:1678
 msgid "media-type.labels"
 msgstr ""
 
 #. TRANSLATORS: Colored Labels
-#: locale/ipp-strings.c:1768
+#: locale/ipp-strings.c:1680
 msgid "media-type.labels-colored"
 msgstr ""
 
 #. TRANSLATORS: Glossy Labels
-#: locale/ipp-strings.c:1770
+#: locale/ipp-strings.c:1682
 msgid "media-type.labels-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Labels
-#: locale/ipp-strings.c:1772
+#: locale/ipp-strings.c:1684
 msgid "media-type.labels-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Inkjet Labels
-#: locale/ipp-strings.c:1774
+#: locale/ipp-strings.c:1686
 msgid "media-type.labels-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Matte Labels
-#: locale/ipp-strings.c:1776
+#: locale/ipp-strings.c:1688
 msgid "media-type.labels-matte"
 msgstr ""
 
 #. TRANSLATORS: Permanent Labels
-#: locale/ipp-strings.c:1778
+#: locale/ipp-strings.c:1690
 msgid "media-type.labels-permanent"
 msgstr ""
 
 #. TRANSLATORS: Satin Labels
-#: locale/ipp-strings.c:1780
+#: locale/ipp-strings.c:1692
 msgid "media-type.labels-satin"
 msgstr ""
 
 #. TRANSLATORS: Security Labels
-#: locale/ipp-strings.c:1782
+#: locale/ipp-strings.c:1694
 msgid "media-type.labels-security"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Labels
-#: locale/ipp-strings.c:1784
+#: locale/ipp-strings.c:1696
 msgid "media-type.labels-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Laminating Foil
-#: locale/ipp-strings.c:1786
+#: locale/ipp-strings.c:1698
 msgid "media-type.laminating-foil"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1788
+#: locale/ipp-strings.c:1700
 msgid "media-type.letterhead"
 msgstr ""
 
 #. TRANSLATORS: Metal
-#: locale/ipp-strings.c:1790
+#: locale/ipp-strings.c:1702
 msgid "media-type.metal"
 msgstr ""
 
 #. TRANSLATORS: Metal Glossy
-#: locale/ipp-strings.c:1792
+#: locale/ipp-strings.c:1704
 msgid "media-type.metal-glossy"
 msgstr ""
 
 #. TRANSLATORS: Metal High Gloss
-#: locale/ipp-strings.c:1794
+#: locale/ipp-strings.c:1706
 msgid "media-type.metal-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Metal Matte
-#: locale/ipp-strings.c:1796
+#: locale/ipp-strings.c:1708
 msgid "media-type.metal-matte"
 msgstr ""
 
 #. TRANSLATORS: Metal Satin
-#: locale/ipp-strings.c:1798
+#: locale/ipp-strings.c:1710
 msgid "media-type.metal-satin"
 msgstr ""
 
 #. TRANSLATORS: Metal Semi Gloss
-#: locale/ipp-strings.c:1800
+#: locale/ipp-strings.c:1712
 msgid "media-type.metal-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Mounting Tape
-#: locale/ipp-strings.c:1802
+#: locale/ipp-strings.c:1714
 msgid "media-type.mounting-tape"
 msgstr ""
 
 #. TRANSLATORS: Multi Layer
-#: locale/ipp-strings.c:1804
+#: locale/ipp-strings.c:1716
 msgid "media-type.multi-layer"
 msgstr ""
 
 #. TRANSLATORS: Multi Part Form
-#: locale/ipp-strings.c:1806
+#: locale/ipp-strings.c:1718
 msgid "media-type.multi-part-form"
 msgstr ""
 
 #. TRANSLATORS: Other
-#: locale/ipp-strings.c:1808
+#: locale/ipp-strings.c:1720
 msgid "media-type.other"
 msgstr ""
 
 #. TRANSLATORS: Paper
-#: locale/ipp-strings.c:1810
+#: locale/ipp-strings.c:1722
 msgid "media-type.paper"
 msgstr ""
 
 #. TRANSLATORS: Photo Paper
-#: locale/ipp-strings.c:1812
+#: locale/ipp-strings.c:1724
 msgid "media-type.photographic"
 msgstr ""
 
 #. TRANSLATORS: Photographic Archival
-#: locale/ipp-strings.c:1814
+#: locale/ipp-strings.c:1726
 msgid "media-type.photographic-archival"
 msgstr ""
 
 #. TRANSLATORS: Photo Film
-#: locale/ipp-strings.c:1816
+#: locale/ipp-strings.c:1728
 msgid "media-type.photographic-film"
 msgstr ""
 
 #. TRANSLATORS: Glossy Photo Paper
-#: locale/ipp-strings.c:1818
+#: locale/ipp-strings.c:1730
 msgid "media-type.photographic-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Photo Paper
-#: locale/ipp-strings.c:1820
+#: locale/ipp-strings.c:1732
 msgid "media-type.photographic-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Photo Paper
-#: locale/ipp-strings.c:1822
+#: locale/ipp-strings.c:1734
 msgid "media-type.photographic-matte"
 msgstr ""
 
 #. TRANSLATORS: Satin Photo Paper
-#: locale/ipp-strings.c:1824
+#: locale/ipp-strings.c:1736
 msgid "media-type.photographic-satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Photo Paper
-#: locale/ipp-strings.c:1826
+#: locale/ipp-strings.c:1738
 msgid "media-type.photographic-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plastic
-#: locale/ipp-strings.c:1828
+#: locale/ipp-strings.c:1740
 msgid "media-type.plastic"
 msgstr ""
 
 #. TRANSLATORS: Plastic Archival
-#: locale/ipp-strings.c:1830
+#: locale/ipp-strings.c:1742
 msgid "media-type.plastic-archival"
 msgstr ""
 
 #. TRANSLATORS: Plastic Colored
-#: locale/ipp-strings.c:1832
+#: locale/ipp-strings.c:1744
 msgid "media-type.plastic-colored"
 msgstr ""
 
 #. TRANSLATORS: Plastic Glossy
-#: locale/ipp-strings.c:1834
+#: locale/ipp-strings.c:1746
 msgid "media-type.plastic-glossy"
 msgstr ""
 
 #. TRANSLATORS: Plastic High Gloss
-#: locale/ipp-strings.c:1836
+#: locale/ipp-strings.c:1748
 msgid "media-type.plastic-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plastic Matte
-#: locale/ipp-strings.c:1838
+#: locale/ipp-strings.c:1750
 msgid "media-type.plastic-matte"
 msgstr ""
 
 #. TRANSLATORS: Plastic Satin
-#: locale/ipp-strings.c:1840
+#: locale/ipp-strings.c:1752
 msgid "media-type.plastic-satin"
 msgstr ""
 
 #. TRANSLATORS: Plastic Semi Gloss
-#: locale/ipp-strings.c:1842
+#: locale/ipp-strings.c:1754
 msgid "media-type.plastic-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plate
-#: locale/ipp-strings.c:1844
+#: locale/ipp-strings.c:1756
 msgid "media-type.plate"
 msgstr ""
 
 #. TRANSLATORS: Polyester
-#: locale/ipp-strings.c:1846
+#: locale/ipp-strings.c:1758
 msgid "media-type.polyester"
 msgstr ""
 
 #. TRANSLATORS: Pre Cut Tabs
-#: locale/ipp-strings.c:1848
+#: locale/ipp-strings.c:1760
 msgid "media-type.pre-cut-tabs"
 msgstr ""
 
 #. TRANSLATORS: Roll
-#: locale/ipp-strings.c:1850
+#: locale/ipp-strings.c:1762
 msgid "media-type.roll"
 msgstr ""
 
 #. TRANSLATORS: Screen
-#: locale/ipp-strings.c:1852
+#: locale/ipp-strings.c:1764
 msgid "media-type.screen"
 msgstr ""
 
 #. TRANSLATORS: Screen Paged
-#: locale/ipp-strings.c:1854
+#: locale/ipp-strings.c:1766
 msgid "media-type.screen-paged"
 msgstr ""
 
 #. TRANSLATORS: Self Adhesive
-#: locale/ipp-strings.c:1856
+#: locale/ipp-strings.c:1768
 msgid "media-type.self-adhesive"
 msgstr ""
 
 #. TRANSLATORS: Self Adhesive Film
-#: locale/ipp-strings.c:1858
+#: locale/ipp-strings.c:1770
 msgid "media-type.self-adhesive-film"
 msgstr ""
 
 #. TRANSLATORS: Shrink Foil
-#: locale/ipp-strings.c:1860
+#: locale/ipp-strings.c:1772
 msgid "media-type.shrink-foil"
 msgstr ""
 
 #. TRANSLATORS: Single Face
-#: locale/ipp-strings.c:1862
+#: locale/ipp-strings.c:1774
 msgid "media-type.single-face"
 msgstr ""
 
 #. TRANSLATORS: Single Wall
-#: locale/ipp-strings.c:1864
+#: locale/ipp-strings.c:1776
 msgid "media-type.single-wall"
 msgstr ""
 
 #. TRANSLATORS: Sleeve
-#: locale/ipp-strings.c:1866
+#: locale/ipp-strings.c:1778
 msgid "media-type.sleeve"
 msgstr ""
 
 #. TRANSLATORS: Stationery
-#: locale/ipp-strings.c:1868
+#: locale/ipp-strings.c:1780
 msgid "media-type.stationery"
 msgstr ""
 
 #. TRANSLATORS: Stationery Archival
-#: locale/ipp-strings.c:1870
+#: locale/ipp-strings.c:1782
 msgid "media-type.stationery-archival"
 msgstr ""
 
 #. TRANSLATORS: Coated Paper
-#: locale/ipp-strings.c:1872
+#: locale/ipp-strings.c:1784
 msgid "media-type.stationery-coated"
 msgstr ""
 
 #. TRANSLATORS: Stationery Cotton
-#: locale/ipp-strings.c:1874
+#: locale/ipp-strings.c:1786
 msgid "media-type.stationery-cotton"
 msgstr ""
 
 #. TRANSLATORS: Vellum Paper
-#: locale/ipp-strings.c:1876
+#: locale/ipp-strings.c:1788
 msgid "media-type.stationery-fine"
 msgstr ""
 
 #. TRANSLATORS: Heavyweight Paper
-#: locale/ipp-strings.c:1878
+#: locale/ipp-strings.c:1790
 msgid "media-type.stationery-heavyweight"
 msgstr ""
 
 #. TRANSLATORS: Stationery Heavyweight Coated
-#: locale/ipp-strings.c:1880
+#: locale/ipp-strings.c:1792
 msgid "media-type.stationery-heavyweight-coated"
 msgstr ""
 
 #. TRANSLATORS: Stationery Inkjet Paper
-#: locale/ipp-strings.c:1882
+#: locale/ipp-strings.c:1794
 msgid "media-type.stationery-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1884
+#: locale/ipp-strings.c:1796
 msgid "media-type.stationery-letterhead"
 msgstr ""
 
 #. TRANSLATORS: Lightweight Paper
-#: locale/ipp-strings.c:1886
+#: locale/ipp-strings.c:1798
 msgid "media-type.stationery-lightweight"
 msgstr ""
 
 #. TRANSLATORS: Preprinted Paper
-#: locale/ipp-strings.c:1888
+#: locale/ipp-strings.c:1800
 msgid "media-type.stationery-preprinted"
 msgstr ""
 
 #. TRANSLATORS: Punched Paper
-#: locale/ipp-strings.c:1890
+#: locale/ipp-strings.c:1802
 msgid "media-type.stationery-prepunched"
 msgstr ""
 
 #. TRANSLATORS: Tab Stock
-#: locale/ipp-strings.c:1892
+#: locale/ipp-strings.c:1804
 msgid "media-type.tab-stock"
 msgstr ""
 
 #. TRANSLATORS: Tractor
-#: locale/ipp-strings.c:1894
+#: locale/ipp-strings.c:1806
 msgid "media-type.tractor"
 msgstr ""
 
 #. TRANSLATORS: Transfer
-#: locale/ipp-strings.c:1896
+#: locale/ipp-strings.c:1808
 msgid "media-type.transfer"
 msgstr ""
 
 #. TRANSLATORS: Transparency
-#: locale/ipp-strings.c:1898
+#: locale/ipp-strings.c:1810
 msgid "media-type.transparency"
 msgstr ""
 
 #. TRANSLATORS: Triple Wall
-#: locale/ipp-strings.c:1900
+#: locale/ipp-strings.c:1812
 msgid "media-type.triple-wall"
 msgstr ""
 
 #. TRANSLATORS: Wet Film
-#: locale/ipp-strings.c:1902
+#: locale/ipp-strings.c:1814
 msgid "media-type.wet-film"
 msgstr ""
 
 #. TRANSLATORS: Media Weight (grams per m²)
-#: locale/ipp-strings.c:1904
+#: locale/ipp-strings.c:1816
 msgid "media-weight-metric"
 msgstr ""
 
 #. TRANSLATORS: 28 x 40″
-#: locale/ipp-strings.c:1906
+#: locale/ipp-strings.c:1818
 msgid "media.asme_f_28x40in"
 msgstr ""
 
 #. TRANSLATORS: A4 or US Letter
-#: locale/ipp-strings.c:1908
+#: locale/ipp-strings.c:1820
 msgid "media.choice_iso_a4_210x297mm_na_letter_8.5x11in"
 msgstr ""
 
 #. TRANSLATORS: 2a0
-#: locale/ipp-strings.c:1910
+#: locale/ipp-strings.c:1822
 msgid "media.iso_2a0_1189x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A0
-#: locale/ipp-strings.c:1912
+#: locale/ipp-strings.c:1824
 msgid "media.iso_a0_841x1189mm"
 msgstr ""
 
 #. TRANSLATORS: A0x3
-#: locale/ipp-strings.c:1914
+#: locale/ipp-strings.c:1826
 msgid "media.iso_a0x3_1189x2523mm"
 msgstr ""
 
 #. TRANSLATORS: A10
-#: locale/ipp-strings.c:1916
+#: locale/ipp-strings.c:1828
 msgid "media.iso_a10_26x37mm"
 msgstr ""
 
 #. TRANSLATORS: A1
-#: locale/ipp-strings.c:1918
+#: locale/ipp-strings.c:1830
 msgid "media.iso_a1_594x841mm"
 msgstr ""
 
 #. TRANSLATORS: A1x3
-#: locale/ipp-strings.c:1920
+#: locale/ipp-strings.c:1832
 msgid "media.iso_a1x3_841x1783mm"
 msgstr ""
 
 #. TRANSLATORS: A1x4
-#: locale/ipp-strings.c:1922
+#: locale/ipp-strings.c:1834
 msgid "media.iso_a1x4_841x2378mm"
 msgstr ""
 
 #. TRANSLATORS: A2
-#: locale/ipp-strings.c:1924
+#: locale/ipp-strings.c:1836
 msgid "media.iso_a2_420x594mm"
 msgstr ""
 
 #. TRANSLATORS: A2x3
-#: locale/ipp-strings.c:1926
+#: locale/ipp-strings.c:1838
 msgid "media.iso_a2x3_594x1261mm"
 msgstr ""
 
 #. TRANSLATORS: A2x4
-#: locale/ipp-strings.c:1928
+#: locale/ipp-strings.c:1840
 msgid "media.iso_a2x4_594x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A2x5
-#: locale/ipp-strings.c:1930
+#: locale/ipp-strings.c:1842
 msgid "media.iso_a2x5_594x2102mm"
 msgstr ""
 
 #. TRANSLATORS: A3 (Extra)
-#: locale/ipp-strings.c:1932
+#: locale/ipp-strings.c:1844
 msgid "media.iso_a3-extra_322x445mm"
 msgstr ""
 
 #. TRANSLATORS: A3
-#: locale/ipp-strings.c:1934
+#: locale/ipp-strings.c:1846
 msgid "media.iso_a3_297x420mm"
 msgstr ""
 
 #. TRANSLATORS: A3x3
-#: locale/ipp-strings.c:1936
+#: locale/ipp-strings.c:1848
 msgid "media.iso_a3x3_420x891mm"
 msgstr ""
 
 #. TRANSLATORS: A3x4
-#: locale/ipp-strings.c:1938
+#: locale/ipp-strings.c:1850
 msgid "media.iso_a3x4_420x1189mm"
 msgstr ""
 
 #. TRANSLATORS: A3x5
-#: locale/ipp-strings.c:1940
+#: locale/ipp-strings.c:1852
 msgid "media.iso_a3x5_420x1486mm"
 msgstr ""
 
 #. TRANSLATORS: A3x6
-#: locale/ipp-strings.c:1942
+#: locale/ipp-strings.c:1854
 msgid "media.iso_a3x6_420x1783mm"
 msgstr ""
 
 #. TRANSLATORS: A3x7
-#: locale/ipp-strings.c:1944
+#: locale/ipp-strings.c:1856
 msgid "media.iso_a3x7_420x2080mm"
 msgstr ""
 
 #. TRANSLATORS: A4 (Extra)
-#: locale/ipp-strings.c:1946
+#: locale/ipp-strings.c:1858
 msgid "media.iso_a4-extra_235.5x322.3mm"
 msgstr ""
 
 #. TRANSLATORS: A4 (Tab)
-#: locale/ipp-strings.c:1948
+#: locale/ipp-strings.c:1860
 msgid "media.iso_a4-tab_225x297mm"
 msgstr ""
 
 #. TRANSLATORS: A4
-#: locale/ipp-strings.c:1950
+#: locale/ipp-strings.c:1862
 msgid "media.iso_a4_210x297mm"
 msgstr ""
 
 #. TRANSLATORS: A4x3
-#: locale/ipp-strings.c:1952
+#: locale/ipp-strings.c:1864
 msgid "media.iso_a4x3_297x630mm"
 msgstr ""
 
 #. TRANSLATORS: A4x4
-#: locale/ipp-strings.c:1954
+#: locale/ipp-strings.c:1866
 msgid "media.iso_a4x4_297x841mm"
 msgstr ""
 
 #. TRANSLATORS: A4x5
-#: locale/ipp-strings.c:1956
+#: locale/ipp-strings.c:1868
 msgid "media.iso_a4x5_297x1051mm"
 msgstr ""
 
 #. TRANSLATORS: A4x6
-#: locale/ipp-strings.c:1958
+#: locale/ipp-strings.c:1870
 msgid "media.iso_a4x6_297x1261mm"
 msgstr ""
 
 #. TRANSLATORS: A4x7
-#: locale/ipp-strings.c:1960
+#: locale/ipp-strings.c:1872
 msgid "media.iso_a4x7_297x1471mm"
 msgstr ""
 
 #. TRANSLATORS: A4x8
-#: locale/ipp-strings.c:1962
+#: locale/ipp-strings.c:1874
 msgid "media.iso_a4x8_297x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A4x9
-#: locale/ipp-strings.c:1964
+#: locale/ipp-strings.c:1876
 msgid "media.iso_a4x9_297x1892mm"
 msgstr ""
 
 #. TRANSLATORS: A5 (Extra)
-#: locale/ipp-strings.c:1966
+#: locale/ipp-strings.c:1878
 msgid "media.iso_a5-extra_174x235mm"
 msgstr ""
 
 #. TRANSLATORS: A5
-#: locale/ipp-strings.c:1968
+#: locale/ipp-strings.c:1880
 msgid "media.iso_a5_148x210mm"
 msgstr ""
 
 #. TRANSLATORS: A6
-#: locale/ipp-strings.c:1970
+#: locale/ipp-strings.c:1882
 msgid "media.iso_a6_105x148mm"
 msgstr ""
 
 #. TRANSLATORS: A7
-#: locale/ipp-strings.c:1972
+#: locale/ipp-strings.c:1884
 msgid "media.iso_a7_74x105mm"
 msgstr ""
 
 #. TRANSLATORS: A8
-#: locale/ipp-strings.c:1974
+#: locale/ipp-strings.c:1886
 msgid "media.iso_a8_52x74mm"
 msgstr ""
 
 #. TRANSLATORS: A9
-#: locale/ipp-strings.c:1976
+#: locale/ipp-strings.c:1888
 msgid "media.iso_a9_37x52mm"
 msgstr ""
 
 #. TRANSLATORS: B0
-#: locale/ipp-strings.c:1978
+#: locale/ipp-strings.c:1890
 msgid "media.iso_b0_1000x1414mm"
 msgstr ""
 
 #. TRANSLATORS: B10
-#: locale/ipp-strings.c:1980
+#: locale/ipp-strings.c:1892
 msgid "media.iso_b10_31x44mm"
 msgstr ""
 
 #. TRANSLATORS: B1
-#: locale/ipp-strings.c:1982
+#: locale/ipp-strings.c:1894
 msgid "media.iso_b1_707x1000mm"
 msgstr ""
 
 #. TRANSLATORS: B2
-#: locale/ipp-strings.c:1984
+#: locale/ipp-strings.c:1896
 msgid "media.iso_b2_500x707mm"
 msgstr ""
 
 #. TRANSLATORS: B3
-#: locale/ipp-strings.c:1986
+#: locale/ipp-strings.c:1898
 msgid "media.iso_b3_353x500mm"
 msgstr ""
 
 #. TRANSLATORS: B4
-#: locale/ipp-strings.c:1988
+#: locale/ipp-strings.c:1900
 msgid "media.iso_b4_250x353mm"
 msgstr ""
 
 #. TRANSLATORS: B5 (Extra)
-#: locale/ipp-strings.c:1990
+#: locale/ipp-strings.c:1902
 msgid "media.iso_b5-extra_201x276mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope B5
-#: locale/ipp-strings.c:1992
+#: locale/ipp-strings.c:1904
 msgid "media.iso_b5_176x250mm"
 msgstr ""
 
 #. TRANSLATORS: B6
-#: locale/ipp-strings.c:1994
+#: locale/ipp-strings.c:1906
 msgid "media.iso_b6_125x176mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope B6/C4
-#: locale/ipp-strings.c:1996
+#: locale/ipp-strings.c:1908
 msgid "media.iso_b6c4_125x324mm"
 msgstr ""
 
 #. TRANSLATORS: B7
-#: locale/ipp-strings.c:1998
+#: locale/ipp-strings.c:1910
 msgid "media.iso_b7_88x125mm"
 msgstr ""
 
 #. TRANSLATORS: B8
-#: locale/ipp-strings.c:2000
+#: locale/ipp-strings.c:1912
 msgid "media.iso_b8_62x88mm"
 msgstr ""
 
 #. TRANSLATORS: B9
-#: locale/ipp-strings.c:2002
+#: locale/ipp-strings.c:1914
 msgid "media.iso_b9_44x62mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 0
-#: locale/ipp-strings.c:2004
+#: locale/ipp-strings.c:1916
 msgid "media.iso_c0_917x1297mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 10
-#: locale/ipp-strings.c:2006
+#: locale/ipp-strings.c:1918
 msgid "media.iso_c10_28x40mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 1
-#: locale/ipp-strings.c:2008
+#: locale/ipp-strings.c:1920
 msgid "media.iso_c1_648x917mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 2
-#: locale/ipp-strings.c:2010
+#: locale/ipp-strings.c:1922
 msgid "media.iso_c2_458x648mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 3
-#: locale/ipp-strings.c:2012
+#: locale/ipp-strings.c:1924
 msgid "media.iso_c3_324x458mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 4
-#: locale/ipp-strings.c:2014
+#: locale/ipp-strings.c:1926
 msgid "media.iso_c4_229x324mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 5
-#: locale/ipp-strings.c:2016
+#: locale/ipp-strings.c:1928
 msgid "media.iso_c5_162x229mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 6
-#: locale/ipp-strings.c:2018
+#: locale/ipp-strings.c:1930
 msgid "media.iso_c6_114x162mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 6c5
-#: locale/ipp-strings.c:2020
+#: locale/ipp-strings.c:1932
 msgid "media.iso_c6c5_114x229mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 7
-#: locale/ipp-strings.c:2022
+#: locale/ipp-strings.c:1934
 msgid "media.iso_c7_81x114mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 7c6
-#: locale/ipp-strings.c:2024
+#: locale/ipp-strings.c:1936
 msgid "media.iso_c7c6_81x162mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 8
-#: locale/ipp-strings.c:2026
+#: locale/ipp-strings.c:1938
 msgid "media.iso_c8_57x81mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 9
-#: locale/ipp-strings.c:2028
+#: locale/ipp-strings.c:1940
 msgid "media.iso_c9_40x57mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope DL
-#: locale/ipp-strings.c:2030
+#: locale/ipp-strings.c:1942
 msgid "media.iso_dl_110x220mm"
 msgstr ""
 
 #. TRANSLATORS: Id-1
-#: locale/ipp-strings.c:2032
+#: locale/ipp-strings.c:1944
 msgid "media.iso_id-1_53.98x85.6mm"
 msgstr ""
 
 #. TRANSLATORS: Id-3
-#: locale/ipp-strings.c:2034
+#: locale/ipp-strings.c:1946
 msgid "media.iso_id-3_88x125mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA0
-#: locale/ipp-strings.c:2036
+#: locale/ipp-strings.c:1948
 msgid "media.iso_ra0_860x1220mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA1
-#: locale/ipp-strings.c:2038
+#: locale/ipp-strings.c:1950
 msgid "media.iso_ra1_610x860mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA2
-#: locale/ipp-strings.c:2040
+#: locale/ipp-strings.c:1952
 msgid "media.iso_ra2_430x610mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA3
-#: locale/ipp-strings.c:2042
+#: locale/ipp-strings.c:1954
 msgid "media.iso_ra3_305x430mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA4
-#: locale/ipp-strings.c:2044
+#: locale/ipp-strings.c:1956
 msgid "media.iso_ra4_215x305mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA0
-#: locale/ipp-strings.c:2046
+#: locale/ipp-strings.c:1958
 msgid "media.iso_sra0_900x1280mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA1
-#: locale/ipp-strings.c:2048
+#: locale/ipp-strings.c:1960
 msgid "media.iso_sra1_640x900mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA2
-#: locale/ipp-strings.c:2050
+#: locale/ipp-strings.c:1962
 msgid "media.iso_sra2_450x640mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA3
-#: locale/ipp-strings.c:2052
+#: locale/ipp-strings.c:1964
 msgid "media.iso_sra3_320x450mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA4
-#: locale/ipp-strings.c:2054
+#: locale/ipp-strings.c:1966
 msgid "media.iso_sra4_225x320mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B0
-#: locale/ipp-strings.c:2056
+#: locale/ipp-strings.c:1968
 msgid "media.jis_b0_1030x1456mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B10
-#: locale/ipp-strings.c:2058
+#: locale/ipp-strings.c:1970
 msgid "media.jis_b10_32x45mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B1
-#: locale/ipp-strings.c:2060
+#: locale/ipp-strings.c:1972
 msgid "media.jis_b1_728x1030mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B2
-#: locale/ipp-strings.c:2062
+#: locale/ipp-strings.c:1974
 msgid "media.jis_b2_515x728mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B3
-#: locale/ipp-strings.c:2064
+#: locale/ipp-strings.c:1976
 msgid "media.jis_b3_364x515mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B4
-#: locale/ipp-strings.c:2066
+#: locale/ipp-strings.c:1978
 msgid "media.jis_b4_257x364mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B5
-#: locale/ipp-strings.c:2068
+#: locale/ipp-strings.c:1980
 msgid "media.jis_b5_182x257mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B6
-#: locale/ipp-strings.c:2070
+#: locale/ipp-strings.c:1982
 msgid "media.jis_b6_128x182mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B7
-#: locale/ipp-strings.c:2072
+#: locale/ipp-strings.c:1984
 msgid "media.jis_b7_91x128mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B8
-#: locale/ipp-strings.c:2074
+#: locale/ipp-strings.c:1986
 msgid "media.jis_b8_64x91mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B9
-#: locale/ipp-strings.c:2076
+#: locale/ipp-strings.c:1988
 msgid "media.jis_b9_45x64mm"
 msgstr ""
 
 #. TRANSLATORS: JIS Executive
-#: locale/ipp-strings.c:2078
+#: locale/ipp-strings.c:1990
 msgid "media.jis_exec_216x330mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chou 2
-#: locale/ipp-strings.c:2080
+#: locale/ipp-strings.c:1992
 msgid "media.jpn_chou2_111.1x146mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chou 3
-#: locale/ipp-strings.c:2082
+#: locale/ipp-strings.c:1994
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+#: locale/ipp-strings.c:1996
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
-#: locale/ipp-strings.c:2084
+#: locale/ipp-strings.c:1998
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
 
 #. TRANSLATORS: Hagaki
-#: locale/ipp-strings.c:2086
+#: locale/ipp-strings.c:2000
 msgid "media.jpn_hagaki_100x148mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Kahu
-#: locale/ipp-strings.c:2088
+#: locale/ipp-strings.c:2002
 msgid "media.jpn_kahu_240x322.1mm"
 msgstr ""
 
 #. TRANSLATORS: 270 x 382mm
-#: locale/ipp-strings.c:2090
+#: locale/ipp-strings.c:2004
 msgid "media.jpn_kaku1_270x382mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Kahu 2
-#: locale/ipp-strings.c:2092
+#: locale/ipp-strings.c:2006
 msgid "media.jpn_kaku2_240x332mm"
 msgstr ""
 
 #. TRANSLATORS: 216 x 277mm
-#: locale/ipp-strings.c:2094
+#: locale/ipp-strings.c:2008
 msgid "media.jpn_kaku3_216x277mm"
 msgstr ""
 
 #. TRANSLATORS: 197 x 267mm
-#: locale/ipp-strings.c:2096
+#: locale/ipp-strings.c:2010
 msgid "media.jpn_kaku4_197x267mm"
 msgstr ""
 
 #. TRANSLATORS: 190 x 240mm
-#: locale/ipp-strings.c:2098
+#: locale/ipp-strings.c:2012
 msgid "media.jpn_kaku5_190x240mm"
 msgstr ""
 
 #. TRANSLATORS: 142 x 205mm
-#: locale/ipp-strings.c:2100
+#: locale/ipp-strings.c:2014
 msgid "media.jpn_kaku7_142x205mm"
 msgstr ""
 
 #. TRANSLATORS: 119 x 197mm
-#: locale/ipp-strings.c:2102
+#: locale/ipp-strings.c:2016
 msgid "media.jpn_kaku8_119x197mm"
 msgstr ""
 
 #. TRANSLATORS: Oufuku Reply Postcard
-#: locale/ipp-strings.c:2104
+#: locale/ipp-strings.c:2018
 msgid "media.jpn_oufuku_148x200mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope You 4
-#: locale/ipp-strings.c:2106
+#: locale/ipp-strings.c:2020
 msgid "media.jpn_you4_105x235mm"
 msgstr ""
 
 #. TRANSLATORS: 10 x 11″
-#: locale/ipp-strings.c:2108
+#: locale/ipp-strings.c:2022
 msgid "media.na_10x11_10x11in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 13″
-#: locale/ipp-strings.c:2110
+#: locale/ipp-strings.c:2024
 msgid "media.na_10x13_10x13in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 14″
-#: locale/ipp-strings.c:2112
+#: locale/ipp-strings.c:2026
 msgid "media.na_10x14_10x14in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 15″
-#: locale/ipp-strings.c:2114
+#: locale/ipp-strings.c:2028
 msgid "media.na_10x15_10x15in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 12″
-#: locale/ipp-strings.c:2116
+#: locale/ipp-strings.c:2030
 msgid "media.na_11x12_11x12in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 15″
-#: locale/ipp-strings.c:2118
+#: locale/ipp-strings.c:2032
 msgid "media.na_11x15_11x15in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 19″
-#: locale/ipp-strings.c:2120
+#: locale/ipp-strings.c:2034
 msgid "media.na_12x19_12x19in"
 msgstr ""
 
 #. TRANSLATORS: 5 x 7″
-#: locale/ipp-strings.c:2122
+#: locale/ipp-strings.c:2036
 msgid "media.na_5x7_5x7in"
 msgstr ""
 
 #. TRANSLATORS: 6 x 9″
-#: locale/ipp-strings.c:2124
+#: locale/ipp-strings.c:2038
 msgid "media.na_6x9_6x9in"
 msgstr ""
 
 #. TRANSLATORS: 7 x 9″
-#: locale/ipp-strings.c:2126
+#: locale/ipp-strings.c:2040
 msgid "media.na_7x9_7x9in"
 msgstr ""
 
 #. TRANSLATORS: 9 x 11″
-#: locale/ipp-strings.c:2128
+#: locale/ipp-strings.c:2042
 msgid "media.na_9x11_9x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope A2
-#: locale/ipp-strings.c:2130
+#: locale/ipp-strings.c:2044
 msgid "media.na_a2_4.375x5.75in"
 msgstr ""
 
 #. TRANSLATORS: 9 x 12″
-#: locale/ipp-strings.c:2132
+#: locale/ipp-strings.c:2046
 msgid "media.na_arch-a_9x12in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 18″
-#: locale/ipp-strings.c:2134
+#: locale/ipp-strings.c:2048
 msgid "media.na_arch-b_12x18in"
 msgstr ""
 
 #. TRANSLATORS: 18 x 24″
-#: locale/ipp-strings.c:2136
+#: locale/ipp-strings.c:2050
 msgid "media.na_arch-c_18x24in"
 msgstr ""
 
 #. TRANSLATORS: 24 x 36″
-#: locale/ipp-strings.c:2138
+#: locale/ipp-strings.c:2052
 msgid "media.na_arch-d_24x36in"
 msgstr ""
 
 #. TRANSLATORS: 26 x 38″
-#: locale/ipp-strings.c:2140
+#: locale/ipp-strings.c:2054
 msgid "media.na_arch-e2_26x38in"
 msgstr ""
 
 #. TRANSLATORS: 27 x 39″
-#: locale/ipp-strings.c:2142
+#: locale/ipp-strings.c:2056
 msgid "media.na_arch-e3_27x39in"
 msgstr ""
 
 #. TRANSLATORS: 36 x 48″
-#: locale/ipp-strings.c:2144
+#: locale/ipp-strings.c:2058
 msgid "media.na_arch-e_36x48in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 19.17″
-#: locale/ipp-strings.c:2146
+#: locale/ipp-strings.c:2060
 msgid "media.na_b-plus_12x19.17in"
 msgstr ""
 
 #. TRANSLATORS: Envelope C5
-#: locale/ipp-strings.c:2148
+#: locale/ipp-strings.c:2062
 msgid "media.na_c5_6.5x9.5in"
 msgstr ""
 
 #. TRANSLATORS: 17 x 22″
-#: locale/ipp-strings.c:2150
+#: locale/ipp-strings.c:2064
 msgid "media.na_c_17x22in"
 msgstr ""
 
 #. TRANSLATORS: 22 x 34″
-#: locale/ipp-strings.c:2152
+#: locale/ipp-strings.c:2066
 msgid "media.na_d_22x34in"
 msgstr ""
 
 #. TRANSLATORS: 34 x 44″
-#: locale/ipp-strings.c:2154
+#: locale/ipp-strings.c:2068
 msgid "media.na_e_34x44in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 14″
-#: locale/ipp-strings.c:2156
+#: locale/ipp-strings.c:2070
 msgid "media.na_edp_11x14in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 14″
-#: locale/ipp-strings.c:2158
+#: locale/ipp-strings.c:2072
 msgid "media.na_eur-edp_12x14in"
 msgstr ""
 
 #. TRANSLATORS: Executive
-#: locale/ipp-strings.c:2160
+#: locale/ipp-strings.c:2074
 msgid "media.na_executive_7.25x10.5in"
 msgstr ""
 
 #. TRANSLATORS: 44 x 68″
-#: locale/ipp-strings.c:2162
+#: locale/ipp-strings.c:2076
 msgid "media.na_f_44x68in"
 msgstr ""
 
 #. TRANSLATORS: European Fanfold
-#: locale/ipp-strings.c:2164
+#: locale/ipp-strings.c:2078
 msgid "media.na_fanfold-eur_8.5x12in"
 msgstr ""
 
 #. TRANSLATORS: US Fanfold
-#: locale/ipp-strings.c:2166
+#: locale/ipp-strings.c:2080
 msgid "media.na_fanfold-us_11x14.875in"
 msgstr ""
 
 #. TRANSLATORS: Foolscap
-#: locale/ipp-strings.c:2168
+#: locale/ipp-strings.c:2082
 msgid "media.na_foolscap_8.5x13in"
 msgstr ""
 
 #. TRANSLATORS: 8 x 13″
-#: locale/ipp-strings.c:2170
+#: locale/ipp-strings.c:2084
 msgid "media.na_govt-legal_8x13in"
 msgstr ""
 
 #. TRANSLATORS: 8 x 10″
-#: locale/ipp-strings.c:2172
+#: locale/ipp-strings.c:2086
 msgid "media.na_govt-letter_8x10in"
 msgstr ""
 
 #. TRANSLATORS: 3 x 5″
-#: locale/ipp-strings.c:2174
+#: locale/ipp-strings.c:2088
 msgid "media.na_index-3x5_3x5in"
 msgstr ""
 
 #. TRANSLATORS: 6 x 8″
-#: locale/ipp-strings.c:2176
+#: locale/ipp-strings.c:2090
 msgid "media.na_index-4x6-ext_6x8in"
 msgstr ""
 
 #. TRANSLATORS: 4 x 6″
-#: locale/ipp-strings.c:2178
+#: locale/ipp-strings.c:2092
 msgid "media.na_index-4x6_4x6in"
 msgstr ""
 
 #. TRANSLATORS: 5 x 8″
-#: locale/ipp-strings.c:2180
+#: locale/ipp-strings.c:2094
 msgid "media.na_index-5x8_5x8in"
 msgstr ""
 
 #. TRANSLATORS: Statement
-#: locale/ipp-strings.c:2182
+#: locale/ipp-strings.c:2096
 msgid "media.na_invoice_5.5x8.5in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 17″
-#: locale/ipp-strings.c:2184
+#: locale/ipp-strings.c:2098
 msgid "media.na_ledger_11x17in"
 msgstr ""
 
 #. TRANSLATORS: US Legal (Extra)
-#: locale/ipp-strings.c:2186
+#: locale/ipp-strings.c:2100
 msgid "media.na_legal-extra_9.5x15in"
 msgstr ""
 
 #. TRANSLATORS: US Legal
-#: locale/ipp-strings.c:2188
+#: locale/ipp-strings.c:2102
 msgid "media.na_legal_8.5x14in"
 msgstr ""
 
 #. TRANSLATORS: US Letter (Extra)
-#: locale/ipp-strings.c:2190
+#: locale/ipp-strings.c:2104
 msgid "media.na_letter-extra_9.5x12in"
 msgstr ""
 
 #. TRANSLATORS: US Letter (Plus)
-#: locale/ipp-strings.c:2192
+#: locale/ipp-strings.c:2106
 msgid "media.na_letter-plus_8.5x12.69in"
 msgstr ""
 
 #. TRANSLATORS: US Letter
-#: locale/ipp-strings.c:2194
+#: locale/ipp-strings.c:2108
 msgid "media.na_letter_8.5x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope Monarch
-#: locale/ipp-strings.c:2196
+#: locale/ipp-strings.c:2110
 msgid "media.na_monarch_3.875x7.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #10
-#: locale/ipp-strings.c:2198
+#: locale/ipp-strings.c:2112
 msgid "media.na_number-10_4.125x9.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #11
-#: locale/ipp-strings.c:2200
+#: locale/ipp-strings.c:2114
 msgid "media.na_number-11_4.5x10.375in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #12
-#: locale/ipp-strings.c:2202
+#: locale/ipp-strings.c:2116
 msgid "media.na_number-12_4.75x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #14
-#: locale/ipp-strings.c:2204
+#: locale/ipp-strings.c:2118
 msgid "media.na_number-14_5x11.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #9
-#: locale/ipp-strings.c:2206
+#: locale/ipp-strings.c:2120
 msgid "media.na_number-9_3.875x8.875in"
 msgstr ""
 
 #. TRANSLATORS: 8.5 x 13.4″
-#: locale/ipp-strings.c:2208
+#: locale/ipp-strings.c:2122
 msgid "media.na_oficio_8.5x13.4in"
 msgstr ""
 
 #. TRANSLATORS: Envelope Personal
-#: locale/ipp-strings.c:2210
+#: locale/ipp-strings.c:2124
 msgid "media.na_personal_3.625x6.5in"
 msgstr ""
 
 #. TRANSLATORS: Quarto
-#: locale/ipp-strings.c:2212
+#: locale/ipp-strings.c:2126
 msgid "media.na_quarto_8.5x10.83in"
 msgstr ""
 
 #. TRANSLATORS: 8.94 x 14″
-#: locale/ipp-strings.c:2214
+#: locale/ipp-strings.c:2128
 msgid "media.na_super-a_8.94x14in"
 msgstr ""
 
 #. TRANSLATORS: 13 x 19″
-#: locale/ipp-strings.c:2216
+#: locale/ipp-strings.c:2130
 msgid "media.na_super-b_13x19in"
 msgstr ""
 
 #. TRANSLATORS: 30 x 42″
-#: locale/ipp-strings.c:2218
+#: locale/ipp-strings.c:2132
 msgid "media.na_wide-format_30x42in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 16″
-#: locale/ipp-strings.c:2220
+#: locale/ipp-strings.c:2134
 msgid "media.oe_12x16_12x16in"
 msgstr ""
 
 #. TRANSLATORS: 14 x 17″
-#: locale/ipp-strings.c:2222
+#: locale/ipp-strings.c:2136
 msgid "media.oe_14x17_14x17in"
 msgstr ""
 
 #. TRANSLATORS: 18 x 22″
-#: locale/ipp-strings.c:2224
+#: locale/ipp-strings.c:2138
 msgid "media.oe_18x22_18x22in"
 msgstr ""
 
 #. TRANSLATORS: 17 x 24″
-#: locale/ipp-strings.c:2226
+#: locale/ipp-strings.c:2140
 msgid "media.oe_a2plus_17x24in"
 msgstr ""
 
 #. TRANSLATORS: 2 x 3.5″
-#: locale/ipp-strings.c:2228
+#: locale/ipp-strings.c:2142
 msgid "media.oe_business-card_2x3.5in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 12″
-#: locale/ipp-strings.c:2230
+#: locale/ipp-strings.c:2144
 msgid "media.oe_photo-10r_10x12in"
 msgstr ""
 
 #. TRANSLATORS: 20 x 24″
-#: locale/ipp-strings.c:2232
+#: locale/ipp-strings.c:2146
 msgid "media.oe_photo-20r_20x24in"
 msgstr ""
 
 #. TRANSLATORS: 3.5 x 5″
-#: locale/ipp-strings.c:2234
+#: locale/ipp-strings.c:2148
 msgid "media.oe_photo-l_3.5x5in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 15″
-#: locale/ipp-strings.c:2236
+#: locale/ipp-strings.c:2150
 msgid "media.oe_photo-s10r_10x15in"
 msgstr ""
 
 #. TRANSLATORS: 4 x 4″
-#: locale/ipp-strings.c:2238
+#: locale/ipp-strings.c:2152
 msgid "media.oe_square-photo_4x4in"
 msgstr ""
 
 #. TRANSLATORS: 5 x 5″
-#: locale/ipp-strings.c:2240
+#: locale/ipp-strings.c:2154
 msgid "media.oe_square-photo_5x5in"
 msgstr ""
 
 #. TRANSLATORS: 184 x 260mm
-#: locale/ipp-strings.c:2242
+#: locale/ipp-strings.c:2156
 msgid "media.om_16k_184x260mm"
 msgstr ""
 
 #. TRANSLATORS: 195 x 270mm
-#: locale/ipp-strings.c:2244
+#: locale/ipp-strings.c:2158
 msgid "media.om_16k_195x270mm"
 msgstr ""
 
 #. TRANSLATORS: 55 x 85mm
-#: locale/ipp-strings.c:2246
+#: locale/ipp-strings.c:2160
 msgid "media.om_business-card_55x85mm"
 msgstr ""
 
 #. TRANSLATORS: 55 x 91mm
-#: locale/ipp-strings.c:2248
+#: locale/ipp-strings.c:2162
 msgid "media.om_business-card_55x91mm"
 msgstr ""
 
 #. TRANSLATORS: 54 x 86mm
-#: locale/ipp-strings.c:2250
+#: locale/ipp-strings.c:2164
 msgid "media.om_card_54x86mm"
 msgstr ""
 
 #. TRANSLATORS: 275 x 395mm
-#: locale/ipp-strings.c:2252
+#: locale/ipp-strings.c:2166
 msgid "media.om_dai-pa-kai_275x395mm"
 msgstr ""
 
 #. TRANSLATORS: 89 x 119mm
-#: locale/ipp-strings.c:2254
+#: locale/ipp-strings.c:2168
 msgid "media.om_dsc-photo_89x119mm"
 msgstr ""
 
 #. TRANSLATORS: Folio
-#: locale/ipp-strings.c:2256
+#: locale/ipp-strings.c:2170
 msgid "media.om_folio-sp_215x315mm"
 msgstr ""
 
 #. TRANSLATORS: Folio (Special)
-#: locale/ipp-strings.c:2258
+#: locale/ipp-strings.c:2172
 msgid "media.om_folio_210x330mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Invitation
-#: locale/ipp-strings.c:2260
+#: locale/ipp-strings.c:2174
 msgid "media.om_invite_220x220mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Italian
-#: locale/ipp-strings.c:2262
+#: locale/ipp-strings.c:2176
 msgid "media.om_italian_110x230mm"
 msgstr ""
 
 #. TRANSLATORS: 198 x 275mm
-#: locale/ipp-strings.c:2264
+#: locale/ipp-strings.c:2178
 msgid "media.om_juuro-ku-kai_198x275mm"
 msgstr ""
 
 #. TRANSLATORS: 200 x 300
-#: locale/ipp-strings.c:2266
+#: locale/ipp-strings.c:2180
 msgid "media.om_large-photo_200x300"
 msgstr ""
 
 #. TRANSLATORS: 130 x 180mm
-#: locale/ipp-strings.c:2268
+#: locale/ipp-strings.c:2182
 msgid "media.om_medium-photo_130x180mm"
 msgstr ""
 
 #. TRANSLATORS: 267 x 389mm
-#: locale/ipp-strings.c:2270
+#: locale/ipp-strings.c:2184
 msgid "media.om_pa-kai_267x389mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Postfix
-#: locale/ipp-strings.c:2272
+#: locale/ipp-strings.c:2186
 msgid "media.om_postfix_114x229mm"
 msgstr ""
 
 #. TRANSLATORS: 100 x 150mm
-#: locale/ipp-strings.c:2274
+#: locale/ipp-strings.c:2188
 msgid "media.om_small-photo_100x150mm"
 msgstr ""
 
 #. TRANSLATORS: 89 x 89mm
-#: locale/ipp-strings.c:2276
+#: locale/ipp-strings.c:2190
 msgid "media.om_square-photo_89x89mm"
 msgstr ""
 
 #. TRANSLATORS: 100 x 200mm
-#: locale/ipp-strings.c:2278
+#: locale/ipp-strings.c:2192
 msgid "media.om_wide-photo_100x200mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #10
-#: locale/ipp-strings.c:2280
+#: locale/ipp-strings.c:2194
 msgid "media.prc_10_324x458mm"
 msgstr ""
 
 #. TRANSLATORS: Chinese 16k
-#: locale/ipp-strings.c:2282
+#: locale/ipp-strings.c:2196
 msgid "media.prc_16k_146x215mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #1
-#: locale/ipp-strings.c:2284
+#: locale/ipp-strings.c:2198
 msgid "media.prc_1_102x165mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #2
-#: locale/ipp-strings.c:2286
+#: locale/ipp-strings.c:2200
 msgid "media.prc_2_102x176mm"
 msgstr ""
 
 #. TRANSLATORS: Chinese 32k
-#: locale/ipp-strings.c:2288
+#: locale/ipp-strings.c:2202
 msgid "media.prc_32k_97x151mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #3
-#: locale/ipp-strings.c:2290
+#: locale/ipp-strings.c:2204
 msgid "media.prc_3_125x176mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #4
-#: locale/ipp-strings.c:2292
+#: locale/ipp-strings.c:2206
 msgid "media.prc_4_110x208mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #5
-#: locale/ipp-strings.c:2294
+#: locale/ipp-strings.c:2208
 msgid "media.prc_5_110x220mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #6
-#: locale/ipp-strings.c:2296
+#: locale/ipp-strings.c:2210
 msgid "media.prc_6_120x320mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #7
-#: locale/ipp-strings.c:2298
+#: locale/ipp-strings.c:2212
 msgid "media.prc_7_160x230mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #8
-#: locale/ipp-strings.c:2300
+#: locale/ipp-strings.c:2214
 msgid "media.prc_8_120x309mm"
 msgstr ""
 
 #. TRANSLATORS: ROC 16k
-#: locale/ipp-strings.c:2302
+#: locale/ipp-strings.c:2216
 msgid "media.roc_16k_7.75x10.75in"
 msgstr ""
 
 #. TRANSLATORS: ROC 8k
-#: locale/ipp-strings.c:2304
+#: locale/ipp-strings.c:2218
 msgid "media.roc_8k_10.75x15.5in"
 msgstr ""
 
@@ -13017,82 +12806,82 @@ msgid "members of class %s:"
 msgstr ""
 
 #. TRANSLATORS: Multiple Document Handling
-#: locale/ipp-strings.c:2306
+#: locale/ipp-strings.c:2220
 msgid "multiple-document-handling"
 msgstr ""
 
 #. TRANSLATORS: Separate Documents Collated Copies
-#: locale/ipp-strings.c:2308
+#: locale/ipp-strings.c:2222
 msgid "multiple-document-handling.separate-documents-collated-copies"
 msgstr ""
 
 #. TRANSLATORS: Separate Documents Uncollated Copies
-#: locale/ipp-strings.c:2310
+#: locale/ipp-strings.c:2224
 msgid "multiple-document-handling.separate-documents-uncollated-copies"
 msgstr ""
 
 #. TRANSLATORS: Single Document
-#: locale/ipp-strings.c:2312
+#: locale/ipp-strings.c:2226
 msgid "multiple-document-handling.single-document"
 msgstr ""
 
 #. TRANSLATORS: Single Document New Sheet
-#: locale/ipp-strings.c:2314
+#: locale/ipp-strings.c:2228
 msgid "multiple-document-handling.single-document-new-sheet"
 msgstr ""
 
 #. TRANSLATORS: Multiple Object Handling
-#: locale/ipp-strings.c:2316
+#: locale/ipp-strings.c:2230
 msgid "multiple-object-handling"
 msgstr ""
 
 #. TRANSLATORS: Multiple Object Handling Actual
-#: locale/ipp-strings.c:2318
+#: locale/ipp-strings.c:2232
 msgid "multiple-object-handling-actual"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2320
+#: locale/ipp-strings.c:2234
 msgid "multiple-object-handling.auto"
 msgstr ""
 
 #. TRANSLATORS: Best Fit
-#: locale/ipp-strings.c:2322
+#: locale/ipp-strings.c:2236
 msgid "multiple-object-handling.best-fit"
 msgstr ""
 
 #. TRANSLATORS: Best Quality
-#: locale/ipp-strings.c:2324
+#: locale/ipp-strings.c:2238
 msgid "multiple-object-handling.best-quality"
 msgstr ""
 
 #. TRANSLATORS: Best Speed
-#: locale/ipp-strings.c:2326
+#: locale/ipp-strings.c:2240
 msgid "multiple-object-handling.best-speed"
 msgstr ""
 
 #. TRANSLATORS: One At A Time
-#: locale/ipp-strings.c:2328
+#: locale/ipp-strings.c:2242
 msgid "multiple-object-handling.one-at-a-time"
 msgstr ""
 
 #. TRANSLATORS: On Timeout
-#: locale/ipp-strings.c:2330
+#: locale/ipp-strings.c:2244
 msgid "multiple-operation-time-out-action"
 msgstr ""
 
 #. TRANSLATORS: Abort Job
-#: locale/ipp-strings.c:2332
+#: locale/ipp-strings.c:2246
 msgid "multiple-operation-time-out-action.abort-job"
 msgstr ""
 
 #. TRANSLATORS: Hold Job
-#: locale/ipp-strings.c:2334
+#: locale/ipp-strings.c:2248
 msgid "multiple-operation-time-out-action.hold-job"
 msgstr ""
 
 #. TRANSLATORS: Process Job
-#: locale/ipp-strings.c:2336
+#: locale/ipp-strings.c:2250
 msgid "multiple-operation-time-out-action.process-job"
 msgstr ""
 
@@ -13105,626 +12894,566 @@ msgid "no system default destination"
 msgstr ""
 
 #. TRANSLATORS: Noise Removal
-#: locale/ipp-strings.c:2338
+#: locale/ipp-strings.c:2252
 msgid "noise-removal"
 msgstr ""
 
 #. TRANSLATORS: Notify Attributes
-#: locale/ipp-strings.c:2340
+#: locale/ipp-strings.c:2254
 msgid "notify-attributes"
 msgstr ""
 
 #. TRANSLATORS: Notify Charset
-#: locale/ipp-strings.c:2342
+#: locale/ipp-strings.c:2256
 msgid "notify-charset"
 msgstr ""
 
 #. TRANSLATORS: Notify Events
-#: locale/ipp-strings.c:2344
+#: locale/ipp-strings.c:2258
 msgid "notify-events"
 msgstr ""
 
-#: scheduler/ipp.c:5877
+#: scheduler/ipp.c:5872
 msgid "notify-events not specified."
 msgstr ""
 
 #. TRANSLATORS: Document Completed
-#: locale/ipp-strings.c:2346
+#: locale/ipp-strings.c:2260
 msgid "notify-events.document-completed"
 msgstr ""
 
 #. TRANSLATORS: Document Config Changed
-#: locale/ipp-strings.c:2348
+#: locale/ipp-strings.c:2262
 msgid "notify-events.document-config-changed"
 msgstr ""
 
 #. TRANSLATORS: Document Created
-#: locale/ipp-strings.c:2350
+#: locale/ipp-strings.c:2264
 msgid "notify-events.document-created"
 msgstr ""
 
 #. TRANSLATORS: Document Fetchable
-#: locale/ipp-strings.c:2352
+#: locale/ipp-strings.c:2266
 msgid "notify-events.document-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Document State Changed
-#: locale/ipp-strings.c:2354
+#: locale/ipp-strings.c:2268
 msgid "notify-events.document-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Document Stopped
-#: locale/ipp-strings.c:2356
+#: locale/ipp-strings.c:2270
 msgid "notify-events.document-stopped"
 msgstr ""
 
 #. TRANSLATORS: Job Completed
-#: locale/ipp-strings.c:2358
+#: locale/ipp-strings.c:2272
 msgid "notify-events.job-completed"
 msgstr ""
 
 #. TRANSLATORS: Job Config Changed
-#: locale/ipp-strings.c:2360
+#: locale/ipp-strings.c:2274
 msgid "notify-events.job-config-changed"
 msgstr ""
 
 #. TRANSLATORS: Job Created
-#: locale/ipp-strings.c:2362
+#: locale/ipp-strings.c:2276
 msgid "notify-events.job-created"
 msgstr ""
 
 #. TRANSLATORS: Job Fetchable
-#: locale/ipp-strings.c:2364
+#: locale/ipp-strings.c:2278
 msgid "notify-events.job-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Job Progress
-#: locale/ipp-strings.c:2366
+#: locale/ipp-strings.c:2280
 msgid "notify-events.job-progress"
 msgstr ""
 
 #. TRANSLATORS: Job State Changed
-#: locale/ipp-strings.c:2368
+#: locale/ipp-strings.c:2282
 msgid "notify-events.job-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Job Stopped
-#: locale/ipp-strings.c:2370
+#: locale/ipp-strings.c:2284
 msgid "notify-events.job-stopped"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2372
+#: locale/ipp-strings.c:2286
 msgid "notify-events.none"
 msgstr ""
 
 #. TRANSLATORS: Printer Config Changed
-#: locale/ipp-strings.c:2374
+#: locale/ipp-strings.c:2288
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-#: locale/ipp-strings.c:2376
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-#: locale/ipp-strings.c:2378
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
-#: locale/ipp-strings.c:2380
+#: locale/ipp-strings.c:2290
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Media Changed
-#: locale/ipp-strings.c:2382
+#: locale/ipp-strings.c:2292
 msgid "notify-events.printer-media-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Queue Order Changed
-#: locale/ipp-strings.c:2384
+#: locale/ipp-strings.c:2294
 msgid "notify-events.printer-queue-order-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Restarted
-#: locale/ipp-strings.c:2386
+#: locale/ipp-strings.c:2296
 msgid "notify-events.printer-restarted"
 msgstr ""
 
 #. TRANSLATORS: Printer Shutdown
-#: locale/ipp-strings.c:2388
+#: locale/ipp-strings.c:2298
 msgid "notify-events.printer-shutdown"
 msgstr ""
 
 #. TRANSLATORS: Printer State Changed
-#: locale/ipp-strings.c:2390
+#: locale/ipp-strings.c:2300
 msgid "notify-events.printer-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Stopped
-#: locale/ipp-strings.c:2392
+#: locale/ipp-strings.c:2302
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-#: locale/ipp-strings.c:2394
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-#: locale/ipp-strings.c:2396
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-#: locale/ipp-strings.c:2398
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-#: locale/ipp-strings.c:2400
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-#: locale/ipp-strings.c:2402
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-#: locale/ipp-strings.c:2404
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-#: locale/ipp-strings.c:2406
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-#: locale/ipp-strings.c:2408
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-#: locale/ipp-strings.c:2410
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-#: locale/ipp-strings.c:2412
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
-#: locale/ipp-strings.c:2414
+#: locale/ipp-strings.c:2304
 msgid "notify-get-interval"
 msgstr ""
 
 #. TRANSLATORS: Notify Lease Duration
-#: locale/ipp-strings.c:2416
+#: locale/ipp-strings.c:2306
 msgid "notify-lease-duration"
 msgstr ""
 
 #. TRANSLATORS: Notify Natural Language
-#: locale/ipp-strings.c:2418
+#: locale/ipp-strings.c:2308
 msgid "notify-natural-language"
 msgstr ""
 
 #. TRANSLATORS: Notify Pull Method
-#: locale/ipp-strings.c:2420
+#: locale/ipp-strings.c:2310
 msgid "notify-pull-method"
 msgstr ""
 
 #. TRANSLATORS: Notify Recipient
-#: locale/ipp-strings.c:2422
+#: locale/ipp-strings.c:2312
 msgid "notify-recipient-uri"
 msgstr ""
 
-#: scheduler/ipp.c:2038 scheduler/ipp.c:5763
+#: scheduler/ipp.c:2034 scheduler/ipp.c:5758
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2028 scheduler/ipp.c:5753
+#: scheduler/ipp.c:2024 scheduler/ipp.c:5748
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
 
 #. TRANSLATORS: Notify Sequence Numbers
-#: locale/ipp-strings.c:2424
+#: locale/ipp-strings.c:2314
 msgid "notify-sequence-numbers"
 msgstr ""
 
 #. TRANSLATORS: Notify Subscription Ids
-#: locale/ipp-strings.c:2426
+#: locale/ipp-strings.c:2316
 msgid "notify-subscription-ids"
 msgstr ""
 
 #. TRANSLATORS: Notify Time Interval
-#: locale/ipp-strings.c:2428
+#: locale/ipp-strings.c:2318
 msgid "notify-time-interval"
 msgstr ""
 
 #. TRANSLATORS: Notify User Data
-#: locale/ipp-strings.c:2430
+#: locale/ipp-strings.c:2320
 msgid "notify-user-data"
 msgstr ""
 
 #. TRANSLATORS: Notify Wait
-#: locale/ipp-strings.c:2432
+#: locale/ipp-strings.c:2322
 msgid "notify-wait"
 msgstr ""
 
 #. TRANSLATORS: Number Of Retries
-#: locale/ipp-strings.c:2434
+#: locale/ipp-strings.c:2324
 msgid "number-of-retries"
 msgstr ""
 
 #. TRANSLATORS: Number-Up
-#: locale/ipp-strings.c:2436
+#: locale/ipp-strings.c:2326
 msgid "number-up"
 msgstr ""
 
 #. TRANSLATORS: Object Offset
-#: locale/ipp-strings.c:2438
+#: locale/ipp-strings.c:2328
 msgid "object-offset"
 msgstr ""
 
 #. TRANSLATORS: Object Size
-#: locale/ipp-strings.c:2440
+#: locale/ipp-strings.c:2330
 msgid "object-size"
 msgstr ""
 
 #. TRANSLATORS: Organization Name
-#: locale/ipp-strings.c:2442
+#: locale/ipp-strings.c:2332
 msgid "organization-name"
 msgstr ""
 
 #. TRANSLATORS: Orientation
-#: locale/ipp-strings.c:2444
+#: locale/ipp-strings.c:2334
 msgid "orientation-requested"
 msgstr ""
 
 #. TRANSLATORS: Portrait
-#: locale/ipp-strings.c:2446
+#: locale/ipp-strings.c:2336
 msgid "orientation-requested.3"
 msgstr ""
 
 #. TRANSLATORS: Landscape
-#: locale/ipp-strings.c:2448
+#: locale/ipp-strings.c:2338
 msgid "orientation-requested.4"
 msgstr ""
 
 #. TRANSLATORS: Reverse Landscape
-#: locale/ipp-strings.c:2450
+#: locale/ipp-strings.c:2340
 msgid "orientation-requested.5"
 msgstr ""
 
 #. TRANSLATORS: Reverse Portrait
-#: locale/ipp-strings.c:2452
+#: locale/ipp-strings.c:2342
 msgid "orientation-requested.6"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2454
+#: locale/ipp-strings.c:2344
 msgid "orientation-requested.7"
 msgstr ""
 
 #. TRANSLATORS: Scanned Image Options
-#: locale/ipp-strings.c:2456
+#: locale/ipp-strings.c:2346
 msgid "output-attributes"
 msgstr ""
 
 #. TRANSLATORS: Output Tray
-#: locale/ipp-strings.c:2458
+#: locale/ipp-strings.c:2348
 msgid "output-bin"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2460
+#: locale/ipp-strings.c:2350
 msgid "output-bin.auto"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:2462
+#: locale/ipp-strings.c:2352
 msgid "output-bin.bottom"
 msgstr ""
 
 #. TRANSLATORS: Center
-#: locale/ipp-strings.c:2464
+#: locale/ipp-strings.c:2354
 msgid "output-bin.center"
 msgstr ""
 
 #. TRANSLATORS: Face Down
-#: locale/ipp-strings.c:2466
+#: locale/ipp-strings.c:2356
 msgid "output-bin.face-down"
 msgstr ""
 
 #. TRANSLATORS: Face Up
-#: locale/ipp-strings.c:2468
+#: locale/ipp-strings.c:2358
 msgid "output-bin.face-up"
 msgstr ""
 
 #. TRANSLATORS: Large Capacity
-#: locale/ipp-strings.c:2470
+#: locale/ipp-strings.c:2360
 msgid "output-bin.large-capacity"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:2472
+#: locale/ipp-strings.c:2362
 msgid "output-bin.left"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 1
-#: locale/ipp-strings.c:2474
+#: locale/ipp-strings.c:2364
 msgid "output-bin.mailbox-1"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 10
-#: locale/ipp-strings.c:2476
+#: locale/ipp-strings.c:2366
 msgid "output-bin.mailbox-10"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 2
-#: locale/ipp-strings.c:2478
+#: locale/ipp-strings.c:2368
 msgid "output-bin.mailbox-2"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 3
-#: locale/ipp-strings.c:2480
+#: locale/ipp-strings.c:2370
 msgid "output-bin.mailbox-3"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 4
-#: locale/ipp-strings.c:2482
+#: locale/ipp-strings.c:2372
 msgid "output-bin.mailbox-4"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 5
-#: locale/ipp-strings.c:2484
+#: locale/ipp-strings.c:2374
 msgid "output-bin.mailbox-5"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 6
-#: locale/ipp-strings.c:2486
+#: locale/ipp-strings.c:2376
 msgid "output-bin.mailbox-6"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 7
-#: locale/ipp-strings.c:2488
+#: locale/ipp-strings.c:2378
 msgid "output-bin.mailbox-7"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 8
-#: locale/ipp-strings.c:2490
+#: locale/ipp-strings.c:2380
 msgid "output-bin.mailbox-8"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 9
-#: locale/ipp-strings.c:2492
+#: locale/ipp-strings.c:2382
 msgid "output-bin.mailbox-9"
 msgstr ""
 
 #. TRANSLATORS: Middle
-#: locale/ipp-strings.c:2494
+#: locale/ipp-strings.c:2384
 msgid "output-bin.middle"
 msgstr ""
 
 #. TRANSLATORS: My Mailbox
-#: locale/ipp-strings.c:2496
+#: locale/ipp-strings.c:2386
 msgid "output-bin.my-mailbox"
 msgstr ""
 
 #. TRANSLATORS: Rear
-#: locale/ipp-strings.c:2498
+#: locale/ipp-strings.c:2388
 msgid "output-bin.rear"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:2500
+#: locale/ipp-strings.c:2390
 msgid "output-bin.right"
 msgstr ""
 
 #. TRANSLATORS: Side
-#: locale/ipp-strings.c:2502
+#: locale/ipp-strings.c:2392
 msgid "output-bin.side"
 msgstr ""
 
 #. TRANSLATORS: Stacker 1
-#: locale/ipp-strings.c:2504
+#: locale/ipp-strings.c:2394
 msgid "output-bin.stacker-1"
 msgstr ""
 
 #. TRANSLATORS: Stacker 10
-#: locale/ipp-strings.c:2506
+#: locale/ipp-strings.c:2396
 msgid "output-bin.stacker-10"
 msgstr ""
 
 #. TRANSLATORS: Stacker 2
-#: locale/ipp-strings.c:2508
+#: locale/ipp-strings.c:2398
 msgid "output-bin.stacker-2"
 msgstr ""
 
 #. TRANSLATORS: Stacker 3
-#: locale/ipp-strings.c:2510
+#: locale/ipp-strings.c:2400
 msgid "output-bin.stacker-3"
 msgstr ""
 
 #. TRANSLATORS: Stacker 4
-#: locale/ipp-strings.c:2512
+#: locale/ipp-strings.c:2402
 msgid "output-bin.stacker-4"
 msgstr ""
 
 #. TRANSLATORS: Stacker 5
-#: locale/ipp-strings.c:2514
+#: locale/ipp-strings.c:2404
 msgid "output-bin.stacker-5"
 msgstr ""
 
 #. TRANSLATORS: Stacker 6
-#: locale/ipp-strings.c:2516
+#: locale/ipp-strings.c:2406
 msgid "output-bin.stacker-6"
 msgstr ""
 
 #. TRANSLATORS: Stacker 7
-#: locale/ipp-strings.c:2518
+#: locale/ipp-strings.c:2408
 msgid "output-bin.stacker-7"
 msgstr ""
 
 #. TRANSLATORS: Stacker 8
-#: locale/ipp-strings.c:2520
+#: locale/ipp-strings.c:2410
 msgid "output-bin.stacker-8"
 msgstr ""
 
 #. TRANSLATORS: Stacker 9
-#: locale/ipp-strings.c:2522
+#: locale/ipp-strings.c:2412
 msgid "output-bin.stacker-9"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:2524
+#: locale/ipp-strings.c:2414
 msgid "output-bin.top"
 msgstr ""
 
 #. TRANSLATORS: Tray 1
-#: locale/ipp-strings.c:2526
+#: locale/ipp-strings.c:2416
 msgid "output-bin.tray-1"
 msgstr ""
 
 #. TRANSLATORS: Tray 10
-#: locale/ipp-strings.c:2528
+#: locale/ipp-strings.c:2418
 msgid "output-bin.tray-10"
 msgstr ""
 
 #. TRANSLATORS: Tray 2
-#: locale/ipp-strings.c:2530
+#: locale/ipp-strings.c:2420
 msgid "output-bin.tray-2"
 msgstr ""
 
 #. TRANSLATORS: Tray 3
-#: locale/ipp-strings.c:2532
+#: locale/ipp-strings.c:2422
 msgid "output-bin.tray-3"
 msgstr ""
 
 #. TRANSLATORS: Tray 4
-#: locale/ipp-strings.c:2534
+#: locale/ipp-strings.c:2424
 msgid "output-bin.tray-4"
 msgstr ""
 
 #. TRANSLATORS: Tray 5
-#: locale/ipp-strings.c:2536
+#: locale/ipp-strings.c:2426
 msgid "output-bin.tray-5"
 msgstr ""
 
 #. TRANSLATORS: Tray 6
-#: locale/ipp-strings.c:2538
+#: locale/ipp-strings.c:2428
 msgid "output-bin.tray-6"
 msgstr ""
 
 #. TRANSLATORS: Tray 7
-#: locale/ipp-strings.c:2540
+#: locale/ipp-strings.c:2430
 msgid "output-bin.tray-7"
 msgstr ""
 
 #. TRANSLATORS: Tray 8
-#: locale/ipp-strings.c:2542
+#: locale/ipp-strings.c:2432
 msgid "output-bin.tray-8"
 msgstr ""
 
 #. TRANSLATORS: Tray 9
-#: locale/ipp-strings.c:2544
+#: locale/ipp-strings.c:2434
 msgid "output-bin.tray-9"
 msgstr ""
 
 #. TRANSLATORS: Scanned Image Quality
-#: locale/ipp-strings.c:2546
+#: locale/ipp-strings.c:2436
 msgid "output-compression-quality-factor"
 msgstr ""
 
 #. TRANSLATORS: Page Delivery
-#: locale/ipp-strings.c:2548
+#: locale/ipp-strings.c:2438
 msgid "page-delivery"
 msgstr ""
 
 #. TRANSLATORS: Reverse Order Face-down
-#: locale/ipp-strings.c:2550
+#: locale/ipp-strings.c:2440
 msgid "page-delivery.reverse-order-face-down"
 msgstr ""
 
 #. TRANSLATORS: Reverse Order Face-up
-#: locale/ipp-strings.c:2552
+#: locale/ipp-strings.c:2442
 msgid "page-delivery.reverse-order-face-up"
 msgstr ""
 
 #. TRANSLATORS: Same Order Face-down
-#: locale/ipp-strings.c:2554
+#: locale/ipp-strings.c:2444
 msgid "page-delivery.same-order-face-down"
 msgstr ""
 
 #. TRANSLATORS: Same Order Face-up
-#: locale/ipp-strings.c:2556
+#: locale/ipp-strings.c:2446
 msgid "page-delivery.same-order-face-up"
 msgstr ""
 
 #. TRANSLATORS: System Specified
-#: locale/ipp-strings.c:2558
+#: locale/ipp-strings.c:2448
 msgid "page-delivery.system-specified"
 msgstr ""
 
 #. TRANSLATORS: Page Order Received
-#: locale/ipp-strings.c:2560
+#: locale/ipp-strings.c:2450
 msgid "page-order-received"
 msgstr ""
 
 #. TRANSLATORS: 1 To N
-#: locale/ipp-strings.c:2562
+#: locale/ipp-strings.c:2452
 msgid "page-order-received.1-to-n-order"
 msgstr ""
 
 #. TRANSLATORS: N To 1
-#: locale/ipp-strings.c:2564
+#: locale/ipp-strings.c:2454
 msgid "page-order-received.n-to-1-order"
 msgstr ""
 
 #. TRANSLATORS: Page Ranges
-#: locale/ipp-strings.c:2566
+#: locale/ipp-strings.c:2456
 msgid "page-ranges"
 msgstr ""
 
 #. TRANSLATORS: Pages
-#: locale/ipp-strings.c:2568
+#: locale/ipp-strings.c:2458
 msgid "pages"
 msgstr ""
 
 #. TRANSLATORS: Pages Per Subset
-#: locale/ipp-strings.c:2570
+#: locale/ipp-strings.c:2460
 msgid "pages-per-subset"
 msgstr ""
 
 #. TRANSLATORS: Pclm Raster Back Side
-#: locale/ipp-strings.c:2572
+#: locale/ipp-strings.c:2462
 msgid "pclm-raster-back-side"
 msgstr ""
 
 #. TRANSLATORS: Flipped
-#: locale/ipp-strings.c:2574
+#: locale/ipp-strings.c:2464
 msgid "pclm-raster-back-side.flipped"
 msgstr ""
 
 #. TRANSLATORS: Normal
-#: locale/ipp-strings.c:2576
+#: locale/ipp-strings.c:2466
 msgid "pclm-raster-back-side.normal"
 msgstr ""
 
 #. TRANSLATORS: Rotated
-#: locale/ipp-strings.c:2578
+#: locale/ipp-strings.c:2468
 msgid "pclm-raster-back-side.rotated"
 msgstr ""
 
 #. TRANSLATORS: Pclm Source Resolution
-#: locale/ipp-strings.c:2580
+#: locale/ipp-strings.c:2470
 msgid "pclm-source-resolution"
 msgstr ""
 
@@ -13733,250 +13462,30 @@ msgid "pending"
 msgstr ""
 
 #. TRANSLATORS: Platform Shape
-#: locale/ipp-strings.c:2582
+#: locale/ipp-strings.c:2472
 msgid "platform-shape"
 msgstr ""
 
 #. TRANSLATORS: Round
-#: locale/ipp-strings.c:2584
+#: locale/ipp-strings.c:2474
 msgid "platform-shape.ellipse"
 msgstr ""
 
 #. TRANSLATORS: Rectangle
-#: locale/ipp-strings.c:2586
+#: locale/ipp-strings.c:2476
 msgid "platform-shape.rectangle"
 msgstr ""
 
 #. TRANSLATORS: Platform Temperature
-#: locale/ipp-strings.c:2588
+#: locale/ipp-strings.c:2478
 msgid "platform-temperature"
 msgstr ""
 
 #. TRANSLATORS: Post-dial String
-#: locale/ipp-strings.c:2590
+#: locale/ipp-strings.c:2480
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-#: locale/ipp-strings.c:2592
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-#: locale/ipp-strings.c:2594
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-#: locale/ipp-strings.c:2596
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-#: locale/ipp-strings.c:2598
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-#: locale/ipp-strings.c:2600
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-#: locale/ipp-strings.c:2602
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-#: locale/ipp-strings.c:2604
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-#: locale/ipp-strings.c:2606
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-#: locale/ipp-strings.c:2608
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-#: locale/ipp-strings.c:2610
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-#: locale/ipp-strings.c:2612
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-#: locale/ipp-strings.c:2614
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-#: locale/ipp-strings.c:2616
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-#: locale/ipp-strings.c:2618
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-#: locale/ipp-strings.c:2620
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-#: locale/ipp-strings.c:2622
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-#: locale/ipp-strings.c:2624
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-#: locale/ipp-strings.c:2626
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-#: locale/ipp-strings.c:2628
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-#: locale/ipp-strings.c:2630
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-#: locale/ipp-strings.c:2632
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-#: locale/ipp-strings.c:2634
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-#: locale/ipp-strings.c:2636
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-#: locale/ipp-strings.c:2638
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-#: locale/ipp-strings.c:2640
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-#: locale/ipp-strings.c:2642
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-#: locale/ipp-strings.c:2644
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-#: locale/ipp-strings.c:2646
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-#: locale/ipp-strings.c:2648
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-#: locale/ipp-strings.c:2650
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-#: locale/ipp-strings.c:2652
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-#: locale/ipp-strings.c:2654
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-#: locale/ipp-strings.c:2656
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-#: locale/ipp-strings.c:2658
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-#: locale/ipp-strings.c:2660
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-#: locale/ipp-strings.c:2662
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-#: locale/ipp-strings.c:2664
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-#: locale/ipp-strings.c:2666
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-#: locale/ipp-strings.c:2668
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-#: locale/ipp-strings.c:2670
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-#: locale/ipp-strings.c:2672
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-#: locale/ipp-strings.c:2674
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-#: locale/ipp-strings.c:2676
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-#: locale/ipp-strings.c:2678
-msgid "power-state.90"
-msgstr ""
-
 #: ppdc/ppdc.cxx:102 ppdc/ppdpo.cxx:81
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
@@ -14451,282 +13960,297 @@ msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr ""
 
 #. TRANSLATORS: Pre-dial String
-#: locale/ipp-strings.c:2680
+#: locale/ipp-strings.c:2482
 msgid "pre-dial-string"
 msgstr ""
 
 #. TRANSLATORS: Number-Up Layout
-#: locale/ipp-strings.c:2682
+#: locale/ipp-strings.c:2484
 msgid "presentation-direction-number-up"
 msgstr ""
 
 #. TRANSLATORS: Top-bottom, Right-left
-#: locale/ipp-strings.c:2684
+#: locale/ipp-strings.c:2486
 msgid "presentation-direction-number-up.tobottom-toleft"
 msgstr ""
 
 #. TRANSLATORS: Top-bottom, Left-right
-#: locale/ipp-strings.c:2686
+#: locale/ipp-strings.c:2488
 msgid "presentation-direction-number-up.tobottom-toright"
 msgstr ""
 
 #. TRANSLATORS: Right-left, Top-bottom
-#: locale/ipp-strings.c:2688
+#: locale/ipp-strings.c:2490
 msgid "presentation-direction-number-up.toleft-tobottom"
 msgstr ""
 
 #. TRANSLATORS: Right-left, Bottom-top
-#: locale/ipp-strings.c:2690
+#: locale/ipp-strings.c:2492
 msgid "presentation-direction-number-up.toleft-totop"
 msgstr ""
 
 #. TRANSLATORS: Left-right, Top-bottom
-#: locale/ipp-strings.c:2692
+#: locale/ipp-strings.c:2494
 msgid "presentation-direction-number-up.toright-tobottom"
 msgstr ""
 
 #. TRANSLATORS: Left-right, Bottom-top
-#: locale/ipp-strings.c:2694
+#: locale/ipp-strings.c:2496
 msgid "presentation-direction-number-up.toright-totop"
 msgstr ""
 
 #. TRANSLATORS: Bottom-top, Right-left
-#: locale/ipp-strings.c:2696
+#: locale/ipp-strings.c:2498
 msgid "presentation-direction-number-up.totop-toleft"
 msgstr ""
 
 #. TRANSLATORS: Bottom-top, Left-right
-#: locale/ipp-strings.c:2698
+#: locale/ipp-strings.c:2500
 msgid "presentation-direction-number-up.totop-toright"
 msgstr ""
 
 #. TRANSLATORS: Print Accuracy
-#: locale/ipp-strings.c:2700
+#: locale/ipp-strings.c:2502
 msgid "print-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Print Base
-#: locale/ipp-strings.c:2702
+#: locale/ipp-strings.c:2504
 msgid "print-base"
 msgstr ""
 
 #. TRANSLATORS: Print Base Actual
-#: locale/ipp-strings.c:2704
+#: locale/ipp-strings.c:2506
 msgid "print-base-actual"
 msgstr ""
 
 #. TRANSLATORS: Brim
-#: locale/ipp-strings.c:2706
+#: locale/ipp-strings.c:2508
 msgid "print-base.brim"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2708
+#: locale/ipp-strings.c:2510
 msgid "print-base.none"
 msgstr ""
 
 #. TRANSLATORS: Raft
-#: locale/ipp-strings.c:2710
+#: locale/ipp-strings.c:2512
 msgid "print-base.raft"
 msgstr ""
 
 #. TRANSLATORS: Skirt
-#: locale/ipp-strings.c:2712
+#: locale/ipp-strings.c:2514
 msgid "print-base.skirt"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:2714
+#: locale/ipp-strings.c:2516
 msgid "print-base.standard"
 msgstr ""
 
 #. TRANSLATORS: Print Color Mode
-#: locale/ipp-strings.c:2716
+#: locale/ipp-strings.c:2518
 msgid "print-color-mode"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2718
+#: locale/ipp-strings.c:2520
 msgid "print-color-mode.auto"
 msgstr ""
 
 #. TRANSLATORS: Auto Monochrome
-#: locale/ipp-strings.c:2720
+#: locale/ipp-strings.c:2522
 msgid "print-color-mode.auto-monochrome"
 msgstr ""
 
 #. TRANSLATORS: Text
-#: locale/ipp-strings.c:2722
+#: locale/ipp-strings.c:2524
 msgid "print-color-mode.bi-level"
 msgstr ""
 
 #. TRANSLATORS: Color
-#: locale/ipp-strings.c:2724
+#: locale/ipp-strings.c:2526
 msgid "print-color-mode.color"
 msgstr ""
 
 #. TRANSLATORS: Highlight
-#: locale/ipp-strings.c:2726
+#: locale/ipp-strings.c:2528
 msgid "print-color-mode.highlight"
 msgstr ""
 
 #. TRANSLATORS: Monochrome
-#: locale/ipp-strings.c:2728
+#: locale/ipp-strings.c:2530
 msgid "print-color-mode.monochrome"
 msgstr ""
 
 #. TRANSLATORS: Process Text
-#: locale/ipp-strings.c:2730
+#: locale/ipp-strings.c:2532
 msgid "print-color-mode.process-bi-level"
 msgstr ""
 
 #. TRANSLATORS: Process Monochrome
-#: locale/ipp-strings.c:2732
+#: locale/ipp-strings.c:2534
 msgid "print-color-mode.process-monochrome"
 msgstr ""
 
 #. TRANSLATORS: Print Optimization
-#: locale/ipp-strings.c:2734
+#: locale/ipp-strings.c:2536
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+#: locale/ipp-strings.c:2538
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2736
+#: locale/ipp-strings.c:2540
 msgid "print-content-optimize.auto"
 msgstr ""
 
 #. TRANSLATORS: Graphics
-#: locale/ipp-strings.c:2738
+#: locale/ipp-strings.c:2542
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+#: locale/ipp-strings.c:2544
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
-#: locale/ipp-strings.c:2740
+#: locale/ipp-strings.c:2546
 msgid "print-content-optimize.photo"
 msgstr ""
 
 #. TRANSLATORS: Text
-#: locale/ipp-strings.c:2742
+#: locale/ipp-strings.c:2548
 msgid "print-content-optimize.text"
 msgstr ""
 
 #. TRANSLATORS: Text and Graphics
-#: locale/ipp-strings.c:2744
+#: locale/ipp-strings.c:2550
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+#: locale/ipp-strings.c:2552
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
-#: locale/ipp-strings.c:2746
+#: locale/ipp-strings.c:2554
 msgid "print-objects"
 msgstr ""
 
 #. TRANSLATORS: Print Quality
-#: locale/ipp-strings.c:2748
+#: locale/ipp-strings.c:2556
 msgid "print-quality"
 msgstr ""
 
 #. TRANSLATORS: Draft
-#: locale/ipp-strings.c:2750
+#: locale/ipp-strings.c:2558
 msgid "print-quality.3"
 msgstr ""
 
 #. TRANSLATORS: Normal
-#: locale/ipp-strings.c:2752
+#: locale/ipp-strings.c:2560
 msgid "print-quality.4"
 msgstr ""
 
 #. TRANSLATORS: High
-#: locale/ipp-strings.c:2754
+#: locale/ipp-strings.c:2562
 msgid "print-quality.5"
 msgstr ""
 
 #. TRANSLATORS: Print Rendering Intent
-#: locale/ipp-strings.c:2756
+#: locale/ipp-strings.c:2564
 msgid "print-rendering-intent"
 msgstr ""
 
 #. TRANSLATORS: Absolute
-#: locale/ipp-strings.c:2758
+#: locale/ipp-strings.c:2566
 msgid "print-rendering-intent.absolute"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2760
+#: locale/ipp-strings.c:2568
 msgid "print-rendering-intent.auto"
 msgstr ""
 
 #. TRANSLATORS: Perceptual
-#: locale/ipp-strings.c:2762
+#: locale/ipp-strings.c:2570
 msgid "print-rendering-intent.perceptual"
 msgstr ""
 
 #. TRANSLATORS: Relative
-#: locale/ipp-strings.c:2764
+#: locale/ipp-strings.c:2572
 msgid "print-rendering-intent.relative"
 msgstr ""
 
 #. TRANSLATORS: Relative w/Black Point Compensation
-#: locale/ipp-strings.c:2766
+#: locale/ipp-strings.c:2574
 msgid "print-rendering-intent.relative-bpc"
 msgstr ""
 
 #. TRANSLATORS: Saturation
-#: locale/ipp-strings.c:2768
+#: locale/ipp-strings.c:2576
 msgid "print-rendering-intent.saturation"
 msgstr ""
 
 #. TRANSLATORS: Print Scaling
-#: locale/ipp-strings.c:2770
+#: locale/ipp-strings.c:2578
 msgid "print-scaling"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2772
+#: locale/ipp-strings.c:2580
 msgid "print-scaling.auto"
 msgstr ""
 
 #. TRANSLATORS: Auto-fit
-#: locale/ipp-strings.c:2774
+#: locale/ipp-strings.c:2582
 msgid "print-scaling.auto-fit"
 msgstr ""
 
 #. TRANSLATORS: Fill
-#: locale/ipp-strings.c:2776
+#: locale/ipp-strings.c:2584
 msgid "print-scaling.fill"
 msgstr ""
 
 #. TRANSLATORS: Fit
-#: locale/ipp-strings.c:2778
+#: locale/ipp-strings.c:2586
 msgid "print-scaling.fit"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2780
+#: locale/ipp-strings.c:2588
 msgid "print-scaling.none"
 msgstr ""
 
 #. TRANSLATORS: Print Supports
-#: locale/ipp-strings.c:2782
+#: locale/ipp-strings.c:2590
 msgid "print-supports"
 msgstr ""
 
 #. TRANSLATORS: Print Supports Actual
-#: locale/ipp-strings.c:2784
+#: locale/ipp-strings.c:2592
 msgid "print-supports-actual"
 msgstr ""
 
 #. TRANSLATORS: With Specified Material
-#: locale/ipp-strings.c:2786
+#: locale/ipp-strings.c:2594
 msgid "print-supports.material"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2788
+#: locale/ipp-strings.c:2596
 msgid "print-supports.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:2790
+#: locale/ipp-strings.c:2598
 msgid "print-supports.standard"
 msgstr ""
 
@@ -14765,3947 +14289,4122 @@ msgstr ""
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#. TRANSLATORS: Printer Geo Location
-#: locale/ipp-strings.c:2792
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-#: locale/ipp-strings.c:2794
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-#: locale/ipp-strings.c:2796
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+#: locale/ipp-strings.c:2600
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-#: locale/ipp-strings.c:2798
-msgid "printer-location"
+#. TRANSLATORS: Disc
+#: locale/ipp-strings.c:2602
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-#: locale/ipp-strings.c:2800
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+#: locale/ipp-strings.c:2604
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-#: locale/ipp-strings.c:2802
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+#: locale/ipp-strings.c:2606
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-#: locale/ipp-strings.c:2804
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+#: locale/ipp-strings.c:2608
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-#: locale/ipp-strings.c:2806
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+#: locale/ipp-strings.c:2610
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-#: locale/ipp-strings.c:2808
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+#: locale/ipp-strings.c:2612
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-#: locale/ipp-strings.c:2810
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+#: locale/ipp-strings.c:2614
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-#: locale/ipp-strings.c:2812
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+#: locale/ipp-strings.c:2616
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-#: locale/ipp-strings.c:2814
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+#: locale/ipp-strings.c:2618
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-#: locale/ipp-strings.c:2816
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+#: locale/ipp-strings.c:2620
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-#: locale/ipp-strings.c:2818
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+#: locale/ipp-strings.c:2622
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
-#: locale/ipp-strings.c:2820
+#: locale/ipp-strings.c:2624
 msgid "printer-state"
 msgstr ""
 
 #. TRANSLATORS: Detailed Printer State
-#: locale/ipp-strings.c:2822
+#: locale/ipp-strings.c:2626
 msgid "printer-state-reasons"
 msgstr ""
 
 #. TRANSLATORS: Old Alerts Have Been Removed
-#: locale/ipp-strings.c:2824
+#: locale/ipp-strings.c:2628
 msgid "printer-state-reasons.alert-removal-of-binary-change-entry"
 msgstr ""
 
 #. TRANSLATORS: Bander Added
-#: locale/ipp-strings.c:2826
+#: locale/ipp-strings.c:2630
 msgid "printer-state-reasons.bander-added"
 msgstr ""
 
 #. TRANSLATORS: Bander Almost Empty
-#: locale/ipp-strings.c:2828
+#: locale/ipp-strings.c:2632
 msgid "printer-state-reasons.bander-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Bander Almost Full
-#: locale/ipp-strings.c:2830
+#: locale/ipp-strings.c:2634
 msgid "printer-state-reasons.bander-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Bander At Limit
-#: locale/ipp-strings.c:2832
+#: locale/ipp-strings.c:2636
 msgid "printer-state-reasons.bander-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Bander Closed
-#: locale/ipp-strings.c:2834
+#: locale/ipp-strings.c:2638
 msgid "printer-state-reasons.bander-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Configuration Change
-#: locale/ipp-strings.c:2836
+#: locale/ipp-strings.c:2640
 msgid "printer-state-reasons.bander-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Bander Cover Closed
-#: locale/ipp-strings.c:2838
+#: locale/ipp-strings.c:2642
 msgid "printer-state-reasons.bander-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Cover Open
-#: locale/ipp-strings.c:2840
+#: locale/ipp-strings.c:2644
 msgid "printer-state-reasons.bander-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Bander Empty
-#: locale/ipp-strings.c:2842
+#: locale/ipp-strings.c:2646
 msgid "printer-state-reasons.bander-empty"
 msgstr ""
 
 #. TRANSLATORS: Bander Full
-#: locale/ipp-strings.c:2844
+#: locale/ipp-strings.c:2648
 msgid "printer-state-reasons.bander-full"
 msgstr ""
 
 #. TRANSLATORS: Bander Interlock Closed
-#: locale/ipp-strings.c:2846
+#: locale/ipp-strings.c:2650
 msgid "printer-state-reasons.bander-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Interlock Open
-#: locale/ipp-strings.c:2848
+#: locale/ipp-strings.c:2652
 msgid "printer-state-reasons.bander-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Bander Jam
-#: locale/ipp-strings.c:2850
+#: locale/ipp-strings.c:2654
 msgid "printer-state-reasons.bander-jam"
 msgstr ""
 
 #. TRANSLATORS: Bander Life Almost Over
-#: locale/ipp-strings.c:2852
+#: locale/ipp-strings.c:2656
 msgid "printer-state-reasons.bander-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Bander Life Over
-#: locale/ipp-strings.c:2854
+#: locale/ipp-strings.c:2658
 msgid "printer-state-reasons.bander-life-over"
 msgstr ""
 
 #. TRANSLATORS: Bander Memory Exhausted
-#: locale/ipp-strings.c:2856
+#: locale/ipp-strings.c:2660
 msgid "printer-state-reasons.bander-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Bander Missing
-#: locale/ipp-strings.c:2858
+#: locale/ipp-strings.c:2662
 msgid "printer-state-reasons.bander-missing"
 msgstr ""
 
 #. TRANSLATORS: Bander Motor Failure
-#: locale/ipp-strings.c:2860
+#: locale/ipp-strings.c:2664
 msgid "printer-state-reasons.bander-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Near Limit
-#: locale/ipp-strings.c:2862
+#: locale/ipp-strings.c:2666
 msgid "printer-state-reasons.bander-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Bander Offline
-#: locale/ipp-strings.c:2864
+#: locale/ipp-strings.c:2668
 msgid "printer-state-reasons.bander-offline"
 msgstr ""
 
 #. TRANSLATORS: Bander Opened
-#: locale/ipp-strings.c:2866
+#: locale/ipp-strings.c:2670
 msgid "printer-state-reasons.bander-opened"
 msgstr ""
 
 #. TRANSLATORS: Bander Over Temperature
-#: locale/ipp-strings.c:2868
+#: locale/ipp-strings.c:2672
 msgid "printer-state-reasons.bander-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Bander Power Saver
-#: locale/ipp-strings.c:2870
+#: locale/ipp-strings.c:2674
 msgid "printer-state-reasons.bander-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Bander Recoverable Failure
-#: locale/ipp-strings.c:2872
+#: locale/ipp-strings.c:2676
 msgid "printer-state-reasons.bander-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Recoverable Storage
-#: locale/ipp-strings.c:2874
+#: locale/ipp-strings.c:2678
 msgid "printer-state-reasons.bander-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Bander Removed
-#: locale/ipp-strings.c:2876
+#: locale/ipp-strings.c:2680
 msgid "printer-state-reasons.bander-removed"
 msgstr ""
 
 #. TRANSLATORS: Bander Resource Added
-#: locale/ipp-strings.c:2878
+#: locale/ipp-strings.c:2682
 msgid "printer-state-reasons.bander-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Bander Resource Removed
-#: locale/ipp-strings.c:2880
+#: locale/ipp-strings.c:2684
 msgid "printer-state-reasons.bander-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Bander Thermistor Failure
-#: locale/ipp-strings.c:2882
+#: locale/ipp-strings.c:2686
 msgid "printer-state-reasons.bander-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Timing Failure
-#: locale/ipp-strings.c:2884
+#: locale/ipp-strings.c:2688
 msgid "printer-state-reasons.bander-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Turned Off
-#: locale/ipp-strings.c:2886
+#: locale/ipp-strings.c:2690
 msgid "printer-state-reasons.bander-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Bander Turned On
-#: locale/ipp-strings.c:2888
+#: locale/ipp-strings.c:2692
 msgid "printer-state-reasons.bander-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Bander Under Temperature
-#: locale/ipp-strings.c:2890
+#: locale/ipp-strings.c:2694
 msgid "printer-state-reasons.bander-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Bander Unrecoverable Failure
-#: locale/ipp-strings.c:2892
+#: locale/ipp-strings.c:2696
 msgid "printer-state-reasons.bander-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Unrecoverable Storage Error
-#: locale/ipp-strings.c:2894
+#: locale/ipp-strings.c:2698
 msgid "printer-state-reasons.bander-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Bander Warming Up
-#: locale/ipp-strings.c:2896
+#: locale/ipp-strings.c:2700
 msgid "printer-state-reasons.bander-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Binder Added
-#: locale/ipp-strings.c:2898
+#: locale/ipp-strings.c:2702
 msgid "printer-state-reasons.binder-added"
 msgstr ""
 
 #. TRANSLATORS: Binder Almost Empty
-#: locale/ipp-strings.c:2900
+#: locale/ipp-strings.c:2704
 msgid "printer-state-reasons.binder-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Binder Almost Full
-#: locale/ipp-strings.c:2902
+#: locale/ipp-strings.c:2706
 msgid "printer-state-reasons.binder-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Binder At Limit
-#: locale/ipp-strings.c:2904
+#: locale/ipp-strings.c:2708
 msgid "printer-state-reasons.binder-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Binder Closed
-#: locale/ipp-strings.c:2906
+#: locale/ipp-strings.c:2710
 msgid "printer-state-reasons.binder-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Configuration Change
-#: locale/ipp-strings.c:2908
+#: locale/ipp-strings.c:2712
 msgid "printer-state-reasons.binder-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Binder Cover Closed
-#: locale/ipp-strings.c:2910
+#: locale/ipp-strings.c:2714
 msgid "printer-state-reasons.binder-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Cover Open
-#: locale/ipp-strings.c:2912
+#: locale/ipp-strings.c:2716
 msgid "printer-state-reasons.binder-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Binder Empty
-#: locale/ipp-strings.c:2914
+#: locale/ipp-strings.c:2718
 msgid "printer-state-reasons.binder-empty"
 msgstr ""
 
 #. TRANSLATORS: Binder Full
-#: locale/ipp-strings.c:2916
+#: locale/ipp-strings.c:2720
 msgid "printer-state-reasons.binder-full"
 msgstr ""
 
 #. TRANSLATORS: Binder Interlock Closed
-#: locale/ipp-strings.c:2918
+#: locale/ipp-strings.c:2722
 msgid "printer-state-reasons.binder-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Interlock Open
-#: locale/ipp-strings.c:2920
+#: locale/ipp-strings.c:2724
 msgid "printer-state-reasons.binder-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Binder Jam
-#: locale/ipp-strings.c:2922
+#: locale/ipp-strings.c:2726
 msgid "printer-state-reasons.binder-jam"
 msgstr ""
 
 #. TRANSLATORS: Binder Life Almost Over
-#: locale/ipp-strings.c:2924
+#: locale/ipp-strings.c:2728
 msgid "printer-state-reasons.binder-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Binder Life Over
-#: locale/ipp-strings.c:2926
+#: locale/ipp-strings.c:2730
 msgid "printer-state-reasons.binder-life-over"
 msgstr ""
 
 #. TRANSLATORS: Binder Memory Exhausted
-#: locale/ipp-strings.c:2928
+#: locale/ipp-strings.c:2732
 msgid "printer-state-reasons.binder-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Binder Missing
-#: locale/ipp-strings.c:2930
+#: locale/ipp-strings.c:2734
 msgid "printer-state-reasons.binder-missing"
 msgstr ""
 
 #. TRANSLATORS: Binder Motor Failure
-#: locale/ipp-strings.c:2932
+#: locale/ipp-strings.c:2736
 msgid "printer-state-reasons.binder-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Near Limit
-#: locale/ipp-strings.c:2934
+#: locale/ipp-strings.c:2738
 msgid "printer-state-reasons.binder-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Binder Offline
-#: locale/ipp-strings.c:2936
+#: locale/ipp-strings.c:2740
 msgid "printer-state-reasons.binder-offline"
 msgstr ""
 
 #. TRANSLATORS: Binder Opened
-#: locale/ipp-strings.c:2938
+#: locale/ipp-strings.c:2742
 msgid "printer-state-reasons.binder-opened"
 msgstr ""
 
 #. TRANSLATORS: Binder Over Temperature
-#: locale/ipp-strings.c:2940
+#: locale/ipp-strings.c:2744
 msgid "printer-state-reasons.binder-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Binder Power Saver
-#: locale/ipp-strings.c:2942
+#: locale/ipp-strings.c:2746
 msgid "printer-state-reasons.binder-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Binder Recoverable Failure
-#: locale/ipp-strings.c:2944
+#: locale/ipp-strings.c:2748
 msgid "printer-state-reasons.binder-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Recoverable Storage
-#: locale/ipp-strings.c:2946
+#: locale/ipp-strings.c:2750
 msgid "printer-state-reasons.binder-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Binder Removed
-#: locale/ipp-strings.c:2948
+#: locale/ipp-strings.c:2752
 msgid "printer-state-reasons.binder-removed"
 msgstr ""
 
 #. TRANSLATORS: Binder Resource Added
-#: locale/ipp-strings.c:2950
+#: locale/ipp-strings.c:2754
 msgid "printer-state-reasons.binder-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Binder Resource Removed
-#: locale/ipp-strings.c:2952
+#: locale/ipp-strings.c:2756
 msgid "printer-state-reasons.binder-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Binder Thermistor Failure
-#: locale/ipp-strings.c:2954
+#: locale/ipp-strings.c:2758
 msgid "printer-state-reasons.binder-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Timing Failure
-#: locale/ipp-strings.c:2956
+#: locale/ipp-strings.c:2760
 msgid "printer-state-reasons.binder-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Turned Off
-#: locale/ipp-strings.c:2958
+#: locale/ipp-strings.c:2762
 msgid "printer-state-reasons.binder-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Binder Turned On
-#: locale/ipp-strings.c:2960
+#: locale/ipp-strings.c:2764
 msgid "printer-state-reasons.binder-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Binder Under Temperature
-#: locale/ipp-strings.c:2962
+#: locale/ipp-strings.c:2766
 msgid "printer-state-reasons.binder-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Binder Unrecoverable Failure
-#: locale/ipp-strings.c:2964
+#: locale/ipp-strings.c:2768
 msgid "printer-state-reasons.binder-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Unrecoverable Storage Error
-#: locale/ipp-strings.c:2966
+#: locale/ipp-strings.c:2770
 msgid "printer-state-reasons.binder-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Binder Warming Up
-#: locale/ipp-strings.c:2968
+#: locale/ipp-strings.c:2772
 msgid "printer-state-reasons.binder-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Camera Failure
-#: locale/ipp-strings.c:2970
+#: locale/ipp-strings.c:2774
 msgid "printer-state-reasons.camera-failure"
 msgstr ""
 
 #. TRANSLATORS: Chamber Cooling
-#: locale/ipp-strings.c:2972
+#: locale/ipp-strings.c:2776
 msgid "printer-state-reasons.chamber-cooling"
 msgstr ""
 
 #. TRANSLATORS: Chamber Failure
-#: locale/ipp-strings.c:2974
+#: locale/ipp-strings.c:2778
 msgid "printer-state-reasons.chamber-failure"
 msgstr ""
 
 #. TRANSLATORS: Chamber Heating
-#: locale/ipp-strings.c:2976
+#: locale/ipp-strings.c:2780
 msgid "printer-state-reasons.chamber-heating"
 msgstr ""
 
 #. TRANSLATORS: Chamber Temperature High
-#: locale/ipp-strings.c:2978
+#: locale/ipp-strings.c:2782
 msgid "printer-state-reasons.chamber-temperature-high"
 msgstr ""
 
 #. TRANSLATORS: Chamber Temperature Low
-#: locale/ipp-strings.c:2980
+#: locale/ipp-strings.c:2784
 msgid "printer-state-reasons.chamber-temperature-low"
 msgstr ""
 
 #. TRANSLATORS: Cleaner Life Almost Over
-#: locale/ipp-strings.c:2982
+#: locale/ipp-strings.c:2786
 msgid "printer-state-reasons.cleaner-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Cleaner Life Over
-#: locale/ipp-strings.c:2984
+#: locale/ipp-strings.c:2788
 msgid "printer-state-reasons.cleaner-life-over"
 msgstr ""
 
 #. TRANSLATORS: Configuration Change
-#: locale/ipp-strings.c:2986
+#: locale/ipp-strings.c:2790
 msgid "printer-state-reasons.configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Connecting To Device
-#: locale/ipp-strings.c:2988
+#: locale/ipp-strings.c:2792
 msgid "printer-state-reasons.connecting-to-device"
 msgstr ""
 
 #. TRANSLATORS: Cover Open
-#: locale/ipp-strings.c:2990
+#: locale/ipp-strings.c:2794
 msgid "printer-state-reasons.cover-open"
 msgstr ""
 
 #. TRANSLATORS: Deactivated
-#: locale/ipp-strings.c:2992
+#: locale/ipp-strings.c:2796
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-#: locale/ipp-strings.c:2994
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
-#: locale/ipp-strings.c:2996
+#: locale/ipp-strings.c:2798
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
 
 #. TRANSLATORS: Developer Low
-#: locale/ipp-strings.c:2998
+#: locale/ipp-strings.c:2800
 msgid "printer-state-reasons.developer-low"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Added
-#: locale/ipp-strings.c:3000
+#: locale/ipp-strings.c:2802
 msgid "printer-state-reasons.die-cutter-added"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Almost Empty
-#: locale/ipp-strings.c:3002
+#: locale/ipp-strings.c:2804
 msgid "printer-state-reasons.die-cutter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Almost Full
-#: locale/ipp-strings.c:3004
+#: locale/ipp-strings.c:2806
 msgid "printer-state-reasons.die-cutter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter At Limit
-#: locale/ipp-strings.c:3006
+#: locale/ipp-strings.c:2808
 msgid "printer-state-reasons.die-cutter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Closed
-#: locale/ipp-strings.c:3008
+#: locale/ipp-strings.c:2810
 msgid "printer-state-reasons.die-cutter-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Configuration Change
-#: locale/ipp-strings.c:3010
+#: locale/ipp-strings.c:2812
 msgid "printer-state-reasons.die-cutter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Cover Closed
-#: locale/ipp-strings.c:3012
+#: locale/ipp-strings.c:2814
 msgid "printer-state-reasons.die-cutter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Cover Open
-#: locale/ipp-strings.c:3014
+#: locale/ipp-strings.c:2816
 msgid "printer-state-reasons.die-cutter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Empty
-#: locale/ipp-strings.c:3016
+#: locale/ipp-strings.c:2818
 msgid "printer-state-reasons.die-cutter-empty"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Full
-#: locale/ipp-strings.c:3018
+#: locale/ipp-strings.c:2820
 msgid "printer-state-reasons.die-cutter-full"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Interlock Closed
-#: locale/ipp-strings.c:3020
+#: locale/ipp-strings.c:2822
 msgid "printer-state-reasons.die-cutter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Interlock Open
-#: locale/ipp-strings.c:3022
+#: locale/ipp-strings.c:2824
 msgid "printer-state-reasons.die-cutter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Jam
-#: locale/ipp-strings.c:3024
+#: locale/ipp-strings.c:2826
 msgid "printer-state-reasons.die-cutter-jam"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Life Almost Over
-#: locale/ipp-strings.c:3026
+#: locale/ipp-strings.c:2828
 msgid "printer-state-reasons.die-cutter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Life Over
-#: locale/ipp-strings.c:3028
+#: locale/ipp-strings.c:2830
 msgid "printer-state-reasons.die-cutter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Memory Exhausted
-#: locale/ipp-strings.c:3030
+#: locale/ipp-strings.c:2832
 msgid "printer-state-reasons.die-cutter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Missing
-#: locale/ipp-strings.c:3032
+#: locale/ipp-strings.c:2834
 msgid "printer-state-reasons.die-cutter-missing"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Motor Failure
-#: locale/ipp-strings.c:3034
+#: locale/ipp-strings.c:2836
 msgid "printer-state-reasons.die-cutter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Near Limit
-#: locale/ipp-strings.c:3036
+#: locale/ipp-strings.c:2838
 msgid "printer-state-reasons.die-cutter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Offline
-#: locale/ipp-strings.c:3038
+#: locale/ipp-strings.c:2840
 msgid "printer-state-reasons.die-cutter-offline"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Opened
-#: locale/ipp-strings.c:3040
+#: locale/ipp-strings.c:2842
 msgid "printer-state-reasons.die-cutter-opened"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Over Temperature
-#: locale/ipp-strings.c:3042
+#: locale/ipp-strings.c:2844
 msgid "printer-state-reasons.die-cutter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Power Saver
-#: locale/ipp-strings.c:3044
+#: locale/ipp-strings.c:2846
 msgid "printer-state-reasons.die-cutter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Recoverable Failure
-#: locale/ipp-strings.c:3046
+#: locale/ipp-strings.c:2848
 msgid "printer-state-reasons.die-cutter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Recoverable Storage
-#: locale/ipp-strings.c:3048
+#: locale/ipp-strings.c:2850
 msgid "printer-state-reasons.die-cutter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Removed
-#: locale/ipp-strings.c:3050
+#: locale/ipp-strings.c:2852
 msgid "printer-state-reasons.die-cutter-removed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Resource Added
-#: locale/ipp-strings.c:3052
+#: locale/ipp-strings.c:2854
 msgid "printer-state-reasons.die-cutter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Resource Removed
-#: locale/ipp-strings.c:3054
+#: locale/ipp-strings.c:2856
 msgid "printer-state-reasons.die-cutter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Thermistor Failure
-#: locale/ipp-strings.c:3056
+#: locale/ipp-strings.c:2858
 msgid "printer-state-reasons.die-cutter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Timing Failure
-#: locale/ipp-strings.c:3058
+#: locale/ipp-strings.c:2860
 msgid "printer-state-reasons.die-cutter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Turned Off
-#: locale/ipp-strings.c:3060
+#: locale/ipp-strings.c:2862
 msgid "printer-state-reasons.die-cutter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Turned On
-#: locale/ipp-strings.c:3062
+#: locale/ipp-strings.c:2864
 msgid "printer-state-reasons.die-cutter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Under Temperature
-#: locale/ipp-strings.c:3064
+#: locale/ipp-strings.c:2866
 msgid "printer-state-reasons.die-cutter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Unrecoverable Failure
-#: locale/ipp-strings.c:3066
+#: locale/ipp-strings.c:2868
 msgid "printer-state-reasons.die-cutter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3068
+#: locale/ipp-strings.c:2870
 msgid "printer-state-reasons.die-cutter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Warming Up
-#: locale/ipp-strings.c:3070
+#: locale/ipp-strings.c:2872
 msgid "printer-state-reasons.die-cutter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Door Open
-#: locale/ipp-strings.c:3072
+#: locale/ipp-strings.c:2874
 msgid "printer-state-reasons.door-open"
 msgstr ""
 
 #. TRANSLATORS: Extruder Cooling
-#: locale/ipp-strings.c:3074
+#: locale/ipp-strings.c:2876
 msgid "printer-state-reasons.extruder-cooling"
 msgstr ""
 
 #. TRANSLATORS: Extruder Failure
-#: locale/ipp-strings.c:3076
+#: locale/ipp-strings.c:2878
 msgid "printer-state-reasons.extruder-failure"
 msgstr ""
 
 #. TRANSLATORS: Extruder Heating
-#: locale/ipp-strings.c:3078
+#: locale/ipp-strings.c:2880
 msgid "printer-state-reasons.extruder-heating"
 msgstr ""
 
 #. TRANSLATORS: Extruder Jam
-#: locale/ipp-strings.c:3080
+#: locale/ipp-strings.c:2882
 msgid "printer-state-reasons.extruder-jam"
 msgstr ""
 
 #. TRANSLATORS: Extruder Temperature High
-#: locale/ipp-strings.c:3082
+#: locale/ipp-strings.c:2884
 msgid "printer-state-reasons.extruder-temperature-high"
 msgstr ""
 
 #. TRANSLATORS: Extruder Temperature Low
-#: locale/ipp-strings.c:3084
+#: locale/ipp-strings.c:2886
 msgid "printer-state-reasons.extruder-temperature-low"
 msgstr ""
 
 #. TRANSLATORS: Fan Failure
-#: locale/ipp-strings.c:3086
+#: locale/ipp-strings.c:2888
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+#: locale/ipp-strings.c:2890
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+#: locale/ipp-strings.c:2892
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+#: locale/ipp-strings.c:2894
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+#: locale/ipp-strings.c:2896
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+#: locale/ipp-strings.c:2898
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
-#: locale/ipp-strings.c:3088
+#: locale/ipp-strings.c:2900
 msgid "printer-state-reasons.folder-added"
 msgstr ""
 
 #. TRANSLATORS: Folder Almost Empty
-#: locale/ipp-strings.c:3090
+#: locale/ipp-strings.c:2902
 msgid "printer-state-reasons.folder-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Folder Almost Full
-#: locale/ipp-strings.c:3092
+#: locale/ipp-strings.c:2904
 msgid "printer-state-reasons.folder-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Folder At Limit
-#: locale/ipp-strings.c:3094
+#: locale/ipp-strings.c:2906
 msgid "printer-state-reasons.folder-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Folder Closed
-#: locale/ipp-strings.c:3096
+#: locale/ipp-strings.c:2908
 msgid "printer-state-reasons.folder-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Configuration Change
-#: locale/ipp-strings.c:3098
+#: locale/ipp-strings.c:2910
 msgid "printer-state-reasons.folder-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Folder Cover Closed
-#: locale/ipp-strings.c:3100
+#: locale/ipp-strings.c:2912
 msgid "printer-state-reasons.folder-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Cover Open
-#: locale/ipp-strings.c:3102
+#: locale/ipp-strings.c:2914
 msgid "printer-state-reasons.folder-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Folder Empty
-#: locale/ipp-strings.c:3104
+#: locale/ipp-strings.c:2916
 msgid "printer-state-reasons.folder-empty"
 msgstr ""
 
 #. TRANSLATORS: Folder Full
-#: locale/ipp-strings.c:3106
+#: locale/ipp-strings.c:2918
 msgid "printer-state-reasons.folder-full"
 msgstr ""
 
 #. TRANSLATORS: Folder Interlock Closed
-#: locale/ipp-strings.c:3108
+#: locale/ipp-strings.c:2920
 msgid "printer-state-reasons.folder-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Interlock Open
-#: locale/ipp-strings.c:3110
+#: locale/ipp-strings.c:2922
 msgid "printer-state-reasons.folder-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Folder Jam
-#: locale/ipp-strings.c:3112
+#: locale/ipp-strings.c:2924
 msgid "printer-state-reasons.folder-jam"
 msgstr ""
 
 #. TRANSLATORS: Folder Life Almost Over
-#: locale/ipp-strings.c:3114
+#: locale/ipp-strings.c:2926
 msgid "printer-state-reasons.folder-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Folder Life Over
-#: locale/ipp-strings.c:3116
+#: locale/ipp-strings.c:2928
 msgid "printer-state-reasons.folder-life-over"
 msgstr ""
 
 #. TRANSLATORS: Folder Memory Exhausted
-#: locale/ipp-strings.c:3118
+#: locale/ipp-strings.c:2930
 msgid "printer-state-reasons.folder-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Folder Missing
-#: locale/ipp-strings.c:3120
+#: locale/ipp-strings.c:2932
 msgid "printer-state-reasons.folder-missing"
 msgstr ""
 
 #. TRANSLATORS: Folder Motor Failure
-#: locale/ipp-strings.c:3122
+#: locale/ipp-strings.c:2934
 msgid "printer-state-reasons.folder-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Near Limit
-#: locale/ipp-strings.c:3124
+#: locale/ipp-strings.c:2936
 msgid "printer-state-reasons.folder-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Folder Offline
-#: locale/ipp-strings.c:3126
+#: locale/ipp-strings.c:2938
 msgid "printer-state-reasons.folder-offline"
 msgstr ""
 
 #. TRANSLATORS: Folder Opened
-#: locale/ipp-strings.c:3128
+#: locale/ipp-strings.c:2940
 msgid "printer-state-reasons.folder-opened"
 msgstr ""
 
 #. TRANSLATORS: Folder Over Temperature
-#: locale/ipp-strings.c:3130
+#: locale/ipp-strings.c:2942
 msgid "printer-state-reasons.folder-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Folder Power Saver
-#: locale/ipp-strings.c:3132
+#: locale/ipp-strings.c:2944
 msgid "printer-state-reasons.folder-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Folder Recoverable Failure
-#: locale/ipp-strings.c:3134
+#: locale/ipp-strings.c:2946
 msgid "printer-state-reasons.folder-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Recoverable Storage
-#: locale/ipp-strings.c:3136
+#: locale/ipp-strings.c:2948
 msgid "printer-state-reasons.folder-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Folder Removed
-#: locale/ipp-strings.c:3138
+#: locale/ipp-strings.c:2950
 msgid "printer-state-reasons.folder-removed"
 msgstr ""
 
 #. TRANSLATORS: Folder Resource Added
-#: locale/ipp-strings.c:3140
+#: locale/ipp-strings.c:2952
 msgid "printer-state-reasons.folder-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Folder Resource Removed
-#: locale/ipp-strings.c:3142
+#: locale/ipp-strings.c:2954
 msgid "printer-state-reasons.folder-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Folder Thermistor Failure
-#: locale/ipp-strings.c:3144
+#: locale/ipp-strings.c:2956
 msgid "printer-state-reasons.folder-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Timing Failure
-#: locale/ipp-strings.c:3146
+#: locale/ipp-strings.c:2958
 msgid "printer-state-reasons.folder-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Turned Off
-#: locale/ipp-strings.c:3148
+#: locale/ipp-strings.c:2960
 msgid "printer-state-reasons.folder-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Folder Turned On
-#: locale/ipp-strings.c:3150
+#: locale/ipp-strings.c:2962
 msgid "printer-state-reasons.folder-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Folder Under Temperature
-#: locale/ipp-strings.c:3152
+#: locale/ipp-strings.c:2964
 msgid "printer-state-reasons.folder-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Folder Unrecoverable Failure
-#: locale/ipp-strings.c:3154
+#: locale/ipp-strings.c:2966
 msgid "printer-state-reasons.folder-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Unrecoverable Storage Error
-#: locale/ipp-strings.c:3156
+#: locale/ipp-strings.c:2968
 msgid "printer-state-reasons.folder-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Folder Warming Up
-#: locale/ipp-strings.c:3158
+#: locale/ipp-strings.c:2970
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
-#: locale/ipp-strings.c:3160
+#. TRANSLATORS: Fuser temperature high
+#: locale/ipp-strings.c:2972
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
-#: locale/ipp-strings.c:3162
+#. TRANSLATORS: Fuser temperature low
+#: locale/ipp-strings.c:2974
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
 #. TRANSLATORS: Hold New Jobs
-#: locale/ipp-strings.c:3164
+#: locale/ipp-strings.c:2976
 msgid "printer-state-reasons.hold-new-jobs"
 msgstr ""
 
 #. TRANSLATORS: Identify Printer
-#: locale/ipp-strings.c:3166
+#: locale/ipp-strings.c:2978
 msgid "printer-state-reasons.identify-printer-requested"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Added
-#: locale/ipp-strings.c:3168
+#: locale/ipp-strings.c:2980
 msgid "printer-state-reasons.imprinter-added"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Almost Empty
-#: locale/ipp-strings.c:3170
+#: locale/ipp-strings.c:2982
 msgid "printer-state-reasons.imprinter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Almost Full
-#: locale/ipp-strings.c:3172
+#: locale/ipp-strings.c:2984
 msgid "printer-state-reasons.imprinter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Imprinter At Limit
-#: locale/ipp-strings.c:3174
+#: locale/ipp-strings.c:2986
 msgid "printer-state-reasons.imprinter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Closed
-#: locale/ipp-strings.c:3176
+#: locale/ipp-strings.c:2988
 msgid "printer-state-reasons.imprinter-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Configuration Change
-#: locale/ipp-strings.c:3178
+#: locale/ipp-strings.c:2990
 msgid "printer-state-reasons.imprinter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Cover Closed
-#: locale/ipp-strings.c:3180
+#: locale/ipp-strings.c:2992
 msgid "printer-state-reasons.imprinter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Cover Open
-#: locale/ipp-strings.c:3182
+#: locale/ipp-strings.c:2994
 msgid "printer-state-reasons.imprinter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Empty
-#: locale/ipp-strings.c:3184
+#: locale/ipp-strings.c:2996
 msgid "printer-state-reasons.imprinter-empty"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Full
-#: locale/ipp-strings.c:3186
+#: locale/ipp-strings.c:2998
 msgid "printer-state-reasons.imprinter-full"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Interlock Closed
-#: locale/ipp-strings.c:3188
+#: locale/ipp-strings.c:3000
 msgid "printer-state-reasons.imprinter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Interlock Open
-#: locale/ipp-strings.c:3190
+#: locale/ipp-strings.c:3002
 msgid "printer-state-reasons.imprinter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Jam
-#: locale/ipp-strings.c:3192
+#: locale/ipp-strings.c:3004
 msgid "printer-state-reasons.imprinter-jam"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Life Almost Over
-#: locale/ipp-strings.c:3194
+#: locale/ipp-strings.c:3006
 msgid "printer-state-reasons.imprinter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Life Over
-#: locale/ipp-strings.c:3196
+#: locale/ipp-strings.c:3008
 msgid "printer-state-reasons.imprinter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Memory Exhausted
-#: locale/ipp-strings.c:3198
+#: locale/ipp-strings.c:3010
 msgid "printer-state-reasons.imprinter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Missing
-#: locale/ipp-strings.c:3200
+#: locale/ipp-strings.c:3012
 msgid "printer-state-reasons.imprinter-missing"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Motor Failure
-#: locale/ipp-strings.c:3202
+#: locale/ipp-strings.c:3014
 msgid "printer-state-reasons.imprinter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Near Limit
-#: locale/ipp-strings.c:3204
+#: locale/ipp-strings.c:3016
 msgid "printer-state-reasons.imprinter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Offline
-#: locale/ipp-strings.c:3206
+#: locale/ipp-strings.c:3018
 msgid "printer-state-reasons.imprinter-offline"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Opened
-#: locale/ipp-strings.c:3208
+#: locale/ipp-strings.c:3020
 msgid "printer-state-reasons.imprinter-opened"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Over Temperature
-#: locale/ipp-strings.c:3210
+#: locale/ipp-strings.c:3022
 msgid "printer-state-reasons.imprinter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Power Saver
-#: locale/ipp-strings.c:3212
+#: locale/ipp-strings.c:3024
 msgid "printer-state-reasons.imprinter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Recoverable Failure
-#: locale/ipp-strings.c:3214
+#: locale/ipp-strings.c:3026
 msgid "printer-state-reasons.imprinter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Recoverable Storage
-#: locale/ipp-strings.c:3216
+#: locale/ipp-strings.c:3028
 msgid "printer-state-reasons.imprinter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Removed
-#: locale/ipp-strings.c:3218
+#: locale/ipp-strings.c:3030
 msgid "printer-state-reasons.imprinter-removed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Resource Added
-#: locale/ipp-strings.c:3220
+#: locale/ipp-strings.c:3032
 msgid "printer-state-reasons.imprinter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Resource Removed
-#: locale/ipp-strings.c:3222
+#: locale/ipp-strings.c:3034
 msgid "printer-state-reasons.imprinter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Thermistor Failure
-#: locale/ipp-strings.c:3224
+#: locale/ipp-strings.c:3036
 msgid "printer-state-reasons.imprinter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Timing Failure
-#: locale/ipp-strings.c:3226
+#: locale/ipp-strings.c:3038
 msgid "printer-state-reasons.imprinter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Turned Off
-#: locale/ipp-strings.c:3228
+#: locale/ipp-strings.c:3040
 msgid "printer-state-reasons.imprinter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Turned On
-#: locale/ipp-strings.c:3230
+#: locale/ipp-strings.c:3042
 msgid "printer-state-reasons.imprinter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Under Temperature
-#: locale/ipp-strings.c:3232
+#: locale/ipp-strings.c:3044
 msgid "printer-state-reasons.imprinter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Unrecoverable Failure
-#: locale/ipp-strings.c:3234
+#: locale/ipp-strings.c:3046
 msgid "printer-state-reasons.imprinter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3236
+#: locale/ipp-strings.c:3048
 msgid "printer-state-reasons.imprinter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Warming Up
-#: locale/ipp-strings.c:3238
+#: locale/ipp-strings.c:3050
 msgid "printer-state-reasons.imprinter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Input Cannot Feed Size Selected
-#: locale/ipp-strings.c:3240
+#: locale/ipp-strings.c:3052
 msgid "printer-state-reasons.input-cannot-feed-size-selected"
 msgstr ""
 
 #. TRANSLATORS: Input Manual Input Request
-#: locale/ipp-strings.c:3242
+#: locale/ipp-strings.c:3054
 msgid "printer-state-reasons.input-manual-input-request"
 msgstr ""
 
 #. TRANSLATORS: Input Media Color Change
-#: locale/ipp-strings.c:3244
+#: locale/ipp-strings.c:3056
 msgid "printer-state-reasons.input-media-color-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Form Parts Change
-#: locale/ipp-strings.c:3246
+#: locale/ipp-strings.c:3058
 msgid "printer-state-reasons.input-media-form-parts-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Size Change
-#: locale/ipp-strings.c:3248
+#: locale/ipp-strings.c:3060
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+#: locale/ipp-strings.c:3062
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+#: locale/ipp-strings.c:3064
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+#: locale/ipp-strings.c:3066
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
-#: locale/ipp-strings.c:3250
+#: locale/ipp-strings.c:3068
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Weight Change
-#: locale/ipp-strings.c:3252
+#: locale/ipp-strings.c:3070
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+#: locale/ipp-strings.c:3072
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+#: locale/ipp-strings.c:3074
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+#: locale/ipp-strings.c:3076
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+#: locale/ipp-strings.c:3078
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
-#: locale/ipp-strings.c:3254
+#: locale/ipp-strings.c:3080
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
-#: locale/ipp-strings.c:3256
+#. TRANSLATORS: Paper tray is missing
+#: locale/ipp-strings.c:3082
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
 #. TRANSLATORS: Input Tray Position Failure
-#: locale/ipp-strings.c:3258
+#: locale/ipp-strings.c:3084
 msgid "printer-state-reasons.input-tray-position-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Added
-#: locale/ipp-strings.c:3260
+#: locale/ipp-strings.c:3086
 msgid "printer-state-reasons.inserter-added"
 msgstr ""
 
 #. TRANSLATORS: Inserter Almost Empty
-#: locale/ipp-strings.c:3262
+#: locale/ipp-strings.c:3088
 msgid "printer-state-reasons.inserter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Inserter Almost Full
-#: locale/ipp-strings.c:3264
+#: locale/ipp-strings.c:3090
 msgid "printer-state-reasons.inserter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Inserter At Limit
-#: locale/ipp-strings.c:3266
+#: locale/ipp-strings.c:3092
 msgid "printer-state-reasons.inserter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Inserter Closed
-#: locale/ipp-strings.c:3268
+#: locale/ipp-strings.c:3094
 msgid "printer-state-reasons.inserter-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Configuration Change
-#: locale/ipp-strings.c:3270
+#: locale/ipp-strings.c:3096
 msgid "printer-state-reasons.inserter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Inserter Cover Closed
-#: locale/ipp-strings.c:3272
+#: locale/ipp-strings.c:3098
 msgid "printer-state-reasons.inserter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Cover Open
-#: locale/ipp-strings.c:3274
+#: locale/ipp-strings.c:3100
 msgid "printer-state-reasons.inserter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Inserter Empty
-#: locale/ipp-strings.c:3276
+#: locale/ipp-strings.c:3102
 msgid "printer-state-reasons.inserter-empty"
 msgstr ""
 
 #. TRANSLATORS: Inserter Full
-#: locale/ipp-strings.c:3278
+#: locale/ipp-strings.c:3104
 msgid "printer-state-reasons.inserter-full"
 msgstr ""
 
 #. TRANSLATORS: Inserter Interlock Closed
-#: locale/ipp-strings.c:3280
+#: locale/ipp-strings.c:3106
 msgid "printer-state-reasons.inserter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Interlock Open
-#: locale/ipp-strings.c:3282
+#: locale/ipp-strings.c:3108
 msgid "printer-state-reasons.inserter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Inserter Jam
-#: locale/ipp-strings.c:3284
+#: locale/ipp-strings.c:3110
 msgid "printer-state-reasons.inserter-jam"
 msgstr ""
 
 #. TRANSLATORS: Inserter Life Almost Over
-#: locale/ipp-strings.c:3286
+#: locale/ipp-strings.c:3112
 msgid "printer-state-reasons.inserter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Inserter Life Over
-#: locale/ipp-strings.c:3288
+#: locale/ipp-strings.c:3114
 msgid "printer-state-reasons.inserter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Inserter Memory Exhausted
-#: locale/ipp-strings.c:3290
+#: locale/ipp-strings.c:3116
 msgid "printer-state-reasons.inserter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Inserter Missing
-#: locale/ipp-strings.c:3292
+#: locale/ipp-strings.c:3118
 msgid "printer-state-reasons.inserter-missing"
 msgstr ""
 
 #. TRANSLATORS: Inserter Motor Failure
-#: locale/ipp-strings.c:3294
+#: locale/ipp-strings.c:3120
 msgid "printer-state-reasons.inserter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Near Limit
-#: locale/ipp-strings.c:3296
+#: locale/ipp-strings.c:3122
 msgid "printer-state-reasons.inserter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Inserter Offline
-#: locale/ipp-strings.c:3298
+#: locale/ipp-strings.c:3124
 msgid "printer-state-reasons.inserter-offline"
 msgstr ""
 
 #. TRANSLATORS: Inserter Opened
-#: locale/ipp-strings.c:3300
+#: locale/ipp-strings.c:3126
 msgid "printer-state-reasons.inserter-opened"
 msgstr ""
 
 #. TRANSLATORS: Inserter Over Temperature
-#: locale/ipp-strings.c:3302
+#: locale/ipp-strings.c:3128
 msgid "printer-state-reasons.inserter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Inserter Power Saver
-#: locale/ipp-strings.c:3304
+#: locale/ipp-strings.c:3130
 msgid "printer-state-reasons.inserter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Inserter Recoverable Failure
-#: locale/ipp-strings.c:3306
+#: locale/ipp-strings.c:3132
 msgid "printer-state-reasons.inserter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Recoverable Storage
-#: locale/ipp-strings.c:3308
+#: locale/ipp-strings.c:3134
 msgid "printer-state-reasons.inserter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Inserter Removed
-#: locale/ipp-strings.c:3310
+#: locale/ipp-strings.c:3136
 msgid "printer-state-reasons.inserter-removed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Resource Added
-#: locale/ipp-strings.c:3312
+#: locale/ipp-strings.c:3138
 msgid "printer-state-reasons.inserter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Inserter Resource Removed
-#: locale/ipp-strings.c:3314
+#: locale/ipp-strings.c:3140
 msgid "printer-state-reasons.inserter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Thermistor Failure
-#: locale/ipp-strings.c:3316
+#: locale/ipp-strings.c:3142
 msgid "printer-state-reasons.inserter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Timing Failure
-#: locale/ipp-strings.c:3318
+#: locale/ipp-strings.c:3144
 msgid "printer-state-reasons.inserter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Turned Off
-#: locale/ipp-strings.c:3320
+#: locale/ipp-strings.c:3146
 msgid "printer-state-reasons.inserter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Inserter Turned On
-#: locale/ipp-strings.c:3322
+#: locale/ipp-strings.c:3148
 msgid "printer-state-reasons.inserter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Inserter Under Temperature
-#: locale/ipp-strings.c:3324
+#: locale/ipp-strings.c:3150
 msgid "printer-state-reasons.inserter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Inserter Unrecoverable Failure
-#: locale/ipp-strings.c:3326
+#: locale/ipp-strings.c:3152
 msgid "printer-state-reasons.inserter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3328
+#: locale/ipp-strings.c:3154
 msgid "printer-state-reasons.inserter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Inserter Warming Up
-#: locale/ipp-strings.c:3330
+#: locale/ipp-strings.c:3156
 msgid "printer-state-reasons.inserter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Interlock Closed
-#: locale/ipp-strings.c:3332
+#: locale/ipp-strings.c:3158
 msgid "printer-state-reasons.interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Interlock Open
-#: locale/ipp-strings.c:3334
+#: locale/ipp-strings.c:3160
 msgid "printer-state-reasons.interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Cartridge Added
-#: locale/ipp-strings.c:3336
+#: locale/ipp-strings.c:3162
 msgid "printer-state-reasons.interpreter-cartridge-added"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Cartridge Removed
-#: locale/ipp-strings.c:3338
+#: locale/ipp-strings.c:3164
 msgid "printer-state-reasons.interpreter-cartridge-deleted"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Complex Page Encountered
-#: locale/ipp-strings.c:3340
+#: locale/ipp-strings.c:3166
 msgid "printer-state-reasons.interpreter-complex-page-encountered"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Memory Decrease
-#: locale/ipp-strings.c:3342
+#: locale/ipp-strings.c:3168
 msgid "printer-state-reasons.interpreter-memory-decrease"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Memory Increase
-#: locale/ipp-strings.c:3344
+#: locale/ipp-strings.c:3170
 msgid "printer-state-reasons.interpreter-memory-increase"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Resource Added
-#: locale/ipp-strings.c:3346
+#: locale/ipp-strings.c:3172
 msgid "printer-state-reasons.interpreter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Resource Deleted
-#: locale/ipp-strings.c:3348
+#: locale/ipp-strings.c:3174
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
-#: locale/ipp-strings.c:3350
+#. TRANSLATORS: Printer resource unavailable
+#: locale/ipp-strings.c:3176
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
 #. TRANSLATORS: Lamp At End of Life
-#: locale/ipp-strings.c:3352
+#: locale/ipp-strings.c:3178
 msgid "printer-state-reasons.lamp-at-eol"
 msgstr ""
 
 #. TRANSLATORS: Lamp Failure
-#: locale/ipp-strings.c:3354
+#: locale/ipp-strings.c:3180
 msgid "printer-state-reasons.lamp-failure"
 msgstr ""
 
 #. TRANSLATORS: Lamp Near End of Life
-#: locale/ipp-strings.c:3356
+#: locale/ipp-strings.c:3182
 msgid "printer-state-reasons.lamp-near-eol"
 msgstr ""
 
 #. TRANSLATORS: Laser At End of Life
-#: locale/ipp-strings.c:3358
+#: locale/ipp-strings.c:3184
 msgid "printer-state-reasons.laser-at-eol"
 msgstr ""
 
 #. TRANSLATORS: Laser Failure
-#: locale/ipp-strings.c:3360
+#: locale/ipp-strings.c:3186
 msgid "printer-state-reasons.laser-failure"
 msgstr ""
 
 #. TRANSLATORS: Laser Near End of Life
-#: locale/ipp-strings.c:3362
+#: locale/ipp-strings.c:3188
 msgid "printer-state-reasons.laser-near-eol"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Added
-#: locale/ipp-strings.c:3364
+#: locale/ipp-strings.c:3190
 msgid "printer-state-reasons.make-envelope-added"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Almost Empty
-#: locale/ipp-strings.c:3366
+#: locale/ipp-strings.c:3192
 msgid "printer-state-reasons.make-envelope-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Almost Full
-#: locale/ipp-strings.c:3368
+#: locale/ipp-strings.c:3194
 msgid "printer-state-reasons.make-envelope-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker At Limit
-#: locale/ipp-strings.c:3370
+#: locale/ipp-strings.c:3196
 msgid "printer-state-reasons.make-envelope-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Closed
-#: locale/ipp-strings.c:3372
+#: locale/ipp-strings.c:3198
 msgid "printer-state-reasons.make-envelope-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Configuration Change
-#: locale/ipp-strings.c:3374
+#: locale/ipp-strings.c:3200
 msgid "printer-state-reasons.make-envelope-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Cover Closed
-#: locale/ipp-strings.c:3376
+#: locale/ipp-strings.c:3202
 msgid "printer-state-reasons.make-envelope-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Cover Open
-#: locale/ipp-strings.c:3378
+#: locale/ipp-strings.c:3204
 msgid "printer-state-reasons.make-envelope-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Empty
-#: locale/ipp-strings.c:3380
+#: locale/ipp-strings.c:3206
 msgid "printer-state-reasons.make-envelope-empty"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Full
-#: locale/ipp-strings.c:3382
+#: locale/ipp-strings.c:3208
 msgid "printer-state-reasons.make-envelope-full"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Interlock Closed
-#: locale/ipp-strings.c:3384
+#: locale/ipp-strings.c:3210
 msgid "printer-state-reasons.make-envelope-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Interlock Open
-#: locale/ipp-strings.c:3386
+#: locale/ipp-strings.c:3212
 msgid "printer-state-reasons.make-envelope-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Jam
-#: locale/ipp-strings.c:3388
+#: locale/ipp-strings.c:3214
 msgid "printer-state-reasons.make-envelope-jam"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Life Almost Over
-#: locale/ipp-strings.c:3390
+#: locale/ipp-strings.c:3216
 msgid "printer-state-reasons.make-envelope-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Life Over
-#: locale/ipp-strings.c:3392
+#: locale/ipp-strings.c:3218
 msgid "printer-state-reasons.make-envelope-life-over"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Memory Exhausted
-#: locale/ipp-strings.c:3394
+#: locale/ipp-strings.c:3220
 msgid "printer-state-reasons.make-envelope-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Missing
-#: locale/ipp-strings.c:3396
+#: locale/ipp-strings.c:3222
 msgid "printer-state-reasons.make-envelope-missing"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Motor Failure
-#: locale/ipp-strings.c:3398
+#: locale/ipp-strings.c:3224
 msgid "printer-state-reasons.make-envelope-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Near Limit
-#: locale/ipp-strings.c:3400
+#: locale/ipp-strings.c:3226
 msgid "printer-state-reasons.make-envelope-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Offline
-#: locale/ipp-strings.c:3402
+#: locale/ipp-strings.c:3228
 msgid "printer-state-reasons.make-envelope-offline"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Opened
-#: locale/ipp-strings.c:3404
+#: locale/ipp-strings.c:3230
 msgid "printer-state-reasons.make-envelope-opened"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Over Temperature
-#: locale/ipp-strings.c:3406
+#: locale/ipp-strings.c:3232
 msgid "printer-state-reasons.make-envelope-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Power Saver
-#: locale/ipp-strings.c:3408
+#: locale/ipp-strings.c:3234
 msgid "printer-state-reasons.make-envelope-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Recoverable Failure
-#: locale/ipp-strings.c:3410
+#: locale/ipp-strings.c:3236
 msgid "printer-state-reasons.make-envelope-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Recoverable Storage
-#: locale/ipp-strings.c:3412
+#: locale/ipp-strings.c:3238
 msgid "printer-state-reasons.make-envelope-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Removed
-#: locale/ipp-strings.c:3414
+#: locale/ipp-strings.c:3240
 msgid "printer-state-reasons.make-envelope-removed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Resource Added
-#: locale/ipp-strings.c:3416
+#: locale/ipp-strings.c:3242
 msgid "printer-state-reasons.make-envelope-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Resource Removed
-#: locale/ipp-strings.c:3418
+#: locale/ipp-strings.c:3244
 msgid "printer-state-reasons.make-envelope-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Thermistor Failure
-#: locale/ipp-strings.c:3420
+#: locale/ipp-strings.c:3246
 msgid "printer-state-reasons.make-envelope-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Timing Failure
-#: locale/ipp-strings.c:3422
+#: locale/ipp-strings.c:3248
 msgid "printer-state-reasons.make-envelope-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Turned Off
-#: locale/ipp-strings.c:3424
+#: locale/ipp-strings.c:3250
 msgid "printer-state-reasons.make-envelope-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Turned On
-#: locale/ipp-strings.c:3426
+#: locale/ipp-strings.c:3252
 msgid "printer-state-reasons.make-envelope-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Under Temperature
-#: locale/ipp-strings.c:3428
+#: locale/ipp-strings.c:3254
 msgid "printer-state-reasons.make-envelope-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Unrecoverable Failure
-#: locale/ipp-strings.c:3430
+#: locale/ipp-strings.c:3256
 msgid "printer-state-reasons.make-envelope-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Unrecoverable Storage Error
-#: locale/ipp-strings.c:3432
+#: locale/ipp-strings.c:3258
 msgid "printer-state-reasons.make-envelope-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Warming Up
-#: locale/ipp-strings.c:3434
+#: locale/ipp-strings.c:3260
 msgid "printer-state-reasons.make-envelope-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Marker Adjusting Print Quality
-#: locale/ipp-strings.c:3436
+#: locale/ipp-strings.c:3262
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+#: locale/ipp-strings.c:3264
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
-#: locale/ipp-strings.c:3438
+#: locale/ipp-strings.c:3266
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Developer Empty
-#: locale/ipp-strings.c:3440
+#: locale/ipp-strings.c:3268
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+#: locale/ipp-strings.c:3270
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+#: locale/ipp-strings.c:3272
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
-#: locale/ipp-strings.c:3442
+#: locale/ipp-strings.c:3274
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Marker Fuser Timing Failure
-#: locale/ipp-strings.c:3444
+#: locale/ipp-strings.c:3276
 msgid "printer-state-reasons.marker-fuser-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Marker Ink Almost Empty
-#: locale/ipp-strings.c:3446
+#: locale/ipp-strings.c:3278
 msgid "printer-state-reasons.marker-ink-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Ink Empty
-#: locale/ipp-strings.c:3448
+#: locale/ipp-strings.c:3280
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+#: locale/ipp-strings.c:3282
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+#: locale/ipp-strings.c:3284
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
-#: locale/ipp-strings.c:3450
+#: locale/ipp-strings.c:3286
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Print Ribbon Empty
-#: locale/ipp-strings.c:3452
+#: locale/ipp-strings.c:3288
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
-#: locale/ipp-strings.c:3454
+#. TRANSLATORS: Marker Print Ribbon Missing
+#: locale/ipp-strings.c:3290
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+#: locale/ipp-strings.c:3292
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
+#: locale/ipp-strings.c:3294
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
-#: locale/ipp-strings.c:3456
+#. TRANSLATORS: Ink/toner low
+#: locale/ipp-strings.c:3296
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+#: locale/ipp-strings.c:3298
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
-#: locale/ipp-strings.c:3458
+#: locale/ipp-strings.c:3300
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
-#: locale/ipp-strings.c:3460
+#. TRANSLATORS: Marker Toner Missing
+#: locale/ipp-strings.c:3302
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
+#: locale/ipp-strings.c:3304
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
-#: locale/ipp-strings.c:3462
+#. TRANSLATORS: Ink/toner waste bin full
+#: locale/ipp-strings.c:3306
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Ink Receptacle Almost Full
-#: locale/ipp-strings.c:3464
+#: locale/ipp-strings.c:3308
 msgid "printer-state-reasons.marker-waste-ink-receptacle-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Ink Receptacle Full
-#: locale/ipp-strings.c:3466
+#: locale/ipp-strings.c:3310
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+#: locale/ipp-strings.c:3312
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+#: locale/ipp-strings.c:3314
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
-#: locale/ipp-strings.c:3468
+#: locale/ipp-strings.c:3316
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Toner Receptacle Full
-#: locale/ipp-strings.c:3470
+#: locale/ipp-strings.c:3318
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+#: locale/ipp-strings.c:3320
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
-#: locale/ipp-strings.c:3472
+#: locale/ipp-strings.c:3322
 msgid "printer-state-reasons.material-empty"
 msgstr ""
 
 #. TRANSLATORS: Material Low
-#: locale/ipp-strings.c:3474
+#: locale/ipp-strings.c:3324
 msgid "printer-state-reasons.material-low"
 msgstr ""
 
 #. TRANSLATORS: Material Needed
-#: locale/ipp-strings.c:3476
+#: locale/ipp-strings.c:3326
 msgid "printer-state-reasons.material-needed"
 msgstr ""
 
 #. TRANSLATORS: Media Drying
-#: locale/ipp-strings.c:3478
+#: locale/ipp-strings.c:3328
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
-#: locale/ipp-strings.c:3480
+#. TRANSLATORS: Paper tray is empty
+#: locale/ipp-strings.c:3330
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
-#: locale/ipp-strings.c:3482
+#. TRANSLATORS: Paper jam
+#: locale/ipp-strings.c:3332
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
-#: locale/ipp-strings.c:3484
+#. TRANSLATORS: Paper tray is almost empty
+#: locale/ipp-strings.c:3334
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
-#: locale/ipp-strings.c:3486
+#. TRANSLATORS: Load paper
+#: locale/ipp-strings.c:3336
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
 #. TRANSLATORS: Media Path Cannot Do 2-Sided Printing
-#: locale/ipp-strings.c:3488
+#: locale/ipp-strings.c:3338
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+#: locale/ipp-strings.c:3340
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+#: locale/ipp-strings.c:3342
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+#: locale/ipp-strings.c:3344
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+#: locale/ipp-strings.c:3346
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+#: locale/ipp-strings.c:3348
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+#: locale/ipp-strings.c:3350
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
-#: locale/ipp-strings.c:3490
+#: locale/ipp-strings.c:3352
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Media Path Media Tray Full
-#: locale/ipp-strings.c:3492
+#: locale/ipp-strings.c:3354
 msgid "printer-state-reasons.media-path-media-tray-full"
 msgstr ""
 
 #. TRANSLATORS: Media Path Media Tray Missing
-#: locale/ipp-strings.c:3494
+#: locale/ipp-strings.c:3356
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+#: locale/ipp-strings.c:3358
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+#: locale/ipp-strings.c:3360
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+#: locale/ipp-strings.c:3362
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+#: locale/ipp-strings.c:3364
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+#: locale/ipp-strings.c:3366
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+#: locale/ipp-strings.c:3368
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+#: locale/ipp-strings.c:3370
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
-#: locale/ipp-strings.c:3496
+#: locale/ipp-strings.c:3372
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
-#: locale/ipp-strings.c:3498
+#. TRANSLATORS: Printer going offline
+#: locale/ipp-strings.c:3374
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:3500
+#: locale/ipp-strings.c:3376
 msgid "printer-state-reasons.none"
 msgstr ""
 
 #. TRANSLATORS: Optical Photoconductor Life Over
-#: locale/ipp-strings.c:3502
+#: locale/ipp-strings.c:3378
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
-#: locale/ipp-strings.c:3504
+#. TRANSLATORS: OPC almost at end-of-life
+#: locale/ipp-strings.c:3380
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
-#: locale/ipp-strings.c:3506
+#. TRANSLATORS: Check the printer for errors
+#: locale/ipp-strings.c:3382
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
-#: locale/ipp-strings.c:3508
+#. TRANSLATORS: Output bin is almost full
+#: locale/ipp-strings.c:3384
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
-#: locale/ipp-strings.c:3510
+#. TRANSLATORS: Output bin is full
+#: locale/ipp-strings.c:3386
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
 #. TRANSLATORS: Output Mailbox Select Failure
-#: locale/ipp-strings.c:3512
+#: locale/ipp-strings.c:3388
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
-#: locale/ipp-strings.c:3514
+#. TRANSLATORS: Output Media Tray Failure
+#: locale/ipp-strings.c:3390
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+#: locale/ipp-strings.c:3392
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+#: locale/ipp-strings.c:3394
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
+#: locale/ipp-strings.c:3396
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
 #. TRANSLATORS: Paused
-#: locale/ipp-strings.c:3516
+#: locale/ipp-strings.c:3398
 msgid "printer-state-reasons.paused"
 msgstr ""
 
 #. TRANSLATORS: Perforater Added
-#: locale/ipp-strings.c:3518
+#: locale/ipp-strings.c:3400
 msgid "printer-state-reasons.perforater-added"
 msgstr ""
 
 #. TRANSLATORS: Perforater Almost Empty
-#: locale/ipp-strings.c:3520
+#: locale/ipp-strings.c:3402
 msgid "printer-state-reasons.perforater-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Perforater Almost Full
-#: locale/ipp-strings.c:3522
+#: locale/ipp-strings.c:3404
 msgid "printer-state-reasons.perforater-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Perforater At Limit
-#: locale/ipp-strings.c:3524
+#: locale/ipp-strings.c:3406
 msgid "printer-state-reasons.perforater-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Perforater Closed
-#: locale/ipp-strings.c:3526
+#: locale/ipp-strings.c:3408
 msgid "printer-state-reasons.perforater-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Configuration Change
-#: locale/ipp-strings.c:3528
+#: locale/ipp-strings.c:3410
 msgid "printer-state-reasons.perforater-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Perforater Cover Closed
-#: locale/ipp-strings.c:3530
+#: locale/ipp-strings.c:3412
 msgid "printer-state-reasons.perforater-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Cover Open
-#: locale/ipp-strings.c:3532
+#: locale/ipp-strings.c:3414
 msgid "printer-state-reasons.perforater-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Perforater Empty
-#: locale/ipp-strings.c:3534
+#: locale/ipp-strings.c:3416
 msgid "printer-state-reasons.perforater-empty"
 msgstr ""
 
 #. TRANSLATORS: Perforater Full
-#: locale/ipp-strings.c:3536
+#: locale/ipp-strings.c:3418
 msgid "printer-state-reasons.perforater-full"
 msgstr ""
 
 #. TRANSLATORS: Perforater Interlock Closed
-#: locale/ipp-strings.c:3538
+#: locale/ipp-strings.c:3420
 msgid "printer-state-reasons.perforater-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Interlock Open
-#: locale/ipp-strings.c:3540
+#: locale/ipp-strings.c:3422
 msgid "printer-state-reasons.perforater-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Perforater Jam
-#: locale/ipp-strings.c:3542
+#: locale/ipp-strings.c:3424
 msgid "printer-state-reasons.perforater-jam"
 msgstr ""
 
 #. TRANSLATORS: Perforater Life Almost Over
-#: locale/ipp-strings.c:3544
+#: locale/ipp-strings.c:3426
 msgid "printer-state-reasons.perforater-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Perforater Life Over
-#: locale/ipp-strings.c:3546
+#: locale/ipp-strings.c:3428
 msgid "printer-state-reasons.perforater-life-over"
 msgstr ""
 
 #. TRANSLATORS: Perforater Memory Exhausted
-#: locale/ipp-strings.c:3548
+#: locale/ipp-strings.c:3430
 msgid "printer-state-reasons.perforater-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Perforater Missing
-#: locale/ipp-strings.c:3550
+#: locale/ipp-strings.c:3432
 msgid "printer-state-reasons.perforater-missing"
 msgstr ""
 
 #. TRANSLATORS: Perforater Motor Failure
-#: locale/ipp-strings.c:3552
+#: locale/ipp-strings.c:3434
 msgid "printer-state-reasons.perforater-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Near Limit
-#: locale/ipp-strings.c:3554
+#: locale/ipp-strings.c:3436
 msgid "printer-state-reasons.perforater-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Perforater Offline
-#: locale/ipp-strings.c:3556
+#: locale/ipp-strings.c:3438
 msgid "printer-state-reasons.perforater-offline"
 msgstr ""
 
 #. TRANSLATORS: Perforater Opened
-#: locale/ipp-strings.c:3558
+#: locale/ipp-strings.c:3440
 msgid "printer-state-reasons.perforater-opened"
 msgstr ""
 
 #. TRANSLATORS: Perforater Over Temperature
-#: locale/ipp-strings.c:3560
+#: locale/ipp-strings.c:3442
 msgid "printer-state-reasons.perforater-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Perforater Power Saver
-#: locale/ipp-strings.c:3562
+#: locale/ipp-strings.c:3444
 msgid "printer-state-reasons.perforater-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Perforater Recoverable Failure
-#: locale/ipp-strings.c:3564
+#: locale/ipp-strings.c:3446
 msgid "printer-state-reasons.perforater-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Recoverable Storage
-#: locale/ipp-strings.c:3566
+#: locale/ipp-strings.c:3448
 msgid "printer-state-reasons.perforater-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Perforater Removed
-#: locale/ipp-strings.c:3568
+#: locale/ipp-strings.c:3450
 msgid "printer-state-reasons.perforater-removed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Resource Added
-#: locale/ipp-strings.c:3570
+#: locale/ipp-strings.c:3452
 msgid "printer-state-reasons.perforater-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Perforater Resource Removed
-#: locale/ipp-strings.c:3572
+#: locale/ipp-strings.c:3454
 msgid "printer-state-reasons.perforater-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Thermistor Failure
-#: locale/ipp-strings.c:3574
+#: locale/ipp-strings.c:3456
 msgid "printer-state-reasons.perforater-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Timing Failure
-#: locale/ipp-strings.c:3576
+#: locale/ipp-strings.c:3458
 msgid "printer-state-reasons.perforater-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Turned Off
-#: locale/ipp-strings.c:3578
+#: locale/ipp-strings.c:3460
 msgid "printer-state-reasons.perforater-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Perforater Turned On
-#: locale/ipp-strings.c:3580
+#: locale/ipp-strings.c:3462
 msgid "printer-state-reasons.perforater-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Perforater Under Temperature
-#: locale/ipp-strings.c:3582
+#: locale/ipp-strings.c:3464
 msgid "printer-state-reasons.perforater-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Perforater Unrecoverable Failure
-#: locale/ipp-strings.c:3584
+#: locale/ipp-strings.c:3466
 msgid "printer-state-reasons.perforater-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Unrecoverable Storage Error
-#: locale/ipp-strings.c:3586
+#: locale/ipp-strings.c:3468
 msgid "printer-state-reasons.perforater-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Perforater Warming Up
-#: locale/ipp-strings.c:3588
+#: locale/ipp-strings.c:3470
 msgid "printer-state-reasons.perforater-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Platform Cooling
-#: locale/ipp-strings.c:3590
+#: locale/ipp-strings.c:3472
 msgid "printer-state-reasons.platform-cooling"
 msgstr ""
 
 #. TRANSLATORS: Platform Failure
-#: locale/ipp-strings.c:3592
+#: locale/ipp-strings.c:3474
 msgid "printer-state-reasons.platform-failure"
 msgstr ""
 
 #. TRANSLATORS: Platform Heating
-#: locale/ipp-strings.c:3594
+#: locale/ipp-strings.c:3476
 msgid "printer-state-reasons.platform-heating"
 msgstr ""
 
 #. TRANSLATORS: Platform Temperature High
-#: locale/ipp-strings.c:3596
+#: locale/ipp-strings.c:3478
 msgid "printer-state-reasons.platform-temperature-high"
 msgstr ""
 
 #. TRANSLATORS: Platform Temperature Low
-#: locale/ipp-strings.c:3598
+#: locale/ipp-strings.c:3480
 msgid "printer-state-reasons.platform-temperature-low"
 msgstr ""
 
 #. TRANSLATORS: Power Down
-#: locale/ipp-strings.c:3600
+#: locale/ipp-strings.c:3482
 msgid "printer-state-reasons.power-down"
 msgstr ""
 
 #. TRANSLATORS: Power Up
-#: locale/ipp-strings.c:3602
+#: locale/ipp-strings.c:3484
 msgid "printer-state-reasons.power-up"
 msgstr ""
 
 #. TRANSLATORS: Printer Reset Manually
-#: locale/ipp-strings.c:3604
+#: locale/ipp-strings.c:3486
 msgid "printer-state-reasons.printer-manual-reset"
 msgstr ""
 
 #. TRANSLATORS: Printer Reset Remotely
-#: locale/ipp-strings.c:3606
+#: locale/ipp-strings.c:3488
 msgid "printer-state-reasons.printer-nms-reset"
 msgstr ""
 
 #. TRANSLATORS: Printer Ready To Print
-#: locale/ipp-strings.c:3608
+#: locale/ipp-strings.c:3490
 msgid "printer-state-reasons.printer-ready-to-print"
 msgstr ""
 
 #. TRANSLATORS: Puncher Added
-#: locale/ipp-strings.c:3610
+#: locale/ipp-strings.c:3492
 msgid "printer-state-reasons.puncher-added"
 msgstr ""
 
 #. TRANSLATORS: Puncher Almost Empty
-#: locale/ipp-strings.c:3612
+#: locale/ipp-strings.c:3494
 msgid "printer-state-reasons.puncher-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Puncher Almost Full
-#: locale/ipp-strings.c:3614
+#: locale/ipp-strings.c:3496
 msgid "printer-state-reasons.puncher-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Puncher At Limit
-#: locale/ipp-strings.c:3616
+#: locale/ipp-strings.c:3498
 msgid "printer-state-reasons.puncher-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Puncher Closed
-#: locale/ipp-strings.c:3618
+#: locale/ipp-strings.c:3500
 msgid "printer-state-reasons.puncher-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Configuration Change
-#: locale/ipp-strings.c:3620
+#: locale/ipp-strings.c:3502
 msgid "printer-state-reasons.puncher-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Puncher Cover Closed
-#: locale/ipp-strings.c:3622
+#: locale/ipp-strings.c:3504
 msgid "printer-state-reasons.puncher-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Cover Open
-#: locale/ipp-strings.c:3624
+#: locale/ipp-strings.c:3506
 msgid "printer-state-reasons.puncher-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Puncher Empty
-#: locale/ipp-strings.c:3626
+#: locale/ipp-strings.c:3508
 msgid "printer-state-reasons.puncher-empty"
 msgstr ""
 
 #. TRANSLATORS: Puncher Full
-#: locale/ipp-strings.c:3628
+#: locale/ipp-strings.c:3510
 msgid "printer-state-reasons.puncher-full"
 msgstr ""
 
 #. TRANSLATORS: Puncher Interlock Closed
-#: locale/ipp-strings.c:3630
+#: locale/ipp-strings.c:3512
 msgid "printer-state-reasons.puncher-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Interlock Open
-#: locale/ipp-strings.c:3632
+#: locale/ipp-strings.c:3514
 msgid "printer-state-reasons.puncher-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Puncher Jam
-#: locale/ipp-strings.c:3634
+#: locale/ipp-strings.c:3516
 msgid "printer-state-reasons.puncher-jam"
 msgstr ""
 
 #. TRANSLATORS: Puncher Life Almost Over
-#: locale/ipp-strings.c:3636
+#: locale/ipp-strings.c:3518
 msgid "printer-state-reasons.puncher-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Puncher Life Over
-#: locale/ipp-strings.c:3638
+#: locale/ipp-strings.c:3520
 msgid "printer-state-reasons.puncher-life-over"
 msgstr ""
 
 #. TRANSLATORS: Puncher Memory Exhausted
-#: locale/ipp-strings.c:3640
+#: locale/ipp-strings.c:3522
 msgid "printer-state-reasons.puncher-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Puncher Missing
-#: locale/ipp-strings.c:3642
+#: locale/ipp-strings.c:3524
 msgid "printer-state-reasons.puncher-missing"
 msgstr ""
 
 #. TRANSLATORS: Puncher Motor Failure
-#: locale/ipp-strings.c:3644
+#: locale/ipp-strings.c:3526
 msgid "printer-state-reasons.puncher-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Near Limit
-#: locale/ipp-strings.c:3646
+#: locale/ipp-strings.c:3528
 msgid "printer-state-reasons.puncher-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Puncher Offline
-#: locale/ipp-strings.c:3648
+#: locale/ipp-strings.c:3530
 msgid "printer-state-reasons.puncher-offline"
 msgstr ""
 
 #. TRANSLATORS: Puncher Opened
-#: locale/ipp-strings.c:3650
+#: locale/ipp-strings.c:3532
 msgid "printer-state-reasons.puncher-opened"
 msgstr ""
 
 #. TRANSLATORS: Puncher Over Temperature
-#: locale/ipp-strings.c:3652
+#: locale/ipp-strings.c:3534
 msgid "printer-state-reasons.puncher-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Puncher Power Saver
-#: locale/ipp-strings.c:3654
+#: locale/ipp-strings.c:3536
 msgid "printer-state-reasons.puncher-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Puncher Recoverable Failure
-#: locale/ipp-strings.c:3656
+#: locale/ipp-strings.c:3538
 msgid "printer-state-reasons.puncher-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Recoverable Storage
-#: locale/ipp-strings.c:3658
+#: locale/ipp-strings.c:3540
 msgid "printer-state-reasons.puncher-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Puncher Removed
-#: locale/ipp-strings.c:3660
+#: locale/ipp-strings.c:3542
 msgid "printer-state-reasons.puncher-removed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Resource Added
-#: locale/ipp-strings.c:3662
+#: locale/ipp-strings.c:3544
 msgid "printer-state-reasons.puncher-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Puncher Resource Removed
-#: locale/ipp-strings.c:3664
+#: locale/ipp-strings.c:3546
 msgid "printer-state-reasons.puncher-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Thermistor Failure
-#: locale/ipp-strings.c:3666
+#: locale/ipp-strings.c:3548
 msgid "printer-state-reasons.puncher-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Timing Failure
-#: locale/ipp-strings.c:3668
+#: locale/ipp-strings.c:3550
 msgid "printer-state-reasons.puncher-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Turned Off
-#: locale/ipp-strings.c:3670
+#: locale/ipp-strings.c:3552
 msgid "printer-state-reasons.puncher-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Puncher Turned On
-#: locale/ipp-strings.c:3672
+#: locale/ipp-strings.c:3554
 msgid "printer-state-reasons.puncher-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Puncher Under Temperature
-#: locale/ipp-strings.c:3674
+#: locale/ipp-strings.c:3556
 msgid "printer-state-reasons.puncher-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Puncher Unrecoverable Failure
-#: locale/ipp-strings.c:3676
+#: locale/ipp-strings.c:3558
 msgid "printer-state-reasons.puncher-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Unrecoverable Storage Error
-#: locale/ipp-strings.c:3678
+#: locale/ipp-strings.c:3560
 msgid "printer-state-reasons.puncher-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Puncher Warming Up
-#: locale/ipp-strings.c:3680
+#: locale/ipp-strings.c:3562
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-#: locale/ipp-strings.c:3682
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
-#: locale/ipp-strings.c:3684
+#: locale/ipp-strings.c:3564
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Almost Empty
-#: locale/ipp-strings.c:3686
+#: locale/ipp-strings.c:3566
 msgid "printer-state-reasons.separation-cutter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Almost Full
-#: locale/ipp-strings.c:3688
+#: locale/ipp-strings.c:3568
 msgid "printer-state-reasons.separation-cutter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter At Limit
-#: locale/ipp-strings.c:3690
+#: locale/ipp-strings.c:3570
 msgid "printer-state-reasons.separation-cutter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Closed
-#: locale/ipp-strings.c:3692
+#: locale/ipp-strings.c:3572
 msgid "printer-state-reasons.separation-cutter-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Configuration Change
-#: locale/ipp-strings.c:3694
+#: locale/ipp-strings.c:3574
 msgid "printer-state-reasons.separation-cutter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Cover Closed
-#: locale/ipp-strings.c:3696
+#: locale/ipp-strings.c:3576
 msgid "printer-state-reasons.separation-cutter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Cover Open
-#: locale/ipp-strings.c:3698
+#: locale/ipp-strings.c:3578
 msgid "printer-state-reasons.separation-cutter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Empty
-#: locale/ipp-strings.c:3700
+#: locale/ipp-strings.c:3580
 msgid "printer-state-reasons.separation-cutter-empty"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Full
-#: locale/ipp-strings.c:3702
+#: locale/ipp-strings.c:3582
 msgid "printer-state-reasons.separation-cutter-full"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Interlock Closed
-#: locale/ipp-strings.c:3704
+#: locale/ipp-strings.c:3584
 msgid "printer-state-reasons.separation-cutter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Interlock Open
-#: locale/ipp-strings.c:3706
+#: locale/ipp-strings.c:3586
 msgid "printer-state-reasons.separation-cutter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Jam
-#: locale/ipp-strings.c:3708
+#: locale/ipp-strings.c:3588
 msgid "printer-state-reasons.separation-cutter-jam"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Life Almost Over
-#: locale/ipp-strings.c:3710
+#: locale/ipp-strings.c:3590
 msgid "printer-state-reasons.separation-cutter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Life Over
-#: locale/ipp-strings.c:3712
+#: locale/ipp-strings.c:3592
 msgid "printer-state-reasons.separation-cutter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Memory Exhausted
-#: locale/ipp-strings.c:3714
+#: locale/ipp-strings.c:3594
 msgid "printer-state-reasons.separation-cutter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Missing
-#: locale/ipp-strings.c:3716
+#: locale/ipp-strings.c:3596
 msgid "printer-state-reasons.separation-cutter-missing"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Motor Failure
-#: locale/ipp-strings.c:3718
+#: locale/ipp-strings.c:3598
 msgid "printer-state-reasons.separation-cutter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Near Limit
-#: locale/ipp-strings.c:3720
+#: locale/ipp-strings.c:3600
 msgid "printer-state-reasons.separation-cutter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Offline
-#: locale/ipp-strings.c:3722
+#: locale/ipp-strings.c:3602
 msgid "printer-state-reasons.separation-cutter-offline"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Opened
-#: locale/ipp-strings.c:3724
+#: locale/ipp-strings.c:3604
 msgid "printer-state-reasons.separation-cutter-opened"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Over Temperature
-#: locale/ipp-strings.c:3726
+#: locale/ipp-strings.c:3606
 msgid "printer-state-reasons.separation-cutter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Power Saver
-#: locale/ipp-strings.c:3728
+#: locale/ipp-strings.c:3608
 msgid "printer-state-reasons.separation-cutter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Recoverable Failure
-#: locale/ipp-strings.c:3730
+#: locale/ipp-strings.c:3610
 msgid "printer-state-reasons.separation-cutter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Recoverable Storage
-#: locale/ipp-strings.c:3732
+#: locale/ipp-strings.c:3612
 msgid "printer-state-reasons.separation-cutter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Removed
-#: locale/ipp-strings.c:3734
+#: locale/ipp-strings.c:3614
 msgid "printer-state-reasons.separation-cutter-removed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Resource Added
-#: locale/ipp-strings.c:3736
+#: locale/ipp-strings.c:3616
 msgid "printer-state-reasons.separation-cutter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Resource Removed
-#: locale/ipp-strings.c:3738
+#: locale/ipp-strings.c:3618
 msgid "printer-state-reasons.separation-cutter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Thermistor Failure
-#: locale/ipp-strings.c:3740
+#: locale/ipp-strings.c:3620
 msgid "printer-state-reasons.separation-cutter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Timing Failure
-#: locale/ipp-strings.c:3742
+#: locale/ipp-strings.c:3622
 msgid "printer-state-reasons.separation-cutter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Turned Off
-#: locale/ipp-strings.c:3744
+#: locale/ipp-strings.c:3624
 msgid "printer-state-reasons.separation-cutter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Turned On
-#: locale/ipp-strings.c:3746
+#: locale/ipp-strings.c:3626
 msgid "printer-state-reasons.separation-cutter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Under Temperature
-#: locale/ipp-strings.c:3748
+#: locale/ipp-strings.c:3628
 msgid "printer-state-reasons.separation-cutter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Unrecoverable Failure
-#: locale/ipp-strings.c:3750
+#: locale/ipp-strings.c:3630
 msgid "printer-state-reasons.separation-cutter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3752
+#: locale/ipp-strings.c:3632
 msgid "printer-state-reasons.separation-cutter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Warming Up
-#: locale/ipp-strings.c:3754
+#: locale/ipp-strings.c:3634
 msgid "printer-state-reasons.separation-cutter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Added
-#: locale/ipp-strings.c:3756
+#: locale/ipp-strings.c:3636
 msgid "printer-state-reasons.sheet-rotator-added"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Almost Empty
-#: locale/ipp-strings.c:3758
+#: locale/ipp-strings.c:3638
 msgid "printer-state-reasons.sheet-rotator-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Almost Full
-#: locale/ipp-strings.c:3760
+#: locale/ipp-strings.c:3640
 msgid "printer-state-reasons.sheet-rotator-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator At Limit
-#: locale/ipp-strings.c:3762
+#: locale/ipp-strings.c:3642
 msgid "printer-state-reasons.sheet-rotator-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Closed
-#: locale/ipp-strings.c:3764
+#: locale/ipp-strings.c:3644
 msgid "printer-state-reasons.sheet-rotator-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Configuration Change
-#: locale/ipp-strings.c:3766
+#: locale/ipp-strings.c:3646
 msgid "printer-state-reasons.sheet-rotator-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Cover Closed
-#: locale/ipp-strings.c:3768
+#: locale/ipp-strings.c:3648
 msgid "printer-state-reasons.sheet-rotator-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Cover Open
-#: locale/ipp-strings.c:3770
+#: locale/ipp-strings.c:3650
 msgid "printer-state-reasons.sheet-rotator-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Empty
-#: locale/ipp-strings.c:3772
+#: locale/ipp-strings.c:3652
 msgid "printer-state-reasons.sheet-rotator-empty"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Full
-#: locale/ipp-strings.c:3774
+#: locale/ipp-strings.c:3654
 msgid "printer-state-reasons.sheet-rotator-full"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Interlock Closed
-#: locale/ipp-strings.c:3776
+#: locale/ipp-strings.c:3656
 msgid "printer-state-reasons.sheet-rotator-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Interlock Open
-#: locale/ipp-strings.c:3778
+#: locale/ipp-strings.c:3658
 msgid "printer-state-reasons.sheet-rotator-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Jam
-#: locale/ipp-strings.c:3780
+#: locale/ipp-strings.c:3660
 msgid "printer-state-reasons.sheet-rotator-jam"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Life Almost Over
-#: locale/ipp-strings.c:3782
+#: locale/ipp-strings.c:3662
 msgid "printer-state-reasons.sheet-rotator-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Life Over
-#: locale/ipp-strings.c:3784
+#: locale/ipp-strings.c:3664
 msgid "printer-state-reasons.sheet-rotator-life-over"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Memory Exhausted
-#: locale/ipp-strings.c:3786
+#: locale/ipp-strings.c:3666
 msgid "printer-state-reasons.sheet-rotator-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Missing
-#: locale/ipp-strings.c:3788
+#: locale/ipp-strings.c:3668
 msgid "printer-state-reasons.sheet-rotator-missing"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Motor Failure
-#: locale/ipp-strings.c:3790
+#: locale/ipp-strings.c:3670
 msgid "printer-state-reasons.sheet-rotator-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Near Limit
-#: locale/ipp-strings.c:3792
+#: locale/ipp-strings.c:3672
 msgid "printer-state-reasons.sheet-rotator-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Offline
-#: locale/ipp-strings.c:3794
+#: locale/ipp-strings.c:3674
 msgid "printer-state-reasons.sheet-rotator-offline"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Opened
-#: locale/ipp-strings.c:3796
+#: locale/ipp-strings.c:3676
 msgid "printer-state-reasons.sheet-rotator-opened"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Over Temperature
-#: locale/ipp-strings.c:3798
+#: locale/ipp-strings.c:3678
 msgid "printer-state-reasons.sheet-rotator-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Power Saver
-#: locale/ipp-strings.c:3800
+#: locale/ipp-strings.c:3680
 msgid "printer-state-reasons.sheet-rotator-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Recoverable Failure
-#: locale/ipp-strings.c:3802
+#: locale/ipp-strings.c:3682
 msgid "printer-state-reasons.sheet-rotator-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Recoverable Storage
-#: locale/ipp-strings.c:3804
+#: locale/ipp-strings.c:3684
 msgid "printer-state-reasons.sheet-rotator-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Removed
-#: locale/ipp-strings.c:3806
+#: locale/ipp-strings.c:3686
 msgid "printer-state-reasons.sheet-rotator-removed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Resource Added
-#: locale/ipp-strings.c:3808
+#: locale/ipp-strings.c:3688
 msgid "printer-state-reasons.sheet-rotator-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Resource Removed
-#: locale/ipp-strings.c:3810
+#: locale/ipp-strings.c:3690
 msgid "printer-state-reasons.sheet-rotator-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Thermistor Failure
-#: locale/ipp-strings.c:3812
+#: locale/ipp-strings.c:3692
 msgid "printer-state-reasons.sheet-rotator-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Timing Failure
-#: locale/ipp-strings.c:3814
+#: locale/ipp-strings.c:3694
 msgid "printer-state-reasons.sheet-rotator-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Turned Off
-#: locale/ipp-strings.c:3816
+#: locale/ipp-strings.c:3696
 msgid "printer-state-reasons.sheet-rotator-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Turned On
-#: locale/ipp-strings.c:3818
+#: locale/ipp-strings.c:3698
 msgid "printer-state-reasons.sheet-rotator-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Under Temperature
-#: locale/ipp-strings.c:3820
+#: locale/ipp-strings.c:3700
 msgid "printer-state-reasons.sheet-rotator-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Unrecoverable Failure
-#: locale/ipp-strings.c:3822
+#: locale/ipp-strings.c:3702
 msgid "printer-state-reasons.sheet-rotator-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Unrecoverable Storage Error
-#: locale/ipp-strings.c:3824
+#: locale/ipp-strings.c:3704
 msgid "printer-state-reasons.sheet-rotator-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Warming Up
-#: locale/ipp-strings.c:3826
+#: locale/ipp-strings.c:3706
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
-#: locale/ipp-strings.c:3828
+#. TRANSLATORS: Printer offline
+#: locale/ipp-strings.c:3708
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
 #. TRANSLATORS: Slitter Added
-#: locale/ipp-strings.c:3830
+#: locale/ipp-strings.c:3710
 msgid "printer-state-reasons.slitter-added"
 msgstr ""
 
 #. TRANSLATORS: Slitter Almost Empty
-#: locale/ipp-strings.c:3832
+#: locale/ipp-strings.c:3712
 msgid "printer-state-reasons.slitter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Slitter Almost Full
-#: locale/ipp-strings.c:3834
+#: locale/ipp-strings.c:3714
 msgid "printer-state-reasons.slitter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Slitter At Limit
-#: locale/ipp-strings.c:3836
+#: locale/ipp-strings.c:3716
 msgid "printer-state-reasons.slitter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Slitter Closed
-#: locale/ipp-strings.c:3838
+#: locale/ipp-strings.c:3718
 msgid "printer-state-reasons.slitter-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Configuration Change
-#: locale/ipp-strings.c:3840
+#: locale/ipp-strings.c:3720
 msgid "printer-state-reasons.slitter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Slitter Cover Closed
-#: locale/ipp-strings.c:3842
+#: locale/ipp-strings.c:3722
 msgid "printer-state-reasons.slitter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Cover Open
-#: locale/ipp-strings.c:3844
+#: locale/ipp-strings.c:3724
 msgid "printer-state-reasons.slitter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Slitter Empty
-#: locale/ipp-strings.c:3846
+#: locale/ipp-strings.c:3726
 msgid "printer-state-reasons.slitter-empty"
 msgstr ""
 
 #. TRANSLATORS: Slitter Full
-#: locale/ipp-strings.c:3848
+#: locale/ipp-strings.c:3728
 msgid "printer-state-reasons.slitter-full"
 msgstr ""
 
 #. TRANSLATORS: Slitter Interlock Closed
-#: locale/ipp-strings.c:3850
+#: locale/ipp-strings.c:3730
 msgid "printer-state-reasons.slitter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Interlock Open
-#: locale/ipp-strings.c:3852
+#: locale/ipp-strings.c:3732
 msgid "printer-state-reasons.slitter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Slitter Jam
-#: locale/ipp-strings.c:3854
+#: locale/ipp-strings.c:3734
 msgid "printer-state-reasons.slitter-jam"
 msgstr ""
 
 #. TRANSLATORS: Slitter Life Almost Over
-#: locale/ipp-strings.c:3856
+#: locale/ipp-strings.c:3736
 msgid "printer-state-reasons.slitter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Slitter Life Over
-#: locale/ipp-strings.c:3858
+#: locale/ipp-strings.c:3738
 msgid "printer-state-reasons.slitter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Slitter Memory Exhausted
-#: locale/ipp-strings.c:3860
+#: locale/ipp-strings.c:3740
 msgid "printer-state-reasons.slitter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Slitter Missing
-#: locale/ipp-strings.c:3862
+#: locale/ipp-strings.c:3742
 msgid "printer-state-reasons.slitter-missing"
 msgstr ""
 
 #. TRANSLATORS: Slitter Motor Failure
-#: locale/ipp-strings.c:3864
+#: locale/ipp-strings.c:3744
 msgid "printer-state-reasons.slitter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Near Limit
-#: locale/ipp-strings.c:3866
+#: locale/ipp-strings.c:3746
 msgid "printer-state-reasons.slitter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Slitter Offline
-#: locale/ipp-strings.c:3868
+#: locale/ipp-strings.c:3748
 msgid "printer-state-reasons.slitter-offline"
 msgstr ""
 
 #. TRANSLATORS: Slitter Opened
-#: locale/ipp-strings.c:3870
+#: locale/ipp-strings.c:3750
 msgid "printer-state-reasons.slitter-opened"
 msgstr ""
 
 #. TRANSLATORS: Slitter Over Temperature
-#: locale/ipp-strings.c:3872
+#: locale/ipp-strings.c:3752
 msgid "printer-state-reasons.slitter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Slitter Power Saver
-#: locale/ipp-strings.c:3874
+#: locale/ipp-strings.c:3754
 msgid "printer-state-reasons.slitter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Slitter Recoverable Failure
-#: locale/ipp-strings.c:3876
+#: locale/ipp-strings.c:3756
 msgid "printer-state-reasons.slitter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Recoverable Storage
-#: locale/ipp-strings.c:3878
+#: locale/ipp-strings.c:3758
 msgid "printer-state-reasons.slitter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Slitter Removed
-#: locale/ipp-strings.c:3880
+#: locale/ipp-strings.c:3760
 msgid "printer-state-reasons.slitter-removed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Resource Added
-#: locale/ipp-strings.c:3882
+#: locale/ipp-strings.c:3762
 msgid "printer-state-reasons.slitter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Slitter Resource Removed
-#: locale/ipp-strings.c:3884
+#: locale/ipp-strings.c:3764
 msgid "printer-state-reasons.slitter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Thermistor Failure
-#: locale/ipp-strings.c:3886
+#: locale/ipp-strings.c:3766
 msgid "printer-state-reasons.slitter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Timing Failure
-#: locale/ipp-strings.c:3888
+#: locale/ipp-strings.c:3768
 msgid "printer-state-reasons.slitter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Turned Off
-#: locale/ipp-strings.c:3890
+#: locale/ipp-strings.c:3770
 msgid "printer-state-reasons.slitter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Slitter Turned On
-#: locale/ipp-strings.c:3892
+#: locale/ipp-strings.c:3772
 msgid "printer-state-reasons.slitter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Slitter Under Temperature
-#: locale/ipp-strings.c:3894
+#: locale/ipp-strings.c:3774
 msgid "printer-state-reasons.slitter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Slitter Unrecoverable Failure
-#: locale/ipp-strings.c:3896
+#: locale/ipp-strings.c:3776
 msgid "printer-state-reasons.slitter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3898
+#: locale/ipp-strings.c:3778
 msgid "printer-state-reasons.slitter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Slitter Warming Up
-#: locale/ipp-strings.c:3900
+#: locale/ipp-strings.c:3780
 msgid "printer-state-reasons.slitter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Spool Area Full
-#: locale/ipp-strings.c:3902
+#: locale/ipp-strings.c:3782
 msgid "printer-state-reasons.spool-area-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker Added
-#: locale/ipp-strings.c:3904
+#: locale/ipp-strings.c:3784
 msgid "printer-state-reasons.stacker-added"
 msgstr ""
 
 #. TRANSLATORS: Stacker Almost Empty
-#: locale/ipp-strings.c:3906
+#: locale/ipp-strings.c:3786
 msgid "printer-state-reasons.stacker-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stacker Almost Full
-#: locale/ipp-strings.c:3908
+#: locale/ipp-strings.c:3788
 msgid "printer-state-reasons.stacker-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker At Limit
-#: locale/ipp-strings.c:3910
+#: locale/ipp-strings.c:3790
 msgid "printer-state-reasons.stacker-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stacker Closed
-#: locale/ipp-strings.c:3912
+#: locale/ipp-strings.c:3792
 msgid "printer-state-reasons.stacker-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Configuration Change
-#: locale/ipp-strings.c:3914
+#: locale/ipp-strings.c:3794
 msgid "printer-state-reasons.stacker-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stacker Cover Closed
-#: locale/ipp-strings.c:3916
+#: locale/ipp-strings.c:3796
 msgid "printer-state-reasons.stacker-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Cover Open
-#: locale/ipp-strings.c:3918
+#: locale/ipp-strings.c:3798
 msgid "printer-state-reasons.stacker-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stacker Empty
-#: locale/ipp-strings.c:3920
+#: locale/ipp-strings.c:3800
 msgid "printer-state-reasons.stacker-empty"
 msgstr ""
 
 #. TRANSLATORS: Stacker Full
-#: locale/ipp-strings.c:3922
+#: locale/ipp-strings.c:3802
 msgid "printer-state-reasons.stacker-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker Interlock Closed
-#: locale/ipp-strings.c:3924
+#: locale/ipp-strings.c:3804
 msgid "printer-state-reasons.stacker-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Interlock Open
-#: locale/ipp-strings.c:3926
+#: locale/ipp-strings.c:3806
 msgid "printer-state-reasons.stacker-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stacker Jam
-#: locale/ipp-strings.c:3928
+#: locale/ipp-strings.c:3808
 msgid "printer-state-reasons.stacker-jam"
 msgstr ""
 
 #. TRANSLATORS: Stacker Life Almost Over
-#: locale/ipp-strings.c:3930
+#: locale/ipp-strings.c:3810
 msgid "printer-state-reasons.stacker-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stacker Life Over
-#: locale/ipp-strings.c:3932
+#: locale/ipp-strings.c:3812
 msgid "printer-state-reasons.stacker-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stacker Memory Exhausted
-#: locale/ipp-strings.c:3934
+#: locale/ipp-strings.c:3814
 msgid "printer-state-reasons.stacker-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stacker Missing
-#: locale/ipp-strings.c:3936
+#: locale/ipp-strings.c:3816
 msgid "printer-state-reasons.stacker-missing"
 msgstr ""
 
 #. TRANSLATORS: Stacker Motor Failure
-#: locale/ipp-strings.c:3938
+#: locale/ipp-strings.c:3818
 msgid "printer-state-reasons.stacker-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Near Limit
-#: locale/ipp-strings.c:3940
+#: locale/ipp-strings.c:3820
 msgid "printer-state-reasons.stacker-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stacker Offline
-#: locale/ipp-strings.c:3942
+#: locale/ipp-strings.c:3822
 msgid "printer-state-reasons.stacker-offline"
 msgstr ""
 
 #. TRANSLATORS: Stacker Opened
-#: locale/ipp-strings.c:3944
+#: locale/ipp-strings.c:3824
 msgid "printer-state-reasons.stacker-opened"
 msgstr ""
 
 #. TRANSLATORS: Stacker Over Temperature
-#: locale/ipp-strings.c:3946
+#: locale/ipp-strings.c:3826
 msgid "printer-state-reasons.stacker-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stacker Power Saver
-#: locale/ipp-strings.c:3948
+#: locale/ipp-strings.c:3828
 msgid "printer-state-reasons.stacker-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stacker Recoverable Failure
-#: locale/ipp-strings.c:3950
+#: locale/ipp-strings.c:3830
 msgid "printer-state-reasons.stacker-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Recoverable Storage
-#: locale/ipp-strings.c:3952
+#: locale/ipp-strings.c:3832
 msgid "printer-state-reasons.stacker-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stacker Removed
-#: locale/ipp-strings.c:3954
+#: locale/ipp-strings.c:3834
 msgid "printer-state-reasons.stacker-removed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Resource Added
-#: locale/ipp-strings.c:3956
+#: locale/ipp-strings.c:3836
 msgid "printer-state-reasons.stacker-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stacker Resource Removed
-#: locale/ipp-strings.c:3958
+#: locale/ipp-strings.c:3838
 msgid "printer-state-reasons.stacker-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Thermistor Failure
-#: locale/ipp-strings.c:3960
+#: locale/ipp-strings.c:3840
 msgid "printer-state-reasons.stacker-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Timing Failure
-#: locale/ipp-strings.c:3962
+#: locale/ipp-strings.c:3842
 msgid "printer-state-reasons.stacker-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Turned Off
-#: locale/ipp-strings.c:3964
+#: locale/ipp-strings.c:3844
 msgid "printer-state-reasons.stacker-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stacker Turned On
-#: locale/ipp-strings.c:3966
+#: locale/ipp-strings.c:3846
 msgid "printer-state-reasons.stacker-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stacker Under Temperature
-#: locale/ipp-strings.c:3968
+#: locale/ipp-strings.c:3848
 msgid "printer-state-reasons.stacker-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stacker Unrecoverable Failure
-#: locale/ipp-strings.c:3970
+#: locale/ipp-strings.c:3850
 msgid "printer-state-reasons.stacker-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Unrecoverable Storage Error
-#: locale/ipp-strings.c:3972
+#: locale/ipp-strings.c:3852
 msgid "printer-state-reasons.stacker-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stacker Warming Up
-#: locale/ipp-strings.c:3974
+#: locale/ipp-strings.c:3854
 msgid "printer-state-reasons.stacker-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Stapler Added
-#: locale/ipp-strings.c:3976
+#: locale/ipp-strings.c:3856
 msgid "printer-state-reasons.stapler-added"
 msgstr ""
 
 #. TRANSLATORS: Stapler Almost Empty
-#: locale/ipp-strings.c:3978
+#: locale/ipp-strings.c:3858
 msgid "printer-state-reasons.stapler-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stapler Almost Full
-#: locale/ipp-strings.c:3980
+#: locale/ipp-strings.c:3860
 msgid "printer-state-reasons.stapler-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stapler At Limit
-#: locale/ipp-strings.c:3982
+#: locale/ipp-strings.c:3862
 msgid "printer-state-reasons.stapler-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stapler Closed
-#: locale/ipp-strings.c:3984
+#: locale/ipp-strings.c:3864
 msgid "printer-state-reasons.stapler-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Configuration Change
-#: locale/ipp-strings.c:3986
+#: locale/ipp-strings.c:3866
 msgid "printer-state-reasons.stapler-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stapler Cover Closed
-#: locale/ipp-strings.c:3988
+#: locale/ipp-strings.c:3868
 msgid "printer-state-reasons.stapler-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Cover Open
-#: locale/ipp-strings.c:3990
+#: locale/ipp-strings.c:3870
 msgid "printer-state-reasons.stapler-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stapler Empty
-#: locale/ipp-strings.c:3992
+#: locale/ipp-strings.c:3872
 msgid "printer-state-reasons.stapler-empty"
 msgstr ""
 
 #. TRANSLATORS: Stapler Full
-#: locale/ipp-strings.c:3994
+#: locale/ipp-strings.c:3874
 msgid "printer-state-reasons.stapler-full"
 msgstr ""
 
 #. TRANSLATORS: Stapler Interlock Closed
-#: locale/ipp-strings.c:3996
+#: locale/ipp-strings.c:3876
 msgid "printer-state-reasons.stapler-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Interlock Open
-#: locale/ipp-strings.c:3998
+#: locale/ipp-strings.c:3878
 msgid "printer-state-reasons.stapler-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stapler Jam
-#: locale/ipp-strings.c:4000
+#: locale/ipp-strings.c:3880
 msgid "printer-state-reasons.stapler-jam"
 msgstr ""
 
 #. TRANSLATORS: Stapler Life Almost Over
-#: locale/ipp-strings.c:4002
+#: locale/ipp-strings.c:3882
 msgid "printer-state-reasons.stapler-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stapler Life Over
-#: locale/ipp-strings.c:4004
+#: locale/ipp-strings.c:3884
 msgid "printer-state-reasons.stapler-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stapler Memory Exhausted
-#: locale/ipp-strings.c:4006
+#: locale/ipp-strings.c:3886
 msgid "printer-state-reasons.stapler-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stapler Missing
-#: locale/ipp-strings.c:4008
+#: locale/ipp-strings.c:3888
 msgid "printer-state-reasons.stapler-missing"
 msgstr ""
 
 #. TRANSLATORS: Stapler Motor Failure
-#: locale/ipp-strings.c:4010
+#: locale/ipp-strings.c:3890
 msgid "printer-state-reasons.stapler-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Near Limit
-#: locale/ipp-strings.c:4012
+#: locale/ipp-strings.c:3892
 msgid "printer-state-reasons.stapler-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stapler Offline
-#: locale/ipp-strings.c:4014
+#: locale/ipp-strings.c:3894
 msgid "printer-state-reasons.stapler-offline"
 msgstr ""
 
 #. TRANSLATORS: Stapler Opened
-#: locale/ipp-strings.c:4016
+#: locale/ipp-strings.c:3896
 msgid "printer-state-reasons.stapler-opened"
 msgstr ""
 
 #. TRANSLATORS: Stapler Over Temperature
-#: locale/ipp-strings.c:4018
+#: locale/ipp-strings.c:3898
 msgid "printer-state-reasons.stapler-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stapler Power Saver
-#: locale/ipp-strings.c:4020
+#: locale/ipp-strings.c:3900
 msgid "printer-state-reasons.stapler-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stapler Recoverable Failure
-#: locale/ipp-strings.c:4022
+#: locale/ipp-strings.c:3902
 msgid "printer-state-reasons.stapler-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Recoverable Storage
-#: locale/ipp-strings.c:4024
+#: locale/ipp-strings.c:3904
 msgid "printer-state-reasons.stapler-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stapler Removed
-#: locale/ipp-strings.c:4026
+#: locale/ipp-strings.c:3906
 msgid "printer-state-reasons.stapler-removed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Resource Added
-#: locale/ipp-strings.c:4028
+#: locale/ipp-strings.c:3908
 msgid "printer-state-reasons.stapler-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stapler Resource Removed
-#: locale/ipp-strings.c:4030
+#: locale/ipp-strings.c:3910
 msgid "printer-state-reasons.stapler-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Thermistor Failure
-#: locale/ipp-strings.c:4032
+#: locale/ipp-strings.c:3912
 msgid "printer-state-reasons.stapler-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Timing Failure
-#: locale/ipp-strings.c:4034
+#: locale/ipp-strings.c:3914
 msgid "printer-state-reasons.stapler-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Turned Off
-#: locale/ipp-strings.c:4036
+#: locale/ipp-strings.c:3916
 msgid "printer-state-reasons.stapler-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stapler Turned On
-#: locale/ipp-strings.c:4038
+#: locale/ipp-strings.c:3918
 msgid "printer-state-reasons.stapler-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stapler Under Temperature
-#: locale/ipp-strings.c:4040
+#: locale/ipp-strings.c:3920
 msgid "printer-state-reasons.stapler-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stapler Unrecoverable Failure
-#: locale/ipp-strings.c:4042
+#: locale/ipp-strings.c:3922
 msgid "printer-state-reasons.stapler-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Unrecoverable Storage Error
-#: locale/ipp-strings.c:4044
+#: locale/ipp-strings.c:3924
 msgid "printer-state-reasons.stapler-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stapler Warming Up
-#: locale/ipp-strings.c:4046
+#: locale/ipp-strings.c:3926
 msgid "printer-state-reasons.stapler-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Added
-#: locale/ipp-strings.c:4048
+#: locale/ipp-strings.c:3928
 msgid "printer-state-reasons.stitcher-added"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Almost Empty
-#: locale/ipp-strings.c:4050
+#: locale/ipp-strings.c:3930
 msgid "printer-state-reasons.stitcher-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Almost Full
-#: locale/ipp-strings.c:4052
+#: locale/ipp-strings.c:3932
 msgid "printer-state-reasons.stitcher-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stitcher At Limit
-#: locale/ipp-strings.c:4054
+#: locale/ipp-strings.c:3934
 msgid "printer-state-reasons.stitcher-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Closed
-#: locale/ipp-strings.c:4056
+#: locale/ipp-strings.c:3936
 msgid "printer-state-reasons.stitcher-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Configuration Change
-#: locale/ipp-strings.c:4058
+#: locale/ipp-strings.c:3938
 msgid "printer-state-reasons.stitcher-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Cover Closed
-#: locale/ipp-strings.c:4060
+#: locale/ipp-strings.c:3940
 msgid "printer-state-reasons.stitcher-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Cover Open
-#: locale/ipp-strings.c:4062
+#: locale/ipp-strings.c:3942
 msgid "printer-state-reasons.stitcher-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Empty
-#: locale/ipp-strings.c:4064
+#: locale/ipp-strings.c:3944
 msgid "printer-state-reasons.stitcher-empty"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Full
-#: locale/ipp-strings.c:4066
+#: locale/ipp-strings.c:3946
 msgid "printer-state-reasons.stitcher-full"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Interlock Closed
-#: locale/ipp-strings.c:4068
+#: locale/ipp-strings.c:3948
 msgid "printer-state-reasons.stitcher-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Interlock Open
-#: locale/ipp-strings.c:4070
+#: locale/ipp-strings.c:3950
 msgid "printer-state-reasons.stitcher-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Jam
-#: locale/ipp-strings.c:4072
+#: locale/ipp-strings.c:3952
 msgid "printer-state-reasons.stitcher-jam"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Life Almost Over
-#: locale/ipp-strings.c:4074
+#: locale/ipp-strings.c:3954
 msgid "printer-state-reasons.stitcher-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Life Over
-#: locale/ipp-strings.c:4076
+#: locale/ipp-strings.c:3956
 msgid "printer-state-reasons.stitcher-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Memory Exhausted
-#: locale/ipp-strings.c:4078
+#: locale/ipp-strings.c:3958
 msgid "printer-state-reasons.stitcher-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Missing
-#: locale/ipp-strings.c:4080
+#: locale/ipp-strings.c:3960
 msgid "printer-state-reasons.stitcher-missing"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Motor Failure
-#: locale/ipp-strings.c:4082
+#: locale/ipp-strings.c:3962
 msgid "printer-state-reasons.stitcher-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Near Limit
-#: locale/ipp-strings.c:4084
+#: locale/ipp-strings.c:3964
 msgid "printer-state-reasons.stitcher-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Offline
-#: locale/ipp-strings.c:4086
+#: locale/ipp-strings.c:3966
 msgid "printer-state-reasons.stitcher-offline"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Opened
-#: locale/ipp-strings.c:4088
+#: locale/ipp-strings.c:3968
 msgid "printer-state-reasons.stitcher-opened"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Over Temperature
-#: locale/ipp-strings.c:4090
+#: locale/ipp-strings.c:3970
 msgid "printer-state-reasons.stitcher-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Power Saver
-#: locale/ipp-strings.c:4092
+#: locale/ipp-strings.c:3972
 msgid "printer-state-reasons.stitcher-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Recoverable Failure
-#: locale/ipp-strings.c:4094
+#: locale/ipp-strings.c:3974
 msgid "printer-state-reasons.stitcher-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Recoverable Storage
-#: locale/ipp-strings.c:4096
+#: locale/ipp-strings.c:3976
 msgid "printer-state-reasons.stitcher-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Removed
-#: locale/ipp-strings.c:4098
+#: locale/ipp-strings.c:3978
 msgid "printer-state-reasons.stitcher-removed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Resource Added
-#: locale/ipp-strings.c:4100
+#: locale/ipp-strings.c:3980
 msgid "printer-state-reasons.stitcher-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Resource Removed
-#: locale/ipp-strings.c:4102
+#: locale/ipp-strings.c:3982
 msgid "printer-state-reasons.stitcher-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Thermistor Failure
-#: locale/ipp-strings.c:4104
+#: locale/ipp-strings.c:3984
 msgid "printer-state-reasons.stitcher-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Timing Failure
-#: locale/ipp-strings.c:4106
+#: locale/ipp-strings.c:3986
 msgid "printer-state-reasons.stitcher-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Turned Off
-#: locale/ipp-strings.c:4108
+#: locale/ipp-strings.c:3988
 msgid "printer-state-reasons.stitcher-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Turned On
-#: locale/ipp-strings.c:4110
+#: locale/ipp-strings.c:3990
 msgid "printer-state-reasons.stitcher-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Under Temperature
-#: locale/ipp-strings.c:4112
+#: locale/ipp-strings.c:3992
 msgid "printer-state-reasons.stitcher-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Unrecoverable Failure
-#: locale/ipp-strings.c:4114
+#: locale/ipp-strings.c:3994
 msgid "printer-state-reasons.stitcher-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Unrecoverable Storage Error
-#: locale/ipp-strings.c:4116
+#: locale/ipp-strings.c:3996
 msgid "printer-state-reasons.stitcher-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Warming Up
-#: locale/ipp-strings.c:4118
+#: locale/ipp-strings.c:3998
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
-#: locale/ipp-strings.c:4120
+#. TRANSLATORS: Partially stopped
+#: locale/ipp-strings.c:4000
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
 #. TRANSLATORS: Stopping
-#: locale/ipp-strings.c:4122
+#: locale/ipp-strings.c:4002
 msgid "printer-state-reasons.stopping"
 msgstr ""
 
 #. TRANSLATORS: Subunit Added
-#: locale/ipp-strings.c:4124
+#: locale/ipp-strings.c:4004
 msgid "printer-state-reasons.subunit-added"
 msgstr ""
 
 #. TRANSLATORS: Subunit Almost Empty
-#: locale/ipp-strings.c:4126
+#: locale/ipp-strings.c:4006
 msgid "printer-state-reasons.subunit-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Subunit Almost Full
-#: locale/ipp-strings.c:4128
+#: locale/ipp-strings.c:4008
 msgid "printer-state-reasons.subunit-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Subunit At Limit
-#: locale/ipp-strings.c:4130
+#: locale/ipp-strings.c:4010
 msgid "printer-state-reasons.subunit-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Subunit Closed
-#: locale/ipp-strings.c:4132
+#: locale/ipp-strings.c:4012
 msgid "printer-state-reasons.subunit-closed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Cooling Down
-#: locale/ipp-strings.c:4134
+#: locale/ipp-strings.c:4014
 msgid "printer-state-reasons.subunit-cooling-down"
 msgstr ""
 
 #. TRANSLATORS: Subunit Empty
-#: locale/ipp-strings.c:4136
+#: locale/ipp-strings.c:4016
 msgid "printer-state-reasons.subunit-empty"
 msgstr ""
 
 #. TRANSLATORS: Subunit Full
-#: locale/ipp-strings.c:4138
+#: locale/ipp-strings.c:4018
 msgid "printer-state-reasons.subunit-full"
 msgstr ""
 
 #. TRANSLATORS: Subunit Life Almost Over
-#: locale/ipp-strings.c:4140
+#: locale/ipp-strings.c:4020
 msgid "printer-state-reasons.subunit-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Subunit Life Over
-#: locale/ipp-strings.c:4142
+#: locale/ipp-strings.c:4022
 msgid "printer-state-reasons.subunit-life-over"
 msgstr ""
 
 #. TRANSLATORS: Subunit Memory Exhausted
-#: locale/ipp-strings.c:4144
+#: locale/ipp-strings.c:4024
 msgid "printer-state-reasons.subunit-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Subunit Missing
-#: locale/ipp-strings.c:4146
+#: locale/ipp-strings.c:4026
 msgid "printer-state-reasons.subunit-missing"
 msgstr ""
 
 #. TRANSLATORS: Subunit Motor Failure
-#: locale/ipp-strings.c:4148
+#: locale/ipp-strings.c:4028
 msgid "printer-state-reasons.subunit-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Near Limit
-#: locale/ipp-strings.c:4150
+#: locale/ipp-strings.c:4030
 msgid "printer-state-reasons.subunit-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Subunit Offline
-#: locale/ipp-strings.c:4152
+#: locale/ipp-strings.c:4032
 msgid "printer-state-reasons.subunit-offline"
 msgstr ""
 
 #. TRANSLATORS: Subunit Opened
-#: locale/ipp-strings.c:4154
+#: locale/ipp-strings.c:4034
 msgid "printer-state-reasons.subunit-opened"
 msgstr ""
 
 #. TRANSLATORS: Subunit Over Temperature
-#: locale/ipp-strings.c:4156
+#: locale/ipp-strings.c:4036
 msgid "printer-state-reasons.subunit-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Subunit Power Saver
-#: locale/ipp-strings.c:4158
+#: locale/ipp-strings.c:4038
 msgid "printer-state-reasons.subunit-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Subunit Recoverable Failure
-#: locale/ipp-strings.c:4160
+#: locale/ipp-strings.c:4040
 msgid "printer-state-reasons.subunit-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Recoverable Storage
-#: locale/ipp-strings.c:4162
+#: locale/ipp-strings.c:4042
 msgid "printer-state-reasons.subunit-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Subunit Removed
-#: locale/ipp-strings.c:4164
+#: locale/ipp-strings.c:4044
 msgid "printer-state-reasons.subunit-removed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Resource Added
-#: locale/ipp-strings.c:4166
+#: locale/ipp-strings.c:4046
 msgid "printer-state-reasons.subunit-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Subunit Resource Removed
-#: locale/ipp-strings.c:4168
+#: locale/ipp-strings.c:4048
 msgid "printer-state-reasons.subunit-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Thermistor Failure
-#: locale/ipp-strings.c:4170
+#: locale/ipp-strings.c:4050
 msgid "printer-state-reasons.subunit-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Timing Failure
-#: locale/ipp-strings.c:4172
+#: locale/ipp-strings.c:4052
 msgid "printer-state-reasons.subunit-timing-Failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Turned Off
-#: locale/ipp-strings.c:4174
+#: locale/ipp-strings.c:4054
 msgid "printer-state-reasons.subunit-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Subunit Turned On
-#: locale/ipp-strings.c:4176
+#: locale/ipp-strings.c:4056
 msgid "printer-state-reasons.subunit-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Subunit Under Temperature
-#: locale/ipp-strings.c:4178
+#: locale/ipp-strings.c:4058
 msgid "printer-state-reasons.subunit-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Subunit Unrecoverable Failure
-#: locale/ipp-strings.c:4180
+#: locale/ipp-strings.c:4060
 msgid "printer-state-reasons.subunit-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Unrecoverable Storage
-#: locale/ipp-strings.c:4182
+#: locale/ipp-strings.c:4062
 msgid "printer-state-reasons.subunit-unrecoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Subunit Warming Up
-#: locale/ipp-strings.c:4184
+#: locale/ipp-strings.c:4064
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
-#: locale/ipp-strings.c:4186
+#. TRANSLATORS: Printer stopped responding
+#: locale/ipp-strings.c:4066
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
-#: locale/ipp-strings.c:4188
+#. TRANSLATORS: Out of toner
+#: locale/ipp-strings.c:4068
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
-#: locale/ipp-strings.c:4190
+#. TRANSLATORS: Toner low
+#: locale/ipp-strings.c:4070
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Added
-#: locale/ipp-strings.c:4192
+#: locale/ipp-strings.c:4072
 msgid "printer-state-reasons.trimmer-added"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Almost Empty
-#: locale/ipp-strings.c:4194
+#: locale/ipp-strings.c:4074
 msgid "printer-state-reasons.trimmer-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Almost Full
-#: locale/ipp-strings.c:4196
+#: locale/ipp-strings.c:4076
 msgid "printer-state-reasons.trimmer-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Trimmer At Limit
-#: locale/ipp-strings.c:4198
+#: locale/ipp-strings.c:4078
 msgid "printer-state-reasons.trimmer-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Closed
-#: locale/ipp-strings.c:4200
+#: locale/ipp-strings.c:4080
 msgid "printer-state-reasons.trimmer-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Configuration Change
-#: locale/ipp-strings.c:4202
+#: locale/ipp-strings.c:4082
 msgid "printer-state-reasons.trimmer-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Cover Closed
-#: locale/ipp-strings.c:4204
+#: locale/ipp-strings.c:4084
 msgid "printer-state-reasons.trimmer-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Cover Open
-#: locale/ipp-strings.c:4206
+#: locale/ipp-strings.c:4086
 msgid "printer-state-reasons.trimmer-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Empty
-#: locale/ipp-strings.c:4208
+#: locale/ipp-strings.c:4088
 msgid "printer-state-reasons.trimmer-empty"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Full
-#: locale/ipp-strings.c:4210
+#: locale/ipp-strings.c:4090
 msgid "printer-state-reasons.trimmer-full"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Interlock Closed
-#: locale/ipp-strings.c:4212
+#: locale/ipp-strings.c:4092
 msgid "printer-state-reasons.trimmer-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Interlock Open
-#: locale/ipp-strings.c:4214
+#: locale/ipp-strings.c:4094
 msgid "printer-state-reasons.trimmer-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Jam
-#: locale/ipp-strings.c:4216
+#: locale/ipp-strings.c:4096
 msgid "printer-state-reasons.trimmer-jam"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Life Almost Over
-#: locale/ipp-strings.c:4218
+#: locale/ipp-strings.c:4098
 msgid "printer-state-reasons.trimmer-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Life Over
-#: locale/ipp-strings.c:4220
+#: locale/ipp-strings.c:4100
 msgid "printer-state-reasons.trimmer-life-over"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Memory Exhausted
-#: locale/ipp-strings.c:4222
+#: locale/ipp-strings.c:4102
 msgid "printer-state-reasons.trimmer-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Missing
-#: locale/ipp-strings.c:4224
+#: locale/ipp-strings.c:4104
 msgid "printer-state-reasons.trimmer-missing"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Motor Failure
-#: locale/ipp-strings.c:4226
+#: locale/ipp-strings.c:4106
 msgid "printer-state-reasons.trimmer-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Near Limit
-#: locale/ipp-strings.c:4228
+#: locale/ipp-strings.c:4108
 msgid "printer-state-reasons.trimmer-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Offline
-#: locale/ipp-strings.c:4230
+#: locale/ipp-strings.c:4110
 msgid "printer-state-reasons.trimmer-offline"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Opened
-#: locale/ipp-strings.c:4232
+#: locale/ipp-strings.c:4112
 msgid "printer-state-reasons.trimmer-opened"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Over Temperature
-#: locale/ipp-strings.c:4234
+#: locale/ipp-strings.c:4114
 msgid "printer-state-reasons.trimmer-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Power Saver
-#: locale/ipp-strings.c:4236
+#: locale/ipp-strings.c:4116
 msgid "printer-state-reasons.trimmer-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Recoverable Failure
-#: locale/ipp-strings.c:4238
+#: locale/ipp-strings.c:4118
 msgid "printer-state-reasons.trimmer-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Recoverable Storage
-#: locale/ipp-strings.c:4240
+#: locale/ipp-strings.c:4120
 msgid "printer-state-reasons.trimmer-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Removed
-#: locale/ipp-strings.c:4242
+#: locale/ipp-strings.c:4122
 msgid "printer-state-reasons.trimmer-removed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Resource Added
-#: locale/ipp-strings.c:4244
+#: locale/ipp-strings.c:4124
 msgid "printer-state-reasons.trimmer-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Resource Removed
-#: locale/ipp-strings.c:4246
+#: locale/ipp-strings.c:4126
 msgid "printer-state-reasons.trimmer-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Thermistor Failure
-#: locale/ipp-strings.c:4248
+#: locale/ipp-strings.c:4128
 msgid "printer-state-reasons.trimmer-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Timing Failure
-#: locale/ipp-strings.c:4250
+#: locale/ipp-strings.c:4130
 msgid "printer-state-reasons.trimmer-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Turned Off
-#: locale/ipp-strings.c:4252
+#: locale/ipp-strings.c:4132
 msgid "printer-state-reasons.trimmer-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Turned On
-#: locale/ipp-strings.c:4254
+#: locale/ipp-strings.c:4134
 msgid "printer-state-reasons.trimmer-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Under Temperature
-#: locale/ipp-strings.c:4256
+#: locale/ipp-strings.c:4136
 msgid "printer-state-reasons.trimmer-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Unrecoverable Failure
-#: locale/ipp-strings.c:4258
+#: locale/ipp-strings.c:4138
 msgid "printer-state-reasons.trimmer-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Unrecoverable Storage Error
-#: locale/ipp-strings.c:4260
+#: locale/ipp-strings.c:4140
 msgid "printer-state-reasons.trimmer-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Warming Up
-#: locale/ipp-strings.c:4262
+#: locale/ipp-strings.c:4142
 msgid "printer-state-reasons.trimmer-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Unknown
-#: locale/ipp-strings.c:4264
+#: locale/ipp-strings.c:4144
 msgid "printer-state-reasons.unknown"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Added
-#: locale/ipp-strings.c:4266
+#: locale/ipp-strings.c:4146
 msgid "printer-state-reasons.wrapper-added"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Almost Empty
-#: locale/ipp-strings.c:4268
+#: locale/ipp-strings.c:4148
 msgid "printer-state-reasons.wrapper-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Almost Full
-#: locale/ipp-strings.c:4270
+#: locale/ipp-strings.c:4150
 msgid "printer-state-reasons.wrapper-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Wrapper At Limit
-#: locale/ipp-strings.c:4272
+#: locale/ipp-strings.c:4152
 msgid "printer-state-reasons.wrapper-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Closed
-#: locale/ipp-strings.c:4274
+#: locale/ipp-strings.c:4154
 msgid "printer-state-reasons.wrapper-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Configuration Change
-#: locale/ipp-strings.c:4276
+#: locale/ipp-strings.c:4156
 msgid "printer-state-reasons.wrapper-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Cover Closed
-#: locale/ipp-strings.c:4278
+#: locale/ipp-strings.c:4158
 msgid "printer-state-reasons.wrapper-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Cover Open
-#: locale/ipp-strings.c:4280
+#: locale/ipp-strings.c:4160
 msgid "printer-state-reasons.wrapper-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Empty
-#: locale/ipp-strings.c:4282
+#: locale/ipp-strings.c:4162
 msgid "printer-state-reasons.wrapper-empty"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Full
-#: locale/ipp-strings.c:4284
+#: locale/ipp-strings.c:4164
 msgid "printer-state-reasons.wrapper-full"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Interlock Closed
-#: locale/ipp-strings.c:4286
+#: locale/ipp-strings.c:4166
 msgid "printer-state-reasons.wrapper-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Interlock Open
-#: locale/ipp-strings.c:4288
+#: locale/ipp-strings.c:4168
 msgid "printer-state-reasons.wrapper-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Jam
-#: locale/ipp-strings.c:4290
+#: locale/ipp-strings.c:4170
 msgid "printer-state-reasons.wrapper-jam"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Life Almost Over
-#: locale/ipp-strings.c:4292
+#: locale/ipp-strings.c:4172
 msgid "printer-state-reasons.wrapper-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Life Over
-#: locale/ipp-strings.c:4294
+#: locale/ipp-strings.c:4174
 msgid "printer-state-reasons.wrapper-life-over"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Memory Exhausted
-#: locale/ipp-strings.c:4296
+#: locale/ipp-strings.c:4176
 msgid "printer-state-reasons.wrapper-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Missing
-#: locale/ipp-strings.c:4298
+#: locale/ipp-strings.c:4178
 msgid "printer-state-reasons.wrapper-missing"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Motor Failure
-#: locale/ipp-strings.c:4300
+#: locale/ipp-strings.c:4180
 msgid "printer-state-reasons.wrapper-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Near Limit
-#: locale/ipp-strings.c:4302
+#: locale/ipp-strings.c:4182
 msgid "printer-state-reasons.wrapper-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Offline
-#: locale/ipp-strings.c:4304
+#: locale/ipp-strings.c:4184
 msgid "printer-state-reasons.wrapper-offline"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Opened
-#: locale/ipp-strings.c:4306
+#: locale/ipp-strings.c:4186
 msgid "printer-state-reasons.wrapper-opened"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Over Temperature
-#: locale/ipp-strings.c:4308
+#: locale/ipp-strings.c:4188
 msgid "printer-state-reasons.wrapper-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Power Saver
-#: locale/ipp-strings.c:4310
+#: locale/ipp-strings.c:4190
 msgid "printer-state-reasons.wrapper-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Recoverable Failure
-#: locale/ipp-strings.c:4312
+#: locale/ipp-strings.c:4192
 msgid "printer-state-reasons.wrapper-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Recoverable Storage
-#: locale/ipp-strings.c:4314
+#: locale/ipp-strings.c:4194
 msgid "printer-state-reasons.wrapper-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Removed
-#: locale/ipp-strings.c:4316
+#: locale/ipp-strings.c:4196
 msgid "printer-state-reasons.wrapper-removed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Resource Added
-#: locale/ipp-strings.c:4318
+#: locale/ipp-strings.c:4198
 msgid "printer-state-reasons.wrapper-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Resource Removed
-#: locale/ipp-strings.c:4320
+#: locale/ipp-strings.c:4200
 msgid "printer-state-reasons.wrapper-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Thermistor Failure
-#: locale/ipp-strings.c:4322
+#: locale/ipp-strings.c:4202
 msgid "printer-state-reasons.wrapper-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Timing Failure
-#: locale/ipp-strings.c:4324
+#: locale/ipp-strings.c:4204
 msgid "printer-state-reasons.wrapper-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Turned Off
-#: locale/ipp-strings.c:4326
+#: locale/ipp-strings.c:4206
 msgid "printer-state-reasons.wrapper-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Turned On
-#: locale/ipp-strings.c:4328
+#: locale/ipp-strings.c:4208
 msgid "printer-state-reasons.wrapper-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Under Temperature
-#: locale/ipp-strings.c:4330
+#: locale/ipp-strings.c:4210
 msgid "printer-state-reasons.wrapper-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Unrecoverable Failure
-#: locale/ipp-strings.c:4332
+#: locale/ipp-strings.c:4212
 msgid "printer-state-reasons.wrapper-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Unrecoverable Storage Error
-#: locale/ipp-strings.c:4334
+#: locale/ipp-strings.c:4214
 msgid "printer-state-reasons.wrapper-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Warming Up
-#: locale/ipp-strings.c:4336
+#: locale/ipp-strings.c:4216
 msgid "printer-state-reasons.wrapper-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Idle
-#: locale/ipp-strings.c:4338
+#: locale/ipp-strings.c:4218
 msgid "printer-state.3"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4340
+#: locale/ipp-strings.c:4220
 msgid "printer-state.4"
 msgstr ""
 
 #. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:4342
+#: locale/ipp-strings.c:4222
 msgid "printer-state.5"
 msgstr ""
 
 #. TRANSLATORS: Printer Uptime
-#: locale/ipp-strings.c:4344
+#: locale/ipp-strings.c:4224
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-#: locale/ipp-strings.c:4346
-msgid "printer-xri-requested"
-msgstr ""
-
 #: cups/notify.c:80 cups/notify.c:121
 msgid "processing"
 msgstr ""
 
 #. TRANSLATORS: Proof Print
-#: locale/ipp-strings.c:4348
+#: locale/ipp-strings.c:4226
 msgid "proof-print"
 msgstr ""
 
 #. TRANSLATORS: Proof Print Copies
-#: locale/ipp-strings.c:4350
+#: locale/ipp-strings.c:4228
 msgid "proof-print-copies"
 msgstr ""
 
 #. TRANSLATORS: Punching
-#: locale/ipp-strings.c:4352
+#: locale/ipp-strings.c:4230
 msgid "punching"
 msgstr ""
 
 #. TRANSLATORS: Punching Locations
-#: locale/ipp-strings.c:4354
+#: locale/ipp-strings.c:4232
 msgid "punching-locations"
 msgstr ""
 
 #. TRANSLATORS: Punching Offset
-#: locale/ipp-strings.c:4356
+#: locale/ipp-strings.c:4234
 msgid "punching-offset"
 msgstr ""
 
 #. TRANSLATORS: Punch Edge
-#: locale/ipp-strings.c:4358
+#: locale/ipp-strings.c:4236
 msgid "punching-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4360
+#: locale/ipp-strings.c:4238
 msgid "punching-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4362
+#: locale/ipp-strings.c:4240
 msgid "punching-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4364
+#: locale/ipp-strings.c:4242
 msgid "punching-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4366
+#: locale/ipp-strings.c:4244
 msgid "punching-reference-edge.top"
 msgstr ""
 
@@ -18718,228 +18417,58 @@ msgstr ""
 msgid "request-id uses indefinite length"
 msgstr ""
 
-#. TRANSLATORS: Request Power State
-#: locale/ipp-strings.c:4368
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
-#: locale/ipp-strings.c:4370
+#: locale/ipp-strings.c:4246
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-#: locale/ipp-strings.c:4372
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-#: locale/ipp-strings.c:4374
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-#: locale/ipp-strings.c:4376
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-#: locale/ipp-strings.c:4378
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-#: locale/ipp-strings.c:4380
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-#: locale/ipp-strings.c:4382
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-#: locale/ipp-strings.c:4384
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-#: locale/ipp-strings.c:4386
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-#: locale/ipp-strings.c:4388
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-#: locale/ipp-strings.c:4390
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-#: locale/ipp-strings.c:4392
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-#: locale/ipp-strings.c:4394
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-#: locale/ipp-strings.c:4396
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-#: locale/ipp-strings.c:4398
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-#: locale/ipp-strings.c:4400
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-#: locale/ipp-strings.c:4402
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-#: locale/ipp-strings.c:4404
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-#: locale/ipp-strings.c:4406
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-#: locale/ipp-strings.c:4408
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-#: locale/ipp-strings.c:4410
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-#: locale/ipp-strings.c:4412
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-#: locale/ipp-strings.c:4414
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-#: locale/ipp-strings.c:4416
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-#: locale/ipp-strings.c:4418
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-#: locale/ipp-strings.c:4420
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-#: locale/ipp-strings.c:4422
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-#: locale/ipp-strings.c:4424
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-#: locale/ipp-strings.c:4426
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-#: locale/ipp-strings.c:4428
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-#: locale/ipp-strings.c:4430
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-#: locale/ipp-strings.c:4432
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-#: locale/ipp-strings.c:4434
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-#: locale/ipp-strings.c:4436
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
-#: locale/ipp-strings.c:4438
+#: locale/ipp-strings.c:4248
 msgid "retry-interval"
 msgstr ""
 
 #. TRANSLATORS: Retry Timeout
-#: locale/ipp-strings.c:4440
+#: locale/ipp-strings.c:4250
 msgid "retry-time-out"
 msgstr ""
 
 #. TRANSLATORS: Save Disposition
-#: locale/ipp-strings.c:4442
+#: locale/ipp-strings.c:4252
 msgid "save-disposition"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4444
+#: locale/ipp-strings.c:4254
 msgid "save-disposition.none"
 msgstr ""
 
 #. TRANSLATORS: Print and Save
-#: locale/ipp-strings.c:4446
+#: locale/ipp-strings.c:4256
 msgid "save-disposition.print-save"
 msgstr ""
 
 #. TRANSLATORS: Save Only
-#: locale/ipp-strings.c:4448
+#: locale/ipp-strings.c:4258
 msgid "save-disposition.save-only"
 msgstr ""
 
 #. TRANSLATORS: Save Document Format
-#: locale/ipp-strings.c:4450
+#: locale/ipp-strings.c:4260
 msgid "save-document-format"
 msgstr ""
 
 #. TRANSLATORS: Save Info
-#: locale/ipp-strings.c:4452
+#: locale/ipp-strings.c:4262
 msgid "save-info"
 msgstr ""
 
 #. TRANSLATORS: Save Location
-#: locale/ipp-strings.c:4454
+#: locale/ipp-strings.c:4264
 msgid "save-location"
 msgstr ""
 
 #. TRANSLATORS: Save Name
-#: locale/ipp-strings.c:4456
+#: locale/ipp-strings.c:4266
 msgid "save-name"
 msgstr ""
 
@@ -18952,80 +18481,60 @@ msgid "scheduler is running"
 msgstr ""
 
 #. TRANSLATORS: Separator Sheets
-#: locale/ipp-strings.c:4458
+#: locale/ipp-strings.c:4268
 msgid "separator-sheets"
 msgstr ""
 
 #. TRANSLATORS: Type of Separator Sheets
-#: locale/ipp-strings.c:4460
+#: locale/ipp-strings.c:4270
 msgid "separator-sheets-type"
 msgstr ""
 
 #. TRANSLATORS: Start and End Sheets
-#: locale/ipp-strings.c:4462
+#: locale/ipp-strings.c:4272
 msgid "separator-sheets-type.both-sheets"
 msgstr ""
 
 #. TRANSLATORS: End Sheet
-#: locale/ipp-strings.c:4464
+#: locale/ipp-strings.c:4274
 msgid "separator-sheets-type.end-sheet"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4466
+#: locale/ipp-strings.c:4276
 msgid "separator-sheets-type.none"
 msgstr ""
 
 #. TRANSLATORS: Slip Sheets
-#: locale/ipp-strings.c:4468
+#: locale/ipp-strings.c:4278
 msgid "separator-sheets-type.slip-sheets"
 msgstr ""
 
 #. TRANSLATORS: Start Sheet
-#: locale/ipp-strings.c:4470
+#: locale/ipp-strings.c:4280
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-#: locale/ipp-strings.c:4472
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-#: locale/ipp-strings.c:4474
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-#: locale/ipp-strings.c:4476
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
-#: locale/ipp-strings.c:4478
+#: locale/ipp-strings.c:4282
 msgid "sides"
 msgstr ""
 
 #. TRANSLATORS: Off
-#: locale/ipp-strings.c:4480
+#: locale/ipp-strings.c:4284
 msgid "sides.one-sided"
 msgstr ""
 
 #. TRANSLATORS: On (Portrait)
-#: locale/ipp-strings.c:4482
+#: locale/ipp-strings.c:4286
 msgid "sides.two-sided-long-edge"
 msgstr ""
 
 #. TRANSLATORS: On (Landscape)
-#: locale/ipp-strings.c:4484
+#: locale/ipp-strings.c:4288
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-#: locale/ipp-strings.c:4486
-msgid "start-power-state"
-msgstr ""
-
 #: cups/adminutil.c:1384
 #, c-format
 msgid "stat of %s failed: %s"
@@ -19036,72 +18545,72 @@ msgid "status\t\tShow status of daemon and queue."
 msgstr ""
 
 #. TRANSLATORS: Status Message
-#: locale/ipp-strings.c:4488
+#: locale/ipp-strings.c:4290
 msgid "status-message"
 msgstr ""
 
 #. TRANSLATORS: Staple
-#: locale/ipp-strings.c:4490
+#: locale/ipp-strings.c:4292
 msgid "stitching"
 msgstr ""
 
 #. TRANSLATORS: Stitching Angle
-#: locale/ipp-strings.c:4492
+#: locale/ipp-strings.c:4294
 msgid "stitching-angle"
 msgstr ""
 
 #. TRANSLATORS: Stitching Locations
-#: locale/ipp-strings.c:4494
+#: locale/ipp-strings.c:4296
 msgid "stitching-locations"
 msgstr ""
 
 #. TRANSLATORS: Staple Method
-#: locale/ipp-strings.c:4496
+#: locale/ipp-strings.c:4298
 msgid "stitching-method"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:4498
+#: locale/ipp-strings.c:4300
 msgid "stitching-method.auto"
 msgstr ""
 
 #. TRANSLATORS: Crimp
-#: locale/ipp-strings.c:4500
+#: locale/ipp-strings.c:4302
 msgid "stitching-method.crimp"
 msgstr ""
 
 #. TRANSLATORS: Wire
-#: locale/ipp-strings.c:4502
+#: locale/ipp-strings.c:4304
 msgid "stitching-method.wire"
 msgstr ""
 
 #. TRANSLATORS: Stitching Offset
-#: locale/ipp-strings.c:4504
+#: locale/ipp-strings.c:4306
 msgid "stitching-offset"
 msgstr ""
 
 #. TRANSLATORS: Staple Edge
-#: locale/ipp-strings.c:4506
+#: locale/ipp-strings.c:4308
 msgid "stitching-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4508
+#: locale/ipp-strings.c:4310
 msgid "stitching-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4510
+#: locale/ipp-strings.c:4312
 msgid "stitching-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4512
+#: locale/ipp-strings.c:4314
 msgid "stitching-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4514
+#: locale/ipp-strings.c:4316
 msgid "stitching-reference-edge.top"
 msgstr ""
 
@@ -19110,62 +18619,62 @@ msgid "stopped"
 msgstr ""
 
 #. TRANSLATORS: Subject
-#: locale/ipp-strings.c:4516
+#: locale/ipp-strings.c:4318
 msgid "subject"
 msgstr ""
 
 #. TRANSLATORS: Subscription Privacy Attributes
-#: locale/ipp-strings.c:4518
+#: locale/ipp-strings.c:4320
 msgid "subscription-privacy-attributes"
 msgstr ""
 
 #. TRANSLATORS: All
-#: locale/ipp-strings.c:4520
+#: locale/ipp-strings.c:4322
 msgid "subscription-privacy-attributes.all"
 msgstr ""
 
 #. TRANSLATORS: Default
-#: locale/ipp-strings.c:4522
+#: locale/ipp-strings.c:4324
 msgid "subscription-privacy-attributes.default"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4524
+#: locale/ipp-strings.c:4326
 msgid "subscription-privacy-attributes.none"
 msgstr ""
 
 #. TRANSLATORS: Subscription Description
-#: locale/ipp-strings.c:4526
+#: locale/ipp-strings.c:4328
 msgid "subscription-privacy-attributes.subscription-description"
 msgstr ""
 
 #. TRANSLATORS: Subscription Template
-#: locale/ipp-strings.c:4528
+#: locale/ipp-strings.c:4330
 msgid "subscription-privacy-attributes.subscription-template"
 msgstr ""
 
 #. TRANSLATORS: Subscription Privacy Scope
-#: locale/ipp-strings.c:4530
+#: locale/ipp-strings.c:4332
 msgid "subscription-privacy-scope"
 msgstr ""
 
 #. TRANSLATORS: All
-#: locale/ipp-strings.c:4532
+#: locale/ipp-strings.c:4334
 msgid "subscription-privacy-scope.all"
 msgstr ""
 
 #. TRANSLATORS: Default
-#: locale/ipp-strings.c:4534
+#: locale/ipp-strings.c:4336
 msgid "subscription-privacy-scope.default"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4536
+#: locale/ipp-strings.c:4338
 msgid "subscription-privacy-scope.none"
 msgstr ""
 
 #. TRANSLATORS: Owner
-#: locale/ipp-strings.c:4538
+#: locale/ipp-strings.c:4340
 msgid "subscription-privacy-scope.owner"
 msgstr ""
 
@@ -19179,193 +18688,143 @@ msgstr ""
 msgid "system default destination: %s/%s"
 msgstr ""
 
-#. TRANSLATORS: System State
-#: locale/ipp-strings.c:4540
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-#: locale/ipp-strings.c:4542
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-#: locale/ipp-strings.c:4544
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4546
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:4548
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-#: locale/ipp-strings.c:4550
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
-#: locale/ipp-strings.c:4552
+#: locale/ipp-strings.c:4342
 msgid "t33-subaddress"
 msgstr ""
 
-#. TRANSLATORS: Timeout Predicate
-#: locale/ipp-strings.c:4554
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-#: locale/ipp-strings.c:4556
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-#: locale/ipp-strings.c:4558
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-#: locale/ipp-strings.c:4560
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
-#: locale/ipp-strings.c:4562
+#: locale/ipp-strings.c:4344
 msgid "to-name"
 msgstr ""
 
 #. TRANSLATORS: Transmission Status
-#: locale/ipp-strings.c:4564
+#: locale/ipp-strings.c:4346
 msgid "transmission-status"
 msgstr ""
 
 #. TRANSLATORS: Pending
-#: locale/ipp-strings.c:4566
+#: locale/ipp-strings.c:4348
 msgid "transmission-status.3"
 msgstr ""
 
 #. TRANSLATORS: Pending Retry
-#: locale/ipp-strings.c:4568
+#: locale/ipp-strings.c:4350
 msgid "transmission-status.4"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4570
+#: locale/ipp-strings.c:4352
 msgid "transmission-status.5"
 msgstr ""
 
 #. TRANSLATORS: Canceled
-#: locale/ipp-strings.c:4572
+#: locale/ipp-strings.c:4354
 msgid "transmission-status.7"
 msgstr ""
 
 #. TRANSLATORS: Aborted
-#: locale/ipp-strings.c:4574
+#: locale/ipp-strings.c:4356
 msgid "transmission-status.8"
 msgstr ""
 
 #. TRANSLATORS: Completed
-#: locale/ipp-strings.c:4576
+#: locale/ipp-strings.c:4358
 msgid "transmission-status.9"
 msgstr ""
 
 #. TRANSLATORS: Cut
-#: locale/ipp-strings.c:4578
+#: locale/ipp-strings.c:4360
 msgid "trimming"
 msgstr ""
 
 #. TRANSLATORS: Cut Position
-#: locale/ipp-strings.c:4580
+#: locale/ipp-strings.c:4362
 msgid "trimming-offset"
 msgstr ""
 
 #. TRANSLATORS: Cut Edge
-#: locale/ipp-strings.c:4582
+#: locale/ipp-strings.c:4364
 msgid "trimming-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4584
+#: locale/ipp-strings.c:4366
 msgid "trimming-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4586
+#: locale/ipp-strings.c:4368
 msgid "trimming-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4588
+#: locale/ipp-strings.c:4370
 msgid "trimming-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4590
+#: locale/ipp-strings.c:4372
 msgid "trimming-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Type of Cut
-#: locale/ipp-strings.c:4592
+#: locale/ipp-strings.c:4374
 msgid "trimming-type"
 msgstr ""
 
 #. TRANSLATORS: Draw Line
-#: locale/ipp-strings.c:4594
+#: locale/ipp-strings.c:4376
 msgid "trimming-type.draw-line"
 msgstr ""
 
 #. TRANSLATORS: Full
-#: locale/ipp-strings.c:4596
+#: locale/ipp-strings.c:4378
 msgid "trimming-type.full"
 msgstr ""
 
 #. TRANSLATORS: Partial
-#: locale/ipp-strings.c:4598
+#: locale/ipp-strings.c:4380
 msgid "trimming-type.partial"
 msgstr ""
 
 #. TRANSLATORS: Perforate
-#: locale/ipp-strings.c:4600
+#: locale/ipp-strings.c:4382
 msgid "trimming-type.perforate"
 msgstr ""
 
 #. TRANSLATORS: Score
-#: locale/ipp-strings.c:4602
+#: locale/ipp-strings.c:4384
 msgid "trimming-type.score"
 msgstr ""
 
 #. TRANSLATORS: Tab
-#: locale/ipp-strings.c:4604
+#: locale/ipp-strings.c:4386
 msgid "trimming-type.tab"
 msgstr ""
 
 #. TRANSLATORS: Cut After
-#: locale/ipp-strings.c:4606
+#: locale/ipp-strings.c:4388
 msgid "trimming-when"
 msgstr ""
 
 #. TRANSLATORS: Every Document
-#: locale/ipp-strings.c:4608
+#: locale/ipp-strings.c:4390
 msgid "trimming-when.after-documents"
 msgstr ""
 
 #. TRANSLATORS: Job
-#: locale/ipp-strings.c:4610
+#: locale/ipp-strings.c:4392
 msgid "trimming-when.after-job"
 msgstr ""
 
 #. TRANSLATORS: Every Set
-#: locale/ipp-strings.c:4612
+#: locale/ipp-strings.c:4394
 msgid "trimming-when.after-sets"
 msgstr ""
 
 #. TRANSLATORS: Every Page
-#: locale/ipp-strings.c:4614
+#: locale/ipp-strings.c:4396
 msgid "trimming-when.after-sheets"
 msgstr ""
 
@@ -19381,98 +18840,58 @@ msgstr ""
 msgid "variable-bindings uses indefinite length"
 msgstr ""
 
-#. TRANSLATORS: Which Printers
-#: locale/ipp-strings.c:4616
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-#: locale/ipp-strings.c:4618
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-#: locale/ipp-strings.c:4620
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-#: locale/ipp-strings.c:4622
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4624
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-#: locale/ipp-strings.c:4626
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:4628
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-#: locale/ipp-strings.c:4630
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
-#: locale/ipp-strings.c:4632
+#: locale/ipp-strings.c:4398
 msgid "x-accuracy"
 msgstr ""
 
 #. TRANSLATORS: X Dimension
-#: locale/ipp-strings.c:4634
+#: locale/ipp-strings.c:4400
 msgid "x-dimension"
 msgstr ""
 
 #. TRANSLATORS: X Offset
-#: locale/ipp-strings.c:4636
+#: locale/ipp-strings.c:4402
 msgid "x-offset"
 msgstr ""
 
 #. TRANSLATORS: X Origin
-#: locale/ipp-strings.c:4638
+#: locale/ipp-strings.c:4404
 msgid "x-origin"
 msgstr ""
 
 #. TRANSLATORS: Y Accuracy
-#: locale/ipp-strings.c:4640
+#: locale/ipp-strings.c:4406
 msgid "y-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Y Dimension
-#: locale/ipp-strings.c:4642
+#: locale/ipp-strings.c:4408
 msgid "y-dimension"
 msgstr ""
 
 #. TRANSLATORS: Y Offset
-#: locale/ipp-strings.c:4644
+#: locale/ipp-strings.c:4410
 msgid "y-offset"
 msgstr ""
 
 #. TRANSLATORS: Y Origin
-#: locale/ipp-strings.c:4646
+#: locale/ipp-strings.c:4412
 msgid "y-origin"
 msgstr ""
 
 #. TRANSLATORS: Z Accuracy
-#: locale/ipp-strings.c:4648
+#: locale/ipp-strings.c:4414
 msgid "z-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Z Dimension
-#: locale/ipp-strings.c:4650
+#: locale/ipp-strings.c:4416
 msgid "z-dimension"
 msgstr ""
 
 #. TRANSLATORS: Z Offset
-#: locale/ipp-strings.c:4652
+#: locale/ipp-strings.c:4418
 msgid "z-offset"
 msgstr ""
 
diff --git a/locale/cups.strings b/locale/cups.strings
index 82d3391f5..0c69de576 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -1034,6 +1034,7 @@
 "Invalid group tag." = "Invalid group tag.";
 "Invalid media name arguments." = "Invalid media name arguments.";
 "Invalid media size." = "Invalid media size.";
+"Invalid named IPP attribute in collection." = "Invalid named IPP attribute in collection.";
 "Invalid ppd-name value." = "Invalid ppd-name value.";
 "Invalid printer command \"%s\"." = "Invalid printer command “%s”.";
 "JCL" = "JCL";
@@ -1782,8 +1783,6 @@
 "document-state.8" = "Aborted";
 // TRANSLATORS: Completed
 "document-state.9" = "Completed";
-// TRANSLATORS: End Power State
-"end-power-state" = "End Power State";
 "error-index uses indefinite length" = "error-index uses indefinite length";
 "error-status uses indefinite length" = "error-status uses indefinite length";
 "expression --and expression\n                        Logical AND" = "expression --and expression\n                        Logical AND";
@@ -2296,100 +2295,6 @@
 "imposition-template.none" = "None";
 // TRANSLATORS: Signature
 "imposition-template.signature" = "Signature";
-// TRANSLATORS: Scanner Options
-"input-attributes" = "Scanner Options";
-// TRANSLATORS: Scan Auto Scaling
-"input-auto-scaling" = "Scan Auto Scaling";
-// TRANSLATORS: Scan Auto Skew Correction
-"input-auto-skew-correction" = "Scan Auto Skew Correction";
-// TRANSLATORS: Scan Brightness
-"input-brightness" = "Scan Brightness";
-// TRANSLATORS: Scanning Mode
-"input-color-mode" = "Scanning Mode";
-// TRANSLATORS: Automatic
-"input-color-mode.auto" = "Automatic";
-// TRANSLATORS: Text
-"input-color-mode.bi-level" = "Text";
-// TRANSLATORS: 16-bit CMYK
-"input-color-mode.cmyk_16" = "16-bit CMYK";
-// TRANSLATORS: 8-bit CMYK
-"input-color-mode.cmyk_8" = "8-bit CMYK";
-// TRANSLATORS: Color
-"input-color-mode.color" = "Color";
-// TRANSLATORS: 8-bit Color
-"input-color-mode.color_8" = "8-bit Color";
-// TRANSLATORS: Monochrome
-"input-color-mode.monochrome" = "Monochrome";
-// TRANSLATORS: 16-bit Monochrome
-"input-color-mode.monochrome_16" = "16-bit Monochrome";
-// TRANSLATORS: 4-bit Monochrome
-"input-color-mode.monochrome_4" = "4-bit Monochrome";
-// TRANSLATORS: 8-bit Monochrome
-"input-color-mode.monochrome_8" = "8-bit Monochrome";
-// TRANSLATORS: 16-bit RGB
-"input-color-mode.rgb_16" = "16-bit RGB";
-// TRANSLATORS: 16-bit RGBA
-"input-color-mode.rgba_16" = "16-bit RGBA";
-// TRANSLATORS: 8-bit RGBA
-"input-color-mode.rgba_8" = "8-bit RGBA";
-// TRANSLATORS: Scan Content
-"input-content-type" = "Scan Content";
-// TRANSLATORS: Automatic
-"input-content-type.auto" = "Automatic";
-// TRANSLATORS: Halftone
-"input-content-type.halftone" = "Halftone";
-// TRANSLATORS: Line Art
-"input-content-type.line-art" = "Line Art";
-// TRANSLATORS: Magazine
-"input-content-type.magazine" = "Magazine";
-// TRANSLATORS: Photo
-"input-content-type.photo" = "Photo";
-// TRANSLATORS: Text
-"input-content-type.text" = "Text";
-// TRANSLATORS: Text And Photo
-"input-content-type.text-and-photo" = "Text And Photo";
-// TRANSLATORS: Scan Contrast
-"input-contrast" = "Scan Contrast";
-// TRANSLATORS: Film Type
-"input-film-scan-mode" = "Film Type";
-// TRANSLATORS: Black And White Negative Film
-"input-film-scan-mode.black-and-white-negative-film" = "Black And White Negative Film";
-// TRANSLATORS: Color Negative Film
-"input-film-scan-mode.color-negative-film" = "Color Negative Film";
-// TRANSLATORS: Color Slide Film
-"input-film-scan-mode.color-slide-film" = "Color Slide Film";
-// TRANSLATORS: Not Applicable
-"input-film-scan-mode.not-applicable" = "Not Applicable";
-// TRANSLATORS: Scan Images To Transfer
-"input-images-to-transfer" = "Scan Images To Transfer";
-// TRANSLATORS: Scan Media
-"input-media" = "Scan Media";
-// TRANSLATORS: Automatic
-"input-media.auto" = "Automatic";
-// TRANSLATORS: Scan Orientation
-"input-orientation-requested" = "Scan Orientation";
-// TRANSLATORS: Scan Quality
-"input-quality" = "Scan Quality";
-// TRANSLATORS: Scan Resolution
-"input-resolution" = "Scan Resolution";
-// TRANSLATORS: Scan Scaling Height
-"input-scaling-height" = "Scan Scaling Height";
-// TRANSLATORS: Scan Scaling Width
-"input-scaling-width" = "Scan Scaling Width";
-// TRANSLATORS: Scan Regions
-"input-scan-regions" = "Scan Regions";
-// TRANSLATORS: Scan Sharpness
-"input-sharpness" = "Scan Sharpness";
-// TRANSLATORS: 2-Sided Scanning
-"input-sides" = "2-Sided Scanning";
-// TRANSLATORS: Scan Source
-"input-source" = "Scan Source";
-// TRANSLATORS: Automatic Document Feeder
-"input-source.adf" = "Automatic Document Feeder";
-// TRANSLATORS: Film Reader
-"input-source.film-reader" = "Film Reader";
-// TRANSLATORS: Platen
-"input-source.platen" = "Platen";
 // TRANSLATORS: Insert Page Number
 "insert-after-page-number" = "Insert Page Number";
 // TRANSLATORS: Insert Count
@@ -2452,14 +2357,8 @@
 "job-accounting-sheets-type.standard" = "Standard";
 // TRANSLATORS: Job Accounting User ID
 "job-accounting-user-id" = "Job Accounting User ID";
-// TRANSLATORS: Collate Copies
-"job-collation-type" = "Collate Copies";
-// TRANSLATORS: Uncollated Sheets
-"job-collation-type.3" = "Uncollated Sheets";
-// TRANSLATORS: Collated Documents
-"job-collation-type.4" = "Collated Documents";
-// TRANSLATORS: Uncollated Documents
-"job-collation-type.5" = "Uncollated Documents";
+// TRANSLATORS: Job Cancel After
+"job-cancel-after" = "job-cancel-after";
 // TRANSLATORS: Copies
 "job-copies" = "Copies";
 // TRANSLATORS: Back Cover
@@ -2569,8 +2468,22 @@
 "job-privacy-scope.owner" = "Owner";
 // TRANSLATORS: Job Recipient Name
 "job-recipient-name" = "Job Recipient Name";
-// TRANSLATORS: Job Resource Ids
-"job-resource-ids" = "Job Resource Ids";
+// TRANSLATORS: Job Retain Until
+"job-retain-until" = "job-retain-until";
+// TRANSLATORS: Job Retain Until Interval
+"job-retain-until-interval" = "job-retain-until-interval";
+// TRANSLATORS: Job Retain Until Time
+"job-retain-until-time" = "job-retain-until-time";
+// TRANSLATORS: End Of Day
+"job-retain-until.end-of-day" = "job-retain-until.end-of-day";
+// TRANSLATORS: End Of Month
+"job-retain-until.end-of-month" = "job-retain-until.end-of-month";
+// TRANSLATORS: End Of Week
+"job-retain-until.end-of-week" = "job-retain-until.end-of-week";
+// TRANSLATORS: Indefinite
+"job-retain-until.indefinite" = "job-retain-until.indefinite";
+// TRANSLATORS: None
+"job-retain-until.none" = "job-retain-until.none";
 // TRANSLATORS: Job Save Disposition
 "job-save-disposition" = "Job Save Disposition";
 // TRANSLATORS: Job Sheet Message
@@ -2597,7 +2510,7 @@
 "job-state-message" = "Job State Message";
 // TRANSLATORS: Detailed Job State
 "job-state-reasons" = "Detailed Job State";
-// TRANSLATORS: Aborted By System
+// TRANSLATORS: Stopping
 "job-state-reasons.aborted-by-system" = "Aborted By System";
 // TRANSLATORS: Account Authorization Failed
 "job-state-reasons.account-authorization-failed" = "Account Authorization Failed";
@@ -2607,7 +2520,7 @@
 "job-state-reasons.account-info-needed" = "Account Info Needed";
 // TRANSLATORS: Account Limit Reached
 "job-state-reasons.account-limit-reached" = "Account Limit Reached";
-// TRANSLATORS: Compression Error
+// TRANSLATORS: Decompression error
 "job-state-reasons.compression-error" = "Compression Error";
 // TRANSLATORS: Conflicting Attributes
 "job-state-reasons.conflicting-attributes" = "Conflicting Attributes";
@@ -2635,19 +2548,19 @@
 "job-state-reasons.document-unprintable-error" = "Document Unprintable Error";
 // TRANSLATORS: Errors Detected
 "job-state-reasons.errors-detected" = "Errors Detected";
-// TRANSLATORS: Job Canceled At Device
+// TRANSLATORS: Canceled at printer
 "job-state-reasons.job-canceled-at-device" = "Job Canceled At Device";
-// TRANSLATORS: Job Canceled By Operator
+// TRANSLATORS: Canceled by operator
 "job-state-reasons.job-canceled-by-operator" = "Job Canceled By Operator";
-// TRANSLATORS: Job Canceled By User
+// TRANSLATORS: Canceled by user
 "job-state-reasons.job-canceled-by-user" = "Job Canceled By User";
-// TRANSLATORS: Job Completed Successfully
+// TRANSLATORS:
 "job-state-reasons.job-completed-successfully" = "Job Completed Successfully";
-// TRANSLATORS: Job Completed With Errors
+// TRANSLATORS: Completed with errors
 "job-state-reasons.job-completed-with-errors" = "Job Completed With Errors";
-// TRANSLATORS: Job Completed With Warnings
+// TRANSLATORS: Completed with warnings
 "job-state-reasons.job-completed-with-warnings" = "Job Completed With Warnings";
-// TRANSLATORS: Job Data Insufficient
+// TRANSLATORS: Insufficient data
 "job-state-reasons.job-data-insufficient" = "Job Data Insufficient";
 // TRANSLATORS: Job Delay Output Until Specified
 "job-state-reasons.job-delay-output-until-specified" = "Job Delay Output Until Specified";
@@ -2657,13 +2570,13 @@
 "job-state-reasons.job-fetchable" = "Job Fetchable";
 // TRANSLATORS: Job Held For Review
 "job-state-reasons.job-held-for-review" = "Job Held For Review";
-// TRANSLATORS: Job Hold Until Specified
+// TRANSLATORS: Job held
 "job-state-reasons.job-hold-until-specified" = "Job Hold Until Specified";
-// TRANSLATORS: Job Incoming
+// TRANSLATORS: Incoming
 "job-state-reasons.job-incoming" = "Job Incoming";
-// TRANSLATORS: Job Interpreting
+// TRANSLATORS: Interpreting
 "job-state-reasons.job-interpreting" = "Job Interpreting";
-// TRANSLATORS: Job Outgoing
+// TRANSLATORS: Outgoing
 "job-state-reasons.job-outgoing" = "Job Outgoing";
 // TRANSLATORS: Job Password Wait
 "job-state-reasons.job-password-wait" = "Job Password Wait";
@@ -2673,15 +2586,15 @@
 "job-state-reasons.job-printed-with-errors" = "Job Printed With Errors";
 // TRANSLATORS: Job Printed With Warnings
 "job-state-reasons.job-printed-with-warnings" = "Job Printed With Warnings";
-// TRANSLATORS: Job Printing
+// TRANSLATORS: Printing
 "job-state-reasons.job-printing" = "Job Printing";
-// TRANSLATORS: Job Queued
+// TRANSLATORS: Preparing to print
 "job-state-reasons.job-queued" = "Job Queued";
-// TRANSLATORS: Job Queued For Marker
+// TRANSLATORS: Processing document
 "job-state-reasons.job-queued-for-marker" = "Job Queued For Marker";
 // TRANSLATORS: Job Release Wait
 "job-state-reasons.job-release-wait" = "Job Release Wait";
-// TRANSLATORS: Job Restartable
+// TRANSLATORS: Restartable
 "job-state-reasons.job-restartable" = "Job Restartable";
 // TRANSLATORS: Job Resuming
 "job-state-reasons.job-resuming" = "Job Resuming";
@@ -2697,7 +2610,7 @@
 "job-state-reasons.job-spooling" = "Job Spooling";
 // TRANSLATORS: Job Streaming
 "job-state-reasons.job-streaming" = "Job Streaming";
-// TRANSLATORS: Job Suspended
+// TRANSLATORS: Suspended
 "job-state-reasons.job-suspended" = "Job Suspended";
 // TRANSLATORS: Job Suspended By Operator
 "job-state-reasons.job-suspended-by-operator" = "Job Suspended By Operator";
@@ -2709,23 +2622,23 @@
 "job-state-reasons.job-suspending" = "Job Suspending";
 // TRANSLATORS: Job Transferring
 "job-state-reasons.job-transferring" = "Job Transferring";
-// TRANSLATORS: Job Transforming
+// TRANSLATORS: Transforming
 "job-state-reasons.job-transforming" = "Job Transforming";
 // TRANSLATORS: None
 "job-state-reasons.none" = "None";
-// TRANSLATORS: Printer Stopped
+// TRANSLATORS: Printer offline
 "job-state-reasons.printer-stopped" = "Printer Stopped";
-// TRANSLATORS: Printer Stopped Partly
+// TRANSLATORS: Printer partially stopped
 "job-state-reasons.printer-stopped-partly" = "Printer Stopped Partly";
-// TRANSLATORS: Processing To Stop Point
+// TRANSLATORS: Stopping
 "job-state-reasons.processing-to-stop-point" = "Processing To Stop Point";
-// TRANSLATORS: Queued In Device
+// TRANSLATORS: Ready
 "job-state-reasons.queued-in-device" = "Queued In Device";
 // TRANSLATORS: Resources Are Not Ready
 "job-state-reasons.resources-are-not-ready" = "Resources Are Not Ready";
 // TRANSLATORS: Resources Are Not Supported
 "job-state-reasons.resources-are-not-supported" = "Resources Are Not Supported";
-// TRANSLATORS: Service Off Line
+// TRANSLATORS: Service offline
 "job-state-reasons.service-off-line" = "Service Off Line";
 // TRANSLATORS: Submission Interrupted
 "job-state-reasons.submission-interrupted" = "Submission Interrupted";
@@ -3708,6 +3621,8 @@
 "media.jpn_chou2_111.1x146mm" = "Envelope Chou 2";
 // TRANSLATORS: Envelope Chou 3
 "media.jpn_chou3_120x235mm" = "Envelope Chou 3";
+// TRANSLATORS: Envelope Chou 40
+"media.jpn_chou40_90x225mm" = "media.jpn_chou40_90x225mm";
 // TRANSLATORS: Envelope Chou 4
 "media.jpn_chou4_90x205mm" = "Envelope Chou 4";
 // TRANSLATORS: Hagaki
@@ -4004,10 +3919,6 @@
 "notify-events.none" = "None";
 // TRANSLATORS: Printer Config Changed
 "notify-events.printer-config-changed" = "Printer Config Changed";
-// TRANSLATORS: Printer Created
-"notify-events.printer-created" = "Printer Created";
-// TRANSLATORS: Printer Deleted
-"notify-events.printer-deleted" = "Printer Deleted";
 // TRANSLATORS: Printer Finishings Changed
 "notify-events.printer-finishings-changed" = "Printer Finishings Changed";
 // TRANSLATORS: Printer Media Changed
@@ -4022,26 +3933,6 @@
 "notify-events.printer-state-changed" = "Printer State Changed";
 // TRANSLATORS: Printer Stopped
 "notify-events.printer-stopped" = "Printer Stopped";
-// TRANSLATORS: Resource Canceled
-"notify-events.resource-canceled" = "Resource Canceled";
-// TRANSLATORS: Resource Config Changed
-"notify-events.resource-config-changed" = "Resource Config Changed";
-// TRANSLATORS: Resource Created
-"notify-events.resource-created" = "Resource Created";
-// TRANSLATORS: Resource Installed
-"notify-events.resource-installed" = "Resource Installed";
-// TRANSLATORS: Resource State Changed
-"notify-events.resource-state-changed" = "Resource State Changed";
-// TRANSLATORS: System Config Changed
-"notify-events.system-config-changed" = "System Config Changed";
-// TRANSLATORS: System Restarted
-"notify-events.system-restarted" = "System Restarted";
-// TRANSLATORS: System Shutdown
-"notify-events.system-shutdown" = "System Shutdown";
-// TRANSLATORS: System State Changed
-"notify-events.system-state-changed" = "System State Changed";
-// TRANSLATORS: System Stopped
-"notify-events.system-stopped" = "System Stopped";
 // TRANSLATORS: Notify Get Interval
 "notify-get-interval" = "Notify Get Interval";
 // TRANSLATORS: Notify Lease Duration
@@ -4223,94 +4114,6 @@
 "platform-temperature" = "Platform Temperature";
 // TRANSLATORS: Post-dial String
 "post-dial-string" = "Post-dial String";
-// TRANSLATORS: Power State
-"power-state" = "Power State";
-// TRANSLATORS: Reset Mbr
-"power-state.100" = "Reset Mbr";
-// TRANSLATORS: Reset Nmi
-"power-state.110" = "Reset Nmi";
-// TRANSLATORS: Off Soft Graceful
-"power-state.120" = "Off Soft Graceful";
-// TRANSLATORS: Off Hard Graceful
-"power-state.130" = "Off Hard Graceful";
-// TRANSLATORS: Reset Mbr Graceful
-"power-state.140" = "Reset Mbr Graceful";
-// TRANSLATORS: Reset Soft Graceful
-"power-state.150" = "Reset Soft Graceful";
-// TRANSLATORS: Reset Hard Graceful
-"power-state.160" = "Reset Hard Graceful";
-// TRANSLATORS: Reset Init
-"power-state.170" = "Reset Init";
-// TRANSLATORS: Not Applicable
-"power-state.180" = "Not Applicable";
-// TRANSLATORS: No Change
-"power-state.190" = "No Change";
-// TRANSLATORS: On
-"power-state.20" = "On";
-// TRANSLATORS: On Vendor1
-"power-state.21" = "On Vendor1";
-// TRANSLATORS: On Vendor2
-"power-state.22" = "On Vendor2";
-// TRANSLATORS: On Vendor3
-"power-state.23" = "On Vendor3";
-// TRANSLATORS: On Vendor4
-"power-state.24" = "On Vendor4";
-// TRANSLATORS: On Vendor5
-"power-state.25" = "On Vendor5";
-// TRANSLATORS: Standby
-"power-state.30" = "Standby";
-// TRANSLATORS: Standby Vendor1
-"power-state.31" = "Standby Vendor1";
-// TRANSLATORS: Standby Vendor2
-"power-state.32" = "Standby Vendor2";
-// TRANSLATORS: Standby Vendor3
-"power-state.33" = "Standby Vendor3";
-// TRANSLATORS: Standby Vendor4
-"power-state.34" = "Standby Vendor4";
-// TRANSLATORS: Standby Vendor5
-"power-state.35" = "Standby Vendor5";
-// TRANSLATORS: Suspend
-"power-state.40" = "Suspend";
-// TRANSLATORS: Suspend Vendor1
-"power-state.41" = "Suspend Vendor1";
-// TRANSLATORS: Suspend Vendor2
-"power-state.42" = "Suspend Vendor2";
-// TRANSLATORS: Suspend Vendor3
-"power-state.43" = "Suspend Vendor3";
-// TRANSLATORS: Suspend Vendor4
-"power-state.44" = "Suspend Vendor4";
-// TRANSLATORS: Suspend Vendor5
-"power-state.45" = "Suspend Vendor5";
-// TRANSLATORS: Reset Soft
-"power-state.50" = "Reset Soft";
-// TRANSLATORS: Off Hard
-"power-state.60" = "Off Hard";
-// TRANSLATORS: Hibernate
-"power-state.70" = "Hibernate";
-// TRANSLATORS: Hibernate Vendor1
-"power-state.71" = "Hibernate Vendor1";
-// TRANSLATORS: Hibernate Vendor2
-"power-state.72" = "Hibernate Vendor2";
-// TRANSLATORS: Hibernate Vendor3
-"power-state.73" = "Hibernate Vendor3";
-// TRANSLATORS: Hibernate Vendor4
-"power-state.74" = "Hibernate Vendor4";
-// TRANSLATORS: Hibernate Vendor5
-"power-state.75" = "Hibernate Vendor5";
-// TRANSLATORS: Off Soft
-"power-state.80" = "Off Soft";
-// TRANSLATORS: Off Soft Vendor1
-"power-state.81" = "Off Soft Vendor1";
-// TRANSLATORS: Off Soft Vendor2
-"power-state.82" = "Off Soft Vendor2";
-// TRANSLATORS: Off Soft Vendor3
-"power-state.83" = "Off Soft Vendor3";
-// TRANSLATORS: Off Soft Vendor4
-"power-state.84" = "Off Soft Vendor4";
-// TRANSLATORS: Off Soft Vendor5
-"power-state.85" = "Off Soft Vendor5";
-// TRANSLATORS: Reset Hard
-"power-state.90" = "Reset Hard";
 "ppdc: Adding include directory \"%s\"." = "ppdc: Adding include directory “%s”.";
 "ppdc: Adding/updating UI text from %s." = "ppdc: Adding/updating UI text from %s.";
 "ppdc: Bad boolean value (%s) on line %d of %s." = "ppdc: Bad boolean value (%s) on line %d of %s.";
@@ -4461,16 +4264,22 @@
 "print-color-mode.process-monochrome" = "Process Monochrome";
 // TRANSLATORS: Print Optimization
 "print-content-optimize" = "Print Optimization";
+// TRANSLATORS: Print Content Optimize Actual
+"print-content-optimize-actual" = "print-content-optimize-actual";
 // TRANSLATORS: Automatic
 "print-content-optimize.auto" = "Automatic";
 // TRANSLATORS: Graphics
 "print-content-optimize.graphic" = "Graphics";
+// TRANSLATORS: Graphics
+"print-content-optimize.graphics" = "print-content-optimize.graphics";
 // TRANSLATORS: Photo
 "print-content-optimize.photo" = "Photo";
 // TRANSLATORS: Text
 "print-content-optimize.text" = "Text";
 // TRANSLATORS: Text and Graphics
 "print-content-optimize.text-and-graphic" = "Text and Graphics";
+// TRANSLATORS: Text And Graphics
+"print-content-optimize.text-and-graphics" = "print-content-optimize.text-and-graphics";
 // TRANSLATORS: Print Objects
 "print-objects" = "Print Objects";
 // TRANSLATORS: Print Quality
@@ -4524,34 +4333,30 @@
 "printer %s/%s disabled since %s -" = "printer %s/%s disabled since %s -";
 "printer %s/%s is idle.  enabled since %s" = "printer %s/%s is idle.  enabled since %s";
 "printer %s/%s now printing %s-%d.  enabled since %s" = "printer %s/%s now printing %s-%d.  enabled since %s";
-// TRANSLATORS: Printer Geo Location
-"printer-geo-location" = "Printer Geo Location";
-// TRANSLATORS: Printer ID
-"printer-id" = "Printer ID";
-// TRANSLATORS: Printer Ids
-"printer-ids" = "Printer Ids";
-// TRANSLATORS: Printer Location
-"printer-location" = "Printer Location";
+// TRANSLATORS: Printer Kind
+"printer-kind" = "printer-kind";
+// TRANSLATORS: Disc
+"printer-kind.disc" = "printer-kind.disc";
+// TRANSLATORS: Document
+"printer-kind.document" = "printer-kind.document";
+// TRANSLATORS: Envelope
+"printer-kind.envelope" = "printer-kind.envelope";
+// TRANSLATORS: Label
+"printer-kind.label" = "printer-kind.label";
+// TRANSLATORS: Large Format
+"printer-kind.large-format" = "printer-kind.large-format";
+// TRANSLATORS: Photo
+"printer-kind.photo" = "printer-kind.photo";
+// TRANSLATORS: Postcard
+"printer-kind.postcard" = "printer-kind.postcard";
+// TRANSLATORS: Receipt
+"printer-kind.receipt" = "printer-kind.receipt";
+// TRANSLATORS: Roll
+"printer-kind.roll" = "printer-kind.roll";
 // TRANSLATORS: Message From Operator
 "printer-message-from-operator" = "Message From Operator";
 // TRANSLATORS: Print Resolution
 "printer-resolution" = "Print Resolution";
-// TRANSLATORS: Printer Service Type
-"printer-service-type" = "Printer Service Type";
-// TRANSLATORS: Copy
-"printer-service-type.copy" = "Copy";
-// TRANSLATORS: Faxin
-"printer-service-type.faxin" = "Faxin";
-// TRANSLATORS: Faxout
-"printer-service-type.faxout" = "Faxout";
-// TRANSLATORS: Print
-"printer-service-type.print" = "Print";
-// TRANSLATORS: Print3d
-"printer-service-type.print3d" = "Print3d";
-// TRANSLATORS: Scan
-"printer-service-type.scan" = "Scan";
-// TRANSLATORS: Transform
-"printer-service-type.transform" = "Transform";
 // TRANSLATORS: Printer State
 "printer-state" = "Printer State";
 // TRANSLATORS: Detailed Printer State
@@ -4726,8 +4531,6 @@
 "printer-state-reasons.cover-open" = "Cover Open";
 // TRANSLATORS: Deactivated
 "printer-state-reasons.deactivated" = "Deactivated";
-// TRANSLATORS: Deleted
-"printer-state-reasons.deleted" = "Deleted";
 // TRANSLATORS: Developer Empty
 "printer-state-reasons.developer-empty" = "Developer Empty";
 // TRANSLATORS: Developer Low
@@ -4820,6 +4623,16 @@
 "printer-state-reasons.extruder-temperature-low" = "Extruder Temperature Low";
 // TRANSLATORS: Fan Failure
 "printer-state-reasons.fan-failure" = "Fan Failure";
+// TRANSLATORS: Fax Modem Life Almost Over
+"printer-state-reasons.fax-modem-life-almost-over" = "printer-state-reasons.fax-modem-life-almost-over";
+// TRANSLATORS: Fax Modem Life Over
+"printer-state-reasons.fax-modem-life-over" = "printer-state-reasons.fax-modem-life-over";
+// TRANSLATORS: Fax Modem Missing
+"printer-state-reasons.fax-modem-missing" = "printer-state-reasons.fax-modem-missing";
+// TRANSLATORS: Fax Modem Turned Off
+"printer-state-reasons.fax-modem-turned-off" = "printer-state-reasons.fax-modem-turned-off";
+// TRANSLATORS: Fax Modem Turned On
+"printer-state-reasons.fax-modem-turned-on" = "printer-state-reasons.fax-modem-turned-on";
 // TRANSLATORS: Folder Added
 "printer-state-reasons.folder-added" = "Folder Added";
 // TRANSLATORS: Folder Almost Empty
@@ -4892,9 +4705,9 @@
 "printer-state-reasons.folder-unrecoverable-storage-error" = "Folder Unrecoverable Storage Error";
 // TRANSLATORS: Folder Warming Up
 "printer-state-reasons.folder-warming-up" = "Folder Warming Up";
-// TRANSLATORS: Fuser Over Temp
+// TRANSLATORS: Fuser temperature high
 "printer-state-reasons.fuser-over-temp" = "Fuser Over Temp";
-// TRANSLATORS: Fuser Under Temp
+// TRANSLATORS: Fuser temperature low
 "printer-state-reasons.fuser-under-temp" = "Fuser Under Temp";
 // TRANSLATORS: Hold New Jobs
 "printer-state-reasons.hold-new-jobs" = "Hold New Jobs";
@@ -4982,13 +4795,27 @@
 "printer-state-reasons.input-media-form-parts-change" = "Input Media Form Parts Change";
 // TRANSLATORS: Input Media Size Change
 "printer-state-reasons.input-media-size-change" = "Input Media Size Change";
+// TRANSLATORS: Input Media Tray Failure
+"printer-state-reasons.input-media-tray-failure" = "printer-state-reasons.input-media-tray-failure";
+// TRANSLATORS: Input Media Tray Feed Error
+"printer-state-reasons.input-media-tray-feed-error" = "printer-state-reasons.input-media-tray-feed-error";
+// TRANSLATORS: Input Media Tray Jam
+"printer-state-reasons.input-media-tray-jam" = "printer-state-reasons.input-media-tray-jam";
 // TRANSLATORS: Input Media Type Change
 "printer-state-reasons.input-media-type-change" = "Input Media Type Change";
 // TRANSLATORS: Input Media Weight Change
 "printer-state-reasons.input-media-weight-change" = "Input Media Weight Change";
+// TRANSLATORS: Input Pick Roller Failure
+"printer-state-reasons.input-pick-roller-failure" = "printer-state-reasons.input-pick-roller-failure";
+// TRANSLATORS: Input Pick Roller Life Over
+"printer-state-reasons.input-pick-roller-life-over" = "printer-state-reasons.input-pick-roller-life-over";
+// TRANSLATORS: Input Pick Roller Life Warn
+"printer-state-reasons.input-pick-roller-life-warn" = "printer-state-reasons.input-pick-roller-life-warn";
+// TRANSLATORS: Input Pick Roller Missing
+"printer-state-reasons.input-pick-roller-missing" = "printer-state-reasons.input-pick-roller-missing";
 // TRANSLATORS: Input Tray Elevation Failure
 "printer-state-reasons.input-tray-elevation-failure" = "Input Tray Elevation Failure";
-// TRANSLATORS: Input Tray Missing
+// TRANSLATORS: Paper tray is missing
 "printer-state-reasons.input-tray-missing" = "Input Tray Missing";
 // TRANSLATORS: Input Tray Position Failure
 "printer-state-reasons.input-tray-position-failure" = "Input Tray Position Failure";
@@ -5082,7 +4909,7 @@
 "printer-state-reasons.interpreter-resource-added" = "Interpreter Resource Added";
 // TRANSLATORS: Interpreter Resource Deleted
 "printer-state-reasons.interpreter-resource-deleted" = "Interpreter Resource Deleted";
-// TRANSLATORS: Interpreter Resource Unavailable
+// TRANSLATORS: Printer resource unavailable
 "printer-state-reasons.interpreter-resource-unavailable" = "Interpreter Resource Unavailable";
 // TRANSLATORS: Lamp At End of Life
 "printer-state-reasons.lamp-at-eol" = "Lamp At End of Life";
@@ -5170,10 +4997,16 @@
 "printer-state-reasons.make-envelope-warming-up" = "Envelope Maker Warming Up";
 // TRANSLATORS: Marker Adjusting Print Quality
 "printer-state-reasons.marker-adjusting-print-quality" = "Marker Adjusting Print Quality";
+// TRANSLATORS: Marker Cleaner Missing
+"printer-state-reasons.marker-cleaner-missing" = "printer-state-reasons.marker-cleaner-missing";
 // TRANSLATORS: Marker Developer Almost Empty
 "printer-state-reasons.marker-developer-almost-empty" = "Marker Developer Almost Empty";
 // TRANSLATORS: Marker Developer Empty
 "printer-state-reasons.marker-developer-empty" = "Marker Developer Empty";
+// TRANSLATORS: Marker Developer Missing
+"printer-state-reasons.marker-developer-missing" = "printer-state-reasons.marker-developer-missing";
+// TRANSLATORS: Marker Fuser Missing
+"printer-state-reasons.marker-fuser-missing" = "printer-state-reasons.marker-fuser-missing";
 // TRANSLATORS: Marker Fuser Thermistor Failure
 "printer-state-reasons.marker-fuser-thermistor-failure" = "Marker Fuser Thermistor Failure";
 // TRANSLATORS: Marker Fuser Timing Failure
@@ -5182,28 +5015,46 @@
 "printer-state-reasons.marker-ink-almost-empty" = "Marker Ink Almost Empty";
 // TRANSLATORS: Marker Ink Empty
 "printer-state-reasons.marker-ink-empty" = "Marker Ink Empty";
+// TRANSLATORS: Marker Ink Missing
+"printer-state-reasons.marker-ink-missing" = "printer-state-reasons.marker-ink-missing";
+// TRANSLATORS: Marker Opc Missing
+"printer-state-reasons.marker-opc-missing" = "printer-state-reasons.marker-opc-missing";
 // TRANSLATORS: Marker Print Ribbon Almost Empty
 "printer-state-reasons.marker-print-ribbon-almost-empty" = "Marker Print Ribbon Almost Empty";
 // TRANSLATORS: Marker Print Ribbon Empty
 "printer-state-reasons.marker-print-ribbon-empty" = "Marker Print Ribbon Empty";
-// TRANSLATORS: Marker Supply Empty
+// TRANSLATORS: Marker Print Ribbon Missing
+"printer-state-reasons.marker-print-ribbon-missing" = "printer-state-reasons.marker-print-ribbon-missing";
+// TRANSLATORS: Marker Supply Almost Empty
+"printer-state-reasons.marker-supply-almost-empty" = "printer-state-reasons.marker-supply-almost-empty";
+// TRANSLATORS: Ink/toner empty
 "printer-state-reasons.marker-supply-empty" = "Marker Supply Empty";
-// TRANSLATORS: Marker Supply Low
+// TRANSLATORS: Ink/toner low
 "printer-state-reasons.marker-supply-low" = "Marker Supply Low";
+// TRANSLATORS: Marker Supply Missing
+"printer-state-reasons.marker-supply-missing" = "printer-state-reasons.marker-supply-missing";
 // TRANSLATORS: Marker Toner Cartridge Missing
 "printer-state-reasons.marker-toner-cartridge-missing" = "Marker Toner Cartridge Missing";
-// TRANSLATORS: Marker Waste Almost Full
+// TRANSLATORS: Marker Toner Missing
+"printer-state-reasons.marker-toner-missing" = "printer-state-reasons.marker-toner-missing";
+// TRANSLATORS: Ink/toner waste bin almost full
 "printer-state-reasons.marker-waste-almost-full" = "Marker Waste Almost Full";
-// TRANSLATORS: Marker Waste Full
+// TRANSLATORS: Ink/toner waste bin full
 "printer-state-reasons.marker-waste-full" = "Marker Waste Full";
 // TRANSLATORS: Marker Waste Ink Receptacle Almost Full
 "printer-state-reasons.marker-waste-ink-receptacle-almost-full" = "Marker Waste Ink Receptacle Almost Full";
 // TRANSLATORS: Marker Waste Ink Receptacle Full
 "printer-state-reasons.marker-waste-ink-receptacle-full" = "Marker Waste Ink Receptacle Full";
+// TRANSLATORS: Marker Waste Ink Receptacle Missing
+"printer-state-reasons.marker-waste-ink-receptacle-missing" = "printer-state-reasons.marker-waste-ink-receptacle-missing";
+// TRANSLATORS: Marker Waste Missing
+"printer-state-reasons.marker-waste-missing" = "printer-state-reasons.marker-waste-missing";
 // TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 "printer-state-reasons.marker-waste-toner-receptacle-almost-full" = "Marker Waste Toner Receptacle Almost Full";
 // TRANSLATORS: Marker Waste Toner Receptacle Full
 "printer-state-reasons.marker-waste-toner-receptacle-full" = "Marker Waste Toner Receptacle Full";
+// TRANSLATORS: Marker Waste Toner Receptacle Missing
+"printer-state-reasons.marker-waste-toner-receptacle-missing" = "printer-state-reasons.marker-waste-toner-receptacle-missing";
 // TRANSLATORS: Material Empty
 "printer-state-reasons.material-empty" = "Material Empty";
 // TRANSLATORS: Material Low
@@ -5212,41 +5063,73 @@
 "printer-state-reasons.material-needed" = "Material Needed";
 // TRANSLATORS: Media Drying
 "printer-state-reasons.media-drying" = "Media Drying";
-// TRANSLATORS: Media Empty
+// TRANSLATORS: Paper tray is empty
 "printer-state-reasons.media-empty" = "Media Empty";
-// TRANSLATORS: Media Jam
+// TRANSLATORS: Paper jam
 "printer-state-reasons.media-jam" = "Media Jam";
-// TRANSLATORS: Media Low
-"printer-state-reasons.media-low" = "Media Low";
-// TRANSLATORS: Media Needed
-"printer-state-reasons.media-needed" = "Media Needed";
+// TRANSLATORS: Paper tray is almost empty
+"printer-state-reasons.media-low" = "Paper tray is almost empty";
+// TRANSLATORS: Load paper
+"printer-state-reasons.media-needed" = "Load paper";
 // TRANSLATORS: Media Path Cannot Do 2-Sided Printing
 "printer-state-reasons.media-path-cannot-duplex-media-selected" = "Media Path Cannot Do 2-Sided Printing";
+// TRANSLATORS: Media Path Failure
+"printer-state-reasons.media-path-failure" = "Media Path Failure";
+// TRANSLATORS: Media Path Input Empty
+"printer-state-reasons.media-path-input-empty" = "Media Path Input Empty";
+// TRANSLATORS: Media Path Input Feed Error
+"printer-state-reasons.media-path-input-feed-error" = "Media Path Input Feed Error";
+// TRANSLATORS: Media Path Input Jam
+"printer-state-reasons.media-path-input-jam" = "Media Path Input Jam";
+// TRANSLATORS: Media Path Input Request
+"printer-state-reasons.media-path-input-request" = "Media Path Input Request";
+// TRANSLATORS: Media Path Jam
+"printer-state-reasons.media-path-jam" = "Media Path Jam";
 // TRANSLATORS: Media Path Media Tray Almost Full
 "printer-state-reasons.media-path-media-tray-almost-full" = "Media Path Media Tray Almost Full";
 // TRANSLATORS: Media Path Media Tray Full
 "printer-state-reasons.media-path-media-tray-full" = "Media Path Media Tray Full";
 // TRANSLATORS: Media Path Media Tray Missing
 "printer-state-reasons.media-path-media-tray-missing" = "Media Path Media Tray Missing";
+// TRANSLATORS: Media Path Output Feed Error
+"printer-state-reasons.media-path-output-feed-error" = "Media Path Output Feed Error";
+// TRANSLATORS: Media Path Output Full
+"printer-state-reasons.media-path-output-full" = "Media Path Output Full";
+// TRANSLATORS: Media Path Output Jam
+"printer-state-reasons.media-path-output-jam" = "Media Path Output Jam";
+// TRANSLATORS: Media Path Pick Roller Failure
+"printer-state-reasons.media-path-pick-roller-failure" = "Media Path Pick Roller Failure";
+// TRANSLATORS: Media Path Pick Roller Life Over
+"printer-state-reasons.media-path-pick-roller-life-over" = "Media Path Pick Roller Life Over";
+// TRANSLATORS: Media Path Pick Roller Life Warn
+"printer-state-reasons.media-path-pick-roller-life-warn" = "Media Path Pick Roller Life Warn";
+// TRANSLATORS: Media Path Pick Roller Missing
+"printer-state-reasons.media-path-pick-roller-missing" = "Media Path Pick Roller Missing";
 // TRANSLATORS: Motor Failure
 "printer-state-reasons.motor-failure" = "Motor Failure";
-// TRANSLATORS: Moving To Paused
+// TRANSLATORS: Printer going offline
 "printer-state-reasons.moving-to-paused" = "Moving To Paused";
 // TRANSLATORS: None
 "printer-state-reasons.none" = "None";
 // TRANSLATORS: Optical Photoconductor Life Over
 "printer-state-reasons.opc-life-over" = "Optical Photoconductor Life Over";
-// TRANSLATORS: Optical Photoconductor Near End-of-life
+// TRANSLATORS: OPC almost at end-of-life
 "printer-state-reasons.opc-near-eol" = "Optical Photoconductor Near End-of-life";
-// TRANSLATORS: Other
+// TRANSLATORS: Check the printer for errors
 "printer-state-reasons.other" = "Other";
-// TRANSLATORS: Output Area Almost Full
+// TRANSLATORS: Output bin is almost full
 "printer-state-reasons.output-area-almost-full" = "Output Area Almost Full";
-// TRANSLATORS: Output Area Full
+// TRANSLATORS: Output bin is full
 "printer-state-reasons.output-area-full" = "Output Area Full";
 // TRANSLATORS: Output Mailbox Select Failure
 "printer-state-reasons.output-mailbox-select-failure" = "Output Mailbox Select Failure";
-// TRANSLATORS: Output Tray Missing
+// TRANSLATORS: Output Media Tray Failure
+"printer-state-reasons.output-media-tray-failure" = "Output Media Tray Failure";
+// TRANSLATORS: Output Media Tray Feed Error
+"printer-state-reasons.output-media-tray-feed-error" = "Output Media Tray Feed Error";
+// TRANSLATORS: Output Media Tray Jam
+"printer-state-reasons.output-media-tray-jam" = "Output Media Tray Jam";
+// TRANSLATORS: Output tray is missing
 "printer-state-reasons.output-tray-missing" = "Output Tray Missing";
 // TRANSLATORS: Paused
 "printer-state-reasons.paused" = "Paused";
@@ -5414,8 +5297,6 @@
 "printer-state-reasons.puncher-unrecoverable-storage-error" = "Puncher Unrecoverable Storage Error";
 // TRANSLATORS: Puncher Warming Up
 "printer-state-reasons.puncher-warming-up" = "Puncher Warming Up";
-// TRANSLATORS: Resuming
-"printer-state-reasons.resuming" = "Resuming";
 // TRANSLATORS: Separation Cutter Added
 "printer-state-reasons.separation-cutter-added" = "Separation Cutter Added";
 // TRANSLATORS: Separation Cutter Almost Empty
@@ -5560,7 +5441,7 @@
 "printer-state-reasons.sheet-rotator-unrecoverable-storage-error" = "Sheet Rotator Unrecoverable Storage Error";
 // TRANSLATORS: Sheet Rotator Warming Up
 "printer-state-reasons.sheet-rotator-warming-up" = "Sheet Rotator Warming Up";
-// TRANSLATORS: Shutdown
+// TRANSLATORS: Printer offline
 "printer-state-reasons.shutdown" = "Shutdown";
 // TRANSLATORS: Slitter Added
 "printer-state-reasons.slitter-added" = "Slitter Added";
@@ -5852,7 +5733,7 @@
 "printer-state-reasons.stitcher-unrecoverable-storage-error" = "Stitcher Unrecoverable Storage Error";
 // TRANSLATORS: Stitcher Warming Up
 "printer-state-reasons.stitcher-warming-up" = "Stitcher Warming Up";
-// TRANSLATORS: Stopped Partly
+// TRANSLATORS: Partially stopped
 "printer-state-reasons.stopped-partly" = "Stopped Partly";
 // TRANSLATORS: Stopping
 "printer-state-reasons.stopping" = "Stopping";
@@ -5918,11 +5799,11 @@
 "printer-state-reasons.subunit-unrecoverable-storage" = "Subunit Unrecoverable Storage";
 // TRANSLATORS: Subunit Warming Up
 "printer-state-reasons.subunit-warming-up" = "Subunit Warming Up";
-// TRANSLATORS: Timed Out
+// TRANSLATORS: Printer stopped responding
 "printer-state-reasons.timed-out" = "Timed Out";
-// TRANSLATORS: Toner Empty
+// TRANSLATORS: Out of toner
 "printer-state-reasons.toner-empty" = "Toner Empty";
-// TRANSLATORS: Toner Low
+// TRANSLATORS: Toner low
 "printer-state-reasons.toner-low" = "Toner Low";
 // TRANSLATORS: Trimmer Added
 "printer-state-reasons.trimmer-added" = "Trimmer Added";
@@ -6078,8 +5959,6 @@
 "printer-state.5" = "Stopped";
 // TRANSLATORS: Printer Uptime
 "printer-up-time" = "Printer Uptime";
-// TRANSLATORS: Printer Xri
-"printer-xri-requested" = "Printer Xri";
 "processing" = "processing";
 // TRANSLATORS: Proof Print
 "proof-print" = "Proof Print";
@@ -6103,76 +5982,8 @@
 "punching-reference-edge.top" = "Top";
 "request id is %s-%d (%d file(s))" = "request id is %s-%d (%d file(s))";
 "request-id uses indefinite length" = "request-id uses indefinite length";
-// TRANSLATORS: Request Power State
-"request-power-state" = "Request Power State";
 // TRANSLATORS: Requested Attributes
 "requested-attributes" = "Requested Attributes";
-// TRANSLATORS: Resource Format
-"resource-format" = "Resource Format";
-// TRANSLATORS: Resource Format Accepted
-"resource-format-accepted" = "Resource Format Accepted";
-// TRANSLATORS: Resource Formats
-"resource-formats" = "Resource Formats";
-// TRANSLATORS: Resource ID
-"resource-id" = "Resource ID";
-// TRANSLATORS: Resource Ids
-"resource-ids" = "Resource Ids";
-// TRANSLATORS: Resource K Octets
-"resource-k-octets" = "Resource K Octets";
-// TRANSLATORS: Resource Signature
-"resource-signature" = "Resource Signature";
-// TRANSLATORS: Resource State
-"resource-state" = "Resource State";
-// TRANSLATORS: Resource State Reasons
-"resource-state-reasons" = "Resource State Reasons";
-// TRANSLATORS: Cancel
-"resource-state-reasons.cancel-requested" = "Cancel";
-// TRANSLATORS: Install
-"resource-state-reasons.install-requested" = "Install";
-// TRANSLATORS: Resource Incoming
-"resource-state-reasons.resource-incoming" = "Resource Incoming";
-// TRANSLATORS: Pending
-"resource-state.3" = "Pending";
-// TRANSLATORS: Available
-"resource-state.4" = "Available";
-// TRANSLATORS: Installed
-"resource-state.5" = "Installed";
-// TRANSLATORS: Canceled
-"resource-state.6" = "Canceled";
-// TRANSLATORS: Aborted
-"resource-state.7" = "Aborted";
-// TRANSLATORS: Resource States
-"resource-states" = "Resource States";
-// TRANSLATORS: Resource Type
-"resource-type" = "Resource Type";
-// TRANSLATORS: Executable Firmware
-"resource-type.executable-firmware" = "Executable Firmware";
-// TRANSLATORS: Executable Software
-"resource-type.executable-software" = "Executable Software";
-// TRANSLATORS: Static Font
-"resource-type.static-font" = "Static Font";
-// TRANSLATORS: Static Form
-"resource-type.static-form" = "Static Form";
-// TRANSLATORS: Static Icc Profile
-"resource-type.static-icc-profile" = "Static Icc Profile";
-// TRANSLATORS: Static Image
-"resource-type.static-image" = "Static Image";
-// TRANSLATORS: Static Logo
-"resource-type.static-logo" = "Static Logo";
-// TRANSLATORS: Static Other
-"resource-type.static-other" = "Static Other";
-// TRANSLATORS: Static Strings
-"resource-type.static-strings" = "Static Strings";
-// TRANSLATORS: Template Document
-"resource-type.template-document" = "Template Document";
-// TRANSLATORS: Template Job
-"resource-type.template-job" = "Template Job";
-// TRANSLATORS: Template Printer
-"resource-type.template-printer" = "Template Printer";
-// TRANSLATORS: Resource Types
-"resource-types" = "Resource Types";
-// TRANSLATORS: Restart Get Interval
-"restart-get-interval" = "Restart Get Interval";
 // TRANSLATORS: Retry Interval
 "retry-interval" = "Retry Interval";
 // TRANSLATORS: Retry Timeout
@@ -6209,12 +6020,6 @@
 "separator-sheets-type.slip-sheets" = "Slip Sheets";
 // TRANSLATORS: Start Sheet
 "separator-sheets-type.start-sheet" = "Start Sheet";
-// TRANSLATORS: Collate Copies
-"sheet-collate" = "Collate Copies";
-// TRANSLATORS: Yes
-"sheet-collate.collated" = "Yes";
-// TRANSLATORS: No
-"sheet-collate.uncollated" = "No";
 // TRANSLATORS: 2-Sided Printing
 "sides" = "2-Sided Printing";
 // TRANSLATORS: Off
@@ -6223,8 +6028,6 @@
 "sides.two-sided-long-edge" = "On (Portrait)";
 // TRANSLATORS: On (Landscape)
 "sides.two-sided-short-edge" = "On (Landscape)";
-// TRANSLATORS: Start Power State
-"start-power-state" = "Start Power State";
 "stat of %s failed: %s" = "stat of %s failed: %s";
 "status\t\tShow status of daemon and queue." = "status\t\tShow status of daemon and queue.";
 // TRANSLATORS: Status Message
@@ -6282,28 +6085,8 @@
 "subscription-privacy-scope.owner" = "Owner";
 "system default destination: %s" = "system default destination: %s";
 "system default destination: %s/%s" = "system default destination: %s/%s";
-// TRANSLATORS: System State
-"system-state" = "System State";
-// TRANSLATORS: System State Reasons
-"system-state-reasons" = "System State Reasons";
-// TRANSLATORS: Idle
-"system-state.3" = "Idle";
-// TRANSLATORS: Processing
-"system-state.4" = "Processing";
-// TRANSLATORS: Stopped
-"system-state.5" = "Stopped";
-// TRANSLATORS: System URI
-"system-uri" = "System URI";
 // TRANSLATORS: T33 Subaddress
 "t33-subaddress" = "T33 Subaddress";
-// TRANSLATORS: Timeout Predicate
-"timeout-predicate" = "Timeout Predicate";
-// TRANSLATORS: Activity
-"timeout-predicate.activity" = "Activity";
-// TRANSLATORS: Inactivity
-"timeout-predicate.inactivity" = "Inactivity";
-// TRANSLATORS: None
-"timeout-predicate.none" = "None";
 // TRANSLATORS: To Name
 "to-name" = "To Name";
 // TRANSLATORS: Transmission Status
@@ -6361,22 +6144,6 @@
 "unknown" = "unknown";
 "untitled" = "untitled";
 "variable-bindings uses indefinite length" = "variable-bindings uses indefinite length";
-// TRANSLATORS: Which Printers
-"which-printers" = "Which Printers";
-// TRANSLATORS: All
-"which-printers.all" = "All";
-// TRANSLATORS: Idle
-"which-printers.idle" = "Idle";
-// TRANSLATORS: Not Accepting
-"which-printers.not-accepting" = "Not Accepting";
-// TRANSLATORS: Processing
-"which-printers.processing" = "Processing";
-// TRANSLATORS: Shutdown
-"which-printers.shutdown" = "Shutdown";
-// TRANSLATORS: Stopped
-"which-printers.stopped" = "Stopped";
-// TRANSLATORS: Testing
-"which-printers.testing" = "Testing";
 // TRANSLATORS: X Accuracy
 "x-accuracy" = "X Accuracy";
 // TRANSLATORS: X Dimension
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 840f6eb2a..f614af3cf 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -3758,6 +3758,9 @@ msgstr ""
 msgid "Invalid media size."
 msgstr "Mida del suport no vàlida."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5922,10 +5925,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index fa servir una longitud indefinida"
 
@@ -6962,194 +6961,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7326,20 +7137,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7561,8 +7360,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7617,7 +7444,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7637,7 +7464,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7693,31 +7520,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7737,19 +7564,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7769,15 +7596,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7785,7 +7612,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7817,7 +7644,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7841,7 +7668,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7849,19 +7676,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7873,7 +7700,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9940,6 +9767,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10537,14 +10368,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10573,46 +10396,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10980,182 +10763,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: s'afegeix el directori inclòs «%s»."
@@ -11679,6 +11286,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11687,6 +11298,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11699,6 +11314,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11819,60 +11438,52 @@ msgstr "la impressora %s/%s està inactiva. Està activada des de %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "la impressora %s/%s està imprimint %s-%d. Està activada des de %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12223,10 +11834,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12411,6 +12018,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12555,11 +12182,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12735,6 +12362,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12743,11 +12382,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12935,7 +12590,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13111,6 +12766,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13119,6 +12778,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13135,6 +12802,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13143,23 +12818,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13171,6 +12862,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13179,6 +12878,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13195,19 +12898,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13215,6 +12918,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13227,11 +12954,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13243,19 +12998,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13263,7 +13018,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13599,10 +13366,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13891,7 +13654,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14475,7 +14238,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14607,15 +14370,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14927,10 +14690,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "s'està processant"
 
@@ -14981,146 +14740,10 @@ msgstr "l'identificador de la petició és %s-%d (%d fitxer(s))"
 msgid "request-id uses indefinite length"
 msgstr "la request-id fa servir una longitud indefinida"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15195,18 +14818,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15223,10 +14834,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stat de %s ha fallat: %s"
@@ -15349,50 +14956,10 @@ msgstr "destí per defecte del sistema: %s"
 msgid "system default destination: %s/%s"
 msgstr "destí per defecte del sistema: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15510,38 +15077,6 @@ msgstr "sense títol"
 msgid "variable-bindings uses indefinite length"
 msgstr "La variable-bindings fa servir una longitud indefinida"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index ed4f39b73..bd244a44b 100644
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -3593,6 +3593,9 @@ msgstr ""
 msgid "Invalid media size."
 msgstr ""
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5720,10 +5723,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "\"error-index\" má neomezenou délku"
 
@@ -6760,194 +6759,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7124,20 +6935,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7359,8 +7158,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7415,7 +7242,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7435,7 +7262,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7491,31 +7318,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7535,19 +7362,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7567,15 +7394,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7583,7 +7410,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7615,7 +7442,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7639,7 +7466,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7647,19 +7474,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7671,7 +7498,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9721,6 +9548,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10318,14 +10149,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10354,46 +10177,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10761,182 +10544,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
@@ -11431,6 +11038,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11439,6 +11050,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11451,6 +11066,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11571,60 +11190,52 @@ msgstr ""
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -11975,10 +11586,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12163,6 +11770,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12307,11 +11934,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12487,6 +12114,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12495,11 +12134,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12687,7 +12342,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -12863,6 +12518,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -12871,6 +12530,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -12887,6 +12554,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -12895,23 +12570,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -12923,6 +12614,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -12931,6 +12630,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -12947,19 +12650,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -12967,6 +12670,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -12979,11 +12706,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -12995,19 +12750,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13015,7 +12770,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13351,10 +13118,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13643,7 +13406,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14227,7 +13990,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14359,15 +14122,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14679,10 +14442,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "zpracování"
 
@@ -14733,146 +14492,10 @@ msgstr ""
 msgid "request-id uses indefinite length"
 msgstr "ID požadavku má neomezenou délku"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -14947,18 +14570,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -14975,10 +14586,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stav %s selhalo: %s"
@@ -15101,50 +14708,10 @@ msgstr ""
 msgid "system default destination: %s/%s"
 msgstr ""
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15262,38 +14829,6 @@ msgstr "nepojmenovaný"
 msgid "variable-bindings uses indefinite length"
 msgstr "\"variable-bindings\" má neomezenou délku"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_de.po b/locale/cups_de.po
index c256a906a..0363a3c06 100644
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -277,7 +277,7 @@ msgid ""
 "        WARN    Non-Windows PPD files should use lines ending with only LF, "
 "not CR LF."
 msgstr ""
-"        WARN    Nicht-Windows PPD Dateien sollten ausschliesslich LF "
+"        WARN    Nicht-Windows PPD Dateien sollten ausschließlich LF "
 "Zeilenenden verwenden, nicht CR LF."
 
 #, c-format
@@ -3216,7 +3216,7 @@ msgid ""
 "valid Kerberos ticket."
 msgstr ""
 "Geben Sie Ihren Benutzernamen und das Passwort oder den root-Benutzernamen "
-"und -passwort ein, um auf diese Seite zuzgreifen. Falls Sie die Kerberos-"
+"und -passwort ein, um auf diese Seite zuzugreifen. Falls Sie die Kerberos-"
 "Authentifizierung verwenden, stellen Sie sicher, dass Sie ein gültiges "
 "Kerberos-Ticket haben."
 
@@ -3578,7 +3578,7 @@ msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr "IPP nameWithLanguage Wert weniger als mindestens 4 Byte."
 
 msgid "IPP octetString length too large."
-msgstr "IPP Oktett-Zeichenkettenlänge zu gross."
+msgstr "IPP Oktett-Zeichenkettenlänge zu groß."
 
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr "IPP rangeOfInteger Wert nicht 8 Byte."
@@ -3675,6 +3675,9 @@ msgstr "Ungültige Argumente des Mediennamens."
 msgid "Invalid media size."
 msgstr "Ungültige Mediengröße."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr "Ungültgier Wert ppd-name"
 
@@ -4273,7 +4276,7 @@ msgid "Print and Cut"
 msgstr "Drucken und abschneiden"
 
 msgid "Print and Tear"
-msgstr "Drucken und abreissen"
+msgstr "Drucken und abreißen"
 
 msgid "Print file sent."
 msgstr "Druckdatei gesendet."
@@ -4282,7 +4285,7 @@ msgid "Print job canceled at printer."
 msgstr "Druckauftrag wurde am Drucker abgebrochen."
 
 msgid "Print job too large."
-msgstr "Der Druckauftrag ist zu gross."
+msgstr "Der Druckauftrag ist zu groß."
 
 msgid "Print job was not accepted."
 msgstr "Der Druckauftrag wurde nicht angenommen."
@@ -4482,7 +4485,7 @@ msgid "Tabloid Oversize Long Edge"
 msgstr "US Tabloid übergroß lange Seite"
 
 msgid "Tear"
-msgstr "Abreissen"
+msgstr "Abreißen"
 
 msgid "Tear-Off"
 msgstr "Abriss"
@@ -4538,7 +4541,7 @@ msgstr ""
 
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
-msgstr "Der WErt für notify-user-data ist zu gross (%d > 63 octets)."
+msgstr "Der WErt für notify-user-data ist zu groß (%d > 63 octets)."
 
 msgid "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
@@ -5836,10 +5839,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "Fehlerindex hat unbestimmte Länge"
 
@@ -6876,194 +6875,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7240,20 +7051,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7475,8 +7274,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7531,7 +7358,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7551,7 +7378,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7607,31 +7434,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7651,19 +7478,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7683,15 +7510,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7699,7 +7526,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7731,7 +7558,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7755,7 +7582,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7763,19 +7590,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7787,7 +7614,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9844,6 +9671,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10441,14 +10272,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10477,46 +10300,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10884,182 +10667,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
@@ -11554,6 +11161,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11562,6 +11173,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11574,6 +11189,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11694,60 +11313,52 @@ msgstr "Drucker %s/%s ist im Leerlauf.  Aktiviert seit %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "Drucker %s/%s druckt jetzt %s-%d.  Aktiviert seit %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12098,10 +11709,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12286,6 +11893,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12430,11 +12057,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12610,6 +12237,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12618,11 +12257,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12810,7 +12465,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -12986,6 +12641,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -12994,6 +12653,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13010,6 +12677,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13018,23 +12693,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13046,6 +12737,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13054,6 +12753,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13070,19 +12773,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13090,6 +12793,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13102,11 +12829,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13118,19 +12873,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13138,7 +12893,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13474,10 +13241,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13766,7 +13529,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14350,7 +14113,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14482,15 +14245,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14802,10 +14565,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "in Verarbeitung"
 
@@ -14856,146 +14615,10 @@ msgstr "Anfrage-ID ist %s-%d (%d Datei(en))"
 msgid "request-id uses indefinite length"
 msgstr "Anfrage-ID hat unbestimmte Länge"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15070,18 +14693,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15098,10 +14709,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "Status von %s fehlgeschlagen: %s"
@@ -15224,50 +14831,10 @@ msgstr "systemvoreingestelltes Ziel: %s"
 msgid "system default destination: %s/%s"
 msgstr "systemvoreingestelltes Ziel: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15385,38 +14952,6 @@ msgstr "Ohne Titel"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings hat unbestimmte Länge"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_en.po b/locale/cups_en.po
index e2c989ed7..fdb34d6fb 100644
--- a/locale/cups_en.po
+++ b/locale/cups_en.po
@@ -1,7 +1,7 @@
 #
-# Message catalog template for CUPS.
+# English message catalog for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2005-2007 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -22,9 +22,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CUPS 2.3b6\n"
+"Project-Id-Version: CUPS 2.3.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
@@ -1558,7 +1558,7 @@ msgid "--false                 Always false"
 msgstr "--false                 Always false"
 
 msgid "--help                  Show program help"
-msgstr ""
+msgstr "--help                  Show program help"
 
 msgid "--hold                  Hold new jobs"
 msgstr "--hold                  Hold new jobs"
@@ -1594,7 +1594,7 @@ msgid "--name regex            Match service name to regular expression"
 msgstr "--name regex            Match service name to regular expression"
 
 msgid "--no-web-forms          Disable web forms for media and supplies"
-msgstr ""
+msgstr "--no-web-forms          Disable web forms for media and supplies"
 
 msgid "--not expression        Unary NOT of expression"
 msgstr "--not expression        Unary NOT of expression"
@@ -1697,7 +1697,7 @@ msgid "-2"
 msgstr "-2"
 
 msgid "-2                      Set 2-sided printing support (default=1-sided)"
-msgstr ""
+msgstr "-2                      Set 2-sided printing support (default=1-sided)"
 
 msgid "-20"
 msgstr "-20"
@@ -1781,7 +1781,7 @@ msgid "-D description          Specify the textual description of the printer"
 msgstr "-D description          Specify the textual description of the printer"
 
 msgid "-D device-uri           Set the device URI for the printer"
-msgstr ""
+msgstr "-D device-uri           Set the device URI for the printer"
 
 msgid ""
 "-E                      Enable and accept jobs on the printer (after -p)"
@@ -1798,7 +1798,7 @@ msgid "-F                      Run in the foreground but detach from console."
 msgstr "-F                      Run in the foreground but detach from console."
 
 msgid "-F output-type/subtype  Set the output format for the printer"
-msgstr ""
+msgstr "-F output-type/subtype  Set the output format for the printer"
 
 msgid "-H                      Show the default server and port"
 msgstr "-H                      Show the default server and port"
@@ -1834,6 +1834,7 @@ msgstr ""
 msgid ""
 "-K keypath              Set location of server X.509 certificates and keys."
 msgstr ""
+"-K keypath              Set location of server X.509 certificates and keys."
 
 msgid "-L                      Send requests using content-length"
 msgstr "-L                      Send requests using content-length"
@@ -1842,7 +1843,7 @@ msgid "-L location             Specify the textual location of the printer"
 msgstr "-L location             Specify the textual location of the printer"
 
 msgid "-M manufacturer         Set manufacturer name (default=Test)"
-msgstr ""
+msgstr "-M manufacturer         Set manufacturer name (default=Test)"
 
 msgid "-P destination          Show status for the specified destination"
 msgstr "-P destination          Show status for the specified destination"
@@ -1858,7 +1859,7 @@ msgstr ""
 "standard output"
 
 msgid "-P filename.ppd         Load printer attributes from PPD file"
-msgstr ""
+msgstr "-P filename.ppd         Load printer attributes from PPD file"
 
 msgid "-P number[-number]      Match port to number or range"
 msgstr "-P number[-number]      Match port to number or range"
@@ -1924,7 +1925,7 @@ msgid "-a [destination(s)]     Show the accepting state of destinations"
 msgstr "-a [destination(s)]     Show the accepting state of destinations"
 
 msgid "-a filename.conf        Load printer attributes from conf file"
-msgstr ""
+msgstr "-a filename.conf        Load printer attributes from conf file"
 
 msgid "-c                      Make a copy of the print file(s)"
 msgstr "-c                      Make a copy of the print file(s)"
@@ -1939,7 +1940,7 @@ msgid "-c class                Add the named destination to a class"
 msgstr "-c class                Add the named destination to a class"
 
 msgid "-c command              Set print command"
-msgstr ""
+msgstr "-c command              Set print command"
 
 msgid "-c cupsd.conf           Set cupsd.conf file to use."
 msgstr "-c cupsd.conf           Set cupsd.conf file to use."
@@ -1961,7 +1962,7 @@ msgid "-d regex                Match domain to regular expression"
 msgstr "-d regex                Match domain to regular expression"
 
 msgid "-d spool-directory      Set spool directory"
-msgstr ""
+msgstr "-d spool-directory      Set spool directory"
 
 msgid "-e                      Show available destinations on the network"
 msgstr "-e                      Show available destinations on the network"
@@ -1973,7 +1974,7 @@ msgid "-f filename             Set default request filename"
 msgstr "-f filename             Set default request filename"
 
 msgid "-f type/subtype[,...]   Set supported file types"
-msgstr ""
+msgstr "-f type/subtype[,...]   Set supported file types"
 
 msgid "-h                      Show this usage message."
 msgstr "-h                      Show this usage message."
@@ -1988,7 +1989,7 @@ msgid "-h server[:port]        Connect to the named server and port"
 msgstr "-h server[:port]        Connect to the named server and port"
 
 msgid "-i iconfile.png         Set icon file"
-msgstr ""
+msgstr "-i iconfile.png         Set icon file"
 
 msgid "-i id                   Specify an existing job ID to modify"
 msgstr "-i id                   Specify an existing job ID to modify"
@@ -2002,7 +2003,7 @@ msgstr ""
 "-i seconds              Repeat the last file with the given time interval"
 
 msgid "-k                      Keep job spool files"
-msgstr ""
+msgstr "-k                      Keep job spool files"
 
 msgid "-l                      List attributes"
 msgstr "-l                      List attributes"
@@ -2020,7 +2021,7 @@ msgid "-l                      Show verbose (long) output"
 msgstr "-l                      Show verbose (long) output"
 
 msgid "-l location             Set location of printer"
-msgstr ""
+msgstr "-l location             Set location of printer"
 
 msgid ""
 "-m                      Send an email notification when the job completes"
@@ -2036,7 +2037,7 @@ msgstr ""
 "-m everywhere           Specify the printer is compatible with IPP Everywhere"
 
 msgid "-m model                Set model name (default=Printer)"
-msgstr ""
+msgstr "-m model                Set model name (default=Printer)"
 
 msgid ""
 "-m model                Specify a standard model/PPD file for the printer"
@@ -2047,7 +2048,7 @@ msgid "-n count                Repeat the last file the given number of times"
 msgstr "-n count                Repeat the last file the given number of times"
 
 msgid "-n hostname             Set hostname for printer"
-msgstr ""
+msgstr "-n hostname             Set hostname for printer"
 
 msgid "-n num-copies           Specify the number of copies to print"
 msgstr "-n num-copies           Specify the number of copies to print"
@@ -2173,7 +2174,7 @@ msgid "-p destination          Specify/add the named destination"
 msgstr "-p destination          Specify/add the named destination"
 
 msgid "-p port                 Set port number for printer"
-msgstr ""
+msgstr "-p port                 Set port number for printer"
 
 msgid "-q                      Quietly report match via exit code"
 msgstr "-q                      Quietly report match via exit code"
@@ -2207,7 +2208,7 @@ msgid "-r reason               Specify a reason message that others can see"
 msgstr "-r reason               Specify a reason message that others can see"
 
 msgid "-r subtype,[subtype]    Set DNS-SD service subtype"
-msgstr ""
+msgstr "-r subtype,[subtype]    Set DNS-SD service subtype"
 
 msgid "-s                      Be silent"
 msgstr "-s                      Be silent"
@@ -2222,7 +2223,7 @@ msgid "-s cups-files.conf      Set cups-files.conf file to use."
 msgstr "-s cups-files.conf      Set cups-files.conf file to use."
 
 msgid "-s speed[,color-speed]  Set speed in pages per minute"
-msgstr ""
+msgstr "-s speed[,color-speed]  Set speed in pages per minute"
 
 msgid "-t                      Produce a test report"
 msgstr "-t                      Produce a test report"
@@ -3823,6 +3824,9 @@ msgstr "Invalid media name arguments."
 msgid "Invalid media size."
 msgstr "Invalid media size."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr "Invalid named IPP attribute in collection."
+
 msgid "Invalid ppd-name value."
 msgstr "Invalid ppd-name value."
 
@@ -3979,7 +3983,7 @@ msgstr "List Available Printers"
 
 #, c-format
 msgid "Listening on port %d."
-msgstr ""
+msgstr "Listening on port %d."
 
 msgid "Local printer created."
 msgstr "Local printer created."
@@ -4862,7 +4866,7 @@ msgid "Unable to allocate memory for pages array"
 msgstr "Unable to allocate memory for pages array"
 
 msgid "Unable to allocate memory for printer"
-msgstr ""
+msgstr "Unable to allocate memory for printer"
 
 msgid "Unable to cancel print job."
 msgstr "Unable to cancel print job."
@@ -4914,7 +4918,7 @@ msgstr "Unable to create server credentials."
 
 #, c-format
 msgid "Unable to create spool directory \"%s\": %s"
-msgstr ""
+msgstr "Unable to create spool directory \"%s\": %s"
 
 msgid "Unable to create temporary file"
 msgstr "Unable to create temporary file"
@@ -4973,7 +4977,7 @@ msgstr "Unable to establish a secure connection to host."
 
 #, c-format
 msgid "Unable to execute command \"%s\": %s"
-msgstr ""
+msgstr "Unable to execute command \"%s\": %s"
 
 msgid "Unable to find destination for job"
 msgstr "Unable to find destination for job"
@@ -5060,7 +5064,7 @@ msgstr "Unable to read print data."
 
 #, c-format
 msgid "Unable to register \"%s.%s\": %d"
-msgstr ""
+msgstr "Unable to register \"%s.%s\": %d"
 
 msgid "Unable to rename job document file."
 msgstr "Unable to rename job document file."
@@ -5114,7 +5118,7 @@ msgstr "Unknown choice \"%s\" for option \"%s\"."
 
 #, c-format
 msgid "Unknown directive \"%s\" on line %d of \"%s\" ignored."
-msgstr ""
+msgstr "Unknown directive \"%s\" on line %d of \"%s\" ignored."
 
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
@@ -5265,7 +5269,7 @@ msgstr ""
 "       program | cupstestppd [options] -"
 
 msgid "Usage: ippeveprinter [options] \"name\""
-msgstr ""
+msgstr "Usage: ippeveprinter [options] \"name\""
 
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
@@ -5364,7 +5368,7 @@ msgstr "Usage: snmp [host-or-ip-address]"
 
 #, c-format
 msgid "Using spool directory \"%s\"."
-msgstr ""
+msgstr "Using spool directory \"%s\"."
 
 msgid "Value uses indefinite length"
 msgstr "Value uses indefinite length"
@@ -5394,14 +5398,14 @@ msgid "Yes"
 msgstr "Yes"
 
 msgid "You cannot access this page."
-msgstr ""
+msgstr "You cannot access this page."
 
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "You must access this page using the URL https://%s:%d%s."
 
 msgid "Your account does not have the necessary privileges."
-msgstr ""
+msgstr "Your account does not have the necessary privileges."
 
 msgid "ZPL Label Printer"
 msgstr "ZPL Label Printer"
@@ -5702,7 +5706,7 @@ msgstr "cups-driverd failed to execute."
 
 #, c-format
 msgid "cupsctl: Cannot set %s directly."
-msgstr ""
+msgstr "cupsctl: Cannot set %s directly."
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -5999,10 +6003,6 @@ msgstr "Aborted"
 msgid "document-state.9"
 msgstr "Completed"
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr "End Power State"
-
 msgid "error-index uses indefinite length"
 msgstr "error-index uses indefinite length"
 
@@ -7043,194 +7043,6 @@ msgstr "None"
 msgid "imposition-template.signature"
 msgstr "Signature"
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr "Scanner Options"
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr "Scan Auto Scaling"
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr "Scan Auto Skew Correction"
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr "Scan Brightness"
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr "Scanning Mode"
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr "Automatic"
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr "Text"
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr "16-bit CMYK"
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr "8-bit CMYK"
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr "Color"
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr "8-bit Color"
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr "Monochrome"
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr "16-bit Monochrome"
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr "4-bit Monochrome"
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr "8-bit Monochrome"
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr "16-bit RGB"
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr "16-bit RGBA"
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr "8-bit RGBA"
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr "Scan Content"
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr "Automatic"
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr "Halftone"
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr "Line Art"
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr "Magazine"
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr "Photo"
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr "Text"
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr "Text And Photo"
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr "Scan Contrast"
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr "Film Type"
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr "Black And White Negative Film"
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr "Color Negative Film"
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr "Color Slide Film"
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr "Not Applicable"
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr "Scan Images To Transfer"
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr "Scan Media"
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr "Automatic"
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr "Scan Orientation"
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr "Scan Quality"
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr "Scan Resolution"
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr "Scan Scaling Height"
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr "Scan Scaling Width"
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr "Scan Regions"
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr "Scan Sharpness"
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr "2-Sided Scanning"
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr "Scan Source"
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr "Automatic Document Feeder"
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr "Film Reader"
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr "Platen"
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr "Insert Page Number"
@@ -7245,7 +7057,7 @@ msgstr "Insert Sheet"
 
 #, c-format
 msgid "ippeveprinter: Unable to open \"%s\": %s on line %d."
-msgstr ""
+msgstr "ippeveprinter: Unable to open \"%s\": %s on line %d."
 
 #, c-format
 msgid "ippfind: Bad regular expression: %s"
@@ -7409,21 +7221,9 @@ msgstr "Standard"
 msgid "job-accounting-user-id"
 msgstr "Job Accounting User ID"
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr "Collate Copies"
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr "Uncollated Sheets"
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr "Collated Documents"
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
-msgstr "Uncollated Documents"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
+msgstr "Cancel job after"
 
 #. TRANSLATORS: Copies
 msgid "job-copies"
@@ -7644,9 +7444,37 @@ msgstr "Owner"
 msgid "job-recipient-name"
 msgstr "Job Recipient Name"
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
-msgstr "Job Resource Ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr "Retain job until"
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr "Retain job until interval"
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr "Retain job until time"
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr "End of day"
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr "End of month"
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr "End of week"
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr "Indefinitely"
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
+msgstr "Never"
 
 #. TRANSLATORS: Job Save Disposition
 msgid "job-save-disposition"
@@ -7700,7 +7528,7 @@ msgstr "Job State Message"
 msgid "job-state-reasons"
 msgstr "Detailed Job State"
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr "Aborted By System"
 
@@ -7720,7 +7548,7 @@ msgstr "Account Info Needed"
 msgid "job-state-reasons.account-limit-reached"
 msgstr "Account Limit Reached"
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr "Compression Error"
 
@@ -7776,31 +7604,31 @@ msgstr "Document Unprintable Error"
 msgid "job-state-reasons.errors-detected"
 msgstr "Errors Detected"
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr "Job Canceled At Device"
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr "Job Canceled By Operator"
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr "Job Canceled By User"
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr "Job Completed Successfully"
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr "Job Completed With Errors"
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr "Job Completed With Warnings"
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr "Job Data Insufficient"
 
@@ -7820,19 +7648,19 @@ msgstr "Job Fetchable"
 msgid "job-state-reasons.job-held-for-review"
 msgstr "Job Held For Review"
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr "Job Hold Until Specified"
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr "Job Incoming"
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr "Job Interpreting"
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr "Job Outgoing"
 
@@ -7852,15 +7680,15 @@ msgstr "Job Printed With Errors"
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr "Job Printed With Warnings"
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr "Job Printing"
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr "Job Queued"
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr "Job Queued For Marker"
 
@@ -7868,7 +7696,7 @@ msgstr "Job Queued For Marker"
 msgid "job-state-reasons.job-release-wait"
 msgstr "Job Release Wait"
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr "Job Restartable"
 
@@ -7900,7 +7728,7 @@ msgstr "Job Spooling"
 msgid "job-state-reasons.job-streaming"
 msgstr "Job Streaming"
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr "Job Suspended"
 
@@ -7924,7 +7752,7 @@ msgstr "Job Suspending"
 msgid "job-state-reasons.job-transferring"
 msgstr "Job Transferring"
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr "Job Transforming"
 
@@ -7932,19 +7760,19 @@ msgstr "Job Transforming"
 msgid "job-state-reasons.none"
 msgstr "None"
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr "Printer Stopped"
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr "Printer Stopped Partly"
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr "Processing To Stop Point"
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr "Queued In Device"
 
@@ -7956,7 +7784,7 @@ msgstr "Resources Are Not Ready"
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr "Resources Are Not Supported"
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr "Service Off Line"
 
@@ -8174,7 +8002,7 @@ msgstr ""
 
 #, c-format
 msgid "lpadmin: Unable to open PPD \"%s\": %s"
-msgstr ""
+msgstr "lpadmin: Unable to open PPD \"%s\": %s"
 
 #, c-format
 msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d."
@@ -10022,6 +9850,10 @@ msgstr "Envelope Chou 2"
 msgid "media.jpn_chou3_120x235mm"
 msgstr "Envelope Chou 3"
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr "Envelope Chou 40"
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr "Envelope Chou 4"
@@ -10619,14 +10451,6 @@ msgstr "None"
 msgid "notify-events.printer-config-changed"
 msgstr "Printer Config Changed"
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr "Printer Created"
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr "Printer Deleted"
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr "Printer Finishings Changed"
@@ -10655,46 +10479,6 @@ msgstr "Printer State Changed"
 msgid "notify-events.printer-stopped"
 msgstr "Printer Stopped"
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr "Resource Canceled"
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr "Resource Config Changed"
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr "Resource Created"
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr "Resource Installed"
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr "Resource State Changed"
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr "System Config Changed"
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr "System Restarted"
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr "System Shutdown"
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr "System State Changed"
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr "System Stopped"
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr "Notify Get Interval"
@@ -11062,182 +10846,6 @@ msgstr "Platform Temperature"
 msgid "post-dial-string"
 msgstr "Post-dial String"
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr "Power State"
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr "Reset Mbr"
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr "Reset Nmi"
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr "Off Soft Graceful"
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr "Off Hard Graceful"
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr "Reset Mbr Graceful"
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr "Reset Soft Graceful"
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr "Reset Hard Graceful"
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr "Reset Init"
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr "Not Applicable"
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr "No Change"
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr "On"
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr "On Vendor1"
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr "On Vendor2"
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr "On Vendor3"
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr "On Vendor4"
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr "On Vendor5"
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr "Standby"
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr "Standby Vendor1"
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr "Standby Vendor2"
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr "Standby Vendor3"
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr "Standby Vendor4"
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr "Standby Vendor5"
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr "Suspend"
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr "Suspend Vendor1"
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr "Suspend Vendor2"
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr "Suspend Vendor3"
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr "Suspend Vendor4"
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr "Suspend Vendor5"
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr "Reset Soft"
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr "Off Hard"
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr "Hibernate"
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr "Hibernate Vendor1"
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr "Hibernate Vendor2"
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr "Hibernate Vendor3"
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr "Hibernate Vendor4"
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr "Hibernate Vendor5"
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr "Off Soft"
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr "Off Soft Vendor1"
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr "Off Soft Vendor2"
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr "Off Soft Vendor3"
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr "Off Soft Vendor4"
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr "Off Soft Vendor5"
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr "Reset Hard"
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: Adding include directory \"%s\"."
@@ -11738,6 +11346,10 @@ msgstr "Process Monochrome"
 msgid "print-content-optimize"
 msgstr "Print Optimization"
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr "Print Optimization"
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr "Automatic"
@@ -11746,6 +11358,10 @@ msgstr "Automatic"
 msgid "print-content-optimize.graphic"
 msgstr "Graphics"
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr "Graphics"
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr "Photo"
@@ -11758,6 +11374,10 @@ msgstr "Text"
 msgid "print-content-optimize.text-and-graphic"
 msgstr "Text and Graphics"
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr "Text and Graphics"
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr "Print Objects"
@@ -11878,61 +11498,53 @@ msgstr "printer %s/%s is idle.  enabled since %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "printer %s/%s now printing %s-%d.  enabled since %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr "Printer Geo Location"
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr "Printer ID"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
+msgstr "Printer Kind"
 
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
-msgstr "Printer Ids"
-
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
-msgstr "Printer Location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
+msgstr "Disc"
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
-msgstr "Message From Operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
+msgstr "Document"
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
-msgstr "Print Resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
+msgstr "Envelope"
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
-msgstr "Printer Service Type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
+msgstr "Label"
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
-msgstr "Copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
+msgstr "Large format"
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
-msgstr "Faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
+msgstr "Photo"
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
-msgstr "Faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
+msgstr "Postcard"
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
-msgstr "Print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
+msgstr "Receipt"
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
-msgstr "Print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
+msgstr "Roll"
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
-msgstr "Scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
+msgstr "Message From Operator"
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
-msgstr "Transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
+msgstr "Print Resolution"
 
 #. TRANSLATORS: Printer State
 msgid "printer-state"
@@ -12282,10 +11894,6 @@ msgstr "Cover Open"
 msgid "printer-state-reasons.deactivated"
 msgstr "Deactivated"
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr "Deleted"
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr "Developer Empty"
@@ -12470,6 +12078,26 @@ msgstr "Extruder Temperature Low"
 msgid "printer-state-reasons.fan-failure"
 msgstr "Fan Failure"
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr "Fax Modem Life Almost Over"
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr "Fax Modem Life Over"
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr "Fax Modem Missing"
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr "Fax Modem Turned Off"
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr "Fax Modem Turned On"
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr "Folder Added"
@@ -12614,11 +12242,11 @@ msgstr "Folder Unrecoverable Storage Error"
 msgid "printer-state-reasons.folder-warming-up"
 msgstr "Folder Warming Up"
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr "Fuser Over Temp"
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr "Fuser Under Temp"
 
@@ -12794,6 +12422,18 @@ msgstr "Input Media Form Parts Change"
 msgid "printer-state-reasons.input-media-size-change"
 msgstr "Input Media Size Change"
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr "Input Media Tray Failure"
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr "Input Media Tray Feed Error"
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr "Input Media Tray Jam"
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr "Input Media Type Change"
@@ -12802,11 +12442,27 @@ msgstr "Input Media Type Change"
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr "Input Media Weight Change"
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr "Input Pick Roller Failure"
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr "Input Pick Roller Life Over"
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr "Input Pick Roller Life Warn"
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr "Input Pick Roller Missing"
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr "Input Tray Elevation Failure"
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr "Input Tray Missing"
 
@@ -12994,7 +12650,7 @@ msgstr "Interpreter Resource Added"
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr "Interpreter Resource Deleted"
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr "Interpreter Resource Unavailable"
 
@@ -13170,6 +12826,10 @@ msgstr "Envelope Maker Warming Up"
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr "Marker Adjusting Print Quality"
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr "Marker Cleaner Missing"
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr "Marker Developer Almost Empty"
@@ -13178,6 +12838,14 @@ msgstr "Marker Developer Almost Empty"
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr "Marker Developer Empty"
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr "Marker Developer Missing"
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr "Marker Fuser Missing"
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr "Marker Fuser Thermistor Failure"
@@ -13188,39 +12856,63 @@ msgstr "Marker Fuser Timing Failure"
 
 #. TRANSLATORS: Marker Ink Almost Empty
 msgid "printer-state-reasons.marker-ink-almost-empty"
-msgstr "Marker Ink Almost Empty"
+msgstr "Low ink"
 
 #. TRANSLATORS: Marker Ink Empty
 msgid "printer-state-reasons.marker-ink-empty"
-msgstr "Marker Ink Empty"
+msgstr "Ink empty"
+
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr "Ink missing"
 
-#. TRANSLATORS: Marker Print Ribbon Almost Empty
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr "OPC missing"
+
+#. TRANSLATORS: Print ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
-msgstr "Marker Print Ribbon Almost Empty"
+msgstr "Print ribbon Almost Empty"
 
-#. TRANSLATORS: Marker Print Ribbon Empty
+#. TRANSLATORS: Print ribbon Empty
 msgid "printer-state-reasons.marker-print-ribbon-empty"
-msgstr "Marker Print Ribbon Empty"
+msgstr "Print ribbon Empty"
+
+#. TRANSLATORS: Print ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr "Print ribbon missing"
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr "Ink/toner almost empty"
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
-msgstr "Marker Supply Empty"
+msgstr "Ink/toner empty"
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
-msgstr "Marker Supply Low"
+msgstr "Ink/toner low"
+
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr "Ink/toner missing"
 
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
-msgstr "Marker Toner Cartridge Missing"
+msgstr "Toner cartridge missing"
+
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr "Toner missing"
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
-msgstr "Marker Waste Almost Full"
+msgstr "Ink/toner waste bin almost full"
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
-msgstr "Marker Waste Full"
+msgstr "Ink/toner waste bin full"
 
 #. TRANSLATORS: Marker Waste Ink Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-ink-receptacle-almost-full"
@@ -13230,6 +12922,14 @@ msgstr "Marker Waste Ink Receptacle Almost Full"
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr "Marker Waste Ink Receptacle Full"
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr "Marker Waste Ink Receptacle Missing"
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr "Ink/toner waste bin missing"
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr "Marker Waste Toner Receptacle Almost Full"
@@ -13238,6 +12938,10 @@ msgstr "Marker Waste Toner Receptacle Almost Full"
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr "Marker Waste Toner Receptacle Full"
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr "Marker Waste Toner Receptacle Missing"
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr "Material Empty"
@@ -13254,26 +12958,50 @@ msgstr "Material Needed"
 msgid "printer-state-reasons.media-drying"
 msgstr "Media Drying"
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr "Media Empty"
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr "Media Jam"
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
-msgstr "Media Low"
+msgstr "Paper tray is almost empty"
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
-msgstr "Media Needed"
+msgstr "Load paper"
 
 #. TRANSLATORS: Media Path Cannot Do 2-Sided Printing
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr "Media Path Cannot Do 2-Sided Printing"
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr "Media Path Failure"
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr "Media Path Input Empty"
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr "Media Path Input Feed Error"
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr "Media Path Input Jam"
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr "Media Path Input Request"
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr "Media Path Jam"
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr "Media Path Media Tray Almost Full"
@@ -13286,11 +13014,39 @@ msgstr "Media Path Media Tray Full"
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr "Media Path Media Tray Missing"
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr "Media Path Output Feed Error"
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr "Media Path Output Full"
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr "Media Path Output Jam"
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr "Media Path Pick Roller Failure"
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr "Media Path Pick Roller Life Over"
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr "Media Path Pick Roller Life Warn"
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr "Media Path Pick Roller Missing"
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr "Motor Failure"
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr "Moving To Paused"
 
@@ -13302,19 +13058,19 @@ msgstr "None"
 msgid "printer-state-reasons.opc-life-over"
 msgstr "Optical Photoconductor Life Over"
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr "Optical Photoconductor Near End-of-life"
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr "Other"
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr "Output Area Almost Full"
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr "Output Area Full"
 
@@ -13322,7 +13078,19 @@ msgstr "Output Area Full"
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr "Output Mailbox Select Failure"
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr "Output Media Tray Failure"
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr "Output Media Tray Feed Error"
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr "Output Media Tray Jam"
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr "Output Tray Missing"
 
@@ -13658,10 +13426,6 @@ msgstr "Puncher Unrecoverable Storage Error"
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr "Puncher Warming Up"
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr "Resuming"
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr "Separation Cutter Added"
@@ -13950,7 +13714,7 @@ msgstr "Sheet Rotator Unrecoverable Storage Error"
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr "Sheet Rotator Warming Up"
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr "Shutdown"
 
@@ -14534,7 +14298,7 @@ msgstr "Stitcher Unrecoverable Storage Error"
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr "Stitcher Warming Up"
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr "Stopped Partly"
 
@@ -14666,15 +14430,15 @@ msgstr "Subunit Unrecoverable Storage"
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr "Subunit Warming Up"
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr "Timed Out"
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr "Toner Empty"
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr "Toner Low"
 
@@ -14986,10 +14750,6 @@ msgstr "Stopped"
 msgid "printer-up-time"
 msgstr "Printer Uptime"
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr "Printer Xri"
-
 msgid "processing"
 msgstr "processing"
 
@@ -15040,146 +14800,10 @@ msgstr "request id is %s-%d (%d file(s))"
 msgid "request-id uses indefinite length"
 msgstr "request-id uses indefinite length"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr "Request Power State"
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr "Requested Attributes"
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr "Resource Format"
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr "Resource Format Accepted"
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr "Resource Formats"
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr "Resource ID"
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr "Resource Ids"
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr "Resource K Octets"
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr "Resource Signature"
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr "Resource State"
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr "Resource State Reasons"
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr "Cancel"
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr "Install"
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr "Resource Incoming"
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr "Pending"
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr "Available"
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr "Installed"
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr "Canceled"
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr "Aborted"
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr "Resource States"
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr "Resource Type"
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr "Executable Firmware"
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr "Executable Software"
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr "Static Font"
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr "Static Form"
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr "Static Icc Profile"
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr "Static Image"
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr "Static Logo"
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr "Static Other"
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr "Static Strings"
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr "Template Document"
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr "Template Job"
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr "Template Printer"
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr "Resource Types"
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr "Restart Get Interval"
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr "Retry Interval"
@@ -15254,18 +14878,6 @@ msgstr "Slip Sheets"
 msgid "separator-sheets-type.start-sheet"
 msgstr "Start Sheet"
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr "Collate Copies"
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr "Yes"
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr "No"
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr "2-Sided Printing"
@@ -15282,10 +14894,6 @@ msgstr "On (Portrait)"
 msgid "sides.two-sided-short-edge"
 msgstr "On (Landscape)"
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr "Start Power State"
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stat of %s failed: %s"
@@ -15408,50 +15016,10 @@ msgstr "system default destination: %s"
 msgid "system default destination: %s/%s"
 msgstr "system default destination: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr "System State"
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr "System State Reasons"
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr "Idle"
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr "Processing"
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr "Stopped"
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr "System URI"
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr "Timeout Predicate"
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr "Activity"
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr "Inactivity"
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr "None"
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr "To Name"
@@ -15569,38 +15137,6 @@ msgstr "untitled"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings uses indefinite length"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr "Which Printers"
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr "All"
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr "Idle"
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr "Not Accepting"
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr "Processing"
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr "Shutdown"
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr "Stopped"
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr "Testing"
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr "X Accuracy"
@@ -15674,46 +15210,3 @@ msgstr "{}                      URI"
 
 msgid "~/.cups/lpoptions file names default destination that does not exist."
 msgstr "~/.cups/lpoptions file names default destination that does not exist."
-
-#~ msgid "A Samba password is required to export printer drivers"
-#~ msgstr "A Samba password is required to export printer drivers"
-
-#~ msgid "A Samba username is required to export printer drivers"
-#~ msgstr "A Samba username is required to export printer drivers"
-
-#~ msgid "Export Printers to Samba"
-#~ msgstr "Export Printers to Samba"
-
-#~ msgid ""
-#~ "Usage:\n"
-#~ "\n"
-#~ "    lpadmin [-h server] -d destination\n"
-#~ "    lpadmin [-h server] -x destination\n"
-#~ "    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m "
-#~ "model]\n"
-#~ "                       [-r remove-class] [-v device] [-D description]\n"
-#~ "                       [-P ppd-file] [-o name=value]\n"
-#~ "                       [-u allow:user,user] [-u deny:user,user]"
-#~ msgstr ""
-#~ "Usage:\n"
-#~ "\n"
-#~ "    lpadmin [-h server] -d destination\n"
-#~ "    lpadmin [-h server] -x destination\n"
-#~ "    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m "
-#~ "model]\n"
-#~ "                       [-r remove-class] [-v device] [-D description]\n"
-#~ "                       [-P ppd-file] [-o name=value]\n"
-#~ "                       [-u allow:user,user] [-u deny:user,user]"
-
-#~ msgid ""
-#~ "You must access this page using the URL <A HREF=\"https://%s:%d%s"
-#~ "\">https://%s:%d%s</A>."
-#~ msgstr ""
-#~ "You must access this page using the URL <A HREF=\"https://%s:%d%s"
-#~ "\">https://%s:%d%s</A>."
-
-#~ msgid "cupsctl: Cannot set Listen or Port directly."
-#~ msgstr "cupsctl: Cannot set Listen or Port directly."
-
-#~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
-#~ msgstr "lpadmin: Unable to open PPD file \"%s\" - %s"
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 357bcbcba..6bf48312d 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -3759,6 +3759,9 @@ msgstr "Argumentos del nombre del papel no válidos."
 msgid "Invalid media size."
 msgstr "Tamaño de papel no válido."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr "Valor ppd-name' no válido."
 
@@ -5938,10 +5941,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index usa una longitud indefinida"
 
@@ -6978,194 +6977,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7342,20 +7153,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7577,8 +7376,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7633,7 +7460,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7653,7 +7480,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7709,31 +7536,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7753,19 +7580,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7785,15 +7612,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7801,7 +7628,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7833,7 +7660,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7857,7 +7684,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7865,19 +7692,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7889,7 +7716,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9954,6 +9781,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10551,14 +10382,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10587,46 +10410,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10994,182 +10777,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: Añadiendo directorio include \"%s\"."
@@ -11690,6 +11297,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11698,6 +11309,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11710,6 +11325,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11830,60 +11449,52 @@ msgstr "la impresora %s/%s está inactiva.  activada desde %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "la impresora %s/%s está ahora imprimiendo %s-%d.  activada desde %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12234,10 +11845,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12422,6 +12029,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12566,11 +12193,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12746,6 +12373,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12754,11 +12393,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12946,7 +12601,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13122,6 +12777,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13130,6 +12789,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13146,6 +12813,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13154,23 +12829,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13182,6 +12873,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13190,6 +12889,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13206,19 +12909,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13226,6 +12929,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13238,11 +12965,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13254,19 +13009,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13274,7 +13029,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13610,10 +13377,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13902,7 +13665,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14486,7 +14249,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14618,15 +14381,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14938,10 +14701,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "en proceso"
 
@@ -14992,146 +14751,10 @@ msgstr "la id solicitada es %s-%d (%d archivo(s))"
 msgid "request-id uses indefinite length"
 msgstr "request-id usa una longitud indefinida"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15206,18 +14829,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15234,10 +14845,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "estado de %s ha fallado: %s"
@@ -15360,50 +14967,10 @@ msgstr "destino predeterminado del sistema: %s"
 msgid "system default destination: %s/%s"
 msgstr "destino predeterminado del sistema: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15521,38 +15088,6 @@ msgstr "sin título"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings usa una longitud indefinida"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 552c835dc..f965def75 100644
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -3606,6 +3606,9 @@ msgstr ""
 msgid "Invalid media size."
 msgstr ""
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5738,10 +5741,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "Le paramètre error-index s’avère être de longueur indéfinie"
 
@@ -6778,194 +6777,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7142,20 +6953,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7377,8 +7176,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7433,7 +7260,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7453,7 +7280,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7509,31 +7336,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7553,19 +7380,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7585,15 +7412,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7601,7 +7428,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7633,7 +7460,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7657,7 +7484,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7665,19 +7492,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7689,7 +7516,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9739,6 +9566,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10336,14 +10167,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10372,46 +10195,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10779,182 +10562,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
@@ -11449,6 +11056,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11457,6 +11068,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11469,6 +11084,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11589,60 +11208,52 @@ msgstr ""
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -11993,10 +11604,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12181,6 +11788,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12325,11 +11952,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12505,6 +12132,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12513,11 +12152,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12705,7 +12360,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -12881,6 +12536,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -12889,6 +12548,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -12905,6 +12572,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -12913,23 +12588,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -12941,6 +12632,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -12949,6 +12648,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -12965,19 +12668,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -12985,6 +12688,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -12997,11 +12724,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13013,19 +12768,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13033,7 +12788,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13369,10 +13136,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13661,7 +13424,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14245,7 +14008,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14377,15 +14140,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14697,10 +14460,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "en cours"
 
@@ -14751,146 +14510,10 @@ msgstr ""
 msgid "request-id uses indefinite length"
 msgstr "Le paramètre request-id s’avère être de longueur indéfinie"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -14965,18 +14588,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -14993,10 +14604,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stat sur %s a échoué : %s"
@@ -15119,50 +14726,10 @@ msgstr ""
 msgid "system default destination: %s/%s"
 msgstr ""
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15280,38 +14847,6 @@ msgstr "sans titre"
 msgid "variable-bindings uses indefinite length"
 msgstr ""
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_it.po b/locale/cups_it.po
index 900c37e89..ff5e45f54 100644
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Italian - Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -3756,6 +3756,9 @@ msgstr "Gli argomenti del nome del supporto non sono validi."
 msgid "Invalid media size."
 msgstr "La dimensione del supporto non è valida."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5923,10 +5926,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index utilizza una lunghezza indefinita"
 
@@ -6963,194 +6962,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7327,20 +7138,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7562,8 +7361,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7618,7 +7445,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7638,7 +7465,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7694,31 +7521,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7738,19 +7565,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7770,15 +7597,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7786,7 +7613,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7818,7 +7645,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7842,7 +7669,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7850,19 +7677,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7874,7 +7701,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9936,6 +9763,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10533,14 +10364,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10569,46 +10392,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10976,182 +10759,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: aggiunta della directory \"%s\"."
@@ -11671,6 +11278,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11679,6 +11290,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11691,6 +11306,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11811,60 +11430,52 @@ msgstr "la stampante %s/%s è inattiva.  è stata abilitata da %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "la stampante %s/%s sta stampando %s-%d. è stata abilitata da %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12215,10 +11826,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12403,6 +12010,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12547,11 +12174,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12727,6 +12354,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12735,11 +12374,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12927,7 +12582,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13103,6 +12758,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13111,6 +12770,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13127,6 +12794,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13135,23 +12810,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13163,6 +12854,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13171,6 +12870,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13187,19 +12890,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13207,6 +12910,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13219,11 +12946,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13235,19 +12990,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13255,7 +13010,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13591,10 +13358,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13883,7 +13646,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14467,7 +14230,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14599,15 +14362,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14919,10 +14682,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "elaborazione in corso"
 
@@ -14973,146 +14732,10 @@ msgstr "request id è %s-%d (%d file(s))"
 msgid "request-id uses indefinite length"
 msgstr "request-id utilizza una lunghezza indefinita"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15187,18 +14810,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15215,10 +14826,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stat di %s non riuscito: %s"
@@ -15341,50 +14948,10 @@ msgstr "destinazione predefinita del sistema: %s"
 msgid "system default destination: %s/%s"
 msgstr "destinazione predefinita del sistema: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15502,38 +15069,6 @@ msgstr "senza titolo"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings utilizza una lunghezza indefinita"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index d34b61658..b47e7f15d 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: Japanese - OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -3754,6 +3754,9 @@ msgstr "無効なメディア名引数です。"
 msgid "Invalid media size."
 msgstr "無効なメディアサイズです。"
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5906,10 +5909,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index は不定長です"
 
@@ -6946,194 +6945,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7311,20 +7122,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7546,8 +7345,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7602,7 +7429,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7622,7 +7449,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7678,31 +7505,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7722,19 +7549,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7754,15 +7581,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7770,7 +7597,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7802,7 +7629,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7826,7 +7653,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7834,19 +7661,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7858,7 +7685,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9928,6 +9755,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10525,14 +10356,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10561,46 +10384,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10968,182 +10751,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: ディレクトリー \"%s\" を追加しています。"
@@ -11689,6 +11296,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11697,6 +11308,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11709,6 +11324,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11829,60 +11448,52 @@ msgstr "プリンター %s/%s は待機中です。%s 以来有効です"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "プリンター %s/%s は現在 %s-%d を印刷中です。%s 以来有効です"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12233,10 +11844,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12421,6 +12028,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12565,11 +12192,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12745,6 +12372,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12753,11 +12392,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12945,7 +12600,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13121,6 +12776,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13129,6 +12788,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13145,6 +12812,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13153,23 +12828,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13181,6 +12872,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13189,6 +12888,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13205,19 +12908,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13225,6 +12928,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13237,11 +12964,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13253,19 +13008,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13273,7 +13028,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13609,10 +13376,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13901,7 +13664,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14485,7 +14248,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14617,15 +14380,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14937,10 +14700,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "処理中"
 
@@ -14991,146 +14750,10 @@ msgstr "リクエスト ID は %s-%d です (%d 個のファイル)"
 msgid "request-id uses indefinite length"
 msgstr "リクエスト ID の長さが不定"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15205,18 +14828,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15233,10 +14844,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "%s の状態取得に失敗しました: %s"
@@ -15359,50 +14966,10 @@ msgstr "システムのデフォルトの宛先: %s"
 msgid "system default destination: %s/%s"
 msgstr "システムのデフォルトの宛先: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15520,38 +15087,6 @@ msgstr "タイトルなし"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings の長さが不定"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index d4523459c..e5fd7686d 100644
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
@@ -3763,6 +3763,9 @@ msgstr "Argumentos de nome de mídia inválidos."
 msgid "Invalid media size."
 msgstr "Tamanho de mídia inválido."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5933,10 +5936,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index usa comprimento indefinido"
 
@@ -6973,194 +6972,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7337,20 +7148,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7572,8 +7371,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7628,7 +7455,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7648,7 +7475,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7704,31 +7531,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7748,19 +7575,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7780,15 +7607,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7796,7 +7623,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7828,7 +7655,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7852,7 +7679,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7860,19 +7687,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7884,7 +7711,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9945,6 +9772,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10542,14 +10373,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10578,46 +10401,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10985,182 +10768,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: Adicionando diretório de include \"%s\"."
@@ -11668,6 +11275,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11676,6 +11287,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11688,6 +11303,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11808,60 +11427,52 @@ msgstr "impressora %s/%s está inativa; habilitada desde %s"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "impressora %s/%s está imprimindo %s-%d; habilitada desde %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12212,10 +11823,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12400,6 +12007,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12544,11 +12171,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12724,6 +12351,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12732,11 +12371,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12924,7 +12579,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13100,6 +12755,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13108,6 +12767,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13124,6 +12791,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13132,23 +12807,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13160,6 +12851,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13168,6 +12867,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13184,19 +12887,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13204,6 +12907,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13216,11 +12943,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13232,19 +12987,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13252,7 +13007,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13588,10 +13355,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13880,7 +13643,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14464,7 +14227,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14596,15 +14359,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14916,10 +14679,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "processando"
 
@@ -14970,146 +14729,10 @@ msgstr "id de requisição é %s-%d (%d arquivo(s))"
 msgid "request-id uses indefinite length"
 msgstr "request-id usa comprimento indefinido"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15184,18 +14807,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15212,10 +14823,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "falhou o estado de %s: %s"
@@ -15338,50 +14945,10 @@ msgstr "destino padrão do sistema: %s"
 msgid "system default destination: %s/%s"
 msgstr "destino padrão do sistema: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15499,38 +15066,6 @@ msgstr "sem título"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings usa comprimento indefinido"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 1b9ab3944..dc078f6fb 100644
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: Russian - PuppyRus Linux Team\n"
@@ -3724,6 +3724,9 @@ msgstr "Неверные аргументы имени бумаги."
 msgid "Invalid media size."
 msgstr "Неверный размер бумаги."
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr ""
 
@@ -5882,10 +5885,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "Для error-index длина не установлена"
 
@@ -6922,194 +6921,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7286,20 +7097,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7521,8 +7320,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7577,7 +7404,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7597,7 +7424,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7653,31 +7480,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7697,19 +7524,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7729,15 +7556,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7745,7 +7572,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7777,7 +7604,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7801,7 +7628,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7809,19 +7636,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7833,7 +7660,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9893,6 +9720,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10490,14 +10321,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10526,46 +10349,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10933,182 +10716,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: Добавление каталога \"%s\"."
@@ -11620,6 +11227,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11628,6 +11239,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11640,6 +11255,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11760,60 +11379,52 @@ msgstr "принтер %s/%s свободен. Включен с момента
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "принтер %s/%s сейчас печатает %s-%d. Включен с момента %s"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12164,10 +11775,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12352,6 +11959,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12496,11 +12123,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12676,6 +12303,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12684,11 +12323,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12876,7 +12531,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13052,6 +12707,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13060,6 +12719,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13076,6 +12743,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13084,23 +12759,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13112,6 +12803,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13120,6 +12819,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13136,19 +12839,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13156,6 +12859,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13168,11 +12895,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13184,19 +12939,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13204,7 +12959,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13540,10 +13307,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13832,7 +13595,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14416,7 +14179,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14548,15 +14311,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14868,10 +14631,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "обработка"
 
@@ -14922,146 +14681,10 @@ msgstr "id запроса %s-%d (%d файл.)"
 msgid "request-id uses indefinite length"
 msgstr "Для request-id длина не определена"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15136,18 +14759,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15164,10 +14775,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "не удалось установить %s: %s"
@@ -15290,50 +14897,10 @@ msgstr "назначение системы по умолчанию: %s"
 msgid "system default destination: %s/%s"
 msgstr "назначение системы по умолчанию: %s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15451,38 +15018,6 @@ msgstr "новый"
 msgid "variable-bindings uses indefinite length"
 msgstr "Для variable-bindings длина не установлена"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index 6130352bf..818df30e9 100644
--- a/locale/cups_zh_CN.po
+++ b/locale/cups_zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-05-17 10:17-0400\n"
+"POT-Creation-Date: 2019-08-23 09:13-0400\n"
 "PO-Revision-Date: 2018-10-09 00:21-0500\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.io>\n"
 "Language-Team: Chinese (Simplified)\n"
@@ -3713,6 +3713,9 @@ msgstr "无效的媒体名称参数。"
 msgid "Invalid media size."
 msgstr "无效的媒体大小。"
 
+msgid "Invalid named IPP attribute in collection."
+msgstr ""
+
 msgid "Invalid ppd-name value."
 msgstr "无效的 ppd-name 值。"
 
@@ -5852,10 +5855,6 @@ msgstr ""
 msgid "document-state.9"
 msgstr ""
 
-#. TRANSLATORS: End Power State
-msgid "end-power-state"
-msgstr ""
-
 msgid "error-index uses indefinite length"
 msgstr "error-index 使用不定长度"
 
@@ -6892,194 +6891,6 @@ msgstr ""
 msgid "imposition-template.signature"
 msgstr ""
 
-#. TRANSLATORS: Scanner Options
-msgid "input-attributes"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Scaling
-msgid "input-auto-scaling"
-msgstr ""
-
-#. TRANSLATORS: Scan Auto Skew Correction
-msgid "input-auto-skew-correction"
-msgstr ""
-
-#. TRANSLATORS: Scan Brightness
-msgid "input-brightness"
-msgstr ""
-
-#. TRANSLATORS: Scanning Mode
-msgid "input-color-mode"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-color-mode.auto"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-color-mode.bi-level"
-msgstr ""
-
-#. TRANSLATORS: 16-bit CMYK
-msgid "input-color-mode.cmyk_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit CMYK
-msgid "input-color-mode.cmyk_8"
-msgstr ""
-
-#. TRANSLATORS: Color
-msgid "input-color-mode.color"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Color
-msgid "input-color-mode.color_8"
-msgstr ""
-
-#. TRANSLATORS: Monochrome
-msgid "input-color-mode.monochrome"
-msgstr ""
-
-#. TRANSLATORS: 16-bit Monochrome
-msgid "input-color-mode.monochrome_16"
-msgstr ""
-
-#. TRANSLATORS: 4-bit Monochrome
-msgid "input-color-mode.monochrome_4"
-msgstr ""
-
-#. TRANSLATORS: 8-bit Monochrome
-msgid "input-color-mode.monochrome_8"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGB
-msgid "input-color-mode.rgb_16"
-msgstr ""
-
-#. TRANSLATORS: 16-bit RGBA
-msgid "input-color-mode.rgba_16"
-msgstr ""
-
-#. TRANSLATORS: 8-bit RGBA
-msgid "input-color-mode.rgba_8"
-msgstr ""
-
-#. TRANSLATORS: Scan Content
-msgid "input-content-type"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-content-type.auto"
-msgstr ""
-
-#. TRANSLATORS: Halftone
-msgid "input-content-type.halftone"
-msgstr ""
-
-#. TRANSLATORS: Line Art
-msgid "input-content-type.line-art"
-msgstr ""
-
-#. TRANSLATORS: Magazine
-msgid "input-content-type.magazine"
-msgstr ""
-
-#. TRANSLATORS: Photo
-msgid "input-content-type.photo"
-msgstr ""
-
-#. TRANSLATORS: Text
-msgid "input-content-type.text"
-msgstr ""
-
-#. TRANSLATORS: Text And Photo
-msgid "input-content-type.text-and-photo"
-msgstr ""
-
-#. TRANSLATORS: Scan Contrast
-msgid "input-contrast"
-msgstr ""
-
-#. TRANSLATORS: Film Type
-msgid "input-film-scan-mode"
-msgstr ""
-
-#. TRANSLATORS: Black And White Negative Film
-msgid "input-film-scan-mode.black-and-white-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Negative Film
-msgid "input-film-scan-mode.color-negative-film"
-msgstr ""
-
-#. TRANSLATORS: Color Slide Film
-msgid "input-film-scan-mode.color-slide-film"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "input-film-scan-mode.not-applicable"
-msgstr ""
-
-#. TRANSLATORS: Scan Images To Transfer
-msgid "input-images-to-transfer"
-msgstr ""
-
-#. TRANSLATORS: Scan Media
-msgid "input-media"
-msgstr ""
-
-#. TRANSLATORS: Automatic
-msgid "input-media.auto"
-msgstr ""
-
-#. TRANSLATORS: Scan Orientation
-msgid "input-orientation-requested"
-msgstr ""
-
-#. TRANSLATORS: Scan Quality
-msgid "input-quality"
-msgstr ""
-
-#. TRANSLATORS: Scan Resolution
-msgid "input-resolution"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Height
-msgid "input-scaling-height"
-msgstr ""
-
-#. TRANSLATORS: Scan Scaling Width
-msgid "input-scaling-width"
-msgstr ""
-
-#. TRANSLATORS: Scan Regions
-msgid "input-scan-regions"
-msgstr ""
-
-#. TRANSLATORS: Scan Sharpness
-msgid "input-sharpness"
-msgstr ""
-
-#. TRANSLATORS: 2-Sided Scanning
-msgid "input-sides"
-msgstr ""
-
-#. TRANSLATORS: Scan Source
-msgid "input-source"
-msgstr ""
-
-#. TRANSLATORS: Automatic Document Feeder
-msgid "input-source.adf"
-msgstr ""
-
-#. TRANSLATORS: Film Reader
-msgid "input-source.film-reader"
-msgstr ""
-
-#. TRANSLATORS: Platen
-msgid "input-source.platen"
-msgstr ""
-
 #. TRANSLATORS: Insert Page Number
 msgid "insert-after-page-number"
 msgstr ""
@@ -7256,20 +7067,8 @@ msgstr ""
 msgid "job-accounting-user-id"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "job-collation-type"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Sheets
-msgid "job-collation-type.3"
-msgstr ""
-
-#. TRANSLATORS: Collated Documents
-msgid "job-collation-type.4"
-msgstr ""
-
-#. TRANSLATORS: Uncollated Documents
-msgid "job-collation-type.5"
+#. TRANSLATORS: Job Cancel After
+msgid "job-cancel-after"
 msgstr ""
 
 #. TRANSLATORS: Copies
@@ -7491,8 +7290,36 @@ msgstr ""
 msgid "job-recipient-name"
 msgstr ""
 
-#. TRANSLATORS: Job Resource Ids
-msgid "job-resource-ids"
+#. TRANSLATORS: Job Retain Until
+msgid "job-retain-until"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Interval
+msgid "job-retain-until-interval"
+msgstr ""
+
+#. TRANSLATORS: Job Retain Until Time
+msgid "job-retain-until-time"
+msgstr ""
+
+#. TRANSLATORS: End Of Day
+msgid "job-retain-until.end-of-day"
+msgstr ""
+
+#. TRANSLATORS: End Of Month
+msgid "job-retain-until.end-of-month"
+msgstr ""
+
+#. TRANSLATORS: End Of Week
+msgid "job-retain-until.end-of-week"
+msgstr ""
+
+#. TRANSLATORS: Indefinite
+msgid "job-retain-until.indefinite"
+msgstr ""
+
+#. TRANSLATORS: None
+msgid "job-retain-until.none"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
@@ -7547,7 +7374,7 @@ msgstr ""
 msgid "job-state-reasons"
 msgstr ""
 
-#. TRANSLATORS: Aborted By System
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
@@ -7567,7 +7394,7 @@ msgstr ""
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
-#. TRANSLATORS: Compression Error
+#. TRANSLATORS: Decompression error
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
@@ -7623,31 +7450,31 @@ msgstr ""
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled At Device
+#. TRANSLATORS: Canceled at printer
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By Operator
+#. TRANSLATORS: Canceled by operator
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
-#. TRANSLATORS: Job Canceled By User
+#. TRANSLATORS: Canceled by user
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
-#. TRANSLATORS: Job Completed Successfully
+#. TRANSLATORS:
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Errors
+#. TRANSLATORS: Completed with errors
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
-#. TRANSLATORS: Job Completed With Warnings
+#. TRANSLATORS: Completed with warnings
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Data Insufficient
+#. TRANSLATORS: Insufficient data
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
@@ -7667,19 +7494,19 @@ msgstr ""
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
-#. TRANSLATORS: Job Hold Until Specified
+#. TRANSLATORS: Job held
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
-#. TRANSLATORS: Job Incoming
+#. TRANSLATORS: Incoming
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
-#. TRANSLATORS: Job Interpreting
+#. TRANSLATORS: Interpreting
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
-#. TRANSLATORS: Job Outgoing
+#. TRANSLATORS: Outgoing
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
@@ -7699,15 +7526,15 @@ msgstr ""
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
-#. TRANSLATORS: Job Printing
+#. TRANSLATORS: Printing
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
-#. TRANSLATORS: Job Queued
+#. TRANSLATORS: Preparing to print
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
-#. TRANSLATORS: Job Queued For Marker
+#. TRANSLATORS: Processing document
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
@@ -7715,7 +7542,7 @@ msgstr ""
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
-#. TRANSLATORS: Job Restartable
+#. TRANSLATORS: Restartable
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
@@ -7747,7 +7574,7 @@ msgstr ""
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
-#. TRANSLATORS: Job Suspended
+#. TRANSLATORS: Suspended
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
@@ -7771,7 +7598,7 @@ msgstr ""
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
-#. TRANSLATORS: Job Transforming
+#. TRANSLATORS: Transforming
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
@@ -7779,19 +7606,19 @@ msgstr ""
 msgid "job-state-reasons.none"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped
+#. TRANSLATORS: Printer offline
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Printer Stopped Partly
+#. TRANSLATORS: Printer partially stopped
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
-#. TRANSLATORS: Processing To Stop Point
+#. TRANSLATORS: Stopping
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
-#. TRANSLATORS: Queued In Device
+#. TRANSLATORS: Ready
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
@@ -7803,7 +7630,7 @@ msgstr ""
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
-#. TRANSLATORS: Service Off Line
+#. TRANSLATORS: Service offline
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
@@ -9861,6 +9688,10 @@ msgstr ""
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
+#. TRANSLATORS: Envelope Chou 40
+msgid "media.jpn_chou40_90x225mm"
+msgstr ""
+
 #. TRANSLATORS: Envelope Chou 4
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
@@ -10458,14 +10289,6 @@ msgstr ""
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
-#. TRANSLATORS: Printer Created
-msgid "notify-events.printer-created"
-msgstr ""
-
-#. TRANSLATORS: Printer Deleted
-msgid "notify-events.printer-deleted"
-msgstr ""
-
 #. TRANSLATORS: Printer Finishings Changed
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
@@ -10494,46 +10317,6 @@ msgstr ""
 msgid "notify-events.printer-stopped"
 msgstr ""
 
-#. TRANSLATORS: Resource Canceled
-msgid "notify-events.resource-canceled"
-msgstr ""
-
-#. TRANSLATORS: Resource Config Changed
-msgid "notify-events.resource-config-changed"
-msgstr ""
-
-#. TRANSLATORS: Resource Created
-msgid "notify-events.resource-created"
-msgstr ""
-
-#. TRANSLATORS: Resource Installed
-msgid "notify-events.resource-installed"
-msgstr ""
-
-#. TRANSLATORS: Resource State Changed
-msgid "notify-events.resource-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Config Changed
-msgid "notify-events.system-config-changed"
-msgstr ""
-
-#. TRANSLATORS: System Restarted
-msgid "notify-events.system-restarted"
-msgstr ""
-
-#. TRANSLATORS: System Shutdown
-msgid "notify-events.system-shutdown"
-msgstr ""
-
-#. TRANSLATORS: System State Changed
-msgid "notify-events.system-state-changed"
-msgstr ""
-
-#. TRANSLATORS: System Stopped
-msgid "notify-events.system-stopped"
-msgstr ""
-
 #. TRANSLATORS: Notify Get Interval
 msgid "notify-get-interval"
 msgstr ""
@@ -10901,182 +10684,6 @@ msgstr ""
 msgid "post-dial-string"
 msgstr ""
 
-#. TRANSLATORS: Power State
-msgid "power-state"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr
-msgid "power-state.100"
-msgstr ""
-
-#. TRANSLATORS: Reset Nmi
-msgid "power-state.110"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Graceful
-msgid "power-state.120"
-msgstr ""
-
-#. TRANSLATORS: Off Hard Graceful
-msgid "power-state.130"
-msgstr ""
-
-#. TRANSLATORS: Reset Mbr Graceful
-msgid "power-state.140"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft Graceful
-msgid "power-state.150"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard Graceful
-msgid "power-state.160"
-msgstr ""
-
-#. TRANSLATORS: Reset Init
-msgid "power-state.170"
-msgstr ""
-
-#. TRANSLATORS: Not Applicable
-msgid "power-state.180"
-msgstr ""
-
-#. TRANSLATORS: No Change
-msgid "power-state.190"
-msgstr ""
-
-#. TRANSLATORS: On
-msgid "power-state.20"
-msgstr ""
-
-#. TRANSLATORS: On Vendor1
-msgid "power-state.21"
-msgstr ""
-
-#. TRANSLATORS: On Vendor2
-msgid "power-state.22"
-msgstr ""
-
-#. TRANSLATORS: On Vendor3
-msgid "power-state.23"
-msgstr ""
-
-#. TRANSLATORS: On Vendor4
-msgid "power-state.24"
-msgstr ""
-
-#. TRANSLATORS: On Vendor5
-msgid "power-state.25"
-msgstr ""
-
-#. TRANSLATORS: Standby
-msgid "power-state.30"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor1
-msgid "power-state.31"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor2
-msgid "power-state.32"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor3
-msgid "power-state.33"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor4
-msgid "power-state.34"
-msgstr ""
-
-#. TRANSLATORS: Standby Vendor5
-msgid "power-state.35"
-msgstr ""
-
-#. TRANSLATORS: Suspend
-msgid "power-state.40"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor1
-msgid "power-state.41"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor2
-msgid "power-state.42"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor3
-msgid "power-state.43"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor4
-msgid "power-state.44"
-msgstr ""
-
-#. TRANSLATORS: Suspend Vendor5
-msgid "power-state.45"
-msgstr ""
-
-#. TRANSLATORS: Reset Soft
-msgid "power-state.50"
-msgstr ""
-
-#. TRANSLATORS: Off Hard
-msgid "power-state.60"
-msgstr ""
-
-#. TRANSLATORS: Hibernate
-msgid "power-state.70"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor1
-msgid "power-state.71"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor2
-msgid "power-state.72"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor3
-msgid "power-state.73"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor4
-msgid "power-state.74"
-msgstr ""
-
-#. TRANSLATORS: Hibernate Vendor5
-msgid "power-state.75"
-msgstr ""
-
-#. TRANSLATORS: Off Soft
-msgid "power-state.80"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor1
-msgid "power-state.81"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor2
-msgid "power-state.82"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor3
-msgid "power-state.83"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor4
-msgid "power-state.84"
-msgstr ""
-
-#. TRANSLATORS: Off Soft Vendor5
-msgid "power-state.85"
-msgstr ""
-
-#. TRANSLATORS: Reset Hard
-msgid "power-state.90"
-msgstr ""
-
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc：正在添加包含目录“%s”。"
@@ -11576,6 +11183,10 @@ msgstr ""
 msgid "print-content-optimize"
 msgstr ""
 
+#. TRANSLATORS: Print Content Optimize Actual
+msgid "print-content-optimize-actual"
+msgstr ""
+
 #. TRANSLATORS: Automatic
 msgid "print-content-optimize.auto"
 msgstr ""
@@ -11584,6 +11195,10 @@ msgstr ""
 msgid "print-content-optimize.graphic"
 msgstr ""
 
+#. TRANSLATORS: Graphics
+msgid "print-content-optimize.graphics"
+msgstr ""
+
 #. TRANSLATORS: Photo
 msgid "print-content-optimize.photo"
 msgstr ""
@@ -11596,6 +11211,10 @@ msgstr ""
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
+#. TRANSLATORS: Text And Graphics
+msgid "print-content-optimize.text-and-graphics"
+msgstr ""
+
 #. TRANSLATORS: Print Objects
 msgid "print-objects"
 msgstr ""
@@ -11716,60 +11335,52 @@ msgstr "打印机 %s/%s 目前空闲。从 %s 开始启用"
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "打印机 %s/%s 正在打印 %s-%d。从 %s 开始启用"
 
-#. TRANSLATORS: Printer Geo Location
-msgid "printer-geo-location"
-msgstr ""
-
-#. TRANSLATORS: Printer ID
-msgid "printer-id"
-msgstr ""
-
-#. TRANSLATORS: Printer Ids
-msgid "printer-ids"
+#. TRANSLATORS: Printer Kind
+msgid "printer-kind"
 msgstr ""
 
-#. TRANSLATORS: Printer Location
-msgid "printer-location"
+#. TRANSLATORS: Disc
+msgid "printer-kind.disc"
 msgstr ""
 
-#. TRANSLATORS: Message From Operator
-msgid "printer-message-from-operator"
+#. TRANSLATORS: Document
+msgid "printer-kind.document"
 msgstr ""
 
-#. TRANSLATORS: Print Resolution
-msgid "printer-resolution"
+#. TRANSLATORS: Envelope
+msgid "printer-kind.envelope"
 msgstr ""
 
-#. TRANSLATORS: Printer Service Type
-msgid "printer-service-type"
+#. TRANSLATORS: Label
+msgid "printer-kind.label"
 msgstr ""
 
-#. TRANSLATORS: Copy
-msgid "printer-service-type.copy"
+#. TRANSLATORS: Large Format
+msgid "printer-kind.large-format"
 msgstr ""
 
-#. TRANSLATORS: Faxin
-msgid "printer-service-type.faxin"
+#. TRANSLATORS: Photo
+msgid "printer-kind.photo"
 msgstr ""
 
-#. TRANSLATORS: Faxout
-msgid "printer-service-type.faxout"
+#. TRANSLATORS: Postcard
+msgid "printer-kind.postcard"
 msgstr ""
 
-#. TRANSLATORS: Print
-msgid "printer-service-type.print"
+#. TRANSLATORS: Receipt
+msgid "printer-kind.receipt"
 msgstr ""
 
-#. TRANSLATORS: Print3d
-msgid "printer-service-type.print3d"
+#. TRANSLATORS: Roll
+msgid "printer-kind.roll"
 msgstr ""
 
-#. TRANSLATORS: Scan
-msgid "printer-service-type.scan"
+#. TRANSLATORS: Message From Operator
+msgid "printer-message-from-operator"
 msgstr ""
 
-#. TRANSLATORS: Transform
-msgid "printer-service-type.transform"
+#. TRANSLATORS: Print Resolution
+msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
@@ -12120,10 +11731,6 @@ msgstr ""
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
-#. TRANSLATORS: Deleted
-msgid "printer-state-reasons.deleted"
-msgstr ""
-
 #. TRANSLATORS: Developer Empty
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
@@ -12308,6 +11915,26 @@ msgstr ""
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
+#. TRANSLATORS: Fax Modem Life Almost Over
+msgid "printer-state-reasons.fax-modem-life-almost-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Life Over
+msgid "printer-state-reasons.fax-modem-life-over"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Missing
+msgid "printer-state-reasons.fax-modem-missing"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned Off
+msgid "printer-state-reasons.fax-modem-turned-off"
+msgstr ""
+
+#. TRANSLATORS: Fax Modem Turned On
+msgid "printer-state-reasons.fax-modem-turned-on"
+msgstr ""
+
 #. TRANSLATORS: Folder Added
 msgid "printer-state-reasons.folder-added"
 msgstr ""
@@ -12452,11 +12079,11 @@ msgstr ""
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Fuser Over Temp
+#. TRANSLATORS: Fuser temperature high
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
-#. TRANSLATORS: Fuser Under Temp
+#. TRANSLATORS: Fuser temperature low
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
@@ -12632,6 +12259,18 @@ msgstr ""
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
+#. TRANSLATORS: Input Media Tray Failure
+msgid "printer-state-reasons.input-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Feed Error
+msgid "printer-state-reasons.input-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Input Media Tray Jam
+msgid "printer-state-reasons.input-media-tray-jam"
+msgstr ""
+
 #. TRANSLATORS: Input Media Type Change
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
@@ -12640,11 +12279,27 @@ msgstr ""
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
+#. TRANSLATORS: Input Pick Roller Failure
+msgid "printer-state-reasons.input-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Over
+msgid "printer-state-reasons.input-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Life Warn
+msgid "printer-state-reasons.input-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Input Pick Roller Missing
+msgid "printer-state-reasons.input-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Input Tray Elevation Failure
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
-#. TRANSLATORS: Input Tray Missing
+#. TRANSLATORS: Paper tray is missing
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
@@ -12832,7 +12487,7 @@ msgstr ""
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
-#. TRANSLATORS: Interpreter Resource Unavailable
+#. TRANSLATORS: Printer resource unavailable
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
@@ -13008,6 +12663,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
+#. TRANSLATORS: Marker Cleaner Missing
+msgid "printer-state-reasons.marker-cleaner-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Developer Almost Empty
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
@@ -13016,6 +12675,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Developer Missing
+msgid "printer-state-reasons.marker-developer-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Fuser Missing
+msgid "printer-state-reasons.marker-fuser-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Fuser Thermistor Failure
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
@@ -13032,6 +12699,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
+#. TRANSLATORS: Marker Ink Missing
+msgid "printer-state-reasons.marker-ink-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Opc Missing
+msgid "printer-state-reasons.marker-opc-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
@@ -13040,23 +12715,39 @@ msgstr ""
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Empty
+#. TRANSLATORS: Marker Print Ribbon Missing
+msgid "printer-state-reasons.marker-print-ribbon-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Supply Almost Empty
+msgid "printer-state-reasons.marker-supply-almost-empty"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner empty
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
-#. TRANSLATORS: Marker Supply Low
+#. TRANSLATORS: Ink/toner low
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
+#. TRANSLATORS: Marker Supply Missing
+msgid "printer-state-reasons.marker-supply-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Toner Cartridge Missing
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Almost Full
+#. TRANSLATORS: Marker Toner Missing
+msgid "printer-state-reasons.marker-toner-missing"
+msgstr ""
+
+#. TRANSLATORS: Ink/toner waste bin almost full
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Marker Waste Full
+#. TRANSLATORS: Ink/toner waste bin full
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
@@ -13068,6 +12759,14 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Ink Receptacle Missing
+msgid "printer-state-reasons.marker-waste-ink-receptacle-missing"
+msgstr ""
+
+#. TRANSLATORS: Marker Waste Missing
+msgid "printer-state-reasons.marker-waste-missing"
+msgstr ""
+
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
@@ -13076,6 +12775,10 @@ msgstr ""
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
+#. TRANSLATORS: Marker Waste Toner Receptacle Missing
+msgid "printer-state-reasons.marker-waste-toner-receptacle-missing"
+msgstr ""
+
 #. TRANSLATORS: Material Empty
 msgid "printer-state-reasons.material-empty"
 msgstr ""
@@ -13092,19 +12795,19 @@ msgstr ""
 msgid "printer-state-reasons.media-drying"
 msgstr ""
 
-#. TRANSLATORS: Media Empty
+#. TRANSLATORS: Paper tray is empty
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
-#. TRANSLATORS: Media Jam
+#. TRANSLATORS: Paper jam
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
-#. TRANSLATORS: Media Low
+#. TRANSLATORS: Paper tray is almost empty
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
-#. TRANSLATORS: Media Needed
+#. TRANSLATORS: Load paper
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
@@ -13112,6 +12815,30 @@ msgstr ""
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
+#. TRANSLATORS: Media Path Failure
+msgid "printer-state-reasons.media-path-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Empty
+msgid "printer-state-reasons.media-path-input-empty"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Feed Error
+msgid "printer-state-reasons.media-path-input-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Jam
+msgid "printer-state-reasons.media-path-input-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Input Request
+msgid "printer-state-reasons.media-path-input-request"
+msgstr ""
+
+#. TRANSLATORS: Media Path Jam
+msgid "printer-state-reasons.media-path-jam"
+msgstr ""
+
 #. TRANSLATORS: Media Path Media Tray Almost Full
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
@@ -13124,11 +12851,39 @@ msgstr ""
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
+#. TRANSLATORS: Media Path Output Feed Error
+msgid "printer-state-reasons.media-path-output-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Full
+msgid "printer-state-reasons.media-path-output-full"
+msgstr ""
+
+#. TRANSLATORS: Media Path Output Jam
+msgid "printer-state-reasons.media-path-output-jam"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Failure
+msgid "printer-state-reasons.media-path-pick-roller-failure"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Over
+msgid "printer-state-reasons.media-path-pick-roller-life-over"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Life Warn
+msgid "printer-state-reasons.media-path-pick-roller-life-warn"
+msgstr ""
+
+#. TRANSLATORS: Media Path Pick Roller Missing
+msgid "printer-state-reasons.media-path-pick-roller-missing"
+msgstr ""
+
 #. TRANSLATORS: Motor Failure
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
-#. TRANSLATORS: Moving To Paused
+#. TRANSLATORS: Printer going offline
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
@@ -13140,19 +12895,19 @@ msgstr ""
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
-#. TRANSLATORS: Optical Photoconductor Near End-of-life
+#. TRANSLATORS: OPC almost at end-of-life
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
-#. TRANSLATORS: Other
+#. TRANSLATORS: Check the printer for errors
 msgid "printer-state-reasons.other"
 msgstr ""
 
-#. TRANSLATORS: Output Area Almost Full
+#. TRANSLATORS: Output bin is almost full
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
-#. TRANSLATORS: Output Area Full
+#. TRANSLATORS: Output bin is full
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
@@ -13160,7 +12915,19 @@ msgstr ""
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
-#. TRANSLATORS: Output Tray Missing
+#. TRANSLATORS: Output Media Tray Failure
+msgid "printer-state-reasons.output-media-tray-failure"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Feed Error
+msgid "printer-state-reasons.output-media-tray-feed-error"
+msgstr ""
+
+#. TRANSLATORS: Output Media Tray Jam
+msgid "printer-state-reasons.output-media-tray-jam"
+msgstr ""
+
+#. TRANSLATORS: Output tray is missing
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
@@ -13496,10 +13263,6 @@ msgstr ""
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Resuming
-msgid "printer-state-reasons.resuming"
-msgstr ""
-
 #. TRANSLATORS: Separation Cutter Added
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
@@ -13788,7 +13551,7 @@ msgstr ""
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Shutdown
+#. TRANSLATORS: Printer offline
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
@@ -14372,7 +14135,7 @@ msgstr ""
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Stopped Partly
+#. TRANSLATORS: Partially stopped
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
@@ -14504,15 +14267,15 @@ msgstr ""
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
-#. TRANSLATORS: Timed Out
+#. TRANSLATORS: Printer stopped responding
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
-#. TRANSLATORS: Toner Empty
+#. TRANSLATORS: Out of toner
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
-#. TRANSLATORS: Toner Low
+#. TRANSLATORS: Toner low
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
@@ -14824,10 +14587,6 @@ msgstr ""
 msgid "printer-up-time"
 msgstr ""
 
-#. TRANSLATORS: Printer Xri
-msgid "printer-xri-requested"
-msgstr ""
-
 msgid "processing"
 msgstr "正在处理"
 
@@ -14878,146 +14637,10 @@ msgstr "请求 ID 为 %s-%d（%d 个文件）"
 msgid "request-id uses indefinite length"
 msgstr "request-id 使用不定长度"
 
-#. TRANSLATORS: Request Power State
-msgid "request-power-state"
-msgstr ""
-
 #. TRANSLATORS: Requested Attributes
 msgid "requested-attributes"
 msgstr ""
 
-#. TRANSLATORS: Resource Format
-msgid "resource-format"
-msgstr ""
-
-#. TRANSLATORS: Resource Format Accepted
-msgid "resource-format-accepted"
-msgstr ""
-
-#. TRANSLATORS: Resource Formats
-msgid "resource-formats"
-msgstr ""
-
-#. TRANSLATORS: Resource ID
-msgid "resource-id"
-msgstr ""
-
-#. TRANSLATORS: Resource Ids
-msgid "resource-ids"
-msgstr ""
-
-#. TRANSLATORS: Resource K Octets
-msgid "resource-k-octets"
-msgstr ""
-
-#. TRANSLATORS: Resource Signature
-msgid "resource-signature"
-msgstr ""
-
-#. TRANSLATORS: Resource State
-msgid "resource-state"
-msgstr ""
-
-#. TRANSLATORS: Resource State Reasons
-msgid "resource-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Cancel
-msgid "resource-state-reasons.cancel-requested"
-msgstr ""
-
-#. TRANSLATORS: Install
-msgid "resource-state-reasons.install-requested"
-msgstr ""
-
-#. TRANSLATORS: Resource Incoming
-msgid "resource-state-reasons.resource-incoming"
-msgstr ""
-
-#. TRANSLATORS: Pending
-msgid "resource-state.3"
-msgstr ""
-
-#. TRANSLATORS: Available
-msgid "resource-state.4"
-msgstr ""
-
-#. TRANSLATORS: Installed
-msgid "resource-state.5"
-msgstr ""
-
-#. TRANSLATORS: Canceled
-msgid "resource-state.6"
-msgstr ""
-
-#. TRANSLATORS: Aborted
-msgid "resource-state.7"
-msgstr ""
-
-#. TRANSLATORS: Resource States
-msgid "resource-states"
-msgstr ""
-
-#. TRANSLATORS: Resource Type
-msgid "resource-type"
-msgstr ""
-
-#. TRANSLATORS: Executable Firmware
-msgid "resource-type.executable-firmware"
-msgstr ""
-
-#. TRANSLATORS: Executable Software
-msgid "resource-type.executable-software"
-msgstr ""
-
-#. TRANSLATORS: Static Font
-msgid "resource-type.static-font"
-msgstr ""
-
-#. TRANSLATORS: Static Form
-msgid "resource-type.static-form"
-msgstr ""
-
-#. TRANSLATORS: Static Icc Profile
-msgid "resource-type.static-icc-profile"
-msgstr ""
-
-#. TRANSLATORS: Static Image
-msgid "resource-type.static-image"
-msgstr ""
-
-#. TRANSLATORS: Static Logo
-msgid "resource-type.static-logo"
-msgstr ""
-
-#. TRANSLATORS: Static Other
-msgid "resource-type.static-other"
-msgstr ""
-
-#. TRANSLATORS: Static Strings
-msgid "resource-type.static-strings"
-msgstr ""
-
-#. TRANSLATORS: Template Document
-msgid "resource-type.template-document"
-msgstr ""
-
-#. TRANSLATORS: Template Job
-msgid "resource-type.template-job"
-msgstr ""
-
-#. TRANSLATORS: Template Printer
-msgid "resource-type.template-printer"
-msgstr ""
-
-#. TRANSLATORS: Resource Types
-msgid "resource-types"
-msgstr ""
-
-#. TRANSLATORS: Restart Get Interval
-msgid "restart-get-interval"
-msgstr ""
-
 #. TRANSLATORS: Retry Interval
 msgid "retry-interval"
 msgstr ""
@@ -15092,18 +14715,6 @@ msgstr ""
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
-#. TRANSLATORS: Collate Copies
-msgid "sheet-collate"
-msgstr ""
-
-#. TRANSLATORS: Yes
-msgid "sheet-collate.collated"
-msgstr ""
-
-#. TRANSLATORS: No
-msgid "sheet-collate.uncollated"
-msgstr ""
-
 #. TRANSLATORS: 2-Sided Printing
 msgid "sides"
 msgstr ""
@@ -15120,10 +14731,6 @@ msgstr ""
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
-#. TRANSLATORS: Start Power State
-msgid "start-power-state"
-msgstr ""
-
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "为 %s 运行 stat 失败：%s"
@@ -15246,50 +14853,10 @@ msgstr "系统默认目标：%s"
 msgid "system default destination: %s/%s"
 msgstr "系统默认目标：%s/%s"
 
-#. TRANSLATORS: System State
-msgid "system-state"
-msgstr ""
-
-#. TRANSLATORS: System State Reasons
-msgid "system-state-reasons"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "system-state.3"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "system-state.4"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "system-state.5"
-msgstr ""
-
-#. TRANSLATORS: System URI
-msgid "system-uri"
-msgstr ""
-
 #. TRANSLATORS: T33 Subaddress
 msgid "t33-subaddress"
 msgstr "T33 Subaddress"
 
-#. TRANSLATORS: Timeout Predicate
-msgid "timeout-predicate"
-msgstr ""
-
-#. TRANSLATORS: Activity
-msgid "timeout-predicate.activity"
-msgstr ""
-
-#. TRANSLATORS: Inactivity
-msgid "timeout-predicate.inactivity"
-msgstr ""
-
-#. TRANSLATORS: None
-msgid "timeout-predicate.none"
-msgstr ""
-
 #. TRANSLATORS: To Name
 msgid "to-name"
 msgstr ""
@@ -15407,38 +14974,6 @@ msgstr "无标题"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings 使用不定长度"
 
-#. TRANSLATORS: Which Printers
-msgid "which-printers"
-msgstr ""
-
-#. TRANSLATORS: All
-msgid "which-printers.all"
-msgstr ""
-
-#. TRANSLATORS: Idle
-msgid "which-printers.idle"
-msgstr ""
-
-#. TRANSLATORS: Not Accepting
-msgid "which-printers.not-accepting"
-msgstr ""
-
-#. TRANSLATORS: Processing
-msgid "which-printers.processing"
-msgstr ""
-
-#. TRANSLATORS: Shutdown
-msgid "which-printers.shutdown"
-msgstr ""
-
-#. TRANSLATORS: Stopped
-msgid "which-printers.stopped"
-msgstr ""
-
-#. TRANSLATORS: Testing
-msgid "which-printers.testing"
-msgstr ""
-
 #. TRANSLATORS: X Accuracy
 msgid "x-accuracy"
 msgstr ""
diff --git a/locale/ipp-strings.c b/locale/ipp-strings.c
index fa658402a..0e7c09c63 100644
--- a/locale/ipp-strings.c
+++ b/locale/ipp-strings.c
@@ -250,8 +250,6 @@ _("document-state.7");
 _("document-state.8");
 /* TRANSLATORS: Completed */
 _("document-state.9");
-/* TRANSLATORS: End Power State */
-_("end-power-state");
 /* TRANSLATORS: Feed Orientation */
 _("feed-orientation");
 /* TRANSLATORS: Long Edge First */
@@ -756,100 +754,6 @@ _("imposition-template");
 _("imposition-template.none");
 /* TRANSLATORS: Signature */
 _("imposition-template.signature");
-/* TRANSLATORS: Scanner Options */
-_("input-attributes");
-/* TRANSLATORS: Scan Auto Scaling */
-_("input-auto-scaling");
-/* TRANSLATORS: Scan Auto Skew Correction */
-_("input-auto-skew-correction");
-/* TRANSLATORS: Scan Brightness */
-_("input-brightness");
-/* TRANSLATORS: Scanning Mode */
-_("input-color-mode");
-/* TRANSLATORS: Automatic */
-_("input-color-mode.auto");
-/* TRANSLATORS: Text */
-_("input-color-mode.bi-level");
-/* TRANSLATORS: 16-bit CMYK */
-_("input-color-mode.cmyk_16");
-/* TRANSLATORS: 8-bit CMYK */
-_("input-color-mode.cmyk_8");
-/* TRANSLATORS: Color */
-_("input-color-mode.color");
-/* TRANSLATORS: 8-bit Color */
-_("input-color-mode.color_8");
-/* TRANSLATORS: Monochrome */
-_("input-color-mode.monochrome");
-/* TRANSLATORS: 16-bit Monochrome */
-_("input-color-mode.monochrome_16");
-/* TRANSLATORS: 4-bit Monochrome */
-_("input-color-mode.monochrome_4");
-/* TRANSLATORS: 8-bit Monochrome */
-_("input-color-mode.monochrome_8");
-/* TRANSLATORS: 16-bit RGB */
-_("input-color-mode.rgb_16");
-/* TRANSLATORS: 16-bit RGBA */
-_("input-color-mode.rgba_16");
-/* TRANSLATORS: 8-bit RGBA */
-_("input-color-mode.rgba_8");
-/* TRANSLATORS: Scan Content */
-_("input-content-type");
-/* TRANSLATORS: Automatic */
-_("input-content-type.auto");
-/* TRANSLATORS: Halftone */
-_("input-content-type.halftone");
-/* TRANSLATORS: Line Art */
-_("input-content-type.line-art");
-/* TRANSLATORS: Magazine */
-_("input-content-type.magazine");
-/* TRANSLATORS: Photo */
-_("input-content-type.photo");
-/* TRANSLATORS: Text */
-_("input-content-type.text");
-/* TRANSLATORS: Text And Photo */
-_("input-content-type.text-and-photo");
-/* TRANSLATORS: Scan Contrast */
-_("input-contrast");
-/* TRANSLATORS: Film Type */
-_("input-film-scan-mode");
-/* TRANSLATORS: Black And White Negative Film */
-_("input-film-scan-mode.black-and-white-negative-film");
-/* TRANSLATORS: Color Negative Film */
-_("input-film-scan-mode.color-negative-film");
-/* TRANSLATORS: Color Slide Film */
-_("input-film-scan-mode.color-slide-film");
-/* TRANSLATORS: Not Applicable */
-_("input-film-scan-mode.not-applicable");
-/* TRANSLATORS: Scan Images To Transfer */
-_("input-images-to-transfer");
-/* TRANSLATORS: Scan Media */
-_("input-media");
-/* TRANSLATORS: Automatic */
-_("input-media.auto");
-/* TRANSLATORS: Scan Orientation */
-_("input-orientation-requested");
-/* TRANSLATORS: Scan Quality */
-_("input-quality");
-/* TRANSLATORS: Scan Resolution */
-_("input-resolution");
-/* TRANSLATORS: Scan Scaling Height */
-_("input-scaling-height");
-/* TRANSLATORS: Scan Scaling Width */
-_("input-scaling-width");
-/* TRANSLATORS: Scan Regions */
-_("input-scan-regions");
-/* TRANSLATORS: Scan Sharpness */
-_("input-sharpness");
-/* TRANSLATORS: 2-Sided Scanning */
-_("input-sides");
-/* TRANSLATORS: Scan Source */
-_("input-source");
-/* TRANSLATORS: Automatic Document Feeder */
-_("input-source.adf");
-/* TRANSLATORS: Film Reader */
-_("input-source.film-reader");
-/* TRANSLATORS: Platen */
-_("input-source.platen");
 /* TRANSLATORS: Insert Page Number */
 _("insert-after-page-number");
 /* TRANSLATORS: Insert Count */
@@ -878,14 +782,8 @@ _("job-accounting-sheets-type.none");
 _("job-accounting-sheets-type.standard");
 /* TRANSLATORS: Job Accounting User ID */
 _("job-accounting-user-id");
-/* TRANSLATORS: Collate Copies */
-_("job-collation-type");
-/* TRANSLATORS: Uncollated Sheets */
-_("job-collation-type.3");
-/* TRANSLATORS: Collated Documents */
-_("job-collation-type.4");
-/* TRANSLATORS: Uncollated Documents */
-_("job-collation-type.5");
+/* TRANSLATORS: Job Cancel After */
+_("job-cancel-after");
 /* TRANSLATORS: Copies */
 _("job-copies");
 /* TRANSLATORS: Back Cover */
@@ -994,8 +892,22 @@ _("job-privacy-scope.none");
 _("job-privacy-scope.owner");
 /* TRANSLATORS: Job Recipient Name */
 _("job-recipient-name");
-/* TRANSLATORS: Job Resource Ids */
-_("job-resource-ids");
+/* TRANSLATORS: Job Retain Until */
+_("job-retain-until");
+/* TRANSLATORS: Job Retain Until Interval */
+_("job-retain-until-interval");
+/* TRANSLATORS: Job Retain Until Time */
+_("job-retain-until-time");
+/* TRANSLATORS: End Of Day */
+_("job-retain-until.end-of-day");
+/* TRANSLATORS: End Of Month */
+_("job-retain-until.end-of-month");
+/* TRANSLATORS: End Of Week */
+_("job-retain-until.end-of-week");
+/* TRANSLATORS: Indefinite */
+_("job-retain-until.indefinite");
+/* TRANSLATORS: None */
+_("job-retain-until.none");
 /* TRANSLATORS: Job Save Disposition */
 _("job-save-disposition");
 /* TRANSLATORS: Job Sheet Message */
@@ -1022,7 +934,7 @@ _("job-state");
 _("job-state-message");
 /* TRANSLATORS: Detailed Job State */
 _("job-state-reasons");
-/* TRANSLATORS: Aborted By System */
+/* TRANSLATORS: Stopping */
 _("job-state-reasons.aborted-by-system");
 /* TRANSLATORS: Account Authorization Failed */
 _("job-state-reasons.account-authorization-failed");
@@ -1032,7 +944,7 @@ _("job-state-reasons.account-closed");
 _("job-state-reasons.account-info-needed");
 /* TRANSLATORS: Account Limit Reached */
 _("job-state-reasons.account-limit-reached");
-/* TRANSLATORS: Compression Error */
+/* TRANSLATORS: Decompression error */
 _("job-state-reasons.compression-error");
 /* TRANSLATORS: Conflicting Attributes */
 _("job-state-reasons.conflicting-attributes");
@@ -1060,19 +972,19 @@ _("job-state-reasons.document-security-error");
 _("job-state-reasons.document-unprintable-error");
 /* TRANSLATORS: Errors Detected */
 _("job-state-reasons.errors-detected");
-/* TRANSLATORS: Job Canceled At Device */
+/* TRANSLATORS: Canceled at printer */
 _("job-state-reasons.job-canceled-at-device");
-/* TRANSLATORS: Job Canceled By Operator */
+/* TRANSLATORS: Canceled by operator */
 _("job-state-reasons.job-canceled-by-operator");
-/* TRANSLATORS: Job Canceled By User */
+/* TRANSLATORS: Canceled by user */
 _("job-state-reasons.job-canceled-by-user");
-/* TRANSLATORS: Job Completed Successfully */
+/* TRANSLATORS:   */
 _("job-state-reasons.job-completed-successfully");
-/* TRANSLATORS: Job Completed With Errors */
+/* TRANSLATORS: Completed with errors */
 _("job-state-reasons.job-completed-with-errors");
-/* TRANSLATORS: Job Completed With Warnings */
+/* TRANSLATORS: Completed with warnings */
 _("job-state-reasons.job-completed-with-warnings");
-/* TRANSLATORS: Job Data Insufficient */
+/* TRANSLATORS: Insufficient data */
 _("job-state-reasons.job-data-insufficient");
 /* TRANSLATORS: Job Delay Output Until Specified */
 _("job-state-reasons.job-delay-output-until-specified");
@@ -1082,13 +994,13 @@ _("job-state-reasons.job-digital-signature-wait");
 _("job-state-reasons.job-fetchable");
 /* TRANSLATORS: Job Held For Review */
 _("job-state-reasons.job-held-for-review");
-/* TRANSLATORS: Job Hold Until Specified */
+/* TRANSLATORS: Job held */
 _("job-state-reasons.job-hold-until-specified");
-/* TRANSLATORS: Job Incoming */
+/* TRANSLATORS: Incoming */
 _("job-state-reasons.job-incoming");
-/* TRANSLATORS: Job Interpreting */
+/* TRANSLATORS: Interpreting */
 _("job-state-reasons.job-interpreting");
-/* TRANSLATORS: Job Outgoing */
+/* TRANSLATORS: Outgoing */
 _("job-state-reasons.job-outgoing");
 /* TRANSLATORS: Job Password Wait */
 _("job-state-reasons.job-password-wait");
@@ -1098,15 +1010,15 @@ _("job-state-reasons.job-printed-successfully");
 _("job-state-reasons.job-printed-with-errors");
 /* TRANSLATORS: Job Printed With Warnings */
 _("job-state-reasons.job-printed-with-warnings");
-/* TRANSLATORS: Job Printing */
+/* TRANSLATORS: Printing */
 _("job-state-reasons.job-printing");
-/* TRANSLATORS: Job Queued */
+/* TRANSLATORS: Preparing to print */
 _("job-state-reasons.job-queued");
-/* TRANSLATORS: Job Queued For Marker */
+/* TRANSLATORS: Processing document */
 _("job-state-reasons.job-queued-for-marker");
 /* TRANSLATORS: Job Release Wait */
 _("job-state-reasons.job-release-wait");
-/* TRANSLATORS: Job Restartable */
+/* TRANSLATORS: Restartable */
 _("job-state-reasons.job-restartable");
 /* TRANSLATORS: Job Resuming */
 _("job-state-reasons.job-resuming");
@@ -1122,7 +1034,7 @@ _("job-state-reasons.job-saving");
 _("job-state-reasons.job-spooling");
 /* TRANSLATORS: Job Streaming */
 _("job-state-reasons.job-streaming");
-/* TRANSLATORS: Job Suspended */
+/* TRANSLATORS: Suspended */
 _("job-state-reasons.job-suspended");
 /* TRANSLATORS: Job Suspended By Operator */
 _("job-state-reasons.job-suspended-by-operator");
@@ -1134,23 +1046,23 @@ _("job-state-reasons.job-suspended-by-user");
 _("job-state-reasons.job-suspending");
 /* TRANSLATORS: Job Transferring */
 _("job-state-reasons.job-transferring");
-/* TRANSLATORS: Job Transforming */
+/* TRANSLATORS: Transforming */
 _("job-state-reasons.job-transforming");
 /* TRANSLATORS: None */
 _("job-state-reasons.none");
-/* TRANSLATORS: Printer Stopped */
+/* TRANSLATORS: Printer offline */
 _("job-state-reasons.printer-stopped");
-/* TRANSLATORS: Printer Stopped Partly */
+/* TRANSLATORS: Printer partially stopped */
 _("job-state-reasons.printer-stopped-partly");
-/* TRANSLATORS: Processing To Stop Point */
+/* TRANSLATORS: Stopping */
 _("job-state-reasons.processing-to-stop-point");
-/* TRANSLATORS: Queued In Device */
+/* TRANSLATORS: Ready */
 _("job-state-reasons.queued-in-device");
 /* TRANSLATORS: Resources Are Not Ready */
 _("job-state-reasons.resources-are-not-ready");
 /* TRANSLATORS: Resources Are Not Supported */
 _("job-state-reasons.resources-are-not-supported");
-/* TRANSLATORS: Service Off Line */
+/* TRANSLATORS: Service offline */
 _("job-state-reasons.service-off-line");
 /* TRANSLATORS: Submission Interrupted */
 _("job-state-reasons.submission-interrupted");
@@ -2080,6 +1992,8 @@ _("media.jis_exec_216x330mm");
 _("media.jpn_chou2_111.1x146mm");
 /* TRANSLATORS: Envelope Chou 3 */
 _("media.jpn_chou3_120x235mm");
+/* TRANSLATORS: Envelope Chou 40 */
+_("media.jpn_chou40_90x225mm");
 /* TRANSLATORS: Envelope Chou 4 */
 _("media.jpn_chou4_90x205mm");
 /* TRANSLATORS: Hagaki */
@@ -2372,10 +2286,6 @@ _("notify-events.job-stopped");
 _("notify-events.none");
 /* TRANSLATORS: Printer Config Changed */
 _("notify-events.printer-config-changed");
-/* TRANSLATORS: Printer Created */
-_("notify-events.printer-created");
-/* TRANSLATORS: Printer Deleted */
-_("notify-events.printer-deleted");
 /* TRANSLATORS: Printer Finishings Changed */
 _("notify-events.printer-finishings-changed");
 /* TRANSLATORS: Printer Media Changed */
@@ -2390,26 +2300,6 @@ _("notify-events.printer-shutdown");
 _("notify-events.printer-state-changed");
 /* TRANSLATORS: Printer Stopped */
 _("notify-events.printer-stopped");
-/* TRANSLATORS: Resource Canceled */
-_("notify-events.resource-canceled");
-/* TRANSLATORS: Resource Config Changed */
-_("notify-events.resource-config-changed");
-/* TRANSLATORS: Resource Created */
-_("notify-events.resource-created");
-/* TRANSLATORS: Resource Installed */
-_("notify-events.resource-installed");
-/* TRANSLATORS: Resource State Changed */
-_("notify-events.resource-state-changed");
-/* TRANSLATORS: System Config Changed */
-_("notify-events.system-config-changed");
-/* TRANSLATORS: System Restarted */
-_("notify-events.system-restarted");
-/* TRANSLATORS: System Shutdown */
-_("notify-events.system-shutdown");
-/* TRANSLATORS: System State Changed */
-_("notify-events.system-state-changed");
-/* TRANSLATORS: System Stopped */
-_("notify-events.system-stopped");
 /* TRANSLATORS: Notify Get Interval */
 _("notify-get-interval");
 /* TRANSLATORS: Notify Lease Duration */
@@ -2588,94 +2478,6 @@ _("platform-shape.rectangle");
 _("platform-temperature");
 /* TRANSLATORS: Post-dial String */
 _("post-dial-string");
-/* TRANSLATORS: Power State */
-_("power-state");
-/* TRANSLATORS: Reset Mbr */
-_("power-state.100");
-/* TRANSLATORS: Reset Nmi */
-_("power-state.110");
-/* TRANSLATORS: Off Soft Graceful */
-_("power-state.120");
-/* TRANSLATORS: Off Hard Graceful */
-_("power-state.130");
-/* TRANSLATORS: Reset Mbr Graceful */
-_("power-state.140");
-/* TRANSLATORS: Reset Soft Graceful */
-_("power-state.150");
-/* TRANSLATORS: Reset Hard Graceful */
-_("power-state.160");
-/* TRANSLATORS: Reset Init */
-_("power-state.170");
-/* TRANSLATORS: Not Applicable */
-_("power-state.180");
-/* TRANSLATORS: No Change */
-_("power-state.190");
-/* TRANSLATORS: On */
-_("power-state.20");
-/* TRANSLATORS: On Vendor1 */
-_("power-state.21");
-/* TRANSLATORS: On Vendor2 */
-_("power-state.22");
-/* TRANSLATORS: On Vendor3 */
-_("power-state.23");
-/* TRANSLATORS: On Vendor4 */
-_("power-state.24");
-/* TRANSLATORS: On Vendor5 */
-_("power-state.25");
-/* TRANSLATORS: Standby */
-_("power-state.30");
-/* TRANSLATORS: Standby Vendor1 */
-_("power-state.31");
-/* TRANSLATORS: Standby Vendor2 */
-_("power-state.32");
-/* TRANSLATORS: Standby Vendor3 */
-_("power-state.33");
-/* TRANSLATORS: Standby Vendor4 */
-_("power-state.34");
-/* TRANSLATORS: Standby Vendor5 */
-_("power-state.35");
-/* TRANSLATORS: Suspend */
-_("power-state.40");
-/* TRANSLATORS: Suspend Vendor1 */
-_("power-state.41");
-/* TRANSLATORS: Suspend Vendor2 */
-_("power-state.42");
-/* TRANSLATORS: Suspend Vendor3 */
-_("power-state.43");
-/* TRANSLATORS: Suspend Vendor4 */
-_("power-state.44");
-/* TRANSLATORS: Suspend Vendor5 */
-_("power-state.45");
-/* TRANSLATORS: Reset Soft */
-_("power-state.50");
-/* TRANSLATORS: Off Hard */
-_("power-state.60");
-/* TRANSLATORS: Hibernate */
-_("power-state.70");
-/* TRANSLATORS: Hibernate Vendor1 */
-_("power-state.71");
-/* TRANSLATORS: Hibernate Vendor2 */
-_("power-state.72");
-/* TRANSLATORS: Hibernate Vendor3 */
-_("power-state.73");
-/* TRANSLATORS: Hibernate Vendor4 */
-_("power-state.74");
-/* TRANSLATORS: Hibernate Vendor5 */
-_("power-state.75");
-/* TRANSLATORS: Off Soft */
-_("power-state.80");
-/* TRANSLATORS: Off Soft Vendor1 */
-_("power-state.81");
-/* TRANSLATORS: Off Soft Vendor2 */
-_("power-state.82");
-/* TRANSLATORS: Off Soft Vendor3 */
-_("power-state.83");
-/* TRANSLATORS: Off Soft Vendor4 */
-_("power-state.84");
-/* TRANSLATORS: Off Soft Vendor5 */
-_("power-state.85");
-/* TRANSLATORS: Reset Hard */
-_("power-state.90");
 /* TRANSLATORS: Pre-dial String */
 _("pre-dial-string");
 /* TRANSLATORS: Number-Up Layout */
@@ -2732,16 +2534,22 @@ _("print-color-mode.process-bi-level");
 _("print-color-mode.process-monochrome");
 /* TRANSLATORS: Print Optimization */
 _("print-content-optimize");
+/* TRANSLATORS: Print Content Optimize Actual */
+_("print-content-optimize-actual");
 /* TRANSLATORS: Automatic */
 _("print-content-optimize.auto");
 /* TRANSLATORS: Graphics */
 _("print-content-optimize.graphic");
+/* TRANSLATORS: Graphics */
+_("print-content-optimize.graphics");
 /* TRANSLATORS: Photo */
 _("print-content-optimize.photo");
 /* TRANSLATORS: Text */
 _("print-content-optimize.text");
 /* TRANSLATORS: Text and Graphics */
 _("print-content-optimize.text-and-graphic");
+/* TRANSLATORS: Text And Graphics */
+_("print-content-optimize.text-and-graphics");
 /* TRANSLATORS: Print Objects */
 _("print-objects");
 /* TRANSLATORS: Print Quality */
@@ -2788,34 +2596,30 @@ _("print-supports.material");
 _("print-supports.none");
 /* TRANSLATORS: Standard */
 _("print-supports.standard");
-/* TRANSLATORS: Printer Geo Location */
-_("printer-geo-location");
-/* TRANSLATORS: Printer ID */
-_("printer-id");
-/* TRANSLATORS: Printer Ids */
-_("printer-ids");
-/* TRANSLATORS: Printer Location */
-_("printer-location");
+/* TRANSLATORS: Printer Kind */
+_("printer-kind");
+/* TRANSLATORS: Disc */
+_("printer-kind.disc");
+/* TRANSLATORS: Document */
+_("printer-kind.document");
+/* TRANSLATORS: Envelope */
+_("printer-kind.envelope");
+/* TRANSLATORS: Label */
+_("printer-kind.label");
+/* TRANSLATORS: Large Format */
+_("printer-kind.large-format");
+/* TRANSLATORS: Photo */
+_("printer-kind.photo");
+/* TRANSLATORS: Postcard */
+_("printer-kind.postcard");
+/* TRANSLATORS: Receipt */
+_("printer-kind.receipt");
+/* TRANSLATORS: Roll */
+_("printer-kind.roll");
 /* TRANSLATORS: Message From Operator */
 _("printer-message-from-operator");
 /* TRANSLATORS: Print Resolution */
 _("printer-resolution");
-/* TRANSLATORS: Printer Service Type */
-_("printer-service-type");
-/* TRANSLATORS: Copy */
-_("printer-service-type.copy");
-/* TRANSLATORS: Faxin */
-_("printer-service-type.faxin");
-/* TRANSLATORS: Faxout */
-_("printer-service-type.faxout");
-/* TRANSLATORS: Print */
-_("printer-service-type.print");
-/* TRANSLATORS: Print3d */
-_("printer-service-type.print3d");
-/* TRANSLATORS: Scan */
-_("printer-service-type.scan");
-/* TRANSLATORS: Transform */
-_("printer-service-type.transform");
 /* TRANSLATORS: Printer State */
 _("printer-state");
 /* TRANSLATORS: Detailed Printer State */
@@ -2990,8 +2794,6 @@ _("printer-state-reasons.connecting-to-device");
 _("printer-state-reasons.cover-open");
 /* TRANSLATORS: Deactivated */
 _("printer-state-reasons.deactivated");
-/* TRANSLATORS: Deleted */
-_("printer-state-reasons.deleted");
 /* TRANSLATORS: Developer Empty */
 _("printer-state-reasons.developer-empty");
 /* TRANSLATORS: Developer Low */
@@ -3084,6 +2886,16 @@ _("printer-state-reasons.extruder-temperature-high");
 _("printer-state-reasons.extruder-temperature-low");
 /* TRANSLATORS: Fan Failure */
 _("printer-state-reasons.fan-failure");
+/* TRANSLATORS: Fax Modem Life Almost Over */
+_("printer-state-reasons.fax-modem-life-almost-over");
+/* TRANSLATORS: Fax Modem Life Over */
+_("printer-state-reasons.fax-modem-life-over");
+/* TRANSLATORS: Fax Modem Missing */
+_("printer-state-reasons.fax-modem-missing");
+/* TRANSLATORS: Fax Modem Turned Off */
+_("printer-state-reasons.fax-modem-turned-off");
+/* TRANSLATORS: Fax Modem Turned On */
+_("printer-state-reasons.fax-modem-turned-on");
 /* TRANSLATORS: Folder Added */
 _("printer-state-reasons.folder-added");
 /* TRANSLATORS: Folder Almost Empty */
@@ -3156,9 +2968,9 @@ _("printer-state-reasons.folder-unrecoverable-failure");
 _("printer-state-reasons.folder-unrecoverable-storage-error");
 /* TRANSLATORS: Folder Warming Up */
 _("printer-state-reasons.folder-warming-up");
-/* TRANSLATORS: Fuser Over Temp */
+/* TRANSLATORS: Fuser temperature high */
 _("printer-state-reasons.fuser-over-temp");
-/* TRANSLATORS: Fuser Under Temp */
+/* TRANSLATORS: Fuser temperature low */
 _("printer-state-reasons.fuser-under-temp");
 /* TRANSLATORS: Hold New Jobs */
 _("printer-state-reasons.hold-new-jobs");
@@ -3246,13 +3058,27 @@ _("printer-state-reasons.input-media-color-change");
 _("printer-state-reasons.input-media-form-parts-change");
 /* TRANSLATORS: Input Media Size Change */
 _("printer-state-reasons.input-media-size-change");
+/* TRANSLATORS: Input Media Tray Failure */
+_("printer-state-reasons.input-media-tray-failure");
+/* TRANSLATORS: Input Media Tray Feed Error */
+_("printer-state-reasons.input-media-tray-feed-error");
+/* TRANSLATORS: Input Media Tray Jam */
+_("printer-state-reasons.input-media-tray-jam");
 /* TRANSLATORS: Input Media Type Change */
 _("printer-state-reasons.input-media-type-change");
 /* TRANSLATORS: Input Media Weight Change */
 _("printer-state-reasons.input-media-weight-change");
+/* TRANSLATORS: Input Pick Roller Failure */
+_("printer-state-reasons.input-pick-roller-failure");
+/* TRANSLATORS: Input Pick Roller Life Over */
+_("printer-state-reasons.input-pick-roller-life-over");
+/* TRANSLATORS: Input Pick Roller Life Warn */
+_("printer-state-reasons.input-pick-roller-life-warn");
+/* TRANSLATORS: Input Pick Roller Missing */
+_("printer-state-reasons.input-pick-roller-missing");
 /* TRANSLATORS: Input Tray Elevation Failure */
 _("printer-state-reasons.input-tray-elevation-failure");
-/* TRANSLATORS: Input Tray Missing */
+/* TRANSLATORS: Paper tray is missing */
 _("printer-state-reasons.input-tray-missing");
 /* TRANSLATORS: Input Tray Position Failure */
 _("printer-state-reasons.input-tray-position-failure");
@@ -3346,7 +3172,7 @@ _("printer-state-reasons.interpreter-memory-increase");
 _("printer-state-reasons.interpreter-resource-added");
 /* TRANSLATORS: Interpreter Resource Deleted */
 _("printer-state-reasons.interpreter-resource-deleted");
-/* TRANSLATORS: Interpreter Resource Unavailable */
+/* TRANSLATORS: Printer resource unavailable */
 _("printer-state-reasons.interpreter-resource-unavailable");
 /* TRANSLATORS: Lamp At End of Life */
 _("printer-state-reasons.lamp-at-eol");
@@ -3434,10 +3260,16 @@ _("printer-state-reasons.make-envelope-unrecoverable-storage-error");
 _("printer-state-reasons.make-envelope-warming-up");
 /* TRANSLATORS: Marker Adjusting Print Quality */
 _("printer-state-reasons.marker-adjusting-print-quality");
+/* TRANSLATORS: Marker Cleaner Missing */
+_("printer-state-reasons.marker-cleaner-missing");
 /* TRANSLATORS: Marker Developer Almost Empty */
 _("printer-state-reasons.marker-developer-almost-empty");
 /* TRANSLATORS: Marker Developer Empty */
 _("printer-state-reasons.marker-developer-empty");
+/* TRANSLATORS: Marker Developer Missing */
+_("printer-state-reasons.marker-developer-missing");
+/* TRANSLATORS: Marker Fuser Missing */
+_("printer-state-reasons.marker-fuser-missing");
 /* TRANSLATORS: Marker Fuser Thermistor Failure */
 _("printer-state-reasons.marker-fuser-thermistor-failure");
 /* TRANSLATORS: Marker Fuser Timing Failure */
@@ -3446,28 +3278,46 @@ _("printer-state-reasons.marker-fuser-timing-failure");
 _("printer-state-reasons.marker-ink-almost-empty");
 /* TRANSLATORS: Marker Ink Empty */
 _("printer-state-reasons.marker-ink-empty");
+/* TRANSLATORS: Marker Ink Missing */
+_("printer-state-reasons.marker-ink-missing");
+/* TRANSLATORS: Marker Opc Missing */
+_("printer-state-reasons.marker-opc-missing");
 /* TRANSLATORS: Marker Print Ribbon Almost Empty */
 _("printer-state-reasons.marker-print-ribbon-almost-empty");
 /* TRANSLATORS: Marker Print Ribbon Empty */
 _("printer-state-reasons.marker-print-ribbon-empty");
-/* TRANSLATORS: Marker Supply Empty */
+/* TRANSLATORS: Marker Print Ribbon Missing */
+_("printer-state-reasons.marker-print-ribbon-missing");
+/* TRANSLATORS: Marker Supply Almost Empty */
+_("printer-state-reasons.marker-supply-almost-empty");
+/* TRANSLATORS: Ink/toner empty */
 _("printer-state-reasons.marker-supply-empty");
-/* TRANSLATORS: Marker Supply Low */
+/* TRANSLATORS: Ink/toner low */
 _("printer-state-reasons.marker-supply-low");
+/* TRANSLATORS: Marker Supply Missing */
+_("printer-state-reasons.marker-supply-missing");
 /* TRANSLATORS: Marker Toner Cartridge Missing */
 _("printer-state-reasons.marker-toner-cartridge-missing");
-/* TRANSLATORS: Marker Waste Almost Full */
+/* TRANSLATORS: Marker Toner Missing */
+_("printer-state-reasons.marker-toner-missing");
+/* TRANSLATORS: Ink/toner waste bin almost full */
 _("printer-state-reasons.marker-waste-almost-full");
-/* TRANSLATORS: Marker Waste Full */
+/* TRANSLATORS: Ink/toner waste bin full */
 _("printer-state-reasons.marker-waste-full");
 /* TRANSLATORS: Marker Waste Ink Receptacle Almost Full */
 _("printer-state-reasons.marker-waste-ink-receptacle-almost-full");
 /* TRANSLATORS: Marker Waste Ink Receptacle Full */
 _("printer-state-reasons.marker-waste-ink-receptacle-full");
+/* TRANSLATORS: Marker Waste Ink Receptacle Missing */
+_("printer-state-reasons.marker-waste-ink-receptacle-missing");
+/* TRANSLATORS: Marker Waste Missing */
+_("printer-state-reasons.marker-waste-missing");
 /* TRANSLATORS: Marker Waste Toner Receptacle Almost Full */
 _("printer-state-reasons.marker-waste-toner-receptacle-almost-full");
 /* TRANSLATORS: Marker Waste Toner Receptacle Full */
 _("printer-state-reasons.marker-waste-toner-receptacle-full");
+/* TRANSLATORS: Marker Waste Toner Receptacle Missing */
+_("printer-state-reasons.marker-waste-toner-receptacle-missing");
 /* TRANSLATORS: Material Empty */
 _("printer-state-reasons.material-empty");
 /* TRANSLATORS: Material Low */
@@ -3476,41 +3326,73 @@ _("printer-state-reasons.material-low");
 _("printer-state-reasons.material-needed");
 /* TRANSLATORS: Media Drying */
 _("printer-state-reasons.media-drying");
-/* TRANSLATORS: Media Empty */
+/* TRANSLATORS: Paper tray is empty */
 _("printer-state-reasons.media-empty");
-/* TRANSLATORS: Media Jam */
+/* TRANSLATORS: Paper jam */
 _("printer-state-reasons.media-jam");
-/* TRANSLATORS: Media Low */
+/* TRANSLATORS: Paper tray is almost empty */
 _("printer-state-reasons.media-low");
-/* TRANSLATORS: Media Needed */
+/* TRANSLATORS: Load paper */
 _("printer-state-reasons.media-needed");
 /* TRANSLATORS: Media Path Cannot Do 2-Sided Printing */
 _("printer-state-reasons.media-path-cannot-duplex-media-selected");
+/* TRANSLATORS: Media Path Failure */
+_("printer-state-reasons.media-path-failure");
+/* TRANSLATORS: Media Path Input Empty */
+_("printer-state-reasons.media-path-input-empty");
+/* TRANSLATORS: Media Path Input Feed Error */
+_("printer-state-reasons.media-path-input-feed-error");
+/* TRANSLATORS: Media Path Input Jam */
+_("printer-state-reasons.media-path-input-jam");
+/* TRANSLATORS: Media Path Input Request */
+_("printer-state-reasons.media-path-input-request");
+/* TRANSLATORS: Media Path Jam */
+_("printer-state-reasons.media-path-jam");
 /* TRANSLATORS: Media Path Media Tray Almost Full */
 _("printer-state-reasons.media-path-media-tray-almost-full");
 /* TRANSLATORS: Media Path Media Tray Full */
 _("printer-state-reasons.media-path-media-tray-full");
 /* TRANSLATORS: Media Path Media Tray Missing */
 _("printer-state-reasons.media-path-media-tray-missing");
+/* TRANSLATORS: Media Path Output Feed Error */
+_("printer-state-reasons.media-path-output-feed-error");
+/* TRANSLATORS: Media Path Output Full */
+_("printer-state-reasons.media-path-output-full");
+/* TRANSLATORS: Media Path Output Jam */
+_("printer-state-reasons.media-path-output-jam");
+/* TRANSLATORS: Media Path Pick Roller Failure */
+_("printer-state-reasons.media-path-pick-roller-failure");
+/* TRANSLATORS: Media Path Pick Roller Life Over */
+_("printer-state-reasons.media-path-pick-roller-life-over");
+/* TRANSLATORS: Media Path Pick Roller Life Warn */
+_("printer-state-reasons.media-path-pick-roller-life-warn");
+/* TRANSLATORS: Media Path Pick Roller Missing */
+_("printer-state-reasons.media-path-pick-roller-missing");
 /* TRANSLATORS: Motor Failure */
 _("printer-state-reasons.motor-failure");
-/* TRANSLATORS: Moving To Paused */
+/* TRANSLATORS: Printer going offline */
 _("printer-state-reasons.moving-to-paused");
 /* TRANSLATORS: None */
 _("printer-state-reasons.none");
 /* TRANSLATORS: Optical Photoconductor Life Over */
 _("printer-state-reasons.opc-life-over");
-/* TRANSLATORS: Optical Photoconductor Near End-of-life */
+/* TRANSLATORS: OPC almost at end-of-life */
 _("printer-state-reasons.opc-near-eol");
-/* TRANSLATORS: Other */
+/* TRANSLATORS: Check the printer for errors */
 _("printer-state-reasons.other");
-/* TRANSLATORS: Output Area Almost Full */
+/* TRANSLATORS: Output bin is almost full */
 _("printer-state-reasons.output-area-almost-full");
-/* TRANSLATORS: Output Area Full */
+/* TRANSLATORS: Output bin is full */
 _("printer-state-reasons.output-area-full");
 /* TRANSLATORS: Output Mailbox Select Failure */
 _("printer-state-reasons.output-mailbox-select-failure");
-/* TRANSLATORS: Output Tray Missing */
+/* TRANSLATORS: Output Media Tray Failure */
+_("printer-state-reasons.output-media-tray-failure");
+/* TRANSLATORS: Output Media Tray Feed Error */
+_("printer-state-reasons.output-media-tray-feed-error");
+/* TRANSLATORS: Output Media Tray Jam */
+_("printer-state-reasons.output-media-tray-jam");
+/* TRANSLATORS: Output tray is missing */
 _("printer-state-reasons.output-tray-missing");
 /* TRANSLATORS: Paused */
 _("printer-state-reasons.paused");
@@ -3678,8 +3560,6 @@ _("printer-state-reasons.puncher-unrecoverable-failure");
 _("printer-state-reasons.puncher-unrecoverable-storage-error");
 /* TRANSLATORS: Puncher Warming Up */
 _("printer-state-reasons.puncher-warming-up");
-/* TRANSLATORS: Resuming */
-_("printer-state-reasons.resuming");
 /* TRANSLATORS: Separation Cutter Added */
 _("printer-state-reasons.separation-cutter-added");
 /* TRANSLATORS: Separation Cutter Almost Empty */
@@ -3824,7 +3704,7 @@ _("printer-state-reasons.sheet-rotator-unrecoverable-failure");
 _("printer-state-reasons.sheet-rotator-unrecoverable-storage-error");
 /* TRANSLATORS: Sheet Rotator Warming Up */
 _("printer-state-reasons.sheet-rotator-warming-up");
-/* TRANSLATORS: Shutdown */
+/* TRANSLATORS: Printer offline */
 _("printer-state-reasons.shutdown");
 /* TRANSLATORS: Slitter Added */
 _("printer-state-reasons.slitter-added");
@@ -4116,7 +3996,7 @@ _("printer-state-reasons.stitcher-unrecoverable-failure");
 _("printer-state-reasons.stitcher-unrecoverable-storage-error");
 /* TRANSLATORS: Stitcher Warming Up */
 _("printer-state-reasons.stitcher-warming-up");
-/* TRANSLATORS: Stopped Partly */
+/* TRANSLATORS: Partially stopped */
 _("printer-state-reasons.stopped-partly");
 /* TRANSLATORS: Stopping */
 _("printer-state-reasons.stopping");
@@ -4182,11 +4062,11 @@ _("printer-state-reasons.subunit-unrecoverable-failure");
 _("printer-state-reasons.subunit-unrecoverable-storage");
 /* TRANSLATORS: Subunit Warming Up */
 _("printer-state-reasons.subunit-warming-up");
-/* TRANSLATORS: Timed Out */
+/* TRANSLATORS: Printer stopped responding */
 _("printer-state-reasons.timed-out");
-/* TRANSLATORS: Toner Empty */
+/* TRANSLATORS: Out of toner */
 _("printer-state-reasons.toner-empty");
-/* TRANSLATORS: Toner Low */
+/* TRANSLATORS: Toner low */
 _("printer-state-reasons.toner-low");
 /* TRANSLATORS: Trimmer Added */
 _("printer-state-reasons.trimmer-added");
@@ -4342,8 +4222,6 @@ _("printer-state.4");
 _("printer-state.5");
 /* TRANSLATORS: Printer Uptime */
 _("printer-up-time");
-/* TRANSLATORS: Printer Xri */
-_("printer-xri-requested");
 /* TRANSLATORS: Proof Print */
 _("proof-print");
 /* TRANSLATORS: Proof Print Copies */
@@ -4364,76 +4242,8 @@ _("punching-reference-edge.left");
 _("punching-reference-edge.right");
 /* TRANSLATORS: Top */
 _("punching-reference-edge.top");
-/* TRANSLATORS: Request Power State */
-_("request-power-state");
 /* TRANSLATORS: Requested Attributes */
 _("requested-attributes");
-/* TRANSLATORS: Resource Format */
-_("resource-format");
-/* TRANSLATORS: Resource Format Accepted */
-_("resource-format-accepted");
-/* TRANSLATORS: Resource Formats */
-_("resource-formats");
-/* TRANSLATORS: Resource ID */
-_("resource-id");
-/* TRANSLATORS: Resource Ids */
-_("resource-ids");
-/* TRANSLATORS: Resource K Octets */
-_("resource-k-octets");
-/* TRANSLATORS: Resource Signature */
-_("resource-signature");
-/* TRANSLATORS: Resource State */
-_("resource-state");
-/* TRANSLATORS: Resource State Reasons */
-_("resource-state-reasons");
-/* TRANSLATORS: Cancel */
-_("resource-state-reasons.cancel-requested");
-/* TRANSLATORS: Install */
-_("resource-state-reasons.install-requested");
-/* TRANSLATORS: Resource Incoming */
-_("resource-state-reasons.resource-incoming");
-/* TRANSLATORS: Pending */
-_("resource-state.3");
-/* TRANSLATORS: Available */
-_("resource-state.4");
-/* TRANSLATORS: Installed */
-_("resource-state.5");
-/* TRANSLATORS: Canceled */
-_("resource-state.6");
-/* TRANSLATORS: Aborted */
-_("resource-state.7");
-/* TRANSLATORS: Resource States */
-_("resource-states");
-/* TRANSLATORS: Resource Type */
-_("resource-type");
-/* TRANSLATORS: Executable Firmware */
-_("resource-type.executable-firmware");
-/* TRANSLATORS: Executable Software */
-_("resource-type.executable-software");
-/* TRANSLATORS: Static Font */
-_("resource-type.static-font");
-/* TRANSLATORS: Static Form */
-_("resource-type.static-form");
-/* TRANSLATORS: Static Icc Profile */
-_("resource-type.static-icc-profile");
-/* TRANSLATORS: Static Image */
-_("resource-type.static-image");
-/* TRANSLATORS: Static Logo */
-_("resource-type.static-logo");
-/* TRANSLATORS: Static Other */
-_("resource-type.static-other");
-/* TRANSLATORS: Static Strings */
-_("resource-type.static-strings");
-/* TRANSLATORS: Template Document */
-_("resource-type.template-document");
-/* TRANSLATORS: Template Job */
-_("resource-type.template-job");
-/* TRANSLATORS: Template Printer */
-_("resource-type.template-printer");
-/* TRANSLATORS: Resource Types */
-_("resource-types");
-/* TRANSLATORS: Restart Get Interval */
-_("restart-get-interval");
 /* TRANSLATORS: Retry Interval */
 _("retry-interval");
 /* TRANSLATORS: Retry Timeout */
@@ -4468,12 +4278,6 @@ _("separator-sheets-type.none");
 _("separator-sheets-type.slip-sheets");
 /* TRANSLATORS: Start Sheet */
 _("separator-sheets-type.start-sheet");
-/* TRANSLATORS: Collate Copies */
-_("sheet-collate");
-/* TRANSLATORS: Yes */
-_("sheet-collate.collated");
-/* TRANSLATORS: No */
-_("sheet-collate.uncollated");
 /* TRANSLATORS: 2-Sided Printing */
 _("sides");
 /* TRANSLATORS: Off */
@@ -4482,8 +4286,6 @@ _("sides.one-sided");
 _("sides.two-sided-long-edge");
 /* TRANSLATORS: On (Landscape) */
 _("sides.two-sided-short-edge");
-/* TRANSLATORS: Start Power State */
-_("start-power-state");
 /* TRANSLATORS: Status Message */
 _("status-message");
 /* TRANSLATORS: Staple */
@@ -4536,28 +4338,8 @@ _("subscription-privacy-scope.default");
 _("subscription-privacy-scope.none");
 /* TRANSLATORS: Owner */
 _("subscription-privacy-scope.owner");
-/* TRANSLATORS: System State */
-_("system-state");
-/* TRANSLATORS: System State Reasons */
-_("system-state-reasons");
-/* TRANSLATORS: Idle */
-_("system-state.3");
-/* TRANSLATORS: Processing */
-_("system-state.4");
-/* TRANSLATORS: Stopped */
-_("system-state.5");
-/* TRANSLATORS: System URI */
-_("system-uri");
 /* TRANSLATORS: T33 Subaddress */
 _("t33-subaddress");
-/* TRANSLATORS: Timeout Predicate */
-_("timeout-predicate");
-/* TRANSLATORS: Activity */
-_("timeout-predicate.activity");
-/* TRANSLATORS: Inactivity */
-_("timeout-predicate.inactivity");
-/* TRANSLATORS: None */
-_("timeout-predicate.none");
 /* TRANSLATORS: To Name */
 _("to-name");
 /* TRANSLATORS: Transmission Status */
@@ -4612,22 +4394,6 @@ _("trimming-when.after-job");
 _("trimming-when.after-sets");
 /* TRANSLATORS: Every Page */
 _("trimming-when.after-sheets");
-/* TRANSLATORS: Which Printers */
-_("which-printers");
-/* TRANSLATORS: All */
-_("which-printers.all");
-/* TRANSLATORS: Idle */
-_("which-printers.idle");
-/* TRANSLATORS: Not Accepting */
-_("which-printers.not-accepting");
-/* TRANSLATORS: Processing */
-_("which-printers.processing");
-/* TRANSLATORS: Shutdown */
-_("which-printers.shutdown");
-/* TRANSLATORS: Stopped */
-_("which-printers.stopped");
-/* TRANSLATORS: Testing */
-_("which-printers.testing");
 /* TRANSLATORS: X Accuracy */
 _("x-accuracy");
 /* TRANSLATORS: X Dimension */
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 79f17ea0c..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -7,7 +7,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH cupsd.conf 5 "CUPS" "2 May 2019" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "16 July 2019" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -690,6 +690,8 @@ The following directives may be placed inside Location and Limit sections in the
 .TP 5
 \fBAllow @LOCAL\fR
 Allows access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
 The Order directive controls whether Allow lines are evaluated before or after Deny lines.
 .TP 5
 \fBAuthType None\fR
@@ -724,6 +726,8 @@ The value "Default" corresponds to the DefaultAuthType value.
 .TP 5
 \fBDeny @LOCAL\fR
 Denies access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
 The Order directive controls whether Deny lines are evaluated before or after Allow lines.
 .TP 5
 \fBEncryption IfRequested\fR
@@ -862,6 +866,10 @@ On Linux this is typically done using the
 command, while on macOS the
 .BR launchctl (8)
 command is used instead.
+.PP
+The @LOCAL macro name can be confusing since the system running
+.B cupsd
+often belongs to a different set of subnets from its clients.
 .SH CONFORMING TO
 The \fBcupsd.conf\fR file format is based on the Apache HTTP Server configuration file format.
 .SH EXAMPLES
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 9cd640344..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -6,7 +6,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ipptoolfile 5 "CUPS" "13 May 2019" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "15 August 2019" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 .SH DESCRIPTION
@@ -166,7 +166,7 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are separated by the comma (",") character \- escape commas using the "\" character.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
 Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
@@ -294,7 +294,7 @@ Makes the \fBEXPECT\fR conditions apply only if the specified variable is not de
 \fBIN\-GROUP \fItag\fR
 Requires the \fBEXPECT\fR attribute to be in the specified group tag.
 .TP 5
-\fBOF\-TYPE \fItag[,tag,...]\fR
+\fBOF\-TYPE \fItag[|tag,...]\fR
 Requires the \fBEXPECT\fR attribute to use one of the specified value tag(s).
 .TP 5
 \fBREPEAT\-LIMIT \fInumber\fR
diff --git a/packaging/cups.spec b/packaging/cups.spec
index d70c43a6c..50d894a30 100644
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -40,12 +40,12 @@
 
 Summary: CUPS
 Name: cups
-Version: 2.3rc1
+Version: 2.3.0
 Release: 0
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: https://github.com/apple/cups/releases/download/v2.3rc1/cups-2.3rc1-source.tar.gz
+Source: https://github.com/apple/cups/releases/download/v2.3.0/cups-2.3.0-source.tar.gz
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@example.com>
 Vendor: Example Corp
diff --git a/scheduler/auth.c b/scheduler/auth.c
index e4c9157f5..5bb80edc9 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -67,8 +67,6 @@ static void		free_authmask(cupsd_authmask_t *am, void *data);
 #if HAVE_LIBPAM
 static int		pam_func(int, const struct pam_message **,
 			         struct pam_response **, void *);
-#else
-static void		to64(char *s, unsigned long v, int n);
 #endif /* HAVE_LIBPAM */
 
 
@@ -1168,7 +1166,23 @@ cupsdCheckGroup(
 
     groupid = group->gr_gid;
 
+    for (i = 0; group->gr_mem[i]; i ++)
+    {
+     /*
+      * User appears in the group membership...
+      */
+
+      if (!_cups_strcasecmp(username, group->gr_mem[i]))
+	return (1);
+    }
+
 #ifdef HAVE_GETGROUPLIST
+   /*
+    * If the user isn't in the group membership list, try the results from
+    * getgrouplist() which is supposed to return the full list of groups a user
+    * belongs to...
+    */
+
     if (user)
     {
       int	ngroups;		/* Number of groups */
@@ -1189,13 +1203,6 @@ cupsdCheckGroup(
         if ((int)groupid == (int)groups[i])
 	  return (1);
     }
-
-#else
-    for (i = 0; group->gr_mem[i]; i ++)
-    {
-      if (!_cups_strcasecmp(username, group->gr_mem[i]))
-	return (1);
-    }
 #endif /* HAVE_GETGROUPLIST */
   }
   else
@@ -2068,24 +2075,4 @@ pam_func(
 
   return (PAM_SUCCESS);
 }
-#else
-
-
-/*
- * 'to64()' - Base64-encode an integer value...
- */
-
-static void
-to64(char          *s,			/* O - Output string */
-     unsigned long v,			/* I - Value to encode */
-     int           n)			/* I - Number of digits */
-{
-  const char	*itoa64 = "./0123456789"
-                          "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                          "abcdefghijklmnopqrstuvwxyz";
-
-
-  for (; n > 0; n --, v >>= 6)
-    *s++ = itoa64[v & 0x3f];
-}
 #endif /* HAVE_LIBPAM */
diff --git a/scheduler/client.c b/scheduler/client.c
index 923a6e67a..f693e7c49 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -564,6 +564,17 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
   cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdReadClient: error=%d, used=%d, state=%s, data_encoding=HTTP_ENCODING_%s, data_remaining=" CUPS_LLFMT ", request=%p(%s), file=%d", httpError(con->http), (int)httpGetReady(con->http), httpStateString(httpGetState(con->http)), httpIsChunked(con->http) ? "CHUNKED" : "LENGTH", CUPS_LLCAST httpGetRemaining(con->http), con->request, con->request ? ippStateString(ippGetState(con->request)) : "", con->file);
 
+  if (httpError(con->http) == EPIPE && !httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
+  {
+   /*
+    * Connection closed...
+    */
+
+    cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
+    cupsdCloseClient(con);
+    return;
+  }
+
   if (httpGetState(con->http) == HTTP_STATE_GET_SEND ||
       httpGetState(con->http) == HTTP_STATE_POST_SEND ||
       httpGetState(con->http) == HTTP_STATE_STATUS)
@@ -573,17 +584,6 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
     * connection and we need to shut it down...
     */
 
-    if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
-    {
-     /*
-      * Connection closed...
-      */
-
-      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
-      cupsdCloseClient(con);
-      return;
-    }
-
     cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.", httpStateString(httpGetState(con->http)));
     cupsdCloseClient(con);
     return;
@@ -1950,6 +1950,7 @@ cupsdSendError(cupsd_client_t *con,	/* I - Connection */
   strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location));
 
   httpClearFields(con->http);
+  httpClearCookie(con->http);
 
   httpSetField(con->http, HTTP_FIELD_LOCATION, location);
 
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index d519b85c0..a38559751 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1902,18 +1902,14 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
   * Fill in the response info...
   */
 
-  httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
-                   con->clientname, con->clientport, "/jobs/%d", job->id);
-  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL,
-               job_uri);
+  httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL, con->clientname, con->clientport, "/jobs/%d", job->id);
+  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL, job_uri);
 
   ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
 
-  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
-                job->state_value);
+  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state", (int)job->state_value);
   ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_TEXT, "job-state-message", NULL, "");
-  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD, "job-state-reasons",
-               NULL, job->reasons->values[0].string.text);
+  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD, "job-state-reasons", NULL, job->reasons->values[0].string.text);
 
   con->response->request.status.status_code = IPP_OK;
 
@@ -3283,7 +3279,7 @@ cancel_all_jobs(cupsd_client_t  *con,	/* I - Client connection */
       * Cancel all jobs on all printers...
       */
 
-      cupsdCancelJobs(NULL, username, purge);
+      cupsdCancelJobs(NULL, username, purge != CUPSD_JOB_DEFAULT);
 
       cupsdLogMessage(CUPSD_LOG_INFO, "All jobs were %s by \"%s\".",
 		      purge == CUPSD_JOB_PURGE ? "purged" : "canceled",
@@ -3342,7 +3338,7 @@ cancel_all_jobs(cupsd_client_t  *con,	/* I - Client connection */
       * Cancel all of the jobs on the named printer...
       */
 
-      cupsdCancelJobs(printer->name, username, purge);
+      cupsdCancelJobs(printer->name, username, purge != CUPSD_JOB_DEFAULT);
 
       cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".",
 		      printer->name,
@@ -3998,8 +3994,7 @@ close_job(cupsd_client_t  *con,		/* I - Client connection */
 
   ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
 
-  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
-                job->state_value);
+  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state", (int)job->state_value);
 
   con->response->request.status.status_code = IPP_OK;
 
@@ -4965,7 +4960,7 @@ copy_printer_attrs(
     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME, "printer-op-policy", NULL, printer->op_policy);
 
   if (!ra || cupsArrayFind(ra, "printer-state"))
-    ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state", printer->state);
+    ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state", (int)printer->state);
 
   if (!ra || cupsArrayFind(ra, "printer-state-change-date-time"))
     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-state-change-date-time", ippTimeToDate(printer->state_time));
@@ -5510,7 +5505,7 @@ create_local_printer(
   add_printer_attributes:
 
   ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs", (char)printer->accepting);
-  ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state", printer->state);
+  ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state", (int)printer->state);
   add_printer_state_reasons(con, printer);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), httpIsEncrypted(con->http) ? "ipps" : "ipp", NULL, con->clientname, con->clientport, "/printers/%s", printer->name);
@@ -9947,17 +9942,13 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
   * Fill in the response info...
   */
 
-  httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
-                   con->clientname, con->clientport, "/jobs/%d", jobid);
-  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL,
-               job_uri);
+  httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL, con->clientname, con->clientport, "/jobs/%d", jobid);
+  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL, job_uri);
 
   ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", jobid);
 
-  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
-                job->state_value);
-  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD, "job-state-reasons",
-               NULL, job->reasons->values[0].string.text);
+  ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state", (int)job->state_value);
+  ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD, "job-state-reasons", NULL, job->reasons->values[0].string.text);
 
   con->response->request.status.status_code = IPP_OK;
 
diff --git a/scheduler/job.c b/scheduler/job.c
index c39bd09d3..9c197efc9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -444,7 +444,7 @@ cupsdCleanJobs(void)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time);
 
-    if ((job->history_time && job->history_time) < JobHistoryUpdate || !JobHistoryUpdate)
+    if ((job->history_time && job->history_time < JobHistoryUpdate) || !JobHistoryUpdate)
       JobHistoryUpdate = job->history_time;
 
     if ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate)
@@ -462,7 +462,7 @@ cupsdCleanJobs(void)
         cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing from history.");
 	cupsdDeleteJob(job, CUPSD_JOB_PURGE);
       }
-      else if (job->file_time && job->file_time <= curtime)
+      else if (job->file_time && job->file_time <= curtime && job->num_files > 0)
       {
         cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files.");
         remove_job_files(job);
@@ -2577,7 +2577,7 @@ cupsdSetJobState(
   job->state_value = newstate;
 
   if (job->state)
-    job->state->values[0].integer = newstate;
+    job->state->values[0].integer = (int)newstate;
 
   switch (newstate)
   {
@@ -2625,7 +2625,7 @@ cupsdSetJobState(
     else
       cupsdAddEvent(CUPSD_EVENT_JOB_STATE, job->printer, job, "%s", buffer);
 
-    if (newstate == IPP_JOB_STOPPED || newstate == IPP_JOB_ABORTED)
+    if (newstate == IPP_JOB_STOPPED || newstate == IPP_JOB_ABORTED || newstate == IPP_JOB_HELD)
       cupsdLogJob(job, CUPSD_LOG_ERROR, "%s", buffer);
     else
       cupsdLogJob(job, CUPSD_LOG_INFO, "%s", buffer);
diff --git a/scheduler/main.c b/scheduler/main.c
index 3a2fe7ec9..842b00a42 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -756,7 +756,10 @@ main(int  argc,				/* I - Number of command-line args */
 
 #ifdef HAVE_ONDEMAND
 	if (OnDemand)
+	{
+	  stop_scheduler = 1;
 	  break;
+	}
 #endif /* HAVE_ONDEMAND */
 
         DoingShutdown = 1;
@@ -2048,13 +2051,31 @@ service_checkout(int shutdown)          /* I - Shutting down? */
 #ifdef HAVE_ONDEMAND
   if (OnDemand)
   {
+    int shared_printers = 0;		/* Do we have shared printers? */
+
     strlcpy(pidfile, CUPS_KEEPALIVE, sizeof(pidfile));
 
+   /*
+    * If printer sharing is on see if there are any actual shared printers...
+    */
+
+    if (Browsing && BrowseLocalProtocols)
+    {
+      cupsd_printer_t *p = NULL;	/* Current printer */
+
+      for (p = (cupsd_printer_t *)cupsArrayFirst(Printers); p; p = (cupsd_printer_t *)cupsArrayNext(Printers))
+      {
+        if (p->shared)
+          break;
+      }
+
+      shared_printers = (p != NULL);
+    }
+
     if (cupsArrayCount(ActiveJobs) ||	/* Active jobs */
         WebInterface ||			/* Web interface enabled */
         NeedReload ||			/* Doing a reload */
-        (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
-                                        /* Printers being shared */
+        shared_printers)                /* Printers being shared */
     {
      /*
       * Create or remove the "keep-alive" file based on whether there are active
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 149eaac7e..10ae91234 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1072,8 +1072,7 @@ cupsdLoadAllPrinters(void)
     }
     else if (!_cups_strcasecmp(line, "Info"))
     {
-      if (value)
-	cupsdSetString(&p->info, value);
+      cupsdSetString(&p->info, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "MakeModel"))
     {
@@ -1082,23 +1081,19 @@ cupsdLoadAllPrinters(void)
     }
     else if (!_cups_strcasecmp(line, "Location"))
     {
-      if (value)
-	cupsdSetString(&p->location, value);
+      cupsdSetString(&p->location, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "GeoLocation"))
     {
-      if (value)
-        cupsdSetString(&p->geo_location, value);
+      cupsdSetString(&p->geo_location, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "Organization"))
     {
-      if (value)
-	cupsdSetString(&p->organization, value);
+      cupsdSetString(&p->organization, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "OrganizationalUnit"))
     {
-      if (value)
-	cupsdSetString(&p->organizational_unit, value);
+      cupsdSetString(&p->organizational_unit, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "DeviceURI"))
     {
@@ -4663,7 +4658,7 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
       for (fin = (_pwg_finishings_t *)cupsArrayFirst(p->pc->finishings); fin; fin = (_pwg_finishings_t *)cupsArrayNext(p->pc->finishings))
       {
         if (num_finishings < (int)(sizeof(finishings) / sizeof(finishings[0])))
-          finishings[num_finishings++] = fin->value;
+          finishings[num_finishings++] = (int)fin->value;
 
         switch (fin->value)
         {
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 71892c7f4..2542ab148 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1,10 +1,11 @@
 /*
  * Subscription routines for the CUPS scheduler.
  *
- * Copyright 2007-2019 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.	See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -27,15 +28,15 @@
  */
 
 static int	cupsd_compare_subscriptions(cupsd_subscription_t *first,
-		                            cupsd_subscription_t *second,
-		                            void *unused);
+					    cupsd_subscription_t *second,
+					    void *unused);
 static void	cupsd_delete_event(cupsd_event_t *event);
 #ifdef HAVE_DBUS
 static void	cupsd_send_dbus(cupsd_eventmask_t event, cupsd_printer_t *dest,
-		                cupsd_job_t *job);
+				cupsd_job_t *job);
 #endif /* HAVE_DBUS */
 static void	cupsd_send_notification(cupsd_subscription_t *sub,
-		                        cupsd_event_t *event);
+					cupsd_event_t *event);
 static void	cupsd_start_notifier(cupsd_subscription_t *sub);
 static void	cupsd_update_notifier(void);
 
@@ -48,8 +49,8 @@ void
 cupsdAddEvent(
     cupsd_eventmask_t event,		/* I - Event */
     cupsd_printer_t   *dest,		/* I - Printer associated with event */
-    cupsd_job_t       *job,		/* I - Job associated with event */
-    const char        *text,		/* I - Notification text */
+    cupsd_job_t	      *job,		/* I - Job associated with event */
+    const char	      *text,		/* I - Notification text */
     ...)				/* I - Additional arguments as needed */
 {
   va_list		ap;		/* Pointer to additional arguments */
@@ -60,7 +61,7 @@ cupsdAddEvent(
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdAddEvent(event=%s, dest=%p(%s), job=%p(%d), text=\"%s\", ...)",
+		  "cupsdAddEvent(event=%s, dest=%p(%s), job=%p(%d), text=\"%s\", ...)",
 		  cupsdEventName(event), dest, dest ? dest->name : "",
 		  job, job ? job->id : 0, text);
 
@@ -81,8 +82,8 @@ cupsdAddEvent(
   if (MaxEvents <= 0)
   {
     cupsdLogMessage(CUPSD_LOG_WARN,
-                    "cupsdAddEvent: Discarding %s event since MaxEvents is %d!",
-                    cupsdEventName(event), MaxEvents);
+		    "cupsdAddEvent: Discarding %s event since MaxEvents is %d!",
+		    cupsdEventName(event), MaxEvents);
     return;
   }
 
@@ -108,54 +109,54 @@ cupsdAddEvent(
       if ((temp = (cupsd_event_t *)calloc(1, sizeof(cupsd_event_t))) == NULL)
       {
 	cupsdLogMessage(CUPSD_LOG_CRIT,
-	                "Unable to allocate memory for event - %s",
-        	        strerror(errno));
+			"Unable to allocate memory for event - %s",
+			strerror(errno));
 	return;
       }
 
       temp->event = event;
       temp->time  = time(NULL);
       temp->attrs = ippNew();
-      temp->job   = job;
+      temp->job	  = job;
 
       if (dest)
-        temp->dest = dest;
+	temp->dest = dest;
       else if (job)
-        temp->dest = dest = cupsdFindPrinter(job->dest);
+	temp->dest = dest = cupsdFindPrinter(job->dest);
 
      /*
       * Add common event notification attributes...
       */
 
       ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_CHARSET,
-                   "notify-charset", NULL, "utf-8");
+		   "notify-charset", NULL, "utf-8");
 
       ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_LANGUAGE,
-                   "notify-natural-language", NULL, "en-US");
+		   "notify-natural-language", NULL, "en-US");
 
       ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
-	            "notify-subscription-id", sub->id);
+		    "notify-subscription-id", sub->id);
 
       ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
-	            "notify-sequence-number", sub->next_event_id);
+		    "notify-sequence-number", sub->next_event_id);
 
       ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD,
-	           "notify-subscribed-event", NULL, cupsdEventName(event));
+		   "notify-subscribed-event", NULL, cupsdEventName(event));
 
       if (sub->user_data_len > 0)
-        ippAddOctetString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-	                  "notify-user-data", sub->user_data,
+	ippAddOctetString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
+			  "notify-user-data", sub->user_data,
 			  sub->user_data_len);
 
       ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
-	            "printer-up-time", time(NULL));
+		    "printer-up-time", time(NULL));
 
       va_start(ap, text);
       vsnprintf(ftext, sizeof(ftext), text, ap);
       va_end(ap);
 
       ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_TEXT,
-	           "notify-text", NULL, ftext);
+		   "notify-text", NULL, ftext);
 
       if (dest)
       {
@@ -163,27 +164,18 @@ cupsdAddEvent(
 	* Add printer attributes...
 	*/
 
-	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_URI,
-	             "notify-printer-uri", NULL, dest->uri);
+	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_URI, "notify-printer-uri", NULL, dest->uri);
 
-	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_NAME,
-	             "printer-name", NULL, dest->name);
+	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_NAME, "printer-name", NULL, dest->name);
 
-	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_ENUM,
-	              "printer-state", dest->state);
+	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_ENUM, "printer-state", (int)dest->state);
 
 	if (dest->num_reasons == 0)
-	  ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-	               IPP_TAG_KEYWORD, "printer-state-reasons", NULL,
-		       dest->state == IPP_PRINTER_STOPPED ? "paused" : "none");
+	  ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "printer-state-reasons", NULL, dest->state == IPP_PRINTER_STOPPED ? "paused" : "none");
 	else
-	  ippAddStrings(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-	                IPP_TAG_KEYWORD, "printer-state-reasons",
-			dest->num_reasons, NULL,
-			(const char * const *)dest->reasons);
+	  ippAddStrings(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "printer-state-reasons", dest->num_reasons, NULL, (const char * const *)dest->reasons);
 
-	ippAddBoolean(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-	              "printer-is-accepting-jobs", (char)dest->accepting);
+	ippAddBoolean(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, "printer-is-accepting-jobs", (char)dest->accepting);
       }
 
       if (job)
@@ -192,75 +184,51 @@ cupsdAddEvent(
 	* Add job attributes...
 	*/
 
-	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
-	              "notify-job-id", job->id);
-	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_ENUM,
-	              "job-state", job->state_value);
+	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER, "notify-job-id", job->id);
+	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_ENUM, "job-state", (int)job->state_value);
 
-        if ((attr = ippFindAttribute(job->attrs, "job-name",
-	                             IPP_TAG_NAME)) != NULL)
-	  ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_NAME,
-	               "job-name", NULL, attr->values[0].string.text);
+	if ((attr = ippFindAttribute(job->attrs, "job-name", IPP_TAG_NAME)) != NULL)
+	  ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_NAME, "job-name", NULL, attr->values[0].string.text);
 
 	switch (job->state_value)
 	{
 	  case IPP_JOB_PENDING :
-              if (dest && dest->state == IPP_PRINTER_STOPPED)
-        	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		             IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			     "printer-stopped");
-              else
-        	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		             IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			     "none");
-              break;
+	      if (dest && dest->state == IPP_PRINTER_STOPPED)
+		ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "printer-stopped");
+	      else
+		ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "none");
+	      break;
 
 	  case IPP_JOB_HELD :
-              if (ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD) != NULL ||
+	      if (ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD) != NULL ||
 		  ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME) != NULL)
-        	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		             IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			     "job-hold-until-specified");
-              else
-        	ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		             IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			     "job-incoming");
-              break;
+		ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-hold-until-specified");
+	      else
+		ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-incoming");
+	      break;
 
 	  case IPP_JOB_PROCESSING :
-              ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		           IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			   "job-printing");
-              break;
+	      ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-printing");
+	      break;
 
 	  case IPP_JOB_STOPPED :
-              ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		           IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			   "job-stopped");
-              break;
+	      ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-stopped");
+	      break;
 
 	  case IPP_JOB_CANCELED :
-              ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		           IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			   "job-canceled-by-user");
-              break;
+	      ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-canceled-by-user");
+	      break;
 
 	  case IPP_JOB_ABORTED :
-              ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		           IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			   "aborted-by-system");
-              break;
+	      ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "aborted-by-system");
+	      break;
 
 	  case IPP_JOB_COMPLETED :
-              ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION,
-		           IPP_TAG_KEYWORD, "job-state-reasons", NULL,
-			   "job-completed-successfully");
-              break;
+	      ippAddString(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_KEYWORD, "job-state-reasons", NULL, "job-completed-successfully");
+	      break;
 	}
 
-	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
-	              "job-impressions-completed",
-		      job->sheets ? job->sheets->values[0].integer : 0);
+	ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER, "job-impressions-completed", job->sheets ? job->sheets->values[0].integer : 0);
       }
 
      /*
@@ -274,8 +242,7 @@ cupsdAddEvent(
   if (temp)
     cupsdMarkDirty(CUPSD_DIRTY_SUBSCRIPTIONS);
   else
-    cupsdLogMessage(CUPSD_LOG_DEBUG, "Discarding unused %s event...",
-                    cupsdEventName(event));
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Discarding unused %s event...", cupsdEventName(event));
 }
 
 
@@ -285,30 +252,30 @@ cupsdAddEvent(
 
 cupsd_subscription_t *			/* O - New subscription object */
 cupsdAddSubscription(
-    unsigned        mask,		/* I - Event mask */
+    unsigned	    mask,		/* I - Event mask */
     cupsd_printer_t *dest,		/* I - Printer, if any */
-    cupsd_job_t     *job,		/* I - Job, if any */
-    const char      *uri,		/* I - notify-recipient-uri, if any */
-    int             sub_id)		/* I - notify-subscription-id or 0 */
+    cupsd_job_t	    *job,		/* I - Job, if any */
+    const char	    *uri,		/* I - notify-recipient-uri, if any */
+    int		    sub_id)		/* I - notify-subscription-id or 0 */
 {
   cupsd_subscription_t	*temp;		/* New subscription object */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdAddSubscription(mask=%x, dest=%p(%s), job=%p(%d), "
+		  "cupsdAddSubscription(mask=%x, dest=%p(%s), job=%p(%d), "
 		  "uri=\"%s\")",
-                  mask, dest, dest ? dest->name : "", job, job ? job->id : 0,
+		  mask, dest, dest ? dest->name : "", job, job ? job->id : 0,
 		  uri ? uri : "(null)");
 
   if (!Subscriptions)
     Subscriptions = cupsArrayNew((cups_array_func_t)cupsd_compare_subscriptions,
-                                 NULL);
+				 NULL);
 
   if (!Subscriptions)
   {
     cupsdLogMessage(CUPSD_LOG_CRIT,
-                    "Unable to allocate memory for subscriptions - %s",
-        	    strerror(errno));
+		    "Unable to allocate memory for subscriptions - %s",
+		    strerror(errno));
     return (NULL);
   }
 
@@ -319,7 +286,7 @@ cupsdAddSubscription(
   if (MaxSubscriptions > 0 && cupsArrayCount(Subscriptions) >= MaxSubscriptions)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "cupsdAddSubscription: Reached MaxSubscriptions %d "
+		    "cupsdAddSubscription: Reached MaxSubscriptions %d "
 		    "(count=%d)", MaxSubscriptions,
 		    cupsArrayCount(Subscriptions));
     return (NULL);
@@ -327,14 +294,14 @@ cupsdAddSubscription(
 
   if (MaxSubscriptionsPerJob > 0 && job)
   {
-    int	count;				/* Number of job subscriptions */
+    int count;				/* Number of job subscriptions */
 
     for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-             count = 0;
-         temp;
+	     count = 0;
+	 temp;
 	 temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
       if (temp->job == job)
-        count ++;
+	count ++;
 
     if (count >= MaxSubscriptionsPerJob)
     {
@@ -348,14 +315,14 @@ cupsdAddSubscription(
 
   if (MaxSubscriptionsPerPrinter > 0 && dest)
   {
-    int	count;				/* Number of printer subscriptions */
+    int count;				/* Number of printer subscriptions */
 
     for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-             count = 0;
-         temp;
+	     count = 0;
+	 temp;
 	 temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
       if (temp->dest == dest)
-        count ++;
+	count ++;
 
     if (count >= MaxSubscriptionsPerPrinter)
     {
@@ -374,8 +341,8 @@ cupsdAddSubscription(
   if ((temp = calloc(1, sizeof(cupsd_subscription_t))) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_CRIT,
-                    "Unable to allocate memory for subscription object - %s",
-                    strerror(errno));
+		    "Unable to allocate memory for subscription object - %s",
+		    strerror(errno));
     return (NULL);
   }
 
@@ -397,10 +364,10 @@ cupsdAddSubscription(
     NextSubscriptionId ++;
   }
 
-  temp->mask           = mask;
-  temp->dest           = dest;
-  temp->job            = job;
-  temp->pipe           = -1;
+  temp->mask	       = mask;
+  temp->dest	       = dest;
+  temp->job	       = job;
+  temp->pipe	       = -1;
   temp->first_event_id = 1;
   temp->next_event_id  = 1;
 
@@ -453,7 +420,7 @@ cupsdDeleteAllSubscriptions(void)
 void
 cupsdDeleteSubscription(
     cupsd_subscription_t *sub,		/* I - Subscription object */
-    int                  update)	/* I - 1 = update subscriptions.conf */
+    int			 update)	/* I - 1 = update subscriptions.conf */
 {
  /*
   * Close the pipe to the notifier as needed...
@@ -499,79 +466,79 @@ cupsdEventName(
   switch (event)
   {
     default :
-        return (NULL);
+	return (NULL);
 
     case CUPSD_EVENT_PRINTER_RESTARTED :
-        return ("printer-restarted");
+	return ("printer-restarted");
 
     case CUPSD_EVENT_PRINTER_SHUTDOWN :
-        return ("printer-shutdown");
+	return ("printer-shutdown");
 
     case CUPSD_EVENT_PRINTER_STOPPED :
-        return ("printer-stopped");
+	return ("printer-stopped");
 
     case CUPSD_EVENT_PRINTER_FINISHINGS_CHANGED :
-        return ("printer-finishings-changed");
+	return ("printer-finishings-changed");
 
     case CUPSD_EVENT_PRINTER_MEDIA_CHANGED :
-        return ("printer-media-changed");
+	return ("printer-media-changed");
 
     case CUPSD_EVENT_PRINTER_ADDED :
-        return ("printer-added");
+	return ("printer-added");
 
     case CUPSD_EVENT_PRINTER_DELETED :
-        return ("printer-deleted");
+	return ("printer-deleted");
 
     case CUPSD_EVENT_PRINTER_MODIFIED :
-        return ("printer-modified");
+	return ("printer-modified");
 
     case CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED :
-        return ("printer-queue-order-changed");
+	return ("printer-queue-order-changed");
 
     case CUPSD_EVENT_PRINTER_STATE :
     case CUPSD_EVENT_PRINTER_STATE_CHANGED :
-        return ("printer-state-changed");
+	return ("printer-state-changed");
 
     case CUPSD_EVENT_PRINTER_CONFIG :
     case CUPSD_EVENT_PRINTER_CONFIG_CHANGED :
-        return ("printer-config-changed");
+	return ("printer-config-changed");
 
     case CUPSD_EVENT_PRINTER_CHANGED :
-        return ("printer-changed");
+	return ("printer-changed");
 
     case CUPSD_EVENT_JOB_CREATED :
-        return ("job-created");
+	return ("job-created");
 
     case CUPSD_EVENT_JOB_COMPLETED :
-        return ("job-completed");
+	return ("job-completed");
 
     case CUPSD_EVENT_JOB_STOPPED :
-        return ("job-stopped");
+	return ("job-stopped");
 
     case CUPSD_EVENT_JOB_CONFIG_CHANGED :
-        return ("job-config-changed");
+	return ("job-config-changed");
 
     case CUPSD_EVENT_JOB_PROGRESS :
-        return ("job-progress");
+	return ("job-progress");
 
     case CUPSD_EVENT_JOB_STATE :
     case CUPSD_EVENT_JOB_STATE_CHANGED :
-        return ("job-state-changed");
+	return ("job-state-changed");
 
     case CUPSD_EVENT_SERVER_RESTARTED :
-        return ("server-restarted");
+	return ("server-restarted");
 
     case CUPSD_EVENT_SERVER_STARTED :
-        return ("server-started");
+	return ("server-started");
 
     case CUPSD_EVENT_SERVER_STOPPED :
-        return ("server-stopped");
+	return ("server-stopped");
 
     case CUPSD_EVENT_SERVER_AUDIT :
-        return ("server-audit");
+	return ("server-audit");
 
     case CUPSD_EVENT_ALL :
-        return ("all");
+	return ("all");
   }
 }
 
@@ -641,7 +608,7 @@ cupsdEventValue(const char *name)	/* I - Name of event */
 void
 cupsdExpireSubscriptions(
     cupsd_printer_t *dest,		/* I - Printer, if any */
-    cupsd_job_t     *job)		/* I - Job, if any */
+    cupsd_job_t	    *job)		/* I - Job, if any */
 {
   cupsd_subscription_t	*sub;		/* Current subscription */
   int			update;		/* Update subscriptions.conf? */
@@ -660,11 +627,11 @@ cupsdExpireSubscriptions(
        sub;
        sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
     if ((!sub->job && !dest && sub->expire && sub->expire <= curtime) ||
-        (dest && sub->dest == dest) ||
+	(dest && sub->dest == dest) ||
 	(job && sub->job == job))
     {
       cupsdLogMessage(CUPSD_LOG_INFO, "Subscription %d has expired...",
-                      sub->id);
+		      sub->id);
 
       cupsdDeleteSubscription(sub, 0);
 
@@ -723,7 +690,7 @@ cupsdLoadAllSubscriptions(void)
   */
 
   linenum    = 0;
-  sub        = NULL;
+  sub	     = NULL;
   delete_sub = 0;
 
   while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
@@ -736,7 +703,7 @@ cupsdLoadAllSubscriptions(void)
 
       i = atoi(value);
       if (i >= NextSubscriptionId && i > 0)
-        NextSubscriptionId = i;
+	NextSubscriptionId = i;
     }
     else if (!_cups_strcasecmp(line, "<Subscription"))
     {
@@ -746,38 +713,38 @@ cupsdLoadAllSubscriptions(void)
 
       if (!sub && value && isdigit(value[0] & 255))
       {
-        sub = cupsdAddSubscription(CUPSD_EVENT_NONE, NULL, NULL, NULL,
-	                           atoi(value));
+	sub = cupsdAddSubscription(CUPSD_EVENT_NONE, NULL, NULL, NULL,
+				   atoi(value));
       }
       else
       {
-        cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
-        break;
+	cupsdLogMessage(CUPSD_LOG_ERROR,
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
+	break;
       }
     }
     else if (!_cups_strcasecmp(line, "</Subscription>"))
     {
       if (!sub)
       {
-        cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
-        break;
+	cupsdLogMessage(CUPSD_LOG_ERROR,
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
+	break;
       }
 
       if (delete_sub)
-        cupsdDeleteSubscription(sub, 0);
+	cupsdDeleteSubscription(sub, 0);
 
-      sub        = NULL;
+      sub	 = NULL;
       delete_sub = 0;
     }
     else if (!sub)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Syntax error on line %d of subscriptions.conf.",
-	              linenum);
+		      "Syntax error on line %d of subscriptions.conf.",
+		      linenum);
     }
     else if (!_cups_strcasecmp(line, "Events"))
     {
@@ -789,31 +756,31 @@ cupsdLoadAllSubscriptions(void)
       if (!value)
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
 
       while (*value)
       {
        /*
-        * Separate event names...
+	* Separate event names...
 	*/
 
-        for (valueptr = value; !isspace(*valueptr) && *valueptr; valueptr ++);
+	for (valueptr = value; !isspace(*valueptr) && *valueptr; valueptr ++);
 
 	while (isspace(*valueptr & 255))
 	  *valueptr++ = '\0';
 
        /*
-        * See if the name exists...
+	* See if the name exists...
 	*/
 
-        if ((sub->mask |= cupsdEventValue(value)) == CUPSD_EVENT_NONE)
+	if ((sub->mask |= cupsdEventValue(value)) == CUPSD_EVENT_NONE)
 	{
 	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Unknown event name \'%s\' on line %d of subscriptions.conf.",
-	                  value, linenum);
+			  "Unknown event name \'%s\' on line %d of subscriptions.conf.",
+			  value, linenum);
 	  break;
 	}
 
@@ -831,8 +798,8 @@ cupsdLoadAllSubscriptions(void)
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -847,8 +814,8 @@ cupsdLoadAllSubscriptions(void)
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -860,19 +827,19 @@ cupsdLoadAllSubscriptions(void)
 
       if (value && isdigit(*value & 255))
       {
-        if ((sub->job = cupsdFindJob(atoi(value))) == NULL)
+	if ((sub->job = cupsdFindJob(atoi(value))) == NULL)
 	{
 	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Job %s not found on line %d of subscriptions.conf.",
-	                  value, linenum);
+			  "Job %s not found on line %d of subscriptions.conf.",
+			  value, linenum);
 	  delete_sub = 1;
 	}
       }
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -884,19 +851,19 @@ cupsdLoadAllSubscriptions(void)
 
       if (value)
       {
-        if ((sub->dest = cupsdFindDest(value)) == NULL)
+	if ((sub->dest = cupsdFindDest(value)) == NULL)
 	{
 	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Printer \'%s\' not found on line %d of subscriptions.conf.",
-	                  value, linenum);
+			  "Printer \'%s\' not found on line %d of subscriptions.conf.",
+			  value, linenum);
 	  delete_sub = 1;
 	}
       }
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -908,7 +875,7 @@ cupsdLoadAllSubscriptions(void)
 
       if (value)
       {
-        for (i = 0, valueptr = value, hex = 0; i < 63 && *valueptr; i ++)
+	for (i = 0, valueptr = value, hex = 0; i < 63 && *valueptr; i ++)
 	{
 	  if (*valueptr == '<' && !hex)
 	  {
@@ -921,20 +888,20 @@ cupsdLoadAllSubscriptions(void)
 	    if (isxdigit(valueptr[0]) && isxdigit(valueptr[1]))
 	    {
 	      if (isdigit(valueptr[0]))
-	        sub->user_data[i] = (unsigned char)((valueptr[0] - '0') << 4);
+		sub->user_data[i] = (unsigned char)((valueptr[0] - '0') << 4);
 	      else
-	        sub->user_data[i] = (unsigned char)((tolower(valueptr[0]) - 'a' + 10) << 4);
+		sub->user_data[i] = (unsigned char)((tolower(valueptr[0]) - 'a' + 10) << 4);
 
 	      if (isdigit(valueptr[1]))
-	        sub->user_data[i] |= valueptr[1] - '0';
+		sub->user_data[i] |= valueptr[1] - '0';
 	      else
-	        sub->user_data[i] |= tolower(valueptr[1]) - 'a' + 10;
+		sub->user_data[i] |= tolower(valueptr[1]) - 'a' + 10;
 
-              valueptr += 2;
+	      valueptr += 2;
 
 	      if (*valueptr == '>')
 	      {
-	        hex = 0;
+		hex = 0;
 		valueptr ++;
 	      }
 	    }
@@ -948,8 +915,8 @@ cupsdLoadAllSubscriptions(void)
 	if (*valueptr)
 	{
 	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Bad UserData \'%s\' on line %d of subscriptions.conf.",
-	                  value, linenum);
+			  "Bad UserData \'%s\' on line %d of subscriptions.conf.",
+			  value, linenum);
 	}
 	else
 	  sub->user_data_len = i;
@@ -957,8 +924,8 @@ cupsdLoadAllSubscriptions(void)
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -970,14 +937,14 @@ cupsdLoadAllSubscriptions(void)
 
       if (value && isdigit(*value & 255))
       {
-        sub->lease  = atoi(value);
-        sub->expire = sub->lease ? time(NULL) + sub->lease : 0;
+	sub->lease  = atoi(value);
+	sub->expire = sub->lease ? time(NULL) + sub->lease : 0;
       }
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -988,12 +955,12 @@ cupsdLoadAllSubscriptions(void)
       */
 
       if (value && isdigit(*value & 255))
-        sub->interval = atoi(value);
+	sub->interval = atoi(value);
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -1004,12 +971,12 @@ cupsdLoadAllSubscriptions(void)
       */
 
       if (value && isdigit(*value & 255))
-        sub->expire = atoi(value);
+	sub->expire = atoi(value);
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -1020,12 +987,12 @@ cupsdLoadAllSubscriptions(void)
       */
 
       if (value && isdigit(*value & 255))
-        sub->next_event_id = sub->first_event_id = atoi(value);
+	sub->next_event_id = sub->first_event_id = atoi(value);
       else
       {
 	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Syntax error on line %d of subscriptions.conf.",
-	                linenum);
+			"Syntax error on line %d of subscriptions.conf.",
+			linenum);
 	break;
       }
     }
@@ -1036,8 +1003,8 @@ cupsdLoadAllSubscriptions(void)
       */
 
       cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unknown configuration directive %s on line %d of subscriptions.conf.",
-	              line, linenum);
+		      "Unknown configuration directive %s on line %d of subscriptions.conf.",
+		      line, linenum);
     }
   }
 
@@ -1054,7 +1021,7 @@ cupsdSaveAllSubscriptions(void)
 {
   int			i;		/* Looping var */
   cups_file_t		*fp;		/* subscriptions.conf file */
-  char			filename[1024],	/* subscriptions.conf filename */
+  char			filename[1024], /* subscriptions.conf filename */
 			temp[1024];	/* Temporary string */
   cupsd_subscription_t	*sub;		/* Current subscription */
   time_t		curtime;	/* Current time */
@@ -1115,7 +1082,7 @@ cupsdSaveAllSubscriptions(void)
       cupsFilePuts(fp, "Events");
 
       for (mask = 1; mask < CUPSD_EVENT_ALL; mask <<= 1)
-        if (sub->mask & mask)
+	if (sub->mask & mask)
 	  cupsFilePrintf(fp, " %s", cupsdEventName((cupsd_eventmask_t)mask));
 
       cupsFilePuts(fp, "\n");
@@ -1136,7 +1103,7 @@ cupsdSaveAllSubscriptions(void)
 
       for (i = 0, hex = 0; i < sub->user_data_len; i ++)
       {
-        if (sub->user_data[i] < ' ' ||
+	if (sub->user_data[i] < ' ' ||
 	    sub->user_data[i] > 0x7f ||
 	    sub->user_data[i] == '<')
 	{
@@ -1161,9 +1128,9 @@ cupsdSaveAllSubscriptions(void)
       }
 
       if (hex)
-        cupsFilePuts(fp, ">\n");
+	cupsFilePuts(fp, ">\n");
       else
-        cupsFilePutChar(fp, '\n');
+	cupsFilePutChar(fp, '\n');
     }
 
     cupsFilePrintf(fp, "LeaseDuration %d\n", sub->lease);
@@ -1238,7 +1205,7 @@ static int				/* O - Result of comparison */
 cupsd_compare_subscriptions(
     cupsd_subscription_t *first,	/* I - First subscription object */
     cupsd_subscription_t *second,	/* I - Second subscription object */
-    void                 *unused)	/* I - Unused user data pointer */
+    void		 *unused)	/* I - Unused user data pointer */
 {
   (void)unused;
 
@@ -1272,14 +1239,14 @@ cupsd_delete_event(cupsd_event_t *event)/* I - Event to delete */
 
 static void
 cupsd_send_dbus(cupsd_eventmask_t event,/* I - Event to send */
-                cupsd_printer_t   *dest,/* I - Destination, if any */
-                cupsd_job_t       *job)	/* I - Job, if any */
+		cupsd_printer_t	  *dest,/* I - Destination, if any */
+		cupsd_job_t	  *job) /* I - Job, if any */
 {
   DBusError		error;		/* Error, if any */
   DBusMessage		*message;	/* Message to send */
   DBusMessageIter	iter;		/* Iterator for message data */
   const char		*what;		/* What to send */
-  static DBusConnection	*con = NULL;	/* Connection to DBUS server */
+  static DBusConnection *con = NULL;	/* Connection to DBUS server */
 
 
  /*
@@ -1295,7 +1262,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,/* I - Event to send */
   else if (event & CUPSD_EVENT_JOB_CREATED)
     what = "JobQueuedLocal";
   else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
-           job->state_value == IPP_JOB_PROCESSING)
+	   job->state_value == IPP_JOB_PROCESSING)
     what = "JobStartedLocal";
   else
     return;
@@ -1352,14 +1319,14 @@ cupsd_send_dbus(cupsd_eventmask_t event,/* I - Event to send */
 static void
 cupsd_send_notification(
     cupsd_subscription_t *sub,		/* I - Subscription object */
-    cupsd_event_t        *event)	/* I - Event to send */
+    cupsd_event_t	 *event)	/* I - Event to send */
 {
   ipp_state_t	state;			/* IPP event state */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsd_send_notification(sub=%p(%d), event=%p(%s))",
-                  sub, sub->id, event, cupsdEventName(event->event));
+		  "cupsd_send_notification(sub=%p(%d), event=%p(%s))",
+		  sub, sub->id, event, cupsdEventName(event->event));
 
  /*
   * Allocate the events array as needed...
@@ -1368,15 +1335,15 @@ cupsd_send_notification(
   if (!sub->events)
   {
     sub->events = cupsArrayNew3((cups_array_func_t)NULL, NULL,
-                                (cups_ahash_func_t)NULL, 0,
+				(cups_ahash_func_t)NULL, 0,
 				(cups_acopy_func_t)NULL,
 				(cups_afree_func_t)cupsd_delete_event);
 
     if (!sub->events)
     {
       cupsdLogMessage(CUPSD_LOG_CRIT,
-                      "Unable to allocate memory for subscription #%d!",
-                      sub->id);
+		      "Unable to allocate memory for subscription #%d!",
+		      sub->id);
       return;
     }
   }
@@ -1397,7 +1364,7 @@ cupsd_send_notification(
   }
 
  /*
-  * Add the event to the subscription.  Since the events array is
+  * Add the event to the subscription.	Since the events array is
   * always MaxEvents in length, and since we will have already
   * removed an event from the subscription cache if we hit the
   * event cache limit, we don't need to check for overflow here...
@@ -1424,30 +1391,30 @@ cupsd_send_notification(
       event->attrs->state = IPP_IDLE;
 
       while ((state = ippWriteFile(sub->pipe, event->attrs)) != IPP_DATA)
-        if (state == IPP_ERROR)
+	if (state == IPP_ERROR)
 	  break;
 
       if (state == IPP_ERROR)
       {
-        if (errno == EPIPE)
+	if (errno == EPIPE)
 	{
 	 /*
 	  * Notifier died, try restarting it...
 	  */
 
-          cupsdLogMessage(CUPSD_LOG_WARN,
-	                  "Notifier for subscription %d (%s) went away, "
+	  cupsdLogMessage(CUPSD_LOG_WARN,
+			  "Notifier for subscription %d (%s) went away, "
 			  "retrying!",
 			  sub->id, sub->recipient);
 	  cupsdEndProcess(sub->pid, 0);
 
 	  close(sub->pipe);
 	  sub->pipe = -1;
-          continue;
+	  continue;
 	}
 
-        cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Unable to send event for subscription %d (%s)!",
+	cupsdLogMessage(CUPSD_LOG_ERROR,
+			"Unable to send event for subscription %d (%s)!",
 			sub->id, sub->recipient);
       }
 
@@ -1501,7 +1468,7 @@ cupsd_start_notifier(
   */
 
   httpEncode64_2(user_data, sizeof(user_data), (char *)sub->user_data,
-                 sub->user_data_len);
+		 sub->user_data_len);
 
  /*
   * Setup the argument array...
@@ -1531,7 +1498,7 @@ cupsd_start_notifier(
     if (cupsdOpenPipe(NotifierPipes))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to create pipes for notifier status - %s",
+		      "Unable to create pipes for notifier status - %s",
 		      strerror(errno));
       return;
     }
@@ -1539,13 +1506,13 @@ cupsd_start_notifier(
     NotifierStatusBuffer = cupsdStatBufNew(NotifierPipes[0], "[Notifier]");
 
     cupsdAddSelect(NotifierPipes[0], (cupsd_selfunc_t)cupsd_update_notifier,
-                   NULL, NULL);
+		   NULL, NULL);
   }
 
   if (cupsdOpenPipe(fds))
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Unable to create pipes for notifier %s - %s",
+		    "Unable to create pipes for notifier %s - %s",
 		    scheme, strerror(errno));
     return;
   }
@@ -1568,7 +1535,7 @@ cupsd_start_notifier(
     */
 
     cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to fork for notifier %s - %s",
-                    scheme, strerror(errno));
+		    scheme, strerror(errno));
 
     cupsdClosePipe(fds);
   }
@@ -1579,10 +1546,10 @@ cupsd_start_notifier(
     */
 
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Notifier %s started - PID = %d",
-                    scheme, pid);
+		    scheme, pid);
 
-    sub->pid    = pid;
-    sub->pipe   = fds[1];
+    sub->pid	= pid;
+    sub->pipe	= fds[1];
     sub->status = 0;
 
     close(fds[0]);
@@ -1602,7 +1569,7 @@ cupsd_update_notifier(void)
 
 
   while (cupsdStatBufUpdate(NotifierStatusBuffer, &loglevel,
-                            message, sizeof(message)))
+			    message, sizeof(message)))
   {
     if (loglevel == CUPSD_LOG_INFO)
       cupsdLogMessage(CUPSD_LOG_INFO, "%s", message);
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index f428368d4..ca6d386b2 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1467,6 +1467,7 @@ set_printer_options(
 	  (boolval = cupsGetOption("cupsIPPSupplies", num_options,
 	                           options)) != NULL)
       {
+        ppdchanged         = 1;
         wrote_ipp_supplies = 1;
         cupsFilePrintf(out, "*cupsIPPSupplies: %s\n",
 	               (!_cups_strcasecmp(boolval, "true") ||
@@ -1477,6 +1478,7 @@ set_printer_options(
 	       (boolval = cupsGetOption("cupsSNMPSupplies", num_options,
 	                                options)) != NULL)
       {
+        ppdchanged          = 1;
         wrote_snmp_supplies = 1;
         cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n",
 	               (!_cups_strcasecmp(boolval, "true") ||
@@ -1537,6 +1539,8 @@ set_printer_options(
 	(boolval = cupsGetOption("cupsIPPSupplies", num_options,
 				 options)) != NULL)
     {
+      ppdchanged = 1;
+
       cupsFilePrintf(out, "*cupsIPPSupplies: %s\n",
 		     (!_cups_strcasecmp(boolval, "true") ||
 		      !_cups_strcasecmp(boolval, "yes") ||
@@ -1547,6 +1551,8 @@ set_printer_options(
         (boolval = cupsGetOption("cupsSNMPSupplies", num_options,
 			         options)) != NULL)
     {
+      ppdchanged = 1;
+
       cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n",
 		     (!_cups_strcasecmp(boolval, "true") ||
 		      !_cups_strcasecmp(boolval, "yes") ||
@@ -1561,8 +1567,7 @@ set_printer_options(
     * Do the request...
     */
 
-    ippDelete(cupsDoFileRequest(http, request, "/admin/",
-                                ppdchanged ? tempfile : file));
+    ippDelete(cupsDoFileRequest(http, request, "/admin/", ppdchanged ? tempfile : file));
 
    /*
     * Clean up temp files... (TODO: catch signals in case we CTRL-C during
diff --git a/templates/fr/jobs-header.tmpl b/templates/fr/jobs-header.tmpl
index 8a6d96392..4072aa641 100644
--- a/templates/fr/jobs-header.tmpl
+++ b/templates/fr/jobs-header.tmpl
@@ -2,4 +2,4 @@
 {?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Affichage des t&acirc;ches termin&eacute;es"></FORM>}
 {?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Affichage de toutes les t&acirc;ches"></FORM>}
 
-<P ALIGN="CENTER">{?which_jobs=?Affichage des tâches dans l'ordre d'impression; les tâches maintenues apparaissent en premier.:{which_jobs=Affichage des tâches dans l'ordre croissant.?:Affichage des tâches dans l'ordre décroissant.}}</P>
+<P ALIGN="CENTER">{?which_jobs=?Affichage des tâches en ordre d'impression; les tâches maintenues apparaissent en premier.:{which_jobs=Affichage des tâches dans l'ordre croissant.?:Affichage des tâches dans l'ordre décroissant.}}</P>
diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl
index 032619eb0..8d787572d 100644
--- a/templates/jobs.tmpl
+++ b/templates/jobs.tmpl
@@ -18,9 +18,9 @@
 <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="Reprint Job"></FORM>:}:}
-{job_state=4?
+{job_state=4?{job_hold_until=auth-info-required?Held for authentication.:
 <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="Release Job"></FORM>:}
+<INPUT TYPE="SUBMIT" VALUE="Release Job"></FORM>:}}
 {job_state=3?
 <FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-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="Hold Job"></FORM>:}
diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index 3fce71594..76c57961a 100644
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -1556,9 +1556,9 @@ create_printer(
     fprintf(stderr, "printer-more-info=\"%s\"\n", adminurl);
     fprintf(stderr, "printer-supply-info-uri=\"%s\"\n", supplyurl);
 #ifdef HAVE_SSL
-    fprintf(stderr, "printer-uri=\"%s\"\n", uri);
-#else
     fprintf(stderr, "printer-uri=\"%s\",\"%s\"\n", uri, securi);
+#else
+    fprintf(stderr, "printer-uri=\"%s\"\n", uri);
 #endif /* HAVE_SSL */
   }
 
@@ -4861,13 +4861,13 @@ load_ppd_attributes(
   attr = ippAddIntegers(attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "finishings-ready", cupsArrayCount(pc->finishings) + 1, NULL);
   ippSetInteger(attrs, &attr, 0, IPP_FINISHINGS_NONE);
   for (i = 1, finishings = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); finishings; i ++, finishings = (_pwg_finishings_t *)cupsArrayNext(pc->finishings))
-    ippSetInteger(attrs, &attr, i, finishings->value);
+    ippSetInteger(attrs, &attr, i, (int)finishings->value);
 
   /* finishings-supported */
   attr = ippAddIntegers(attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "finishings-supported", cupsArrayCount(pc->finishings) + 1, NULL);
   ippSetInteger(attrs, &attr, 0, IPP_FINISHINGS_NONE);
   for (i = 1, finishings = (_pwg_finishings_t *)cupsArrayFirst(pc->finishings); finishings; i ++, finishings = (_pwg_finishings_t *)cupsArrayNext(pc->finishings))
-    ippSetInteger(attrs, &attr, i, finishings->value);
+    ippSetInteger(attrs, &attr, i, (int)finishings->value);
 
   /* media-bottom-margin-supported */
   for (i = 0, num_margins = 0, pwg_size = pc->sizes; i < pc->num_sizes && num_margins < (int)(sizeof(margins) / sizeof(margins[0])); i ++, pwg_size ++)
diff --git a/tools/ipptool.c b/tools/ipptool.c
index aca6d24cb..e54b78ad3 100644
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -1448,7 +1448,7 @@ do_test(_ipp_file_t      *f,		/* I - IPP data file */
 	      _ippVarsSet(vars, expect->define_no_match, "1");
 	    else if (!expect->define_match && !expect->define_value)
 	    {
-	      if (found && expect->not_expect)
+	      if (found && expect->not_expect && !expect->with_value && !expect->with_value_from)
 		add_stringf(data->errors, "NOT EXPECTED: %s", expect->name);
 	      else if (!found && !(expect->not_expect || expect->optional))
 		add_stringf(data->errors, "EXPECTED: %s", expect->name);
diff --git a/vcnet/config.h b/vcnet/config.h
index 4c6aa2fbe..ad6919071 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -376,6 +376,13 @@ typedef unsigned long useconds_t;
 
 
 /*
+ * Do we have the gnutls_fips140_set_mode function?
+ */
+
+/* #undef HAVE_GNUTLS_FIPS140_SET_MODE */
+
+
+/*
  * Do we have the gnutls_transport_set_pull_timeout_function function?
  */
 
diff --git a/xcode/config.h b/xcode/config.h
index b8684d9d5..13198f5bc 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -306,6 +306,13 @@
 
 
 /*
+ * Do we have the gnutls_fips140_set_mode function?
+ */
+
+/* #undef HAVE_GNUTLS_FIPS140_SET_MODE */
+
+
+/*
  * Do we have the gnutls_transport_set_pull_timeout_function function?
  */