CUPS 2.2.0.

for system-wide trust of printer certs.

.gitignore

@@ -44,6 +44,7 @@ cups/testadmin
 cups/testarray
 cups/testcache
 cups/testconflicts
+cups/testcreds
 cups/testcups
 cups/testdest
 cups/testfile

CHANGES.txt

@@ -1,6 +1,29 @@
-CHANGES.txt - 2.2b2 - 2016-06-24
+CHANGES.txt - 2.2.0 - 2016-09-13
 --------------------------------
 
+CHANGES IN CUPS V2.2.0
+
+	- Normalized the TLS certificate validation code and added additional
+	  error messages to aid troubleshooting.
+	- http*Connect did not work on Linux when cupsd was not running
+	  (Issue #4870)
+	- The --no-remote-any option of cupsctl had no effect (Issue #4866)
+	- http*Connect did not return early when all addresses failed
+	  (Issue #4870)
+
+
+CHANGES IN CUPS V2.2rc1
+
+	- Updated the list of supported IPP Everywhere media types.
+	- The IPP backend did not validate TLS credentials properly.
+	- The printer-state-message attribute was not cleared after a
+	  print job with no errors (Issue #4851)
+	- The CUPS-Add-Modify-Class and CUPS-Add-Modify-Printer operations did
+	  not always return an error for failed adds (Issue #4854)
+	- PPD files with names longer than 127 bytes did not work (Issue #4860)
+	- Updated localizations (Issue #4846, PR #4858)
+
+
 CHANGES IN CUPS V2.2b2
 
 	- Added Upstart support (PR #4825)

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.2b2 - 2016-06-24
+INSTALL - CUPS v2.2.0 - 2016-09-13
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
@@ -30,10 +30,10 @@ BEFORE YOU BEGIN
     make does not support "include".
 
     Besides these tools you'll want ZLIB library for compression support, the
-    CDSA, GNU TLS, or OpenSSL libraries for encryption support, and either MIT
-    (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.  CUPS will
-    compile and run without these, however you'll miss out on many of the
-    features provided by CUPS.
+    GNU TLS library for encryption support on platforms other than iOS, macOS,
+    or Windows, and either MIT (1.6.3 or higher) or Heimdal Kerberos for
+    Kerberos support.  CUPS will compile and run without these, however you'll
+    miss out on many of the features provided by CUPS.
 
     Also, please note that CUPS does not include print filters to support PDF
     or raster printing.  You *must* download GPL Ghostscript and/or the Open
@@ -41,15 +41,6 @@ BEFORE YOU BEGIN
     other than macOS.
 
 
-COMPILING THE SUBVERSION REPOSITORY CODE
-
-    The CUPS Subversion repository doesn't hold a copy of the pre-built
-    configure script.  You'll need to run the GNU autoconf software (2.60 or
-    higher) to create it:
-
-	autoconf
-
-
 CONFIGURATION
 
     CUPS uses GNU autoconf, so you should find the usual "configure" script in
@@ -103,6 +94,14 @@ CONFIGURATION
 
         ./configure --with-archflags="-arch i386 -arch x86_64" ...
 
+        Note: Current versions of macOS DO NOT allow installation to
+        /usr with the default system integrity settings.  In addition,
+        we do not recommend replacing the CUPS supplied with macOS
+        because not all versions of CUPS are compatible with every
+        macOS release, and because software updates will replace parts
+        of your local installation potentially rendering your system
+        unusable.
+
     Once you have configured things, just type:
 
 	make ENTER

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v2.2b2 - 2016-06-24
+README - CUPS v2.2.0 - 2016-09-13
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...

backend/ipp.c

@@ -688,44 +688,6 @@ main(int  argc,				/* I - Number of command-line args */
                       0, NULL);
   httpSetTimeout(http, 30.0, timeout_cb, NULL);
 
-  if (httpIsEncrypted(http))
-  {
-   /*
-    * Validate TLS credentials...
-    */
-
-    cups_array_t	*creds;		/* TLS credentials */
-    cups_array_t	*lcreds = NULL;	/* Loaded credentials */
-    http_trust_t	trust;		/* Trust level */
-    static const char	*trusts[] = { NULL, "+cups-pki-invalid", "+cups-pki-changed", "+cups-pki-expired", NULL, "+cups-pki-unknown" };
-					/* Trust keywords */
-
-    if (!httpCopyCredentials(http, &creds))
-    {
-      trust = httpCredentialsGetTrust(creds, hostname);
-
-      update_reasons(NULL, "-cups-pki-invalid,cups-pki-changed,cups-pki-expired,cups-pki-unknown");
-      if (trusts[trust])
-      {
-        update_reasons(NULL, trusts[trust]);
-        return (CUPS_BACKEND_STOP);
-      }
-
-      if (httpLoadCredentials(NULL, &lcreds, hostname))
-      {
-       /*
-        * Could not load the credentials, let's save the ones we have so we
-        * can detect changes...
-        */
-
-        httpSaveCredentials(NULL, creds, hostname);
-      }
-
-      httpFreeCredentials(lcreds);
-      httpFreeCredentials(creds);
-    }
-  }
-
  /*
   * See if the printer supports SNMP...
   */
@@ -856,6 +818,76 @@ main(int  argc,				/* I - Number of command-line args */
   else if (!http)
     return (CUPS_BACKEND_FAILED);
 
+  if (httpIsEncrypted(http))
+  {
+   /*
+    * Validate TLS credentials...
+    */
+
+    cups_array_t	*creds;		/* TLS credentials */
+    cups_array_t	*lcreds = NULL;	/* Loaded credentials */
+    http_trust_t	trust;		/* Trust level */
+    char		credinfo[1024],	/* Information on credentials */
+			lcredinfo[1024];/* Information on saved credentials */
+    static const char	* const trusts[] = { NULL, "+cups-pki-invalid", "+cups-pki-changed", "+cups-pki-expired", NULL, "+cups-pki-unknown" };
+					/* Trust keywords */
+    static const char	* const trust_msgs[] =
+    {
+      "Credentials are OK/trusted",
+      "Credentials are invalid",
+      "Credentials have changed",
+      "Credentials are expired",
+      "Credentials have been renewed",
+      "Credentials are unknown/new"
+    };
+
+    fputs("DEBUG: Connection is encrypted.\n", stderr);
+
+    if (!httpCopyCredentials(http, &creds))
+    {
+      trust = httpCredentialsGetTrust(creds, hostname);
+      httpCredentialsString(creds, credinfo, sizeof(credinfo));
+
+      fprintf(stderr, "DEBUG: %s (%s)\n", trust_msgs[trust], cupsLastErrorString());
+      fprintf(stderr, "DEBUG: Printer credentials: %s\n", credinfo);
+
+      if (!httpLoadCredentials(NULL, &lcreds, hostname))
+      {
+        httpCredentialsString(lcreds, lcredinfo, sizeof(lcredinfo));
+	fprintf(stderr, "DEBUG: Stored credentials: %s\n", lcredinfo);
+      }
+      else
+        fputs("DEBUG: No stored credentials.\n", stderr);
+
+      update_reasons(NULL, "-cups-pki-invalid,cups-pki-changed,cups-pki-expired,cups-pki-unknown");
+      if (trusts[trust])
+      {
+        update_reasons(NULL, trusts[trust]);
+        return (CUPS_BACKEND_STOP);
+      }
+
+      if (!lcreds)
+      {
+       /*
+        * Could not load the credentials, let's save the ones we have so we
+        * can detect changes...
+        */
+
+        httpSaveCredentials(NULL, creds, hostname);
+      }
+
+      httpFreeCredentials(lcreds);
+      httpFreeCredentials(creds);
+    }
+    else
+    {
+      fputs("DEBUG: No printer credentials.\n", stderr);
+
+      update_reasons(NULL, "cups-pki-unknown");
+      return (CUPS_BACKEND_STOP);
+    }
+  }
+
   update_reasons(NULL, "-connecting-to-device");
   _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
 
@@ -3317,7 +3349,7 @@ sigterm_handler(int sig)		/* I - Signal */
   if (tmpfilename[0])
     unlink(tmpfilename);
 
-  exit(1);
+  _exit(1);
 }
 
 

configure

@@ -1,11 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for CUPS 2.2b1.
+# Generated by GNU Autoconf 2.68 for CUPS 2.2.0.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,31 +136,6 @@ 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
@@ -192,8 +169,7 @@ 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 / || exit 1"
+test x\$exitcode = x0 || 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'\" &&
@@ -238,25 +214,21 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  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
+  # 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+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -359,14 +331,6 @@ $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
@@ -488,10 +452,6 @@ 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).
@@ -526,16 +486,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 -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -547,8 +507,28 @@ else
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+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
 
 # 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'"
@@ -580,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.2b1'
-PACKAGE_STRING='CUPS 2.2b1'
+PACKAGE_VERSION='2.2.0'
+PACKAGE_STRING='CUPS 2.2.0'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -1381,6 +1361,8 @@ 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
@@ -1466,7 +1448,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.2b1 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1527,7 +1509,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.2b1:";;
+     short | recursive ) echo "Configuration of CUPS 2.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1707,10 +1689,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.2b1
-generated by GNU Autoconf 2.69
+CUPS configure 2.2.0
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1861,7 +1843,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2171,8 +2153,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.2b1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by CUPS $as_me 2.2.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2545,7 +2527,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.2b1"
+CUPS_VERSION="2.2.0"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -2591,7 +2573,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2639,7 +2621,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2683,7 +2665,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3127,7 +3109,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* 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);
@@ -3377,7 +3360,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3421,7 +3404,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3623,7 +3606,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3663,7 +3646,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3716,7 +3699,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3756,7 +3739,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3796,7 +3779,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  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"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3836,7 +3819,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3876,7 +3859,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3916,7 +3899,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3956,7 +3939,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3996,7 +3979,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -4036,7 +4019,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -4076,7 +4059,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -4152,7 +4135,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -4195,7 +4178,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -4605,7 +4588,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"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$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
@@ -4671,7 +4654,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"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$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
@@ -7640,7 +7623,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7683,7 +7666,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -8235,7 +8218,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -8278,7 +8261,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -8333,7 +8316,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LIBGCRYPTCONFIG="$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
@@ -8376,7 +8359,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$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
@@ -8935,8 +8918,6 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 
@@ -9960,7 +9941,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVA="$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
@@ -10023,7 +10004,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$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
@@ -10086,7 +10067,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PHPCGI="$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
@@ -10127,7 +10108,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PHP="$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
@@ -10195,7 +10176,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PYTHON="$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
@@ -10663,16 +10644,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 -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10732,16 +10713,28 @@ else
   as_mkdir_p=false
 fi
 
-
-# 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
+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
 
 # 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'"
@@ -10762,8 +10755,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.2b1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by CUPS $as_me 2.2.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10825,11 +10818,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.2b1
-configured by $0, generated by GNU Autoconf 2.69,
+CUPS config.status 2.2.0
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10918,7 +10911,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'

configure.ac

@@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.2b2], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.2.0], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)

cups/Dependencies

@@ -261,6 +261,11 @@ testcache.o: testcache.c ppd-private.h ../cups/cups.h file.h versioning.h \
   thread-private.h
 testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \
   array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h
+testcreds.o: testcreds.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
+  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
+  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
+  ../cups/cups.h file.h pwg.h thread-private.h
 testcups.o: testcups.c string-private.h ../config.h cups.h file.h \
   versioning.h ipp.h http.h array.h language.h pwg.h ppd.h raster.h
 testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \

cups/Makefile

@@ -85,6 +85,7 @@ TESTOBJS	= \
 		testarray.o \
 		testcache.o \
 		testconflicts.o \
+		testcreds.o \
 		testcups.o \
 		testdest.o \
 		testfile.o \
@@ -153,6 +154,7 @@ UNITTARGETS =	\
 		testarray \
 		testcache \
 		testconflicts \
+		testcreds \
 		testcups \
 		testdest \
 		testfile \
@@ -365,7 +367,7 @@ libcups.a:	$(LIBOBJS)
 libcups2.def: $(LIBOBJS) Makefile
 	echo Generating $@...
 	echo "LIBRARY libcups2" >libcups2.def
-	echo "VERSION 2.11" >>libcups2.def
+	echo "VERSION 2.12" >>libcups2.def
 	echo "EXPORTS" >>libcups2.def
 	(nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
 	 echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
@@ -417,6 +419,16 @@ testconflicts:	testconflicts.o $(LIBCUPSSTATIC)
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
+#
+# testcreds (dependency on static CUPS library is intentional)
+#
+
+testcreds:	testcreds.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # testcups (dependency on static CUPS library is intentional)
 #

cups/adminutil.c

@@ -1,7 +1,7 @@
 /*
  * Administration utility API definitions for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 2001-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -1194,6 +1194,7 @@ cupsAdminSetServerSettings(
   int		cupsd_num_settings;	/* New number of settings */
   int		old_share_printers,	/* Share local printers */
 		old_remote_admin,	/* Remote administration allowed? */
+		old_remote_any,		/* Remote access from anywhere? */
 		old_user_cancel_any,	/* Cancel-job policy set? */
 		old_debug_logging;	/* LogLevel debug set? */
   cups_option_t	*cupsd_settings,	/* New settings */
@@ -1259,12 +1260,12 @@ cupsAdminSetServerSettings(
 
   if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, cupsd_num_settings,
                            cupsd_settings)) != NULL)
-    remote_any = atoi(val);
+    old_remote_any = atoi(val);
   else
-    remote_any = 0;
+    old_remote_any = 0;
 
   DEBUG_printf(("1cupsAdminSetServerSettings: old remote_any=%d",
-                remote_any));
+                old_remote_any));
 
   if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, cupsd_num_settings,
                            cupsd_settings)) != NULL)
@@ -1310,12 +1311,23 @@ cupsAdminSetServerSettings(
   DEBUG_printf(("1cupsAdminSetServerSettings: debug_logging=%d",
                 debug_logging));
 
-  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, num_settings,
-                           settings)) != NULL)
+  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, num_settings, settings)) != NULL)
+  {
     remote_any = atoi(val);
 
-  DEBUG_printf(("1cupsAdminSetServerSettings: remote_any=%d",
-                remote_any));
+    if (remote_any == old_remote_any)
+    {
+     /*
+      * No change to this setting...
+      */
+
+      remote_any = -1;
+    }
+  }
+  else
+    remote_any = -1;
+
+  DEBUG_printf(("1cupsAdminSetServerSettings: remote_any=%d", remote_any));
 
   if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ADMIN, num_settings,
                            settings)) != NULL)
@@ -1430,7 +1442,7 @@ cupsAdminSetServerSettings(
   while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum))
   {
     if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")) &&
-        (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+        (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
     {
       if (!wrote_port_listen)
       {
@@ -1616,7 +1628,7 @@ cupsAdminSetServerSettings(
 	                 remote_any > 0 ? "all" : "@LOCAL");
       }
       else if (in_root_location &&
-               (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+               (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
       {
 	wrote_root_location = 1;
 
@@ -1719,7 +1731,7 @@ cupsAdminSetServerSettings(
       in_cancel_job = 0;
     }
     else if ((((in_admin_location || in_conf_location || in_root_location) &&
-               (remote_admin >= 0 || remote_any > 0)) ||
+               (remote_admin >= 0 || remote_any >= 0)) ||
               (in_root_location && share_printers >= 0)) &&
              (!_cups_strcasecmp(line, "Allow") || !_cups_strcasecmp(line, "Deny") ||
 	      !_cups_strcasecmp(line, "Order")))
@@ -1811,7 +1823,7 @@ cupsAdminSetServerSettings(
   }
 
   if (!wrote_port_listen &&
-      (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
   {
     if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
     {
@@ -1832,7 +1844,7 @@ cupsAdminSetServerSettings(
   }
 
   if (!wrote_root_location &&
-      (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
   {
     if (remote_admin > 0 && share_printers > 0)
       cupsFilePuts(temp,
@@ -2009,9 +2021,14 @@ cupsAdminSetServerSettings(
                                 	 old_remote_admin ? "1" : "0",
 					 cupsd_num_settings, &cupsd_settings);
 
-    cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
-                                       remote_any ? "1" : "0",
-				       cupsd_num_settings, &cupsd_settings);
+    if (remote_any >= 0)
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
+					 remote_any ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
+    else
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
+					 old_remote_any ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
 
     if (share_printers >= 0)
       cupsd_num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS,

cups/cups.h

@@ -24,8 +24,8 @@
 #  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
 #    include <stddef.h>
-/* Windows does not support the ssize_t type, so map it to off_t... */
-typedef off_t ssize_t;			/* @private@ */
+/* Windows does not support the ssize_t type, so map it to long... */
+typedef long ssize_t;			/* @private@ */
 #  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
 #  include "file.h"

cups/http-addrlist.c

@@ -61,20 +61,25 @@ httpAddrConnect2(
     int             *cancel)		/* I - Pointer to "cancel" variable */
 {
   int			val;		/* Socket option value */
-#ifdef O_NONBLOCK
-  int			flags,		/* Socket flags */
-			remaining;	/* Remaining timeout */
+#ifndef WIN32
+  int			flags;		/* Socket flags */
+#endif /* !WIN32 */
+  int			remaining;	/* Remaining timeout */
   int			i,		/* Looping var */
 			nfds,		/* Number of file descriptors */
 			fds[100],	/* Socket file descriptors */
 			result;		/* Result from select() or poll() */
   http_addrlist_t	*addrs[100];	/* Addresses */
+#ifndef HAVE_POLL
+  int			max_fd = -1;	/* Highest file descriptor */
+#endif /* !HAVE_POLL */
+#ifdef O_NONBLOCK
 #  ifdef HAVE_POLL
   struct pollfd		pfds[100];	/* Polled file descriptors */
 #  else
-  int			max_fd = -1;	/* Highest file descriptor */
   fd_set		input_set,	/* select() input set */
-			output_set;	/* select() output set */
+			output_set,	/* select() output set */
+			error_set;	/* select() error set */
   struct timeval	timeout;	/* Timeout */
 #  endif /* HAVE_POLL */
 #endif /* O_NONBLOCK */
@@ -220,7 +225,9 @@ httpAddrConnect2(
 	continue;
       }
 
+#ifndef WIN32
       fcntl(fds[nfds], F_SETFL, flags);
+#endif /* !WIN32 */
 
 #ifndef HAVE_POLL
       if (fds[nfds] > max_fd)
@@ -232,6 +239,9 @@ httpAddrConnect2(
       addrlist = addrlist->next;
     }
 
+    if (!addrlist && nfds == 0)
+      break;
+
    /*
     * See if we can connect to any of the addresses so far...
     */
@@ -276,11 +286,12 @@ httpAddrConnect2(
       for (i = 0; i < nfds; i ++)
 	FD_SET(fds[i], &input_set);
       output_set = input_set;
+      error_set  = input_set;
 
       timeout.tv_sec  = 0;
       timeout.tv_usec = (addrlist ? 100 : remaining > 250 ? 250 : remaining) * 1000;
 
-      result = select(max_fd + 1, &input_set, &output_set, NULL, &timeout);
+      result = select(max_fd + 1, &input_set, &output_set, &error_set, &timeout);
 
       DEBUG_printf(("1httpAddrConnect2: select() returned %d (%d)", result, errno));
 #  endif /* HAVE_POLL */
@@ -297,9 +308,9 @@ httpAddrConnect2(
       {
 #  ifdef HAVE_POLL
 	DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents));
-	if (pfds[i].revents)
+	if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP)))
 #  else
-	if (FD_ISSET(fds[i], &input))
+	if (FD_ISSET(fds[i], &input) && !FD_ISSET(fds[i], &error))
 #  endif /* HAVE_POLL */
 	{
 	  *sock    = fds[i];

cups/http-support.c

@@ -1724,7 +1724,7 @@ _httpResolveURI(
 	while (time(NULL) < end_time)
 	{
 	  if (options & _HTTP_RESOLVE_STDERR)
-	    _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer..."));
+	    _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer."));
 
 	  if (cb && !(*cb)(context))
 	  {

cups/ipp-support.c

@@ -209,7 +209,7 @@ static const char * const ipp_std_ops[] =
 		  "Close-Job",
 		  "Identify-Printer",
 		  "Validate-Document",
-		  "Send-Hardcopy-Document",
+		  "Add-Document-Images",
 		  "Acknowledge-Document",
 
 		  /* 0x0040 - 0x004a */

cups/ipp.h

@@ -302,7 +302,7 @@ typedef enum ipp_op_e			/**** IPP operations ****/
   IPP_OP_CLOSE_JOB,			/* Close-Job */
   IPP_OP_IDENTIFY_PRINTER,		/* Identify-Printer */
   IPP_OP_VALIDATE_DOCUMENT,		/* Validate-Document */
-  IPP_OP_SEND_HARDCOPY_DOCUMENT,	/* Send-Hardcopy-Document */
+  IPP_OP_ADD_DOCUMENT_IMAGES,		/* Add-Document-Images */
   IPP_OP_ACKNOWLEDGE_DOCUMENT,		/* Acknowledge-Document */
   IPP_OP_ACKNOWLEDGE_IDENTIFY_PRINTER,	/* Acknowledge-Identify-Printer */
   IPP_OP_ACKNOWLEDGE_JOB,		/* Acknowledge-Job */
@@ -397,6 +397,7 @@ typedef enum ipp_op_e			/**** IPP operations ****/
 #    define IPP_CLOSE_JOB			IPP_OP_CLOSE_JOB
 #    define IPP_IDENTIFY_PRINTER		IPP_OP_IDENTIFY_PRINTER
 #    define IPP_VALIDATE_DOCUMENT		IPP_OP_VALIDATE_DOCUMENT
+#    define IPP_OP_SEND_HARDCOPY_DOCUMENT	IPP_OP_ADD_DOCUMENT_IMAGES
 #    define IPP_PRIVATE				IPP_OP_PRIVATE
 #    define CUPS_GET_DEFAULT			IPP_OP_CUPS_GET_DEFAULT
 #    define CUPS_GET_PRINTERS			IPP_OP_CUPS_GET_PRINTERS

cups/libcups2.def

@@ -1,12 +1,17 @@
 LIBRARY libcups2
-VERSION 2.11
+VERSION 2.12
 EXPORTS
 _cupsArrayAddStrings
 _cupsArrayNewStrings
 _cupsBufferGet
 _cupsBufferRelease
 _cupsCharmapFlush
+_cupsCondBroadcast
+_cupsCondInit
+_cupsCondWait
 _cupsConnect
+_cupsConvertOptions
+_cupsCreateDest
 _cupsEncodingName
 _cupsGet1284Values
 _cupsGetDestResource
@@ -58,8 +63,11 @@ _cupsStrFree
 _cupsStrRetain
 _cupsStrScand
 _cupsStrStatistics
+_cupsThreadCancel
 _cupsThreadCreate
+_cupsThreadWait
 _cupsUserDefault
+_cups_safe_vsnprintf
 _cups_strcasecmp
 _cups_strcpy
 _cups_strcpy
@@ -77,6 +85,7 @@ _httpStatus
 _httpTLSInitialize
 _httpTLSPending
 _httpTLSRead
+_httpTLSSetOptions
 _httpTLSStart
 _httpTLSStop
 _httpTLSWrite
@@ -98,9 +107,11 @@ _ppdCacheGetSize
 _ppdCacheGetSource
 _ppdCacheGetType
 _ppdCacheWriteFile
+_ppdCreateFromIPP
 _ppdFreeLanguages
 _ppdGetEncoding
 _ppdGetLanguages
+_ppdGlobals
 _ppdHashName
 _ppdLocalizedAttr
 _ppdNormalizeMakeAndModel
@@ -110,10 +121,6 @@ _ppdParseOptions
 _pwgGenerateSize
 _pwgInitSize
 _pwgInputSlotForSource
-_pwgMediaForLegacy
-_pwgMediaForPPD
-_pwgMediaForPWG
-_pwgMediaForSize
 _pwgMediaNearSize
 _pwgMediaTable
 _pwgMediaTypeForType
@@ -234,6 +241,7 @@ cupsGetPassword2
 cupsGetPrinters
 cupsGetResponse
 cupsGetServerPPD
+cupsHashData
 cupsLangDefault
 cupsLangEncoding
 cupsLangFlush

cups/ppd-cache.c

@@ -1,7 +1,7 @@
 /*
  * PPD cache implementation for CUPS.
  *
- * Copyright 2010-2015 by Apple Inc.
+ * Copyright 2010-2016 by Apple Inc.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
@@ -3252,7 +3252,7 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
   if ((attr = ippFindAttribute(response, "media-source-supported", IPP_TAG_KEYWORD)) != NULL && (count = ippGetCount(attr)) > 1)
   {
     static const char * const sources[][2] =
-    {
+    {					/* "media-source" strings */
       { "Auto", _("Automatic") },
       { "Main", _("Main") },
       { "Alternate", _("Alternate") },
@@ -3333,42 +3333,143 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
 
   if ((attr = ippFindAttribute(response, "media-type-supported", IPP_TAG_KEYWORD)) != NULL && (count = ippGetCount(attr)) > 1)
   {
-    static const char * const types[][2] =
-    {					/* Media type strings (far from complete) */
-      { "Auto", _("Automatic") },
-      { "Cardstock", _("Cardstock") },
-      { "Disc", _("CD/DVD/Bluray") },
-      { "Envelope", _("Envelope") },
-      { "Labels", _("Label") },
-      { "Other", _("Other") },
-      { "Photographic", _("Photo") },
-      { "PhotographicGlossy", _("Glossy Photo") },
-      { "PhotographicHighGloss", _("High-Gloss Photo") },
-      { "PhotographicMatte", _("Matte Photo") },
-      { "PhotographicSatin", _("Satin Photo") },
-      { "PhotographicSemiGloss", _("Semi-Gloss Photo") },
-      { "Stationery", _("Plain Paper") },
-      { "StationeryLetterhead", _("Letterhead") },
-      { "Transparency", _("Transparency") }
+    static const char * const media_types[][2] =
+    {					/* "media-type" strings */
+      { "aluminum", _("Aluminum") },
+      { "auto", _("Automatic") },
+      { "back-print-film", _("Back Print Film") },
+      { "cardboard", _("Cardboard") },
+      { "cardstock", _("Cardstock") },
+      { "cd", _("CD") },
+      { "continuous", _("Continuous") },
+      { "continuous-long", _("Continuous Long") },
+      { "continuous-short", _("Continuous Short") },
+      { "disc", _("Optical Disc") },
+      { "disc-glossy", _("Glossy Optical Disc") },
+      { "disc-high-gloss", _("High Gloss Optical Disc") },
+      { "disc-matte", _("Matte Optical Disc") },
+      { "disc-satin", _("Satin Optical Disc") },
+      { "disc-semi-gloss", _("Semi-Gloss Optical Disc") },
+      { "double-wall", _("Double Wall Cardboard") },
+      { "dry-film", _("Dry Film") },
+      { "dvd", _("DVD") },
+      { "embossing-foil", _("Embossing Foil") },
+      { "end-board", _("End Board") },
+      { "envelope", _("Envelope") },
+      { "envelope-archival", _("Archival Envelope") },
+      { "envelope-bond", _("Bond Envelope") },
+      { "envelope-coated", _("Coated Envelope") },
+      { "envelope-cotton", _("Cotton Envelope") },
+      { "envelope-fine", _("Fine Envelope") },
+      { "envelope-heavyweight", _("Heavyweight Envelope") },
+      { "envelope-inkjet", _("Inkjet Envelope") },
+      { "envelope-lightweight", _("Lightweight Envelope") },
+      { "envelope-plain", _("Plain Envelope") },
+      { "envelope-preprinted", _("Preprinted Envelope") },
+      { "envelope-window", _("Windowed Envelope") },
+      { "fabric", _("Fabric") },
+      { "fabric-archival", _("Archival Fabric") },
+      { "fabric-glossy", _("Glossy Fabric") },
+      { "fabric-high-gloss", _("High Gloss Fabric") },
+      { "fabric-matte", _("Matte Fabric") },
+      { "fabric-semi-gloss", _("Semi-Gloss Fabric") },
+      { "fabric-waterproof", _("Waterproof Fabric") },
+      { "film", _("Film") },
+      { "flexo-base", _("Flexo Base") },
+      { "flexo-photo-polymer", _("Flexo Photo Polymer") },
+      { "flute", _("Flute") },
+      { "foil", _("Foil") },
+      { "full-cut-tabs", _("Full Cut Tabs") },
+      { "glass", _("Glass") },
+      { "glass-colored", _("Glass Colored") },
+      { "glass-opaque", _("Glass Opaque") },
+      { "glass-surfaced", _("Glass Surfaced") },
+      { "glass-textured", _("Glass Textured") },
+      { "gravure-cylinder", _("Gravure Cylinder") },
+      { "image-setter-paper", _("Image Setter Paper") },
+      { "imaging-cylinder", _("Imaging Cylinder") },
+      { "labels", _("Labels") },
+      { "labels-colored", _("Colored Labels") },
+      { "labels-glossy", _("Glossy Labels") },
+      { "labels-high-gloss", _("High Gloss Labels") },
+      { "labels-inkjet", _("Inkjet Labels") },
+      { "labels-matte", _("Matte Labels") },
+      { "labels-permanent", _("Permanent Labels") },
+      { "labels-satin", _("Satin Labels") },
+      { "labels-security", _("Security Labels") },
+      { "labels-semi-gloss", _("Semi-Gloss Labels") },
+      { "laminating-foil", _("Laminating Foil") },
+      { "letterhead", _("Letterhead") },
+      { "metal", _("Metal") },
+      { "metal-glossy", _("Metal Glossy") },
+      { "metal-high-gloss", _("Metal High Gloss") },
+      { "metal-matte", _("Metal Matte") },
+      { "metal-satin", _("Metal Satin") },
+      { "metal-semi-gloss", _("Metal Semi Gloss") },
+      { "mounting-tape", _("Mounting Tape") },
+      { "multi-layer", _("Multi Layer") },
+      { "multi-part-form", _("Multi Part Form") },
+      { "other", _("Other") },
+      { "paper", _("Paper") },
+      { "photographic", _("Photo Paper") },
+      { "photographic-archival", _("Photographic Archival") },
+      { "photographic-film", _("Photo Film") },
+      { "photographic-glossy", _("Glossy Photo Paper") },
+      { "photographic-high-gloss", _("High Gloss Photo Paper") },
+      { "photographic-matte", _("Matte Photo Paper") },
+      { "photographic-satin", _("Satin Photo Paper") },
+      { "photographic-semi-gloss", _("Semi-Gloss Photo Paper") },
+      { "plastic", _("Plastic") },
+      { "plastic-archival", _("Plastic Archival") },
+      { "plastic-colored", _("Plastic Colored") },
+      { "plastic-glossy", _("Plastic Glossy") },
+      { "plastic-high-gloss", _("Plastic High Gloss") },
+      { "plastic-matte", _("Plastic Matte") },
+      { "plastic-satin", _("Plastic Satin") },
+      { "plastic-semi-gloss", _("Plastic Semi Gloss") },
+      { "plate", _("Plate") },
+      { "polyester", _("Polyester") },
+      { "pre-cut-tabs", _("Pre Cut Tabs") },
+      { "roll", _("Roll") },
+      { "screen", _("Screen") },
+      { "screen-paged", _("Screen Paged") },
+      { "self-adhesive", _("Self Adhesive") },
+      { "self-adhesive-film", _("Self Adhesive Film") },
+      { "shrink-foil", _("Shrink Foil") },
+      { "single-face", _("Single Face") },
+      { "single-wall", _("Single Wall Cardboard") },
+      { "sleeve", _("Sleeve") },
+      { "stationery", _("Stationery") },
+      { "stationery-archival", _("Stationery Archival") },
+      { "stationery-coated", _("Coated Paper") },
+      { "stationery-cotton", _("Stationery Cotton") },
+      { "stationery-fine", _("Vellum Paper") },
+      { "stationery-heavyweight", _("Heavyweight Paper") },
+      { "stationery-heavyweight-coated", _("Stationery Heavyweight Coated") },
+      { "stationery-inkjet", _("Stationery Inkjet Paper") },
+      { "stationery-letterhead", _("Letterhead") },
+      { "stationery-lightweight", _("Lightweight Paper") },
+      { "stationery-preprinted", _("Preprinted Paper") },
+      { "stationery-prepunched", _("Punched Paper") },
+      { "tab-stock", _("Tab Stock") },
+      { "tractor", _("Tractor") },
+      { "transfer", _("Transfer") },
+      { "transparency", _("Transparency") },
+      { "triple-wall", _("Triple Wall Cardboard") },
+      { "wet-film", _("Wet Film") }
     };
 
     cupsFilePrintf(fp, "*OpenUI *MediaType: PickOne\n"
                        "*OrderDependency: 10 AnySetup *MediaType\n"
                        "*DefaultMediaType: %s\n", ppdname);
-    for (i = 0, count = ippGetCount(attr); i < count; i ++)
+    for (i = 0; i < (int)(sizeof(media_types) / sizeof(media_types[0])); i ++)
     {
-      pwg_ppdize_name(ippGetString(attr, i, NULL), ppdname, sizeof(ppdname));
+      if (!ippContainsString(attr, media_types[i][0]))
+        continue;
 
-      for (j = 0; j < (int)(sizeof(types) / sizeof(types[0])); j ++)
-        if (!strcmp(types[j][0], ppdname))
-	{
-	  cupsFilePrintf(fp, "*MediaType %s/%s: \"<</MediaType(%s)>>setpagedevice\"\n", ppdname, _cupsLangString(lang, types[j][1]), ppdname);
-	  break;
-	}
-
-      if (j >= (int)(sizeof(types) / sizeof(types[0])))
-	cupsFilePrintf(fp, "*MediaType %s: \"<</MediaType(%s)>>setpagedevice\"\n", ppdname, ppdname);
+      pwg_ppdize_name(media_types[i][0], ppdname, sizeof(ppdname));
 
+      cupsFilePrintf(fp, "*MediaType %s/%s: \"<</MediaType(%s)>>setpagedevice\"\n", ppdname, _cupsLangString(lang, media_types[i][1]), ppdname);
     }
     cupsFilePuts(fp, "*CloseUI: *MediaType\n");
   }

cups/string-private.h

@@ -42,6 +42,13 @@
 #    include <bstring.h>
 #  endif /* HAVE_BSTRING_H */
 
+#  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
+#    define __CUPS_SSIZE_T_DEFINED
+#    include <stddef.h>
+/* Windows does not support the ssize_t type, so map it to long... */
+typedef long ssize_t;			/* @private@ */
+#  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
+
 
 /*
  * C++ magic...

cups/testcreds.c

@@ -0,0 +1,124 @@
+/*
+ * HTTP credentials test program for CUPS.
+ *
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups-private.h"
+
+
+/*
+ * 'main()' - Main entry.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  http_t	*http;			/* HTTP connection */
+  char		scheme[HTTP_MAX_URI],	/* Scheme from URI */
+		hostname[HTTP_MAX_URI],	/* Hostname from URI */
+		username[HTTP_MAX_URI],	/* Username:password from URI */
+		resource[HTTP_MAX_URI];	/* Resource from URI */
+  int		port;			/* Port number from URI */
+  http_trust_t	trust;			/* Trust evaluation for connection */
+  cups_array_t	*hcreds,		/* Credentials from connection */
+		*tcreds;		/* Credentials from trust store */
+  char		hinfo[1024],		/* String for connection credentials */
+		tinfo[1024];		/* String for trust store credentials */
+  static const char *trusts[] =		/* Trust strings */
+  { "OK", "Invalid", "Changed", "Expired", "Renewed", "Unknown" };
+
+
+ /*
+  * Check command-line...
+  */
+
+  if (argc != 2)
+  {
+    puts("Usage: ./testcreds hostname");
+    puts("       ./testcreds https://hostname[:port]");
+    return (1);
+  }
+
+  if (!strncmp(argv[1], "https://", 8))
+  {
+   /*
+    * Connect to the host and validate credentials...
+    */
+
+    if (httpSeparateURI(HTTP_URI_CODING_MOST, argv[1], scheme, sizeof(scheme), username, sizeof(username), hostname, sizeof(hostname), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+    {
+      printf("ERROR: Bad URI \"%s\".\n", argv[1]);
+      return (1);
+    }
+
+    if ((http = httpConnect2(hostname, port, NULL, AF_UNSPEC, HTTP_ENCRYPTION_ALWAYS, 1, 30000, NULL)) == NULL)
+    {
+      printf("ERROR: Unable to connect to \"%s\" on port %d: %s\n", hostname, port, cupsLastErrorString());
+      return (1);
+    }
+
+    puts("HTTP Credentials:");
+    if (!httpCopyCredentials(http, &hcreds))
+    {
+      trust = httpCredentialsGetTrust(hcreds, hostname);
+
+      httpCredentialsString(hcreds, hinfo, sizeof(hinfo));
+
+      printf("    Certificate Count: %d\n", cupsArrayCount(hcreds));
+      if (trust == HTTP_TRUST_OK)
+        puts("    Trust: OK");
+      else
+        printf("    Trust: %s (%s)\n", trusts[trust], cupsLastErrorString());
+      printf("    Expiration: %s\n", httpGetDateString(httpCredentialsGetExpiration(hcreds)));
+      printf("    IsValidName: %d\n", httpCredentialsAreValidForName(hcreds, hostname));
+      printf("    String: \"%s\"\n", hinfo);
+
+      httpFreeCredentials(hcreds);
+    }
+    else
+      puts("    Not present (error).");
+
+    puts("");
+  }
+  else
+  {
+   /*
+    * Load stored credentials...
+    */
+
+    strlcpy(hostname, argv[1], sizeof(hostname));
+  }
+
+  printf("Trust Store for \"%s\":\n", hostname);
+
+  if (!httpLoadCredentials(NULL, &tcreds, hostname))
+  {
+    httpCredentialsString(tcreds, tinfo, sizeof(tinfo));
+
+    printf("    Certificate Count: %d\n", cupsArrayCount(tcreds));
+    printf("    Expiration: %s\n", httpGetDateString(httpCredentialsGetExpiration(tcreds)));
+    printf("    IsValidName: %d\n", httpCredentialsAreValidForName(tcreds, hostname));
+    printf("    String: \"%s\"\n", tinfo);
+
+    httpFreeCredentials(tcreds);
+  }
+  else
+    puts("    Not present.");
+
+  return (0);
+}

cups/thread.c

@@ -193,6 +193,41 @@ _cupsThreadWait(_cups_thread_t thread)	/* I - Thread ID */
 #  include <process.h>
 
 
+/*
+ * '_cupsCondBroadcast()' - Wake up waiting threads.
+ */
+
+void
+_cupsCondBroadcast(_cups_cond_t *cond)	/* I - Condition */
+{
+  // TODO: Implement me
+}
+
+
+/*
+ * '_cupsCondInit()' - Initialize a condition variable.
+ */
+
+void
+_cupsCondInit(_cups_cond_t *cond)	/* I - Condition */
+{
+  // TODO: Implement me
+}
+
+
+/*
+ * '_cupsCondWait()' - Wait for a condition with optional timeout.
+ */
+
+void
+_cupsCondWait(_cups_cond_t  *cond,	/* I - Condition */
+              _cups_mutex_t *mutex,	/* I - Mutex */
+	      double        timeout)	/* I - Timeout in seconds (0 or negative for none) */
+{
+  // TODO: Implement me
+}
+
+
 /*
  * '_cupsMutexInit()' - Initialize a mutex.
  */
@@ -314,12 +349,50 @@ _cupsThreadCreate(
 
 void *					/* O - Return value */
 _cupsThreadWait(_cups_thread_t thread)	/* I - Thread ID */
+{
+  // TODO: Implement me
+  (void)thread;
+
+  return (NULL);
+}
+
+
+#else /* No threading */
+/*
+ * '_cupsCondBroadcast()' - Wake up waiting threads.
+ */
+
+void
+_cupsCondBroadcast(_cups_cond_t *cond)	/* I - Condition */
+{
+  // TODO: Implement me
+}
+
+
+/*
+ * '_cupsCondInit()' - Initialize a condition variable.
+ */
+
+void
+_cupsCondInit(_cups_cond_t *cond)	/* I - Condition */
+{
+  // TODO: Implement me
+}
+
+
+/*
+ * '_cupsCondWait()' - Wait for a condition with optional timeout.
+ */
+
+void
+_cupsCondWait(_cups_cond_t  *cond,	/* I - Condition */
+              _cups_mutex_t *mutex,	/* I - Mutex */
+	      double        timeout)	/* I - Timeout in seconds (0 or negative for none) */
 {
   // TODO: Implement me
 }
 
 
-#else
 /*
  * '_cupsMutexInit()' - Initialize a mutex.
  */

cups/tls-darwin.c

@@ -24,6 +24,14 @@
 extern char **environ;
 
 
+/*
+ * Constants, very secure stuff...
+ */
+
+#define _CUPS_CDSA_PASSWORD	"42"	/* CUPS keychain password */
+#define _CUPS_CDSA_PASSLEN	2	/* Length of keychain password */
+
+
 /*
  * Local globals...
  */
@@ -54,6 +62,8 @@ static CFArrayRef	http_cdsa_copy_server(const char *common_name);
 static SecCertificateRef http_cdsa_create_credential(http_credential_t *credential);
 #ifdef HAVE_SECKEYCHAINOPEN
 static const char	*http_cdsa_default_path(char *buffer, size_t bufsize);
+static SecKeychainRef	http_cdsa_open_keychain(const char *path, char *filename, size_t filesize);
+static SecKeychainRef	http_cdsa_open_system_keychain(void);
 #endif /* HAVE_SECKEYCHAINOPEN */
 static OSStatus		http_cdsa_read(SSLConnectionRef connection, void *data, size_t *dataLength);
 static int		http_cdsa_set_credentials(http_t *http);
@@ -354,18 +364,12 @@ cupsSetServerCredentials(
   DEBUG_printf(("cupsSetServerCredentials(path=\"%s\", common_name=\"%s\", auto_create=%d)", path, common_name, auto_create));
 
 #ifdef HAVE_SECKEYCHAINOPEN
-  char			filename[1024];	/* Filename for keychain */
-  SecKeychainRef	keychain = NULL;/* Temporary keychain */
-  OSStatus		status;		/* Status code */
+  char		filename[1024];		/* Keychain filename */
+  SecKeychainRef keychain = http_cdsa_open_keychain(path, filename, sizeof(filename));
 
-
-  if (!path)
-    path = http_cdsa_default_path(filename, sizeof(filename));
-
-  if ((status = SecKeychainOpen(path, &keychain)) != noErr)
+  if (!keychain)
   {
-    /* TODO: Set cups last error string */
-    DEBUG_printf(("1cupsSetServerCredentials: Unable to open keychain (%d), returning 0.", (int)status));
+    DEBUG_puts("1cupsSetServerCredentials: Unable to open keychain.");
     return (0);
   }
 
@@ -389,7 +393,7 @@ cupsSetServerCredentials(
   */
 
   tls_keychain    = keychain;
-  tls_keypath     = _cupsStrAlloc(path);
+  tls_keypath     = _cupsStrAlloc(filename);
   tls_auto_create = auto_create;
   tls_common_name = _cupsStrAlloc(common_name);
 
@@ -600,10 +604,16 @@ httpCredentialsGetTrust(
 
 
   if (!common_name)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No common name specified."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if ((secCert = http_cdsa_create_credential((http_credential_t *)cupsArrayFirst(credentials))) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to create credentials from array."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if (cg->any_root < 0)
     _cupsSetDefaults();
@@ -635,15 +645,28 @@ httpCredentialsGetTrust(
         * Do not trust certificates on first use...
 	*/
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
-      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds) || !httpCredentialsAreValidForName(credentials, common_name))
+      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds))
       {
        /*
-        * Either the new credentials are not newly issued, or the common name
-	* does not match the issued certificate...
+        * The new credentials are not newly issued...
 	*/
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are older than stored credentials."), 1);
+
+        trust = HTTP_TRUST_INVALID;
+      }
+      else if (!httpCredentialsAreValidForName(credentials, common_name))
+      {
+       /*
+        * The common name does not match the issued certificate...
+	*/
+
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are not valid for name."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
       else if (httpCredentialsGetExpiration(tcreds) < time(NULL))
@@ -661,14 +684,65 @@ httpCredentialsGetTrust(
     httpFreeCredentials(tcreds);
   }
   else if (cg->validate_certs && !httpCredentialsAreValidForName(credentials, common_name))
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No stored credentials, not valid for name."), 1);
     trust = HTTP_TRUST_INVALID;
-
-  if (!cg->expired_certs && !SecCertificateIsValid(secCert, CFAbsoluteTimeGetCurrent()))
-    trust = HTTP_TRUST_EXPIRED;
-  else if (!cg->any_root && cupsArrayCount(credentials) == 1)
-    trust = HTTP_TRUST_INVALID;
+  }
   else if (!cg->trust_first)
+  {
+   /*
+    * See if we have a site CA certificate we can compare...
+    */
+
+    if (!httpLoadCredentials(NULL, &tcreds, "site"))
+    {
+      if (cupsArrayCount(credentials) != (cupsArrayCount(tcreds) + 1))
+      {
+       /*
+        * Certificate isn't directly generated from the CA cert...
+	*/
+
+        trust = HTTP_TRUST_INVALID;
+      }
+      else
+      {
+       /*
+        * Do a tail comparison of the two certificates...
+	*/
+
+        http_credential_t	*a, *b;		/* Certificates */
+
+        for (a = (http_credential_t *)cupsArrayFirst(tcreds), b = (http_credential_t *)cupsArrayIndex(credentials, 1);
+	     a && b;
+	     a = (http_credential_t *)cupsArrayNext(tcreds), b = (http_credential_t *)cupsArrayNext(credentials))
+	  if (a->datalen != b->datalen || memcmp(a->data, b->data, a->datalen))
+	    break;
+
+        if (a || b)
+	  trust = HTTP_TRUST_INVALID;
+      }
+
+      if (trust != HTTP_TRUST_OK)
+	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Credentials do not validate against site CA certificate."), 1);
+    }
+    else
+    {
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+      trust = HTTP_TRUST_INVALID;
+    }
+  }
+
+  if (trust == HTTP_TRUST_OK && !cg->expired_certs && !SecCertificateIsValid(secCert, CFAbsoluteTimeGetCurrent()))
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Credentials have expired."), 1);
+    trust = HTTP_TRUST_EXPIRED;
+  }
+
+  if (trust == HTTP_TRUST_OK && !cg->any_root && cupsArrayCount(credentials) == 1)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Self-signed credentials are blocked."), 1);
     trust = HTTP_TRUST_INVALID;
+  }
 
   CFRelease(secCert);
 
@@ -789,7 +863,8 @@ httpLoadCredentials(
   OSStatus		err;		/* Error info */
 #ifdef HAVE_SECKEYCHAINOPEN
   char			filename[1024];	/* Filename for keychain */
-  SecKeychainRef	keychain = NULL;/* Keychain reference */
+  SecKeychainRef	keychain = NULL,/* Keychain reference */
+			syschain = NULL;/* System keychain */
   CFArrayRef		list;		/* Keychain list */
 #endif /* HAVE_SECKEYCHAINOPEN */
   SecCertificateRef	cert = NULL;	/* Certificate */
@@ -808,12 +883,13 @@ httpLoadCredentials(
   *credentials = NULL;
 
 #ifdef HAVE_SECKEYCHAINOPEN
-  if (!path)
-    path = http_cdsa_default_path(filename, sizeof(filename));
+  keychain = http_cdsa_open_keychain(path, filename, sizeof(filename));
 
-  if ((err = SecKeychainOpen(path, &keychain)) != noErr)
+  if (!keychain)
     goto cleanup;
 
+  syschain = http_cdsa_open_system_keychain();
+
 #else
   if (path)
     return (-1);
@@ -838,7 +914,14 @@ httpLoadCredentials(
   CFDictionaryAddValue(query, kSecMatchLimit, kSecMatchLimitOne);
 
 #ifdef HAVE_SECKEYCHAINOPEN
-  list = CFArrayCreate(kCFAllocatorDefault, (const void **)&keychain, 1, &kCFTypeArrayCallBacks);
+  if (syschain)
+  {
+    const void *values[2] = { syschain, keychain };
+
+    list = CFArrayCreate(kCFAllocatorDefault, (const void **)values, 2, &kCFTypeArrayCallBacks);
+  }
+  else
+    list = CFArrayCreate(kCFAllocatorDefault, (const void **)&keychain, 1, &kCFTypeArrayCallBacks);
   CFDictionaryAddValue(query, kSecMatchSearchList, list);
   CFRelease(list);
 #endif /* HAVE_SECKEYCHAINOPEN */
@@ -865,6 +948,9 @@ httpLoadCredentials(
 #ifdef HAVE_SECKEYCHAINOPEN
   if (keychain)
     CFRelease(keychain);
+
+  if (syschain)
+    CFRelease(syschain);
 #endif /* HAVE_SECKEYCHAINOPEN */
   if (cert)
     CFRelease(cert);
@@ -919,14 +1005,10 @@ httpSaveCredentials(
   }
 
 #ifdef HAVE_SECKEYCHAINOPEN
-  if (!path)
-    path = http_cdsa_default_path(filename, sizeof(filename));
+  keychain = http_cdsa_open_keychain(path, filename, sizeof(filename));
 
-  if ((err = SecKeychainOpen(path, &keychain)) != noErr)
-  {
-    DEBUG_printf(("1httpSaveCredentials: SecKeychainOpen returned %d.", (int)err));
+  if (!keychain)
     goto cleanup;
-  }
 
 #else
   if (path)
@@ -1664,6 +1746,7 @@ http_cdsa_copy_server(
 					/* Server name */
   CFMutableDictionaryRef query = NULL;	/* Query qualifiers */
   CFArrayRef		list = NULL;	/* Keychain list */
+  SecKeychainRef	syschain = NULL;/* System keychain */
 
 
   DEBUG_printf(("3http_cdsa_copy_server(common_name=\"%s\")", common_name));
@@ -1691,7 +1774,17 @@ http_cdsa_copy_server(
   CFDictionaryAddValue(query, kSecReturnRef, kCFBooleanTrue);
   CFDictionaryAddValue(query, kSecMatchLimit, kSecMatchLimitOne);
 
-  list = CFArrayCreate(kCFAllocatorDefault, (const void **)&tls_keychain, 1, &kCFTypeArrayCallBacks);
+  syschain = http_cdsa_open_system_keychain();
+
+  if (syschain)
+  {
+    const void *values[2] = { syschain, tls_keychain };
+
+    list = CFArrayCreate(kCFAllocatorDefault, (const void **)values, 2, &kCFTypeArrayCallBacks);
+  }
+  else
+    list = CFArrayCreate(kCFAllocatorDefault, (const void **)&tls_keychain, 1, &kCFTypeArrayCallBacks);
+
   CFDictionaryAddValue(query, kSecMatchSearchList, list);
   CFRelease(list);
 
@@ -1719,6 +1812,8 @@ http_cdsa_copy_server(
 
   cleanup :
 
+  if (syschain)
+    CFRelease(syschain);
   if (identity)
     CFRelease(identity);
   if (policy)
@@ -1768,15 +1863,164 @@ http_cdsa_default_path(char   *buffer,	/* I - Path buffer */
   const char *home = getenv("HOME");	/* HOME environment variable */
 
 
+ /*
+  * Determine the default keychain path.  Note that the login and system
+  * keychains are no longer accessible to user applications starting in macOS
+  * 10.11.4 (!), so we need to create our own keychain just for CUPS.
+  */
+
   if (getuid() && home)
-    snprintf(buffer, bufsize, "%s/Library/Keychains/login.keychain", home);
+    snprintf(buffer, bufsize, "%s/.cups/ssl.keychain", home);
   else
-    strlcpy(buffer, "/Library/Keychains/System.keychain", bufsize);
+    strlcpy(buffer, "/etc/cups/ssl.keychain", bufsize);
 
   DEBUG_printf(("1http_cdsa_default_path: Using default path \"%s\".", buffer));
 
   return (buffer);
 }
+
+
+/*
+ * 'http_cdsa_open_keychain()' - Open (or create) a keychain.
+ */
+
+static SecKeychainRef			/* O - Keychain or NULL */
+http_cdsa_open_keychain(
+    const char *path,			/* I - Path to keychain */
+    char       *filename,		/* I - Keychain filename */
+    size_t     filesize)		/* I - Size of filename buffer */
+{
+  SecKeychainRef	keychain = NULL;/* Temporary keychain */
+  OSStatus		err;		/* Error code */
+  Boolean		interaction;	/* Interaction allowed? */
+  SecKeychainStatus	status = 0;	/* Keychain status */
+
+
+ /*
+  * Get the keychain filename...
+  */
+
+  if (!path)
+    path = http_cdsa_default_path(filename, filesize);
+  else
+    strlcpy(filename, path, filesize);
+
+ /*
+  * Save the interaction setting and disable while we open the keychain...
+  */
+
+  SecKeychainGetUserInteractionAllowed(&interaction);
+  SecKeychainSetUserInteractionAllowed(FALSE);
+
+  if (access(path, R_OK))
+  {
+   /*
+    * Create a new keychain at the given path...
+    */
+
+    err = SecKeychainCreate(path, _CUPS_CDSA_PASSLEN, _CUPS_CDSA_PASSWORD, FALSE, NULL, &keychain);
+  }
+  else
+  {
+   /*
+    * Open the existing keychain and unlock as needed...
+    */
+
+    err = SecKeychainOpen(path, &keychain);
+
+    if (err == noErr)
+      err = SecKeychainGetStatus(keychain, &status);
+
+    if (err == noErr && !(status & kSecUnlockStateStatus))
+      err = SecKeychainUnlock(keychain, _CUPS_CDSA_PASSLEN, _CUPS_CDSA_PASSWORD, TRUE);
+  }
+
+ /*
+  * Restore interaction setting...
+  */
+
+  SecKeychainSetUserInteractionAllowed(interaction);
+
+ /*
+  * Release the keychain if we had any errors...
+  */
+
+  if (err != noErr)
+  {
+    /* TODO: Set cups last error string */
+    DEBUG_printf(("4http_cdsa_open_keychain: Unable to open keychain (%d), returning NULL.", (int)err));
+
+    if (keychain)
+    {
+      CFRelease(keychain);
+      keychain = NULL;
+    }
+  }
+
+ /*
+  * Return the keychain or NULL...
+  */
+
+  return (keychain);
+}
+
+
+/*
+ * 'http_cdsa_open_system_keychain()' - Open the System keychain.
+ */
+
+static SecKeychainRef
+http_cdsa_open_system_keychain(void)
+{
+  SecKeychainRef	keychain = NULL;/* Temporary keychain */
+  OSStatus		err;		/* Error code */
+  Boolean		interaction;	/* Interaction allowed? */
+  SecKeychainStatus	status = 0;	/* Keychain status */
+
+
+ /*
+  * Save the interaction setting and disable while we open the keychain...
+  */
+
+  SecKeychainGetUserInteractionAllowed(&interaction);
+  SecKeychainSetUserInteractionAllowed(TRUE);
+
+  err = SecKeychainOpen("/Library/Keychains/System.keychain", &keychain);
+
+  if (err == noErr)
+    err = SecKeychainGetStatus(keychain, &status);
+
+  if (err == noErr && !(status & kSecUnlockStateStatus))
+    err = errSecInteractionNotAllowed;
+
+ /*
+  * Restore interaction setting...
+  */
+
+  SecKeychainSetUserInteractionAllowed(interaction);
+
+ /*
+  * Release the keychain if we had any errors...
+  */
+
+  if (err != noErr)
+  {
+    /* TODO: Set cups last error string */
+    DEBUG_printf(("4http_cdsa_open_system_keychain: Unable to open keychain (%d), returning NULL.", (int)err));
+
+    if (keychain)
+    {
+      CFRelease(keychain);
+      keychain = NULL;
+    }
+  }
+
+ /*
+  * Return the keychain or NULL...
+  */
+
+  return (keychain);
+}
 #endif /* HAVE_SECKEYCHAINOPEN */
 
 

cups/tls-gnutls.c

@@ -435,10 +435,16 @@ httpCredentialsGetTrust(
 
 
   if (!common_name)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No common name specified."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if ((cert = http_gnutls_create_credential((http_credential_t *)cupsArrayFirst(credentials))) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to create credentials from array."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if (cg->any_root < 0)
   {
@@ -473,15 +479,28 @@ httpCredentialsGetTrust(
         * Do not trust certificates on first use...
 	*/
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
-      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds) || !httpCredentialsAreValidForName(credentials, common_name))
+      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds))
       {
        /*
-        * Either the new credentials are not newly issued, or the common name
-	* does not match the issued certificate...
+        * The new credentials are not newly issued...
 	*/
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are older than stored credentials."), 1);
+
+        trust = HTTP_TRUST_INVALID;
+      }
+      else if (!httpCredentialsAreValidForName(credentials, common_name))
+      {
+       /*
+        * The common name does not match the issued certificate...
+	*/
+
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are not valid for name."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
       else if (httpCredentialsGetExpiration(tcreds) < time(NULL))
@@ -499,7 +518,53 @@ httpCredentialsGetTrust(
     httpFreeCredentials(tcreds);
   }
   else if (cg->validate_certs && !httpCredentialsAreValidForName(credentials, common_name))
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No stored credentials, not valid for name."), 1);
     trust = HTTP_TRUST_INVALID;
+  }
+  else if (!cg->trust_first)
+  {
+   /*
+    * See if we have a site CA certificate we can compare...
+    */
+
+    if (!httpLoadCredentials(NULL, &tcreds, "site"))
+    {
+      if (cupsArrayCount(credentials) != (cupsArrayCount(tcreds) + 1))
+      {
+       /*
+        * Certificate isn't directly generated from the CA cert...
+	*/
+
+        trust = HTTP_TRUST_INVALID;
+      }
+      else
+      {
+       /*
+        * Do a tail comparison of the two certificates...
+	*/
+
+        http_credential_t	*a, *b;		/* Certificates */
+
+        for (a = (http_credential_t *)cupsArrayFirst(tcreds), b = (http_credential_t *)cupsArrayIndex(credentials, 1);
+	     a && b;
+	     a = (http_credential_t *)cupsArrayNext(tcreds), b = (http_credential_t *)cupsArrayNext(credentials))
+	  if (a->datalen != b->datalen || memcmp(a->data, b->data, a->datalen))
+	    break;
+
+        if (a || b)
+	  trust = HTTP_TRUST_INVALID;
+      }
+
+      if (trust != HTTP_TRUST_OK)
+	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Credentials do not validate against site CA certificate."), 1);
+    }
+    else
+    {
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+      trust = HTTP_TRUST_INVALID;
+    }
+  }
 
   if (trust == HTTP_TRUST_OK && !cg->expired_certs)
   {
@@ -508,11 +573,17 @@ httpCredentialsGetTrust(
     time(&curtime);
     if (curtime < gnutls_x509_crt_get_activation_time(cert) ||
         curtime > gnutls_x509_crt_get_expiration_time(cert))
+    {
+      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Credentials have expired."), 1);
       trust = HTTP_TRUST_EXPIRED;
+    }
   }
 
   if (trust == HTTP_TRUST_OK && !cg->any_root && cupsArrayCount(credentials) == 1)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Self-signed credentials are blocked."), 1);
     trust = HTTP_TRUST_INVALID;
+  }
 
   gnutls_x509_crt_deinit(cert);
 
@@ -621,6 +692,8 @@ httpLoadCredentials(
   size_t		alloc_data = 0,	/* Bytes allocated */
 			num_data = 0;	/* Bytes used */
   int			decoded;	/* Bytes decoded */
+  int			in_certificate = 0;
+					/* In a certificate? */
 
 
   if (!credentials || !common_name)
@@ -640,7 +713,7 @@ httpLoadCredentials(
   {
     if (!strcmp(line, "-----BEGIN CERTIFICATE-----"))
     {
-      if (num_data)
+      if (in_certificate)
       {
        /*
 	* Missing END CERTIFICATE...
@@ -650,10 +723,12 @@ httpLoadCredentials(
 	*credentials = NULL;
         break;
       }
+
+      in_certificate = 1;
     }
     else if (!strcmp(line, "-----END CERTIFICATE-----"))
     {
-      if (!num_data)
+      if (!in_certificate || !num_data)
       {
        /*
 	* Missing data...
@@ -674,9 +749,10 @@ httpLoadCredentials(
         break;
       }
 
-      num_data = 0;
+      num_data       = 0;
+      in_certificate = 0;
     }
-    else
+    else if (in_certificate)
     {
       if (alloc_data == 0)
       {
@@ -710,7 +786,7 @@ httpLoadCredentials(
 
   cupsFileClose(fp);
 
-  if (num_data)
+  if (in_certificate)
   {
    /*
     * Missing END CERTIFICATE...

doc/help/spec-ipp.html

@@ -587,7 +587,7 @@ name='CREATE_PRINTER_SUBSCRIPTION'>Create-Printer-Subscription</a></h3>
 
 	<dd>The client OPTIONALLY supplies a port monitor name for the specified printer.
 
-	<dt>"ppd-name" (name(127)):
+	<dt>"ppd-name" (name(255)):
 
 	<dd>The client OPTIONALLY supplies a PPD name for the specified printer.
 

locale/cups.strings

@@ -692,9 +692,12 @@
 "Administration" = "Administration";
 "Alternate" = "Alternate";
 "Alternate Roll" = "Alternate Roll";
+"Aluminum" = "Aluminum";
 "Always" = "Always";
 "AppSocket/HP JetDirect" = "AppSocket/HP JetDirect";
 "Applicator" = "Applicator";
+"Archival Envelope" = "Archival Envelope";
+"Archival Fabric" = "Archival Fabric";
 "Attempt to set %s printer-state to bad value %d." = "Attempt to set %s printer-state to bad value %d.";
 "Attribute \"%s\" is in the wrong group." = "Attribute “%s” is in the wrong group.";
 "Attribute \"%s\" is the wrong value type." = "Attribute “%s” is the wrong value type.";
@@ -712,6 +715,7 @@
 "B7" = "B7";
 "B8" = "B8";
 "B9" = "B9";
+"Back Print Film" = "Back Print Film";
 "Bad 'document-format' value \"%s\"." = "Bad 'document-format' value “%s”.";
 "Bad NULL dests pointer" = "Bad NULL dests pointer";
 "Bad OpenGroup" = "Bad OpenGroup";
@@ -762,12 +766,13 @@
 "Bind (Portrait)" = "Bind (Portrait)";
 "Bind (Reverse Landscape)" = "Bind (Reverse Landscape)";
 "Bind (Reverse Portrait)" = "Bind (Reverse Portrait)";
+"Bond Envelope" = "Bond Envelope";
 "Bond Paper" = "Bond Paper";
 "Booklet Maker" = "Booklet Maker";
 "Boolean expected for waiteof option \"%s\"." = "Boolean expected for waiteof option “%s”.";
 "Bottom" = "Bottom";
 "Buffer overflow detected, aborting." = "Buffer overflow detected, aborting.";
-"CD/DVD/Bluray" = "CD/DVD/Bluray";
+"CD" = "CD";
 "CMYK" = "CMYK";
 "CPCL Label Printer" = "CPCL Label Printer";
 "Cancel Jobs" = "Cancel Jobs";
@@ -775,6 +780,7 @@
 "Canceling print job." = "Canceling print job.";
 "Cannot change printer-is-shared for remote queues." = "Cannot change printer-is-shared for remote queues.";
 "Cannot share a remote Kerberized printer." = "Cannot share a remote Kerberized printer.";
+"Cardboard" = "Cardboard";
 "Cardstock" = "Cardstock";
 "Cassette" = "Cassette";
 "Center" = "Center";
@@ -784,24 +790,33 @@
 "Clean Print Heads" = "Clean Print Heads";
 "Close-Job doesn't support the job-uri attribute." = "Close-Job doesn't support the job-uri attribute.";
 "Coat" = "Coat";
+"Coated Envelope" = "Coated Envelope";
+"Coated Paper" = "Coated Paper";
 "Color" = "Color";
 "Color Mode" = "Color Mode";
+"Colored Labels" = "Colored Labels";
 "Commands may be abbreviated.  Commands are:\n\nexit    help    quit    status  ?" = "Commands may be abbreviated.  Commands are:\n\nexit    help    quit    status  ?";
 "Community name uses indefinite length" = "Community name uses indefinite length";
 "Connected to printer." = "Connected to printer.";
 "Connecting to printer." = "Connecting to printer.";
 "Continue" = "Continue";
 "Continuous" = "Continuous";
+"Continuous Long" = "Continuous Long";
+"Continuous Short" = "Continuous Short";
 "Control file sent successfully." = "Control file sent successfully.";
 "Copying print data." = "Copying print data.";
+"Cotton Envelope" = "Cotton Envelope";
 "Cover" = "Cover";
 "Created" = "Created";
+"Credentials do not validate against site CA certificate." = "Credentials do not validate against site CA certificate.";
+"Credentials have expired." = "Credentials have expired.";
 "Custom" = "Custom";
 "CustominCutInterval" = "CustominCutInterval";
 "CustominTearInterval" = "CustominTearInterval";
 "Cut" = "Cut";
 "Cut Media" = "Cut Media";
 "Cutter" = "Cutter";
+"DVD" = "DVD";
 "Dark" = "Dark";
 "Darkness" = "Darkness";
 "Data file sent successfully." = "Data file sent successfully.";
@@ -824,14 +839,18 @@
 "Double Staple (Portrait)" = "Double Staple (Portrait)";
 "Double Staple (Reverse Landscape)" = "Double Staple (Reverse Landscape)";
 "Double Staple (Reverse Portrait)" = "Double Staple (Reverse Portrait)";
+"Double Wall Cardboard" = "Double Wall Cardboard";
 "Draft" = "Draft";
+"Dry Film" = "Dry Film";
 "Duplexer" = "Duplexer";
 "Dymo" = "Dymo";
 "EPL1 Label Printer" = "EPL1 Label Printer";
 "EPL2 Label Printer" = "EPL2 Label Printer";
 "Edit Configuration File" = "Edit Configuration File";
+"Embossing Foil" = "Embossing Foil";
 "Empty PPD file." = "Empty PPD file.";
 "Encryption is not supported." = "Encryption is not supported.";
+"End Board" = "End Board";
 // TRANSLATORS: Banner/cover sheet after the print job.
 "Ending Banner" = "Ending Banner";
 "English" = "English";
@@ -911,6 +930,7 @@
 "Export Printers to Samba" = "Export Printers to Samba";
 "Expressions:" = "Expressions:";
 "FAIL" = "FAIL";
+"Fabric" = "Fabric";
 "FanFold German" = "FanFold German";
 "FanFold Legal German" = "FanFold Legal German";
 "Fanfold US" = "Fanfold US";
@@ -922,18 +942,34 @@
 "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)." = "File “%s” permissions OK (0%o/uid=%d/gid=%d).";
 "File Folder" = "File Folder";
 "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"." = "File device URIs have been disabled. To enable, see the FileDevice directive in “%s/cups-files.conf”.";
+"Film" = "Film";
+"Fine Envelope" = "Fine Envelope";
 "Finished page %d." = "Finished page %d.";
 "Finishing" = "Finishing";
+"Flexo Base" = "Flexo Base";
+"Flexo Photo Polymer" = "Flexo Photo Polymer";
+"Flute" = "Flute";
+"Foil" = "Foil";
 "Fold" = "Fold";
 "Folio" = "Folio";
 "Forbidden" = "Forbidden";
+"Full Cut Tabs" = "Full Cut Tabs";
 "Gate Fold" = "Gate Fold";
 "General" = "General";
 "Generic" = "Generic";
 "Get-Response-PDU uses indefinite length" = "Get-Response-PDU uses indefinite length";
+"Glass" = "Glass";
+"Glass Colored" = "Glass Colored";
+"Glass Opaque" = "Glass Opaque";
+"Glass Surfaced" = "Glass Surfaced";
+"Glass Textured" = "Glass Textured";
+"Glossy Fabric" = "Glossy Fabric";
+"Glossy Labels" = "Glossy Labels";
+"Glossy Optical Disc" = "Glossy Optical Disc";
 "Glossy Paper" = "Glossy Paper";
-"Glossy Photo" = "Glossy Photo";
+"Glossy Photo Paper" = "Glossy Photo Paper";
 "Got a printer-uri attribute but no job-id." = "Got a printer-uri attribute but no job-id.";
+"Gravure Cylinder" = "Gravure Cylinder";
 "Grayscale" = "Grayscale";
 "HP" = "HP";
 "Hagaki" = "Hagaki";
@@ -941,9 +977,14 @@
 "Half Z Fold" = "Half Z Fold";
 "Hanging Folder" = "Hanging Folder";
 "Hash buffer too small." = "Hash buffer too small.";
+"Heavyweight Envelope" = "Heavyweight Envelope";
+"Heavyweight Paper" = "Heavyweight Paper";
 "Help file not in index." = "Help file not in index.";
 "High" = "High";
-"High-Gloss Photo" = "High-Gloss Photo";
+"High Gloss Fabric" = "High Gloss Fabric";
+"High Gloss Labels" = "High Gloss Labels";
+"High Gloss Optical Disc" = "High Gloss Optical Disc";
+"High Gloss Photo Paper" = "High Gloss Photo Paper";
 "IPP 1setOf attribute with incompatible value tags." = "IPP 1setOf attribute with incompatible value tags.";
 "IPP attribute has no name." = "IPP attribute has no name.";
 "IPP attribute is not a member of the message." = "IPP attribute is not a member of the message.";
@@ -973,6 +1014,10 @@
 "Illegal option keyword string" = "Illegal option keyword string";
 "Illegal translation string" = "Illegal translation string";
 "Illegal whitespace character" = "Illegal whitespace character";
+"Image Setter Paper" = "Image Setter Paper";
+"Imaging Cylinder" = "Imaging Cylinder";
+"Inkjet Envelope" = "Inkjet Envelope";
+"Inkjet Labels" = "Inkjet Labels";
 "Installable Options" = "Installable Options";
 "Installed" = "Installed";
 "IntelliBar Label Printer" = "IntelliBar Label Printer";
@@ -1021,10 +1066,11 @@
 "Jobs" = "Jobs";
 "Jog" = "Jog";
 "LPD/LPR Host or Printer" = "LPD/LPR Host or Printer";
-"Label" = "Label";
 "Label Printer" = "Label Printer";
 "Label Top" = "Label Top";
+"Labels" = "Labels";
 "Laminate" = "Laminate";
+"Laminating Foil" = "Laminating Foil";
 "Language \"%s\" not supported." = "Language “%s” not supported.";
 "Large Address" = "Large Address";
 "Large Capacity" = "Large Capacity";
@@ -1036,23 +1082,34 @@
 "Letter Oversize Long Edge" = "Letter Oversize Long Edge";
 "Letterhead" = "Letterhead";
 "Light" = "Light";
+"Lightweight Envelope" = "Lightweight Envelope";
+"Lightweight Paper" = "Lightweight Paper";
 "Line longer than the maximum allowed (255 characters)" = "Line longer than the maximum allowed (255 characters)";
 "List Available Printers" = "List Available Printers";
 "Load paper." = "Load paper.";
 "Local printer created." = "Local printer created.";
 "Long-Edge (Portrait)" = "Long-Edge (Portrait)";
-"Looking for printer..." = "Looking for printer…";
+"Looking for printer." = "Looking for printer.";
 "Main" = "Main";
 "Main Roll" = "Main Roll";
 "Manual" = "Manual";
 "Manual Feed" = "Manual Feed";
-"Matte Photo" = "Matte Photo";
+"Matte Fabric" = "Matte Fabric";
+"Matte Labels" = "Matte Labels";
+"Matte Optical Disc" = "Matte Optical Disc";
+"Matte Photo Paper" = "Matte Photo Paper";
 "Media Size" = "Media Size";
 "Media Source" = "Media Source";
 "Media Tracking" = "Media Tracking";
 "Media Type" = "Media Type";
 "Medium" = "Medium";
 "Memory allocation error" = "Memory allocation error";
+"Metal" = "Metal";
+"Metal Glossy" = "Metal Glossy";
+"Metal High Gloss" = "Metal High Gloss";
+"Metal Matte" = "Metal Matte";
+"Metal Satin" = "Metal Satin";
+"Metal Semi Gloss" = "Metal Semi Gloss";
 "Middle" = "Middle";
 "Missing CloseGroup" = "Missing CloseGroup";
 "Missing PPD-Adobe-4.x header" = "Missing PPD-Adobe-4.x header";
@@ -1078,14 +1135,19 @@
 "Modifiers:" = "Modifiers:";
 "Modify Class" = "Modify Class";
 "Modify Printer" = "Modify Printer";
+"Mounting Tape" = "Mounting Tape";
 "Move All Jobs" = "Move All Jobs";
 "Move Job" = "Move Job";
 "Moved Permanently" = "Moved Permanently";
+"Multi Layer" = "Multi Layer";
+"Multi Part Form" = "Multi Part Form";
 "Multipurpose" = "Multipurpose";
 "NULL PPD file pointer" = "NULL PPD file pointer";
 "Name OID uses indefinite length" = "Name OID uses indefinite length";
 "Nested classes are not allowed." = "Nested classes are not allowed.";
 "Never" = "Never";
+"New credentials are not valid for name." = "New credentials are not valid for name.";
+"New credentials are older than stored credentials." = "New credentials are older than stored credentials.";
 "No" = "No";
 "No Content" = "No Content";
 "No Finishing" = "No Finishing";
@@ -1097,6 +1159,7 @@
 "No active jobs on %s." = "No active jobs on %s.";
 "No attributes in request." = "No attributes in request.";
 "No authentication information provided." = "No authentication information provided.";
+"No common name specified." = "No common name specified.";
 "No community name" = "No community name";
 "No default printer." = "No default printer.";
 "No destinations added." = "No destinations added.";
@@ -1115,6 +1178,7 @@
 "No request protocol version." = "No request protocol version.";
 "No request sent." = "No request sent.";
 "No request-id" = "No request-id";
+"No stored credentials, not valid for name." = "No stored credentials, not valid for name.";
 "No subscription attributes in request." = "No subscription attributes in request.";
 "No subscriptions found." = "No subscriptions found.";
 "No variable-bindings SEQUENCE" = "No variable-bindings SEQUENCE";
@@ -1139,6 +1203,7 @@
 "OpenGroup without a CloseGroup first" = "OpenGroup without a CloseGroup first";
 "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first" = "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first";
 "Operation Policy" = "Operation Policy";
+"Optical Disc" = "Optical Disc";
 "Option \"%s\" cannot be included via %%%%IncludeFeature." = "Option “%s” cannot be included via %%%%IncludeFeature.";
 "Options Installed" = "Options Installed";
 "Options:" = "Options:";
@@ -1159,6 +1224,7 @@
 "PRC32K Oversize Long Edge" = "PRC32K Oversize Long Edge";
 "Packet does not contain a Get-Response-PDU" = "Packet does not contain a Get-Response-PDU";
 "Packet does not start with SEQUENCE" = "Packet does not start with SEQUENCE";
+"Paper" = "Paper";
 "Paper jam." = "Paper jam.";
 "Paper tray is almost empty." = "Paper tray is almost empty.";
 "Paper tray is empty." = "Paper tray is empty.";
@@ -1171,10 +1237,25 @@
 "Pause Class" = "Pause Class";
 "Pause Printer" = "Pause Printer";
 "Peel-Off" = "Peel-Off";
+"Permanent Labels" = "Permanent Labels";
 "Photo" = "Photo";
+"Photo Film" = "Photo Film";
 "Photo Labels" = "Photo Labels";
+"Photo Paper" = "Photo Paper";
+"Photographic Archival" = "Photographic Archival";
+"Plain Envelope" = "Plain Envelope";
 "Plain Paper" = "Plain Paper";
+"Plastic" = "Plastic";
+"Plastic Archival" = "Plastic Archival";
+"Plastic Colored" = "Plastic Colored";
+"Plastic Glossy" = "Plastic Glossy";
+"Plastic High Gloss" = "Plastic High Gloss";
+"Plastic Matte" = "Plastic Matte";
+"Plastic Satin" = "Plastic Satin";
+"Plastic Semi Gloss" = "Plastic Semi Gloss";
+"Plate" = "Plate";
 "Policies" = "Policies";
+"Polyester" = "Polyester";
 "Port Monitor" = "Port Monitor";
 "PostScript Printer" = "PostScript Printer";
 "Postcard" = "Postcard";
@@ -1182,7 +1263,10 @@
 "Postcard Double Long Edge" = "Postcard Double Long Edge";
 "Postcard Long Edge" = "Postcard Long Edge";
 "Poster Fold" = "Poster Fold";
+"Pre Cut Tabs" = "Pre Cut Tabs";
 "Preparing to print." = "Preparing to print.";
+"Preprinted Envelope" = "Preprinted Envelope";
+"Preprinted Paper" = "Preprinted Paper";
 "Print Density" = "Print Density";
 "Print Job:" = "Print Job:";
 "Print Mode" = "Print Mode";
@@ -1210,6 +1294,7 @@
 "Printers" = "Printers";
 "Printing page %d, %u%% complete." = "Printing page %d, %u%% complete.";
 "Punch" = "Punch";
+"Punched Paper" = "Punched Paper";
 "Quarto" = "Quarto";
 "Quota limit reached." = "Quota limit reached.";
 "Rank    Owner   Job     File(s)                         Total Size" = "Rank    Owner   Job     File(s)                         Total Size";
@@ -1226,6 +1311,7 @@
 "Rewind" = "Rewind";
 "Right" = "Right";
 "Right Gate Fold" = "Right Gate Fold";
+"Roll" = "Roll";
 "Roll 1" = "Roll 1";
 "Roll 10" = "Roll 10";
 "Roll 2" = "Roll 2";
@@ -1240,10 +1326,21 @@
 "SEQUENCE uses indefinite length" = "SEQUENCE uses indefinite length";
 "SSL/TLS Negotiation Error" = "SSL/TLS Negotiation Error";
 "Saddle Stitch" = "Saddle Stitch";
-"Satin Photo" = "Satin Photo";
+"Satin Labels" = "Satin Labels";
+"Satin Optical Disc" = "Satin Optical Disc";
+"Satin Photo Paper" = "Satin Photo Paper";
+"Screen" = "Screen";
+"Screen Paged" = "Screen Paged";
+"Security Labels" = "Security Labels";
 "See Other" = "See Other";
 "See remote printer." = "See remote printer.";
-"Semi-Gloss Photo" = "Semi-Gloss Photo";
+"Self Adhesive" = "Self Adhesive";
+"Self Adhesive Film" = "Self Adhesive Film";
+"Self-signed credentials are blocked." = "Self-signed credentials are blocked.";
+"Semi-Gloss Fabric" = "Semi-Gloss Fabric";
+"Semi-Gloss Labels" = "Semi-Gloss Labels";
+"Semi-Gloss Optical Disc" = "Semi-Gloss Optical Disc";
+"Semi-Gloss Photo Paper" = "Semi-Gloss Photo Paper";
 "Sending data to printer." = "Sending data to printer.";
 "Server Restarted" = "Server Restarted";
 "Server Security Auditing" = "Server Security Auditing";
@@ -1258,7 +1355,9 @@
 "Set Publishing" = "Set Publishing";
 "Shipping Address" = "Shipping Address";
 "Short-Edge (Landscape)" = "Short-Edge (Landscape)";
+"Shrink Foil" = "Shrink Foil";
 "Side" = "Side";
+"Single Face" = "Single Face";
 "Single Punch (Landscape)" = "Single Punch (Landscape)";
 "Single Punch (Portrait)" = "Single Punch (Portrait)";
 "Single Punch (Reverse Landscape)" = "Single Punch (Reverse Landscape)";
@@ -1267,6 +1366,8 @@
 "Single Staple (Portrait)" = "Single Staple (Portrait)";
 "Single Staple (Reverse Landscape)" = "Single Staple (Reverse Landscape)";
 "Single Staple (Reverse Portrait)" = "Single Staple (Reverse Portrait)";
+"Single Wall Cardboard" = "Single Wall Cardboard";
+"Sleeve" = "Sleeve";
 "Special Paper" = "Special Paper";
 "Spooling job, %.0f%% complete." = "Spooling job, %.0f%% complete.";
 "Standard" = "Standard";
@@ -1280,12 +1381,18 @@
 "Starting Banner" = "Starting Banner";
 "Starting page %d." = "Starting page %d.";
 "Statement" = "Statement";
+"Stationery" = "Stationery";
+"Stationery Archival" = "Stationery Archival";
+"Stationery Cotton" = "Stationery Cotton";
+"Stationery Heavyweight Coated" = "Stationery Heavyweight Coated";
+"Stationery Inkjet Paper" = "Stationery Inkjet Paper";
 "Subscription #%d does not exist." = "Subscription #%d does not exist.";
 "Substitutions:" = "Substitutions:";
 "Super A" = "Super A";
 "Super B" = "Super B";
 "Super B/A3" = "Super B/A3";
 "Switching Protocols" = "Switching Protocols";
+"Tab Stock" = "Tab Stock";
 "Tabloid" = "Tabloid";
 "Tabloid Oversize" = "Tabloid Oversize";
 "Tabloid Oversize Long Edge" = "Tabloid Oversize Long Edge";
@@ -1344,6 +1451,8 @@
 "Too many job-sheets values (%d > 2)." = "Too many job-sheets values (%d > 2).";
 "Too many printer-state-reasons values (%d > %d)." = "Too many printer-state-reasons values (%d > %d).";
 "Top" = "Top";
+"Tractor" = "Tractor";
+"Transfer" = "Transfer";
 "Transparency" = "Transparency";
 "Tray" = "Tray";
 "Tray 1" = "Tray 1";
@@ -1370,6 +1479,8 @@
 "Triple Staple (Portrait)" = "Triple Staple (Portrait)";
 "Triple Staple (Reverse Landscape)" = "Triple Staple (Reverse Landscape)";
 "Triple Staple (Reverse Portrait)" = "Triple Staple (Reverse Portrait)";
+"Triple Wall Cardboard" = "Triple Wall Cardboard";
+"Trust on first use is disabled." = "Trust on first use is disabled.";
 "URI Too Long" = "URI Too Long";
 "URI too large" = "URI too large";
 "US Ledger" = "US Ledger";
@@ -1407,6 +1518,7 @@
 "Unable to copy PPD file." = "Unable to copy PPD file.";
 "Unable to copy Windows 2000 printer driver files (%d)." = "Unable to copy Windows 2000 printer driver files (%d).";
 "Unable to copy Windows 9x printer driver files (%d)." = "Unable to copy Windows 9x printer driver files (%d).";
+"Unable to create credentials from array." = "Unable to create credentials from array.";
 "Unable to create printer-uri" = "Unable to create printer-uri";
 "Unable to create printer." = "Unable to create printer.";
 "Unable to create server credentials." = "Unable to create server credentials.";
@@ -1522,12 +1634,16 @@
 "Usage: snmp [host-or-ip-address]" = "Usage: snmp [host-or-ip-address]";
 "Value uses indefinite length" = "Value uses indefinite length";
 "VarBind uses indefinite length" = "VarBind uses indefinite length";
+"Vellum Paper" = "Vellum Paper";
 "Version uses indefinite length" = "Version uses indefinite length";
 "Waiting for job to complete." = "Waiting for job to complete.";
 "Waiting for printer to become available." = "Waiting for printer to become available.";
 "Waiting for printer to finish." = "Waiting for printer to finish.";
 "Warning, no Windows 2000 printer drivers are installed." = "Warning, no Windows 2000 printer drivers are installed.";
+"Waterproof Fabric" = "Waterproof Fabric";
 "Web Interface is Disabled" = "Web Interface is Disabled";
+"Wet Film" = "Wet Film";
+"Windowed Envelope" = "Windowed Envelope";
 "Yes" = "Yes";
 "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>." = "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>.";
 "Z Fold" = "Z Fold";

locale/cups_ca.po

@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-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"
@@ -2707,6 +2707,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Sempre"
 
@@ -2716,6 +2719,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Aplicador"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
@@ -2772,6 +2781,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2940,6 +2952,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Paper de valors"
 
@@ -2956,7 +2971,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "S'ha detectat un desbordament la memòria cau. S'interromp."
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -2980,6 +2995,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr "No es pot compartir una impressora remota sobre Kerberos."
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -3008,12 +3026,21 @@ msgstr "Close-Job no permet l'ús de l'atribut job-uri."
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Color"
 
 msgid "Color Mode"
 msgstr "Mode de color"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3038,18 +3065,33 @@ msgstr "Continua"
 msgid "Continuous"
 msgstr "Contínua"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "El fitxer de control s'ha enviat correctament."
 
 msgid "Copying print data."
 msgstr "Es copien les dades d'impressió."
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Creat"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalitzat"
 
@@ -3068,6 +3110,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Ganiveta"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Fosc"
 
@@ -3154,9 +3199,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Unitat d'impressió a dues cares"
 
@@ -3172,12 +3223,18 @@ msgstr "Impressora d'etiquetes EPL2"
 msgid "Edit Configuration File"
 msgstr "Edita el fitxer de configuració"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "El fitxer PPD és buit."
 
 msgid "Encryption is not supported."
 msgstr ""
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "S'està acabant el bàner"
@@ -3420,6 +3477,9 @@ msgstr ""
 msgid "FAIL"
 msgstr "ERROR"
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr "Paper continu alemany"
 
@@ -3461,6 +3521,12 @@ msgid ""
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "S'ha acabat la pàgina %d."
@@ -3468,6 +3534,18 @@ msgstr "S'ha acabat la pàgina %d."
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3477,6 +3555,9 @@ msgstr "Foli"
 msgid "Forbidden"
 msgstr "Prohibit"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3489,15 +3570,42 @@ msgstr "Genèric"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "La Get-Response-PDU fa servir una longitud indefinida"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Paper fotogràfic"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "S'ha obtingut l'atribut printer-uri però no el job-id."
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Escala de grisos"
 
@@ -3519,13 +3627,28 @@ msgstr "Carpeta per penjar"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "El fitxer d'ajuda no és a l'índex."
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3618,6 +3741,18 @@ msgstr "Cadena de traducció no permesa"
 msgid "Illegal whitespace character"
 msgstr "Caràcter d'espai en blanc no permés"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Opcions instal·lables"
 
@@ -3772,18 +3907,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Amfitrió o impressora LPD/LPR"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Impressora d'etiquetes"
 
 msgid "Label Top"
 msgstr "Capçalera de l'etiqueta"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "L'idioma «%s» no està disponible."
@@ -3818,6 +3956,12 @@ msgstr ""
 msgid "Light"
 msgstr "Lluminós"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "La línia la longitud màxima permesa (255 caràcters)"
 
@@ -3833,8 +3977,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Costat-llarg (vertical)"
 
-msgid "Looking for printer..."
-msgstr ""
+msgid "Looking for printer."
+msgstr "S'està buscant la impressora."
 
 msgid "Main"
 msgstr ""
@@ -3848,7 +3992,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Alimentació manual"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3869,6 +4022,24 @@ msgstr "Mitjà"
 msgid "Memory allocation error"
 msgstr "S'ha produït un error d'ubicació de memòria"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3956,6 +4127,9 @@ msgstr "Modifica la classe"
 msgid "Modify Printer"
 msgstr "Modifica la impressora"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Mou totes les feines"
 
@@ -3965,6 +4139,12 @@ msgstr "Mou la feina"
 msgid "Moved Permanently"
 msgstr "S'ha mogut de manera permanent"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -3980,6 +4160,12 @@ msgstr "No es permeten les classes imbricades."
 msgid "Never"
 msgstr "Mai"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "No"
 
@@ -4014,6 +4200,9 @@ msgstr "No hi ha atributs en demanda."
 msgid "No authentication information provided."
 msgstr "No s'ha donat cap informació d'autenticació."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Ho hi na cap nom de comunitat"
 
@@ -4070,6 +4259,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "No hi ha cap request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "No hi ha cap atribut de la subscripció a la sol·licitud."
 
@@ -4146,6 +4338,9 @@ msgstr "OpenUI/JCLOpenUI sense un CloseUI/JCLCloseUI abans"
 msgid "Operation Policy"
 msgstr "Política d'operacions"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "L'opció «%s» no es pot incloure a través de %%%%IncludeFeature."
@@ -4207,6 +4402,9 @@ msgstr "El paquet no conté cap Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "El paquet no comença amb SEQUENCE"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr ""
 
@@ -4245,18 +4443,63 @@ msgstr "Posa la impressora en pausa"
 msgid "Peel-Off"
 msgstr "Desenganxar"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Fotografia"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Etiquetes de fotografia"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Paper normal"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Polítiques"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Seguiment del port"
 
@@ -4278,9 +4521,18 @@ msgstr "Postal costat llarg"
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr ""
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Densitat de la impressió"
 
@@ -4364,6 +4616,9 @@ msgstr ""
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quart"
 
@@ -4415,6 +4670,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4458,7 +4716,22 @@ msgstr "S'ha produït un error mentre es negociava el SSL/TLS"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4467,7 +4740,25 @@ msgstr "Vegeu altres"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4512,9 +4803,15 @@ msgstr "Adreça de lliurament"
 msgid "Short-Edge (Landscape)"
 msgstr "Costat curt (horitzontal)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4539,6 +4836,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Paper especial"
 
@@ -4578,6 +4881,21 @@ msgstr "S'està començant la pàgina %d."
 msgid "Statement"
 msgstr "Declaració"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "La subscripció #%d no existeix."
@@ -4597,6 +4915,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Intercanviar els protocols"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloide"
 
@@ -4812,6 +5133,12 @@ msgstr "Hi ha massa valors de printer-state-reasons (%d > %d)."
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Transparència"
 
@@ -4890,6 +5217,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "L'URI és massa llarg"
 
@@ -5019,6 +5352,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora Windows 9x (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "No es pot crear el printer-uri"
 
@@ -5454,6 +5790,9 @@ msgstr "El valor té una longitud indefinida"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind té una longitud indefinida"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version té una longitud indefinida"
 
@@ -5469,9 +5808,18 @@ msgstr "S'està esperant que la impressora acabi."
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "AVÍS. No hi ha cap controlador per Windows 2000 instal·lat."
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "La interfície web està deshabilitada"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sí"
 
@@ -6539,9 +6887,6 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ msgid "Large Address - 1 4/10 x 3 1/2\""
 #~ msgstr "Adreça gran - 1 4/10 x 3 1/2\""
 
-#~ msgid "Looking for printer."
-#~ msgstr "S'està buscant la impressora."
-
 #~ msgid "New Stylus Color Series"
 #~ msgstr "Sèrie New Stylus Color"
 

locale/cups_cs.po

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-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"
@@ -2515,6 +2515,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Vždy"
 
@@ -2524,6 +2527,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Aplikátor"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
@@ -2579,6 +2588,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2747,6 +2759,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Kancelářský papír"
 
@@ -2763,7 +2778,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -2787,6 +2802,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -2815,12 +2833,21 @@ msgstr ""
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Barva"
 
 msgid "Color Mode"
 msgstr "Barevný režim"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -2842,18 +2869,33 @@ msgstr "Pokračovat"
 msgid "Continuous"
 msgstr "Souvislý"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr ""
 
 msgid "Copying print data."
 msgstr ""
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Vytvořeno"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Uživatelský"
 
@@ -2872,6 +2914,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Výstřižek"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Tmavý"
 
@@ -2952,9 +2997,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Duplexní jednotka"
 
@@ -2970,12 +3021,18 @@ msgstr "Tiskárna štítků EPL2"
 msgid "Edit Configuration File"
 msgstr "Úprava konfiguračního souboru"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr ""
 
 msgid "Encryption is not supported."
 msgstr ""
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Ukončení baneru"
@@ -3217,6 +3274,9 @@ msgstr ""
 msgid "FAIL"
 msgstr ""
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr ""
 
@@ -3258,6 +3318,12 @@ msgid ""
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr ""
@@ -3265,6 +3331,18 @@ msgstr ""
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3274,6 +3352,9 @@ msgstr "Fólie"
 msgid "Forbidden"
 msgstr "Zakázaný"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3286,15 +3367,42 @@ msgstr "Obecný"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "\"Get-Response-PDU\" má neomezenou délku"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Lesklý papír"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Stupně šedi"
 
@@ -3316,13 +3424,28 @@ msgstr "Závěsná složka"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr ""
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3412,6 +3535,18 @@ msgstr "Neplatný překlad řetězce"
 msgid "Illegal whitespace character"
 msgstr "Nedovolený prázdný znak"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Možnosti instalace"
 
@@ -3566,18 +3701,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR hostitel nebo tiskárna"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Tiskárna štítků"
 
 msgid "Label Top"
 msgstr "Horní štítek"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -3612,6 +3750,12 @@ msgstr ""
 msgid "Light"
 msgstr "Světlý"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Řádek je delší než maximální povolená velikost (255 znaků)"
 
@@ -3627,7 +3771,7 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Delší okraj (na výšku)"
 
-msgid "Looking for printer..."
+msgid "Looking for printer."
 msgstr ""
 
 msgid "Main"
@@ -3642,7 +3786,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Ruční podávání"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3663,6 +3816,24 @@ msgstr "Střední"
 msgid "Memory allocation error"
 msgstr "Chyba přidělení paměti"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3746,6 +3917,9 @@ msgstr "Úprava třídy"
 msgid "Modify Printer"
 msgstr "Úprava tiskárny"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Přesun všech úloh"
 
@@ -3755,6 +3929,12 @@ msgstr "Přesun úlohy"
 msgid "Moved Permanently"
 msgstr "Trvale přesunuto"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -3770,6 +3950,12 @@ msgstr ""
 msgid "Never"
 msgstr "Nikdy"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Ne"
 
@@ -3804,6 +3990,9 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Žádný název komunity"
 
@@ -3858,6 +4047,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Žádný ID požadavek"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr ""
 
@@ -3933,6 +4125,9 @@ msgstr "OpenUI/JCLOpenUI nepředcházelo CloseUI/JCLCloseUI"
 msgid "Operation Policy"
 msgstr "Způsob ověření"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
@@ -3994,6 +4189,9 @@ msgstr "Packet neobsahuje \"Get-Response-PDU\""
 msgid "Packet does not start with SEQUENCE"
 msgstr "Paket nezačíná SEQUENCÍ"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr ""
 
@@ -4032,18 +4230,63 @@ msgstr "Pozastavení tiskárny"
 msgid "Peel-Off"
 msgstr "Peel-Off"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Fotografie"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Foto-samolepky"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Obyčejný papír"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Pravidla"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Monitorování portu"
 
@@ -4065,9 +4308,18 @@ msgstr ""
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr ""
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Hustota tisku"
 
@@ -4151,6 +4403,9 @@ msgstr ""
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quarto"
 
@@ -4201,6 +4456,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4244,7 +4502,22 @@ msgstr ""
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4253,7 +4526,25 @@ msgstr "Viz další"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4298,9 +4589,15 @@ msgstr "Doručovací adresa"
 msgid "Short-Edge (Landscape)"
 msgstr "Kratší okraj (na šířku)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4325,6 +4622,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Speciální papír"
 
@@ -4364,6 +4667,21 @@ msgstr ""
 msgid "Statement"
 msgstr "Prohlášení"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -4383,6 +4701,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Protokol výměny"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloid"
 
@@ -4588,6 +4909,12 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Průhlednost"
 
@@ -4666,6 +4993,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI je příliš dlouhá"
 
@@ -4786,6 +5119,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr ""
 
@@ -5184,6 +5520,9 @@ msgstr "Hodnota má neomezenou délku"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind má neomezenou délku"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version má neomezenou délku"
 
@@ -5199,9 +5538,18 @@ msgstr ""
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr ""
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ano"
 

locale/cups_de.po

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-0400\n"
 "PO-Revision-Date: 2016-04-22 12:25+0100\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2579,6 +2579,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Immer"
 
@@ -2588,6 +2591,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Applicator"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr "Versuch den %s Druckerstatus auf einen ungültigen %d Wert zu setzen."
@@ -2643,6 +2652,9 @@ msgstr "DIN B8"
 msgid "B9"
 msgstr "DIN B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Fehlerhafter 'document-format' Wert \"%s\"."
@@ -2811,6 +2823,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Papier bündeln"
 
@@ -2827,7 +2842,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "Pufferüberlauf festgestellt, Abbruch."
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -2851,6 +2866,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr "Freigabe eines entfernten kerberisierten Druckers nicht möglich"
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -2879,12 +2897,21 @@ msgstr "Close-Job unterstützt keine job-uri Attribute."
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Farbe"
 
 msgid "Color Mode"
 msgstr "Farbmodus"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -2909,18 +2936,33 @@ msgstr "Weiter"
 msgid "Continuous"
 msgstr "Kontinuierlich"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "Steuerdatei erfolgreich gesendet."
 
 msgid "Copying print data."
 msgstr "Kopiere Druckdaten."
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Erstellt"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Eigene"
 
@@ -2939,6 +2981,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Abschneider"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Dunkel"
 
@@ -3019,9 +3064,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Duplexer"
 
@@ -3037,12 +3088,18 @@ msgstr "EPL2 Etikettendrucker"
 msgid "Edit Configuration File"
 msgstr "Konfigurationsdatei bearbeiten"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "Leere PPD Datei."
 
 msgid "Encryption is not supported."
 msgstr "Verschlüsselung ist nicht unterstüzt."
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Banner beenden"
@@ -3285,6 +3342,9 @@ msgstr "Ausdrücke:"
 msgid "FAIL"
 msgstr ""
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr ""
 
@@ -3326,6 +3386,12 @@ msgid ""
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "Seite %d fertiggestellt."
@@ -3333,6 +3399,18 @@ msgstr "Seite %d fertiggestellt."
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3342,6 +3420,9 @@ msgstr "Folio"
 msgid "Forbidden"
 msgstr "Verboten"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3354,15 +3435,42 @@ msgstr "Allgemein"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU hat unbestimmte Länge"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Glanzpapier"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "Drucker-URI Attribut empfangen aber keine Auftrags-ID."
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -3384,13 +3492,28 @@ msgstr "Hängeordner"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "Hilfedatei nicht im Index."
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3480,6 +3603,18 @@ msgstr "Ungültiger Übersetzungsstring"
 msgid "Illegal whitespace character"
 msgstr "Ungültiges Leerzeichen"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Installationsoptionen"
 
@@ -3635,18 +3770,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR-Host oder -Drucker"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Etikettendrucker"
 
 msgid "Label Top"
 msgstr "Etikett (oben)"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "Sprache \"%s\" nicht unterstützt."
@@ -3681,6 +3819,12 @@ msgstr ""
 msgid "Light"
 msgstr "Leicht"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Zeile ist länger als die zulässige Länge von 255 Zeichen"
 
@@ -3696,8 +3840,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Lange Kante (Hochformat)"
 
-msgid "Looking for printer..."
-msgstr ""
+msgid "Looking for printer."
+msgstr "Suche nach Drucker."
 
 msgid "Main"
 msgstr ""
@@ -3711,7 +3855,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Manuelle Papierzufuhr"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3732,6 +3885,24 @@ msgstr "Medium"
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicherzuteilung"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3815,6 +3986,9 @@ msgstr "Klasse verändern"
 msgid "Modify Printer"
 msgstr "Drucker verändern"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Alle Druckaufträge verschieben"
 
@@ -3824,6 +3998,12 @@ msgstr "Druckauftrag verschieben"
 msgid "Moved Permanently"
 msgstr "Dauerhaft verschoben"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -3839,6 +4019,12 @@ msgstr "Geschachtelte Klassen sind nicht erlaubt."
 msgid "Never"
 msgstr "Nie"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Nein"
 
@@ -3873,6 +4059,9 @@ msgstr "Keine Attribute in der Anfrage."
 msgid "No authentication information provided."
 msgstr "Keine Authentifizierungsinformation bereitgestellt."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Kein Community-Name"
 
@@ -3928,6 +4117,9 @@ msgstr "Keine Anfrage gesendet."
 msgid "No request-id"
 msgstr "Keine Anfrage-ID"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Keine Subskriptions-Attribute in der Anfrage."
 
@@ -4005,6 +4197,9 @@ msgstr "OpenUI/JCLOpenUI ohne CloseUI/JCLCloseUI zuerst"
 msgid "Operation Policy"
 msgstr "Nutzungsrichtlinien"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
@@ -4066,6 +4261,9 @@ msgstr "Paket enthält kein Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "Paket beginnt nicht mit SEQUENCE"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr "Papierstau."
 
@@ -4104,18 +4302,63 @@ msgstr "Drucker anhalten"
 msgid "Peel-Off"
 msgstr "Aufkleber"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Foto"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Foto-Etiketten"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Standardpapier"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Richtlinien "
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Port-Monitor"
 
@@ -4137,9 +4380,18 @@ msgstr ""
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr "Vorbereitung zum Druck."
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Druckdichte"
 
@@ -4223,6 +4475,9 @@ msgstr "Drucke Seite %d, %u%% fertig."
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "US Quarto"
 
@@ -4273,6 +4528,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4316,7 +4574,22 @@ msgstr "SSL/TLS Verhandlungsfehler"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4325,7 +4598,25 @@ msgstr "Siehe auch"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4370,9 +4661,15 @@ msgstr "Lieferadresse"
 msgid "Short-Edge (Landscape)"
 msgstr "Kurze Kante (Querformat)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4397,6 +4694,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Spezialpapier"
 
@@ -4436,6 +4739,21 @@ msgstr "Beginne Seite %d."
 msgid "Statement"
 msgstr "US Statement"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "Abonnement #%d existiert nicht."
@@ -4455,6 +4773,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Protokoll wechseln"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "US Tabloid"
 
@@ -4673,6 +4994,12 @@ msgstr "Zu viele printer-state-reasons Werte (%d > %d)."
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Transparenz"
 
@@ -4751,6 +5078,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI zu lang"
 
@@ -4876,6 +5209,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Druckertrieberdateien für Windows 9x können nicht kopiert werden (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Drucker-URI kann nicht erzeugt werden"
 
@@ -5301,6 +5637,9 @@ msgstr "Wert hat unbestimmte Länge"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind hat unbestimmte Länge"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version hat unbestimmte Länge"
 
@@ -5316,9 +5655,18 @@ msgstr "Warte auf Abschluss."
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "Warnung, keine Win2k Treiber installiert."
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "Web-Schnittstelle ist abgeschaltet"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ja"
 
@@ -6235,9 +6583,6 @@ msgstr "variable-bindings hat unbestimmte Länge"
 #~ msgid "File Folder "
 #~ msgstr "Datei-Verzeichnis "
 
-#~ msgid "Looking for printer."
-#~ msgstr "Suche nach Drucker."
-
 #~ msgid "New Stylus Color Series"
 #~ msgstr "Neue Stylus Color Serie"
 

locale/cups_fr.po

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2515,6 +2515,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Toujours"
 
@@ -2524,6 +2527,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Applicator"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
@@ -2579,6 +2588,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2747,6 +2759,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Papier pour titres"
 
@@ -2763,7 +2778,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -2787,6 +2802,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -2815,12 +2833,21 @@ msgstr ""
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Couleur"
 
 msgid "Color Mode"
 msgstr "Mode de couleur"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -2842,18 +2869,33 @@ msgstr "Continuer"
 msgid "Continuous"
 msgstr "Continu"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr ""
 
 msgid "Copying print data."
 msgstr ""
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Créé"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personnalisation"
 
@@ -2872,6 +2914,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Cutter"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Foncé"
 
@@ -2952,9 +2997,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Duplexeur"
 
@@ -2970,12 +3021,18 @@ msgstr "Imprimante pour étiquettes EPL2"
 msgid "Edit Configuration File"
 msgstr "Modifier le fichier de configuration"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr ""
 
 msgid "Encryption is not supported."
 msgstr ""
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Fin de la bannière"
@@ -3214,6 +3271,9 @@ msgstr ""
 msgid "FAIL"
 msgstr ""
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr ""
 
@@ -3255,6 +3315,12 @@ msgid ""
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr ""
@@ -3262,6 +3328,18 @@ msgstr ""
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3271,6 +3349,9 @@ msgstr "Folio"
 msgid "Forbidden"
 msgstr ""
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3283,15 +3364,42 @@ msgstr "Générique"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU s’avère être de longueur indéfinie"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Papier brillant"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -3313,13 +3421,28 @@ msgstr "Dossier suspendu"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr ""
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3409,6 +3532,18 @@ msgstr "Traduction interdite"
 msgid "Illegal whitespace character"
 msgstr "Caractère « espace blanc » interdit"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Options installables"
 
@@ -3563,18 +3698,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Hôte ou imprimante LPD/LPR"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Imprimante pour étiquettes"
 
 msgid "Label Top"
 msgstr "Étiquette supérieure"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -3609,6 +3747,12 @@ msgstr ""
 msgid "Light"
 msgstr "Clair"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Ligne dépassant la longueur maximale autorisée (255 caractères)"
 
@@ -3624,7 +3768,7 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Bord le plus long (Portrait)"
 
-msgid "Looking for printer..."
+msgid "Looking for printer."
 msgstr ""
 
 msgid "Main"
@@ -3639,7 +3783,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr ""
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3660,6 +3813,24 @@ msgstr "Moyen"
 msgid "Memory allocation error"
 msgstr "Erreur d’allocation de mémoire"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3743,6 +3914,9 @@ msgstr "Modifier la classe"
 msgid "Modify Printer"
 msgstr "Modifier l’imprimante"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Transférer toutes les tâches"
 
@@ -3752,6 +3926,12 @@ msgstr "Transférer la tâche"
 msgid "Moved Permanently"
 msgstr "Transférées de façon permanente"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -3767,6 +3947,12 @@ msgstr ""
 msgid "Never"
 msgstr "Jamais"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Non"
 
@@ -3801,6 +3987,9 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Aucun nom de communauté"
 
@@ -3855,6 +4044,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Paramètre request-id absent"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr ""
 
@@ -3930,6 +4122,9 @@ msgstr "OpenUI/JCLOpenUI sans CloseUI/JCLCloseUI préalable"
 msgid "Operation Policy"
 msgstr "Règles de fonctionnement"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
@@ -3991,6 +4186,9 @@ msgstr "Le paquet ne contient aucun paramètre Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "Le paquet ne commence pas par SEQUENCE"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr ""
 
@@ -4029,18 +4227,63 @@ msgstr "Suspendre l’imprimante"
 msgid "Peel-Off"
 msgstr "Décoller"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Photo"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Étiquettes photo"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr ""
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Règles"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Moniteur de port"
 
@@ -4062,9 +4305,18 @@ msgstr ""
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr ""
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Densité d’impression"
 
@@ -4148,6 +4400,9 @@ msgstr ""
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quarto"
 
@@ -4198,6 +4453,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4241,7 +4499,22 @@ msgstr ""
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4250,7 +4523,25 @@ msgstr "Autres"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4295,9 +4586,15 @@ msgstr "Adresse de livraison"
 msgid "Short-Edge (Landscape)"
 msgstr "Bord le plus court (paysage)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4322,6 +4619,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Papier spécial"
 
@@ -4361,6 +4664,21 @@ msgstr ""
 msgid "Statement"
 msgstr "Déclaration"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -4380,6 +4698,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Permuter les protocoles"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloïd"
 
@@ -4590,6 +4911,12 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Transparence"
 
@@ -4668,6 +4995,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI trop long"
 
@@ -4788,6 +5121,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr ""
 
@@ -5186,6 +5522,9 @@ msgstr "La valeur s’avère être de longueur indéfinie"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind s’avère être de longueur indéfinie"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "La version s’avère être de longueur indéfinie"
 
@@ -5201,9 +5540,18 @@ msgstr ""
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr ""
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Oui"
 

locale/cups_it.po

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -2782,6 +2782,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Sempre"
 
@@ -2791,6 +2794,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Applicatore"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr "Tentativo di impostare %s printer-state al valore non valido %d."
@@ -2846,6 +2855,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Il valore di 'document-format' non è valido \"%s\"."
@@ -3014,6 +3026,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Carta per scrivere"
 
@@ -3030,7 +3045,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "È stato individuato un buffer overflow, operazione annullata."
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -3054,6 +3069,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr "Non è possibile condividere una stampante remota kerberizzata."
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -3082,12 +3100,21 @@ msgstr "Close-Job non supporta l'attributo job-uri."
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Colore"
 
 msgid "Color Mode"
 msgstr "Modalità colore"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3112,18 +3139,33 @@ msgstr "Continua"
 msgid "Continuous"
 msgstr "Continuo"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "Il file del controllo è stato inviato con successo."
 
 msgid "Copying print data."
 msgstr "Copia dei dati di stampa in corso."
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Creato"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -3142,6 +3184,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Taglierino"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Scuro"
 
@@ -3229,9 +3274,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Duplexer"
 
@@ -3247,12 +3298,18 @@ msgstr "EPL2 Label Printer"
 msgid "Edit Configuration File"
 msgstr "Edita il file di configurazione"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "Il file PPD è vuoto."
 
 msgid "Encryption is not supported."
 msgstr ""
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Termine del banner"
@@ -3494,6 +3551,9 @@ msgstr "Espressioni:"
 msgid "FAIL"
 msgstr "OPERAZIONE NON RIUSCITA CORRETTAMENTE"
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr "FanFold German"
 
@@ -3537,6 +3597,12 @@ msgstr ""
 "I file del dispositivo URI sono stati disabilitati. Per abilitare, vedere la "
 "direttiva FileDevice in \"%s/cups-files.conf\"."
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "Finito pagina %d."
@@ -3544,6 +3610,18 @@ msgstr "Finito pagina %d."
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3553,6 +3631,9 @@ msgstr "Foglio"
 msgid "Forbidden"
 msgstr "Vietato"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3565,15 +3646,42 @@ msgstr "Generico"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU utilizza una lunghezza indefinita"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Carta lucida"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "Esiste un attributo printer-uri ma nessun job-id."
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Scala di grigi"
 
@@ -3595,13 +3703,28 @@ msgstr "Directory appesa"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "Il file di aiuto non è nell'indice."
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3691,6 +3814,18 @@ msgstr "La stringa della traduzione è illegale"
 msgid "Illegal whitespace character"
 msgstr "Il carattere spazio è illegale"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Opzioni installabili"
 
@@ -3845,18 +3980,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR Host o stampante"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Label Printer"
 
 msgid "Label Top"
 msgstr "Label Top"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "La lingua \"%s\" non è supportata."
@@ -3891,6 +4029,12 @@ msgstr ""
 msgid "Light"
 msgstr "Luce"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Linea più lunga di quella massima consentita (255 caratteri)"
 
@@ -3906,8 +4050,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Long-Edge (Portrait)"
 
-msgid "Looking for printer..."
-msgstr ""
+msgid "Looking for printer."
+msgstr "Cerca una stampante."
 
 msgid "Main"
 msgstr ""
@@ -3921,7 +4065,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Alimentazione manuale"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3942,6 +4095,24 @@ msgstr "Supporto"
 msgid "Memory allocation error"
 msgstr "Errore di allocazione della memoria"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -4029,6 +4200,9 @@ msgstr "Modifica la classe"
 msgid "Modify Printer"
 msgstr "Modifica la stampante"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Sposta tutti le stampe"
 
@@ -4038,6 +4212,12 @@ msgstr "Sposta il processo"
 msgid "Moved Permanently"
 msgstr "Spostato in modo permanente"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -4053,6 +4233,12 @@ msgstr "Le classi nidificate non sono consentite."
 msgid "Never"
 msgstr "Mai"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "No"
 
@@ -4087,6 +4273,9 @@ msgstr "Nessun attributo nella richiesta."
 msgid "No authentication information provided."
 msgstr "Nessuna informazione di autenticazione fornita."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Nessun nome della comunità"
 
@@ -4143,6 +4332,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Nessun request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Nessun attributo della sottoscrizione nella richiesta."
 
@@ -4220,6 +4412,9 @@ msgstr "OpenUI/JCLOpenUI senza prima un CloseUI/JCLCloseUI"
 msgid "Operation Policy"
 msgstr "Policy dell'operazione"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "L'opzione \"%s\" non può essere inclusa tramite %%%%IncludeFeature."
@@ -4281,6 +4476,9 @@ msgstr "Il pacchetto non contiene un Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "Il pacchetto non inizia con SEQUENZA"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr ""
 
@@ -4319,18 +4517,63 @@ msgstr "Metti in pausa la stampante"
 msgid "Peel-Off"
 msgstr "Peel-Off"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Foto"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Etichette delle foto"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Carta comune"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Policy"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Controllo della porta"
 
@@ -4352,9 +4595,18 @@ msgstr "Postcard Long Edge"
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr "Preparazione per la stampa."
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Densità di stampa"
 
@@ -4438,6 +4690,9 @@ msgstr ""
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quarto"
 
@@ -4488,6 +4743,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4531,7 +4789,22 @@ msgstr "Errore di negoziazione SSL/TLS"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4540,7 +4813,25 @@ msgstr "Vedi altro"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4585,9 +4876,15 @@ msgstr "Indirizzo di spedizione"
 msgid "Short-Edge (Landscape)"
 msgstr "Short-Edge (Landscape)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4612,6 +4909,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Carta speciale"
 
@@ -4651,6 +4954,21 @@ msgstr "Pagina iniziale %d."
 msgid "Statement"
 msgstr "Rapporto"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "La sottoscrizione #%d non esiste."
@@ -4670,6 +4988,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Protocolli di commutazione"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloid"
 
@@ -4888,6 +5209,12 @@ msgstr "Troppi valori di printer-state-reasons (%d > %d)."
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Trasparenza"
 
@@ -4966,6 +5293,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "L'URI è troppo lungo"
 
@@ -5090,6 +5423,9 @@ msgstr "Non è possibile copiare i driver di Windows 2000 della stampante (%d)."
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Non è possibile copiare i driver di Windows 9x della stampante (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Non è possibile creare il printer-uri"
 
@@ -5524,6 +5860,9 @@ msgstr "Il valore utilizza una lunghezza indefinita"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind utilizza una lunghezza indefinita"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version utilizza una lunghezza indefinita"
 
@@ -5540,9 +5879,18 @@ msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 "Attenzione, nessun driver di Windows 2000 della stampante è stato installato."
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "L'interfaccia web è stata disabilitata"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sì"
 
@@ -6508,9 +6856,6 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgid "File Folder "
 #~ msgstr "Directory del file"
 
-#~ msgid "Looking for printer."
-#~ msgstr "Cerca una stampante."
-
 #~ msgid "New Stylus Color Series"
 #~ msgstr "Nuova Stylus Color Series"
 

locale/cups_ja.po

@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -2741,6 +2741,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "常に有効"
 
@@ -2750,6 +2753,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "アプリケーター"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr "%s printer-state に 不正な値 %d を設定しようとしています。"
@@ -2805,6 +2814,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "誤った 'document-format' の値です \"%s\"。"
@@ -2973,6 +2985,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "ボンド紙"
 
@@ -2989,7 +3004,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "オーバーフローが検出され、中断しました。"
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -3013,6 +3028,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr "リモートの Kerberos 認証のプリンターを共有できません。"
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -3041,12 +3059,21 @@ msgstr "Close-Job は job-uri 属性をサポートしていません。"
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "カラー"
 
 msgid "Color Mode"
 msgstr "カラーモード"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3071,18 +3098,33 @@ msgstr "継続"
 msgid "Continuous"
 msgstr "連続"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "コントロールファイルが正常に送信されました。"
 
 msgid "Copying print data."
 msgstr "印刷データをコピーしています。"
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "ジョブ作成"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "カスタム"
 
@@ -3101,6 +3143,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "カッター"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "濃い"
 
@@ -3190,9 +3235,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "両面オプション"
 
@@ -3208,12 +3259,18 @@ msgstr "EPL2 ラベルプリンター"
 msgid "Edit Configuration File"
 msgstr "設定ファイルの編集"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "PPD ファイルが空です。"
 
 msgid "Encryption is not supported."
 msgstr "暗号化はサポートされていません。"
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "終了バナー"
@@ -3455,6 +3512,9 @@ msgstr "式:"
 msgid "FAIL"
 msgstr "失敗"
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr "FanFold German"
 
@@ -3500,6 +3560,12 @@ msgstr ""
 "ファイルデバイス URI は無効になっています。有効にするには、\"%s/cups-files."
 "conf\" の FileDevice ディレクティブを参照してください。"
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "ページ %d を終了。"
@@ -3507,6 +3573,18 @@ msgstr "ページ %d を終了。"
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3516,6 +3594,9 @@ msgstr "フォリオ"
 msgid "Forbidden"
 msgstr "Forbidden"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3528,15 +3609,42 @@ msgstr "汎用"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU は不確定の長さを使用しています"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "光沢紙"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした。"
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "グレースケール"
 
@@ -3558,13 +3666,28 @@ msgstr "Hanging Folder"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "ヘルプファイルが索引に含まれていません。"
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3654,6 +3777,18 @@ msgstr "不正な翻訳文字列"
 msgid "Illegal whitespace character"
 msgstr "不正な空白文字"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "インストール可能オプション"
 
@@ -3808,18 +3943,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR ホストまたはプリンター"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "ラベルプリンター"
 
 msgid "Label Top"
 msgstr "ラベルトップ"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "言語 \"%s\" はサポートされていません。"
@@ -3854,6 +3992,12 @@ msgstr ""
 msgid "Light"
 msgstr "薄い"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "1 行が最大値 (255 文字) を超えています"
 
@@ -3869,8 +4013,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "長辺給紙 (縦向き)"
 
-msgid "Looking for printer..."
-msgstr ""
+msgid "Looking for printer."
+msgstr "プリンターを探しています。"
 
 msgid "Main"
 msgstr ""
@@ -3884,7 +4028,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "手差し"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3905,6 +4058,24 @@ msgstr "紙質"
 msgid "Memory allocation error"
 msgstr "メモリー割り当てエラー"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3992,6 +4163,9 @@ msgstr "クラスの変更"
 msgid "Modify Printer"
 msgstr "プリンターの変更"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "すべてのジョブの移動"
 
@@ -4001,6 +4175,12 @@ msgstr "ジョブの移動"
 msgid "Moved Permanently"
 msgstr "別の場所へ移動しました"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -4016,6 +4196,12 @@ msgstr "入れ子になったクラスは許可されていません。"
 msgid "Never"
 msgstr "Never"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "いいえ"
 
@@ -4050,6 +4236,9 @@ msgstr "リクエストに属性がありません。"
 msgid "No authentication information provided."
 msgstr "認証情報が提供されていません。"
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "コミュニティ名がありません"
 
@@ -4104,6 +4293,9 @@ msgstr "リクエストが送られませんでした。"
 msgid "No request-id"
 msgstr "リクエストID がありません"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "リクエストにサブスクリプション属性がありません。"
 
@@ -4181,6 +4373,9 @@ msgstr "OpenUI/JCLOpenUI の前にまず CloseUI/JCLCloseUI が必要です"
 msgid "Operation Policy"
 msgstr "操作ポリシー"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "オプション \"%s\" は %%%%IncludeFeature 経由で含めることはできません。"
@@ -4242,6 +4437,9 @@ msgstr "パケットが Get-Response-PDU を含んでいません"
 msgid "Packet does not start with SEQUENCE"
 msgstr "パケットが SEQUENCE から始まりません"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr "用紙詰まりです。"
 
@@ -4280,18 +4478,63 @@ msgstr "プリンターの休止"
 msgid "Peel-Off"
 msgstr "Peel-Off"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "写真"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "写真ラベル"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "普通紙"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "ポリシー"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "ポートモニター"
 
@@ -4313,9 +4556,18 @@ msgstr "ハガキ 長辺送り"
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr "印刷準備中です。"
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "印刷密度"
 
@@ -4399,6 +4651,9 @@ msgstr "ページ %d, %u%% の印刷が完了しました。"
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quarto"
 
@@ -4449,6 +4704,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4492,7 +4750,22 @@ msgstr "SSL/TLS のネゴシエーションエラー"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4501,7 +4774,25 @@ msgstr "残りを見てください"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4546,9 +4837,15 @@ msgstr "発送先ラベル"
 msgid "Short-Edge (Landscape)"
 msgstr "短辺 (横原稿)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4573,6 +4870,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "特殊紙"
 
@@ -4612,6 +4915,21 @@ msgstr "ページ %d を開始しています。"
 msgid "Statement"
 msgstr "記述"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "サブスクリプション番号 %d は存在しません。"
@@ -4631,6 +4949,9 @@ msgstr "スーパー B/A3"
 msgid "Switching Protocols"
 msgstr "プロトコルの変更"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "タブロイド"
 
@@ -4843,6 +5164,12 @@ msgstr "printer-state-reasons 値が多すぎます (%d > %d)。"
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "OHP シート"
 
@@ -4921,6 +5248,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI が長すぎます"
 
@@ -5043,6 +5376,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "printer-uri を作成できません"
 
@@ -5471,6 +5807,9 @@ msgstr "値は不定長です"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind は不定長です"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version は不定長です"
 
@@ -5486,9 +5825,18 @@ msgstr "プリンターが終了するのを待っています。"
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "警告、Windows 2000 プリンタードライバーがインストールされていません。"
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "Web インターフェイスが無効になっています"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "はい"
 
@@ -6501,9 +6849,6 @@ msgstr "variable-bindings の長さが不定"
 #~ msgid "File Folder "
 #~ msgstr "ファイルフォルダー"
 
-#~ msgid "Looking for printer."
-#~ msgstr "プリンターを探しています。"
-
 #~ msgid "New Stylus Color Series"
 #~ msgstr "New Stylus Color シリーズ"
 

locale/cups_pt_BR.po

@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-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"
@@ -2782,6 +2782,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Sempre"
 
@@ -2791,6 +2794,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Aplicador"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
@@ -2847,6 +2856,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Valor de \"document-format\" inválido \"%s\"."
@@ -3015,6 +3027,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Papel autocolante"
 
@@ -3031,7 +3046,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "Estouro de pilha do buffer detectado, abortando."
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -3055,6 +3070,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr "Não foi possível compartilhar uma impressora remota via Kerberos."
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -3083,12 +3101,21 @@ msgstr "Close-Job não suporta o atributo job-uri."
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Cor"
 
 msgid "Color Mode"
 msgstr "Modo colorido"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3113,18 +3140,33 @@ msgstr "Continuar"
 msgid "Continuous"
 msgstr "Contínuo"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "Arquivo de controle enviado com sucesso."
 
 msgid "Copying print data."
 msgstr "Copiando dados de impressão."
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Criada"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalizar"
 
@@ -3143,6 +3185,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Cortador"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Escuro"
 
@@ -3229,9 +3274,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Duplexador"
 
@@ -3247,12 +3298,18 @@ msgstr "Impressora de etiqueta EPL2"
 msgid "Edit Configuration File"
 msgstr "Editar arquivo de configuração"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "Arquivo PPD vazio."
 
 msgid "Encryption is not supported."
 msgstr "Não há suporte a criptografia."
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Banner ao final"
@@ -3494,6 +3551,9 @@ msgstr "Expressões:"
 msgid "FAIL"
 msgstr "FALHA"
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr "FanFold German"
 
@@ -3537,6 +3597,12 @@ msgstr ""
 "URIs de arquivos de dispositivo foram desabilitadas. Para habilitar, veja a "
 "diretiva FileDevice em \"%s/cups-files.conf\"."
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "Terminou página %d."
@@ -3544,6 +3610,18 @@ msgstr "Terminou página %d."
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3553,6 +3631,9 @@ msgstr "Fólio"
 msgid "Forbidden"
 msgstr "Proibido"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3565,15 +3646,42 @@ msgstr "Genérico"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU usa comprimento indefinido"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Papel brilhante"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "Atributo printer-ui obtido, mas nenhum job-id."
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Escalas de cinza"
 
@@ -3595,13 +3703,28 @@ msgstr "Pasta suspensa"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "Arquivo de ajuda não está no índice."
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3691,6 +3814,18 @@ msgstr "String ilegal de tradução"
 msgid "Illegal whitespace character"
 msgstr "Caractere ilegal de espaço em branco"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Opções instaláveis"
 
@@ -3845,18 +3980,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Impressora ou máquina LPD/LPR"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Impressora de etiqueta"
 
 msgid "Label Top"
 msgstr "Parte superior da etiqueta"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "Não há suporte ao idioma \"%s\"."
@@ -3891,6 +4029,12 @@ msgstr ""
 msgid "Light"
 msgstr "Leve"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Linha maior do que o máximo permitido (255 caracteres)"
 
@@ -3906,8 +4050,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "Borda maior (retrato)"
 
-msgid "Looking for printer..."
-msgstr "Procurando por impressora..."
+msgid "Looking for printer."
+msgstr "Procurando impressoras."
 
 msgid "Main"
 msgstr ""
@@ -3921,7 +4065,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Alimentação manual"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3942,6 +4095,24 @@ msgstr "Médio"
 msgid "Memory allocation error"
 msgstr "Erro de alocação de memória"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -4029,6 +4200,9 @@ msgstr "Modificar classe"
 msgid "Modify Printer"
 msgstr "Modificar impressora"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Mover todos trabalhos"
 
@@ -4038,6 +4212,12 @@ msgstr "Mover trabalho"
 msgid "Moved Permanently"
 msgstr "Mover permanentemente"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -4053,6 +4233,12 @@ msgstr "Classes aninhadas não são permitidas."
 msgid "Never"
 msgstr "Nunca"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Não"
 
@@ -4087,6 +4273,9 @@ msgstr "Nenhum atributo na requisição."
 msgid "No authentication information provided."
 msgstr "Nenhuma informação de autenticação foi fornecida."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Nenhum nome de comunidade"
 
@@ -4143,6 +4332,9 @@ msgstr "Nenhuma requisição enviada."
 msgid "No request-id"
 msgstr "Nenhum request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Nenhum atributo de inscrição na requisição."
 
@@ -4219,6 +4411,9 @@ msgstr "OpenUI/JCLOpenUI sem um CloseUI/JCLCloseUI primeiro"
 msgid "Operation Policy"
 msgstr "Política de operação"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "Opção \"%s\" não pode ser incluída via %%%%IncludeFeature."
@@ -4280,6 +4475,9 @@ msgstr "Pacote não contém um Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "Pacote não inicia com SEQUENCE"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr "Atolamento de papel."
 
@@ -4319,18 +4517,63 @@ msgstr "Pausar impressora"
 msgid "Peel-Off"
 msgstr "Descolar"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Foto"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Foto pequena"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Papel normal"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Políticas"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Monitor de porta"
 
@@ -4352,9 +4595,18 @@ msgstr "Postal borda maior"
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr "Preparando para imprimir."
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Densidade de impressão"
 
@@ -4438,6 +4690,9 @@ msgstr "Imprimindo página %d, %u%% concluído."
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Quarto"
 
@@ -4488,6 +4743,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4531,7 +4789,22 @@ msgstr "Erro de negociação SSL/TLS"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4540,7 +4813,25 @@ msgstr "Veja outro"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4585,9 +4876,15 @@ msgstr "Endereço de entrega"
 msgid "Short-Edge (Landscape)"
 msgstr "Borda menor (paisagem)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4612,6 +4909,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Papel especial"
 
@@ -4651,6 +4954,21 @@ msgstr "Iniciando página %d."
 msgid "Statement"
 msgstr "Declaração"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "Inscrição #%d não existe."
@@ -4670,6 +4988,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Alternando protocolos"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloide"
 
@@ -4886,6 +5207,12 @@ msgstr "Há valores de printer-state-reasons demais (%d >%d)."
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Transparência"
 
@@ -4964,6 +5291,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI muito longa"
 
@@ -5092,6 +5425,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "Não foi possível copiar arquivos de driver de impressora (%d) de Windows 9x."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Não foi possível criar uri de impressora"
 
@@ -5523,6 +5859,9 @@ msgstr "Valor usa comprimento indefinido"
 msgid "VarBind uses indefinite length"
 msgstr "VarBind usa comprimento indefinido"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Version usa comprimento indefinido"
 
@@ -5538,9 +5877,18 @@ msgstr "Esperando a impressora finalizar."
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "Aviso, nenhum driver de impressora Windows 2000 está instalado."
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "Interface web está desabilitada"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sim"
 
@@ -6496,8 +6844,8 @@ msgstr "variable-bindings usa comprimento indefinido"
 #~ msgid "File Folder "
 #~ msgstr "Pasta do arquivo "
 
-#~ msgid "Looking for printer."
-#~ msgstr "Procurando impressoras."
+#~ msgid "Looking for printer..."
+#~ msgstr "Procurando por impressora..."
 
 #~ msgid "New Stylus Color Series"
 #~ msgstr "Nova Stylus Color Séries"

locale/cups_ru.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2016-06-24 11:07-0400\n"
+"POT-Creation-Date: 2016-08-30 16:00-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -2715,6 +2715,9 @@ msgstr ""
 msgid "Alternate Roll"
 msgstr ""
 
+msgid "Aluminum"
+msgstr ""
+
 msgid "Always"
 msgstr "Всегда"
 
@@ -2724,6 +2727,12 @@ msgstr "AppSocket/HP JetDirect"
 msgid "Applicator"
 msgstr "Исполнительное устройство"
 
+msgid "Archival Envelope"
+msgstr ""
+
+msgid "Archival Fabric"
+msgstr ""
+
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr "Попытка установить %s printer-state на неверное значение %d"
@@ -2779,6 +2788,9 @@ msgstr "B8"
 msgid "B9"
 msgstr "B9"
 
+msgid "Back Print Film"
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2947,6 +2959,9 @@ msgstr ""
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
+msgid "Bond Envelope"
+msgstr ""
+
 msgid "Bond Paper"
 msgstr "Документная бумага"
 
@@ -2963,7 +2978,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr "Обнаружено переполнение буфера, прерывание."
 
-msgid "CD/DVD/Bluray"
+msgid "CD"
 msgstr ""
 
 msgid "CMYK"
@@ -2987,6 +3002,9 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
+msgid "Cardboard"
+msgstr ""
+
 msgid "Cardstock"
 msgstr ""
 
@@ -3015,12 +3033,21 @@ msgstr "Close-Job не подерживает атрибут job-uri"
 msgid "Coat"
 msgstr ""
 
+msgid "Coated Envelope"
+msgstr ""
+
+msgid "Coated Paper"
+msgstr ""
+
 msgid "Color"
 msgstr "Цвет"
 
 msgid "Color Mode"
 msgstr "Цветной режим"
 
+msgid "Colored Labels"
+msgstr ""
+
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3045,18 +3072,33 @@ msgstr "Продолжить"
 msgid "Continuous"
 msgstr "Непрерывно"
 
+msgid "Continuous Long"
+msgstr ""
+
+msgid "Continuous Short"
+msgstr ""
+
 msgid "Control file sent successfully."
 msgstr "Контрольный файл успешно отправлен."
 
 msgid "Copying print data."
 msgstr "Копирование данных печати."
 
+msgid "Cotton Envelope"
+msgstr ""
+
 msgid "Cover"
 msgstr ""
 
 msgid "Created"
 msgstr "Создано"
 
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Индивидуальный"
 
@@ -3075,6 +3117,9 @@ msgstr ""
 msgid "Cutter"
 msgstr "Резак"
 
+msgid "DVD"
+msgstr ""
+
 msgid "Dark"
 msgstr "Темный"
 
@@ -3155,9 +3200,15 @@ msgstr ""
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Double Wall Cardboard"
+msgstr ""
+
 msgid "Draft"
 msgstr ""
 
+msgid "Dry Film"
+msgstr ""
+
 msgid "Duplexer"
 msgstr "Дуплексер"
 
@@ -3173,12 +3224,18 @@ msgstr "Принтер для печати этикеток EPL2"
 msgid "Edit Configuration File"
 msgstr "Редактировать файл конфигурации"
 
+msgid "Embossing Foil"
+msgstr ""
+
 msgid "Empty PPD file."
 msgstr "Пустой PPD файл."
 
 msgid "Encryption is not supported."
 msgstr "Шифрование не поддерживается."
 
+msgid "End Board"
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Конечный баннер"
@@ -3420,6 +3477,9 @@ msgstr "Выражение:"
 msgid "FAIL"
 msgstr "FAIL"
 
+msgid "Fabric"
+msgstr ""
+
 msgid "FanFold German"
 msgstr ""
 
@@ -3463,6 +3523,12 @@ msgstr ""
 "URI-адреса файлового устройства отключены! Чтобы включить их, используйте "
 "параметр FileDevice в \"%s/cups-files.conf\"."
 
+msgid "Film"
+msgstr ""
+
+msgid "Fine Envelope"
+msgstr ""
+
 #, c-format
 msgid "Finished page %d."
 msgstr "Последняя страница %d."
@@ -3470,6 +3536,18 @@ msgstr "Последняя страница %d."
 msgid "Finishing"
 msgstr ""
 
+msgid "Flexo Base"
+msgstr ""
+
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+msgid "Flute"
+msgstr ""
+
+msgid "Foil"
+msgstr ""
+
 msgid "Fold"
 msgstr ""
 
@@ -3479,6 +3557,9 @@ msgstr "Фолио"
 msgid "Forbidden"
 msgstr "Запрещено"
 
+msgid "Full Cut Tabs"
+msgstr ""
+
 msgid "Gate Fold"
 msgstr ""
 
@@ -3491,15 +3572,42 @@ msgstr "Общее"
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Для Get-Response-PDU длина не установлена"
 
+msgid "Glass"
+msgstr ""
+
+msgid "Glass Colored"
+msgstr ""
+
+msgid "Glass Opaque"
+msgstr ""
+
+msgid "Glass Surfaced"
+msgstr ""
+
+msgid "Glass Textured"
+msgstr ""
+
+msgid "Glossy Fabric"
+msgstr ""
+
+msgid "Glossy Labels"
+msgstr ""
+
+msgid "Glossy Optical Disc"
+msgstr ""
+
 msgid "Glossy Paper"
 msgstr "Глянцевая бумага"
 
-msgid "Glossy Photo"
+msgid "Glossy Photo Paper"
 msgstr ""
 
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "Получен атрибут printer-uri, но не job-id"
 
+msgid "Gravure Cylinder"
+msgstr ""
+
 msgid "Grayscale"
 msgstr "Оттенки серого"
 
@@ -3521,13 +3629,28 @@ msgstr "Папка подвесного хранения"
 msgid "Hash buffer too small."
 msgstr ""
 
+msgid "Heavyweight Envelope"
+msgstr ""
+
+msgid "Heavyweight Paper"
+msgstr ""
+
 msgid "Help file not in index."
 msgstr "Файл справки не проиндексирован."
 
 msgid "High"
 msgstr ""
 
-msgid "High-Gloss Photo"
+msgid "High Gloss Fabric"
+msgstr ""
+
+msgid "High Gloss Labels"
+msgstr ""
+
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+msgid "High Gloss Photo Paper"
 msgstr ""
 
 msgid "IPP 1setOf attribute with incompatible value tags."
@@ -3617,6 +3740,18 @@ msgstr "Недействительный перевод"
 msgid "Illegal whitespace character"
 msgstr "Недействительный символ пробела"
 
+msgid "Image Setter Paper"
+msgstr ""
+
+msgid "Imaging Cylinder"
+msgstr ""
+
+msgid "Inkjet Envelope"
+msgstr ""
+
+msgid "Inkjet Labels"
+msgstr ""
+
 msgid "Installable Options"
 msgstr "Параметры, разрешенные к установке"
 
@@ -3771,18 +3906,21 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Хост или принтер LPD/LPR"
 
-msgid "Label"
-msgstr ""
-
 msgid "Label Printer"
 msgstr "Принтер для печати этикеток"
 
 msgid "Label Top"
 msgstr "Верхний край этикетки"
 
+msgid "Labels"
+msgstr ""
+
 msgid "Laminate"
 msgstr ""
 
+msgid "Laminating Foil"
+msgstr ""
+
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "Язык \"%s\" не поддерживается."
@@ -3817,6 +3955,12 @@ msgstr ""
 msgid "Light"
 msgstr "Светлый"
 
+msgid "Lightweight Envelope"
+msgstr ""
+
+msgid "Lightweight Paper"
+msgstr ""
+
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Строка длиннее разрешенного предела (255 символов)"
 
@@ -3832,8 +3976,8 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr "По длинной стороне (книжная)"
 
-msgid "Looking for printer..."
-msgstr ""
+msgid "Looking for printer."
+msgstr "Поиск принтера."
 
 msgid "Main"
 msgstr ""
@@ -3847,7 +3991,16 @@ msgstr ""
 msgid "Manual Feed"
 msgstr "Ручная подача"
 
-msgid "Matte Photo"
+msgid "Matte Fabric"
+msgstr ""
+
+msgid "Matte Labels"
+msgstr ""
+
+msgid "Matte Optical Disc"
+msgstr ""
+
+msgid "Matte Photo Paper"
 msgstr ""
 
 msgid "Media Size"
@@ -3868,6 +4021,24 @@ msgstr "Средний"
 msgid "Memory allocation error"
 msgstr "Ошибка выделения памяти"
 
+msgid "Metal"
+msgstr ""
+
+msgid "Metal Glossy"
+msgstr ""
+
+msgid "Metal High Gloss"
+msgstr ""
+
+msgid "Metal Matte"
+msgstr ""
+
+msgid "Metal Satin"
+msgstr ""
+
+msgid "Metal Semi Gloss"
+msgstr ""
+
 msgid "Middle"
 msgstr ""
 
@@ -3955,6 +4126,9 @@ msgstr "Изменить группу"
 msgid "Modify Printer"
 msgstr "Изменить принтер"
 
+msgid "Mounting Tape"
+msgstr ""
+
 msgid "Move All Jobs"
 msgstr "Переместить все задания"
 
@@ -3964,6 +4138,12 @@ msgstr "Переместить задание"
 msgid "Moved Permanently"
 msgstr "Перемещено окончательно"
 
+msgid "Multi Layer"
+msgstr ""
+
+msgid "Multi Part Form"
+msgstr ""
+
 msgid "Multipurpose"
 msgstr ""
 
@@ -3979,6 +4159,12 @@ msgstr "Вложенные группы не допускаются."
 msgid "Never"
 msgstr "Никогда"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Нет"
 
@@ -4013,6 +4199,9 @@ msgstr "Нет атрибутов в запросе."
 msgid "No authentication information provided."
 msgstr "Нет информации для проверки подлинности."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Нет имени сообщества"
 
@@ -4068,6 +4257,9 @@ msgstr "Не отправлен запрос."
 msgid "No request-id"
 msgstr "Нет идентификатора request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Нет атрибутов подписки в запросе."
 
@@ -4145,6 +4337,9 @@ msgstr "OpenUI/JCLOpenUI без предыдущего CloseUI/JCLCloseUI"
 msgid "Operation Policy"
 msgstr "Политика операций"
 
+msgid "Optical Disc"
+msgstr ""
+
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "Параметр \"%s\" не может быть добавлен через %%%%IncludeFeature."
@@ -4206,6 +4401,9 @@ msgstr "В пакете нет Get-Response-PDU"
 msgid "Packet does not start with SEQUENCE"
 msgstr "Нет индикатора SEQUENCE в начале пакета"
 
+msgid "Paper"
+msgstr ""
+
 msgid "Paper jam."
 msgstr "Замятие бумаги."
 
@@ -4244,18 +4442,63 @@ msgstr "Приостановить принтер"
 msgid "Peel-Off"
 msgstr "Съемный слой"
 
+msgid "Permanent Labels"
+msgstr ""
+
 msgid "Photo"
 msgstr "Фото"
 
+msgid "Photo Film"
+msgstr ""
+
 msgid "Photo Labels"
 msgstr "Фотоэтикетки"
 
+msgid "Photo Paper"
+msgstr ""
+
+msgid "Photographic Archival"
+msgstr ""
+
+msgid "Plain Envelope"
+msgstr ""
+
 msgid "Plain Paper"
 msgstr "Обычная бумага"
 
+msgid "Plastic"
+msgstr ""
+
+msgid "Plastic Archival"
+msgstr ""
+
+msgid "Plastic Colored"
+msgstr ""
+
+msgid "Plastic Glossy"
+msgstr ""
+
+msgid "Plastic High Gloss"
+msgstr ""
+
+msgid "Plastic Matte"
+msgstr ""
+
+msgid "Plastic Satin"
+msgstr ""
+
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+msgid "Plate"
+msgstr ""
+
 msgid "Policies"
 msgstr "Политики"
 
+msgid "Polyester"
+msgstr ""
+
 msgid "Port Monitor"
 msgstr "Мониторинг порта"
 
@@ -4277,9 +4520,18 @@ msgstr "Открытка Long Edge"
 msgid "Poster Fold"
 msgstr ""
 
+msgid "Pre Cut Tabs"
+msgstr ""
+
 msgid "Preparing to print."
 msgstr "Подготовка к печати."
 
+msgid "Preprinted Envelope"
+msgstr ""
+
+msgid "Preprinted Paper"
+msgstr ""
+
 msgid "Print Density"
 msgstr "Плотность печати"
 
@@ -4363,6 +4615,9 @@ msgstr "Печать страницы %d, %u%% завершена."
 msgid "Punch"
 msgstr ""
 
+msgid "Punched Paper"
+msgstr ""
+
 msgid "Quarto"
 msgstr "Кватро"
 
@@ -4414,6 +4669,9 @@ msgstr ""
 msgid "Right Gate Fold"
 msgstr ""
 
+msgid "Roll"
+msgstr ""
+
 msgid "Roll 1"
 msgstr ""
 
@@ -4457,7 +4715,22 @@ msgstr "SSL/TLS Negotiation Error"
 msgid "Saddle Stitch"
 msgstr ""
 
-msgid "Satin Photo"
+msgid "Satin Labels"
+msgstr ""
+
+msgid "Satin Optical Disc"
+msgstr ""
+
+msgid "Satin Photo Paper"
+msgstr ""
+
+msgid "Screen"
+msgstr ""
+
+msgid "Screen Paged"
+msgstr ""
+
+msgid "Security Labels"
 msgstr ""
 
 msgid "See Other"
@@ -4466,7 +4739,25 @@ msgstr "Посмотреть другие"
 msgid "See remote printer."
 msgstr ""
 
-msgid "Semi-Gloss Photo"
+msgid "Self Adhesive"
+msgstr ""
+
+msgid "Self Adhesive Film"
+msgstr ""
+
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
 msgid "Sending data to printer."
@@ -4511,9 +4802,15 @@ msgstr "Адрес доставки"
 msgid "Short-Edge (Landscape)"
 msgstr "По короткой стороне (альбомная)"
 
+msgid "Shrink Foil"
+msgstr ""
+
 msgid "Side"
 msgstr ""
 
+msgid "Single Face"
+msgstr ""
+
 msgid "Single Punch (Landscape)"
 msgstr ""
 
@@ -4538,6 +4835,12 @@ msgstr ""
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Single Wall Cardboard"
+msgstr ""
+
+msgid "Sleeve"
+msgstr ""
+
 msgid "Special Paper"
 msgstr "Особая бумага"
 
@@ -4577,6 +4880,21 @@ msgstr "Главная страница %d."
 msgid "Statement"
 msgstr "Оператор"
 
+msgid "Stationery"
+msgstr ""
+
+msgid "Stationery Archival"
+msgstr ""
+
+msgid "Stationery Cotton"
+msgstr ""
+
+msgid "Stationery Heavyweight Coated"
+msgstr ""
+
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "Подписка #%d не существует."
@@ -4596,6 +4914,9 @@ msgstr "Super B/A3"
 msgid "Switching Protocols"
 msgstr "Протоколы переключения"
 
+msgid "Tab Stock"
+msgstr ""
+
 msgid "Tabloid"
 msgstr "Tabloid"
 
@@ -4804,6 +5125,12 @@ msgstr "Слишком много значений printer-state-reasons (%d > %
 msgid "Top"
 msgstr ""
 
+msgid "Tractor"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
 msgid "Transparency"
 msgstr "Прозрачность"
 
@@ -4882,6 +5209,12 @@ msgstr ""
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "Слишком длинный адрес URI"
 
@@ -5005,6 +5338,9 @@ msgstr "Не удается копировать файлы драйвера п
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)"
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Не удается создать printer-uri"
 
@@ -5434,6 +5770,9 @@ msgstr "Для значения длина не установлена"
 msgid "VarBind uses indefinite length"
 msgstr "Для VarBind длина не установлена"
 
+msgid "Vellum Paper"
+msgstr ""
+
 msgid "Version uses indefinite length"
 msgstr "Для Version длина не установлена"
 
@@ -5449,9 +5788,18 @@ msgstr "Ожидание окончания работы принтера."
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "Внимание, драйверы принтера Windows 2000 не установлены"
 
+msgid "Waterproof Fabric"
+msgstr ""
+
 msgid "Web Interface is Disabled"
 msgstr "Web интерфейс отключен"
 
+msgid "Wet Film"
+msgstr ""
+
+msgid "Windowed Envelope"
+msgstr ""
+
 msgid "Yes"
 msgstr "Да"
 
@@ -6391,9 +6739,6 @@ msgstr "Для variable-bindings длина не установлена"
 #~ msgid "File Folder "
 #~ msgstr "Каталог файла "
 
-#~ msgid "Looking for printer."
-#~ msgstr "Поиск принтера."
-
 #~ msgid "Postcard Double "
 #~ msgstr "Открытка двойная"
 

scheduler/cups-driverd.cxx

@@ -31,7 +31,7 @@
  * Constants...
  */
 
-#define PPD_SYNC	0x50504438	/* Sync word for ppds.dat (PPD8) */
+#define PPD_SYNC	0x50504439	/* Sync word for ppds.dat (PPD9) */
 #define PPD_MAX_LANG	32		/* Maximum languages */
 #define PPD_MAX_PROD	32		/* Maximum products */
 #define PPD_MAX_VERS	32		/* Maximum versions */
@@ -75,7 +75,7 @@ typedef struct				/**** PPD record ****/
   int		model_number;		/* cupsModelNumber */
   int		type;			/* ppd-type */
   char		filename[512],		/* Filename */
-		name[512],		/* PPD name */
+		name[256],		/* PPD name */
 		languages[PPD_MAX_LANG][6],
 					/* LanguageVersion/cupsLanguages */
 		products[PPD_MAX_PROD][128],
@@ -1719,7 +1719,7 @@ load_drivers(cups_array_t *include,	/* I - Drivers to include */
   char		*argv[3],		/* Arguments for command */
 		filename[1024],		/* Name of driver */
 		line[2048],		/* Line from driver */
-		name[512],		/* ppd-name */
+		name[256],		/* ppd-name */
 		make[128],		/* ppd-make */
 		make_and_model[128],	/* ppd-make-and-model */
 		device_id[256],		/* ppd-device-id */
@@ -1852,7 +1852,7 @@ load_drivers(cups_array_t *include,	/* I - Drivers to include */
 	psversion[0] = '\0';
 	strlcpy(type_str, "postscript", sizeof(type_str));
 
-        if (sscanf(line, "\"%511[^\"]\"%127s%*[ \t]\"%127[^\"]\""
+        if (sscanf(line, "\"%255[^\"]\"%127s%*[ \t]\"%127[^\"]\""
 	                 "%*[ \t]\"%127[^\"]\"%*[ \t]\"%255[^\"]\""
 			 "%*[ \t]\"%127[^\"]\"%*[ \t]\"%127[^\"]\""
 			 "%*[ \t]\"%127[^\"]\"",
@@ -2383,7 +2383,7 @@ load_ppds(const char *d,		/* I - Actual directory */
   char		filename[1024],		/* Name of PPD or directory */
 		line[256],		/* Line from file */
 		*ptr,			/* Pointer into name */
-		name[128];		/* Name of PPD file */
+		name[256];		/* Name of PPD file */
   ppd_info_t	*ppd,			/* New PPD file */
 		key;			/* Search key */
 

scheduler/ipp.c

@@ -124,8 +124,7 @@ static void	send_ipp_status(cupsd_client_t *con, ipp_status_t status,
 static void	set_default(cupsd_client_t *con, ipp_attribute_t *uri);
 static void	set_job_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
 static void	set_printer_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
-static void	set_printer_defaults(cupsd_client_t *con,
-		                     cupsd_printer_t *printer);
+static int	set_printer_defaults(cupsd_client_t *con, cupsd_printer_t *printer);
 static void	start_printer(cupsd_client_t *con, ipp_attribute_t *uri);
 static void	stop_printer(cupsd_client_t *con, ipp_attribute_t *uri);
 static void	url_encode_attr(ipp_attribute_t *attr, char *buffer, size_t bufsize);
@@ -987,6 +986,9 @@ add_class(cupsd_client_t  *con,		/* I - Client connection */
       */
 
       send_ipp_status(con, IPP_BAD_REQUEST, _("Cannot change printer-is-shared for remote queues."));
+      if (!modify)
+	cupsdDeletePrinter(pclass, 0);
+
       return;
     }
 
@@ -1009,6 +1011,9 @@ add_class(cupsd_client_t  *con,		/* I - Client connection */
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Attempt to set %s printer-state to bad value %d."),
                       pclass->name, attr->values[0].integer);
+      if (!modify)
+	cupsdDeletePrinter(pclass, 0);
+
       return;
     }
 
@@ -1065,12 +1070,18 @@ add_class(cupsd_client_t  *con,		/* I - Client connection */
 
 	send_ipp_status(con, IPP_NOT_FOUND,
                 	_("The printer or class does not exist."));
+	if (!modify)
+	  cupsdDeletePrinter(pclass, 0);
+
 	return;
       }
       else if (dtype & CUPS_PRINTER_CLASS)
       {
         send_ipp_status(con, IPP_BAD_REQUEST,
 			_("Nested classes are not allowed."));
+	if (!modify)
+	  cupsdDeletePrinter(pclass, 0);
+
         return;
       }
 
@@ -1082,7 +1093,13 @@ add_class(cupsd_client_t  *con,		/* I - Client connection */
     }
   }
 
-  set_printer_defaults(con, pclass);
+  if (!set_printer_defaults(con, pclass))
+  {
+    if (!modify)
+      cupsdDeletePrinter(pclass, 0);
+
+    return;
+  }
 
   if ((attr = ippFindAttribute(con->request, "auth-info-required",
                                IPP_TAG_KEYWORD)) != NULL)
@@ -2344,22 +2361,6 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     http_uri_status_t	uri_status;	/* URI separation status */
     char		old_device_uri[1024];
 					/* Old device URI */
-    static const char * const uri_status_strings[] =
-    {
-      "URI too large.",
-      "Bad arguments to function.",
-      "Bad resource path.",
-      "Bad port number.",
-      "Bad hostname/address.",
-      "Bad username/password.",
-      "Bad URI scheme.",
-      "Bad URI.",
-      "OK",
-      "Missing URI scheme.",
-      "Unknown URI scheme",
-      "Missing resource path."
-    };
-
 
     need_restart_job = 1;
 
@@ -2370,14 +2371,15 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 				 host, sizeof(host), &port,
 				 resource, sizeof(resource));
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG,
-		    "%s device-uri: %s", printer->name,
-		    uri_status_strings[uri_status - HTTP_URI_STATUS_OVERFLOW]);
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "%s device-uri: %s", printer->name, httpURIStatusString(uri_status));
 
     if (uri_status < HTTP_URI_OK)
     {
       send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"."),
 		      attr->values[0].string.text);
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2398,6 +2400,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 	                  "To enable, see the FileDevice directive in "
 			  "\"%s/cups-files.conf\"."),
 			ServerRoot);
+	if (!modify)
+	  cupsdDeletePrinter(printer, 0);
+
 	return;
       }
     }
@@ -2416,6 +2421,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 
 	send_ipp_status(con, IPP_NOT_POSSIBLE,
                         _("Bad device-uri scheme \"%s\"."), scheme);
+	if (!modify)
+	  cupsdDeletePrinter(printer, 0);
+
 	return;
       }
     }
@@ -2460,6 +2468,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     {
       send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"."),
         	      attr->values[0].string.text);
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2499,6 +2510,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Cannot share a remote Kerberized printer."));
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2509,6 +2523,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
       */
 
       send_ipp_status(con, IPP_BAD_REQUEST, _("Cannot change printer-is-shared for remote queues."));
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2532,6 +2549,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     {
       send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d."),
                       attr->values[0].integer);
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2568,6 +2588,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 		      attr->num_values,
 		      (int)(sizeof(printer->reasons) /
 		            sizeof(printer->reasons[0])));
+      if (!modify)
+        cupsdDeletePrinter(printer, 0);
+
       return;
     }
 
@@ -2601,7 +2624,13 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
                   "Printer \"%s\" state changed.", printer->name);
   }
 
-  set_printer_defaults(con, printer);
+  if (!set_printer_defaults(con, printer))
+  {
+    if (!modify)
+      cupsdDeletePrinter(printer, 0);
+
+    return;
+  }
 
   if ((attr = ippFindAttribute(con->request, "auth-info-required",
                                IPP_TAG_KEYWORD)) != NULL)
@@ -2642,6 +2671,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
       if (strncmp(line, "*PPD-Adobe", 10))
       {
 	send_ipp_status(con, IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED, _("Bad PPD file."));
+	if (!modify)
+	  cupsdDeletePrinter(printer, 0);
+
 	return;
       }
 
@@ -2656,6 +2688,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
       if (copy_file(srcfile, dstfile, ConfigFilePerm))
       {
 	send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file - %s"), strerror(errno));
+	if (!modify)
+	  cupsdDeletePrinter(printer, 0);
+
 	return;
       }
 
@@ -2682,6 +2717,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     else if (strstr(ppd_name, "../"))
     {
       send_ipp_status(con, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, _("Invalid ppd-name value."));
+      if (!modify)
+	cupsdDeletePrinter(printer, 0);
+
       return;
     }
     else
@@ -2695,6 +2733,9 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
       if (copy_model(con, ppd_name, dstfile))
       {
         send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file."));
+	if (!modify)
+	  cupsdDeletePrinter(printer, 0);
+
 	return;
       }
 
@@ -2711,8 +2752,7 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 
     char cache_name[1024];		/* Cache filename for printer attrs */
 
-    snprintf(cache_name, sizeof(cache_name), "%s/%s.data", CacheDir,
-             printer->name);
+    snprintf(cache_name, sizeof(cache_name), "%s/%s.data", CacheDir, printer->name);
     unlink(cache_name);
 
     cupsdSetPrinterReasons(printer, "none");
@@ -10576,7 +10616,7 @@ set_printer_attrs(cupsd_client_t  *con,	/* I - Client connection */
  * 'set_printer_defaults()' - Set printer default options from a request.
  */
 
-static void
+static int				/* O - 1 on success, 0 on failure */
 set_printer_defaults(
     cupsd_client_t  *con,		/* I - Client connection */
     cupsd_printer_t *printer)		/* I - Printer */
@@ -10705,7 +10745,7 @@ set_printer_defaults(
 	send_ipp_status(con, IPP_NOT_POSSIBLE,
                 	_("Unknown printer-op-policy \"%s\"."),
                 	attr->values[0].string.text);
-	return;
+	return (0);
       }
     }
     else if (!strcmp(attr->name, "printer-error-policy"))
@@ -10722,7 +10762,7 @@ set_printer_defaults(
 	send_ipp_status(con, IPP_NOT_POSSIBLE,
                 	_("Unknown printer-error-policy \"%s\"."),
                 	attr->values[0].string.text);
-	return;
+	return (0);
       }
 
       cupsdLogMessage(CUPSD_LOG_DEBUG,
@@ -10818,6 +10858,8 @@ set_printer_defaults(
 	  break;
     }
   }
+
+  return (1);
 }
 
 

scheduler/job.c

@@ -3544,6 +3544,13 @@ finalize_job(cupsd_job_t *job,		/* I - Job */
 
   cupsArrayRemove(PrintingJobs, job);
 
+ /*
+  * Clear informational messages...
+  */
+
+  if (job->status_level > CUPSD_LOG_ERROR)
+    job->printer->state_message[0] = '\0';
+
  /*
   * Apply any PPD updates...
   */

systemv/Dependencies

@@ -62,7 +62,7 @@ lpinfo.o: lpinfo.c ../cups/cups-private.h ../cups/string-private.h \
   ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
-  ../cups/thread-private.h
+  ../cups/thread-private.h ../cups/adminutil.h
 lpmove.o: lpmove.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \

templates/de/add-class.tmpl

@@ -8,17 +8,17 @@
 <TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Darf alle druckbaren Zeichen ausser "/", "#", und Leerzeichen enthalten)</SMALL></TD>
+<SMALL>(Darf alle druckbaren Zeichen außer "/", "#", und Leerzeichen enthalten)</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Beschreibung:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Für Menschen lesbare Beschreibung wie "HP LaserJet with Duplexer")</SMALL></TD>
+<SMALL>(Menschenlesbare Beschreibung wie etwa "HP LaserJet mit Duplexer")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Ort:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Für Menschen lesbarer Ort wie "Lab 1")</SMALL></TD>
+<SMALL>(Menschenlesbarer Ort wie etwa "Labor 1")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Mitglieder:</TH>

templates/de/add-printer.tmpl

@@ -14,7 +14,7 @@
 <TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Darf druckbare Zeichen enthalten ausser "/", "#", und Leerzeichen)</SMALL></TD>
+<SMALL>(Darf alle druckbaren Zeichen außer "/", "#", und Leerzeichen enthalten)</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Beschreibung:</TH>
@@ -33,7 +33,7 @@
 <TR>
 <TH CLASS="label">Freigabe:</TH>
 <TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
-Gebe diesen Drucker frei</TD>
+Drucker im Netzwerk freigeben</TD>
 </TR>
 <TR>
 <TD></TD>

templates/de/add-rss-subscription.tmpl

@@ -2,13 +2,13 @@
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
 
-<H2 CLASS="title">RSS Subskription hinzufügen</H2>
+<H2 CLASS="title">RSS-Abonnement hinzufügen</H2>
 
-<TABLE SUMMARY="Forumlar zum Hinzufügen einer RSS Subskription">
+<TABLE SUMMARY="Formular zum Hinzufügen eines RSS-Abonnements">
 <TR>
 <TH CLASS="label">Name:</TH>
 <TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
-<SMALL>(Darf alle druckbaren Zeichen ausser Leerzeichen, "/", "?", und "#" enthalten)</SMALL></TD>
+<SMALL>(Darf alle druckbaren Zeichen außer Leerzeichen, "/", "?" und "#" enthalten)</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Warteschlange:</TH>
@@ -19,7 +19,7 @@
 <TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Auftrag erstellt<BR>
 <INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Auftrag abgeschlossen<BR>
 <INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Auftrag angehalten<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Auftrags Parameter Geändert</TD>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Auftragsparameter geändert</TD>
 <TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 <TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Warteschlange angehalten<BR>
 <INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Warteschlange hinzugefügt<BR>
@@ -29,7 +29,7 @@
 <TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Server gestartet<BR>
 <INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Server angehalten<BR>
 <INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Server neu gestartet<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Server Sicherheits Prüfung</TD>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Server-Sicherheitsprüfung</TD>
 </TR>
 <TR>
 <TH CLASS="label">Maximale Ereignisse in Durchführung:</TH>
@@ -37,7 +37,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription hinzufügen"></TD>
+<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement hinzufügen"></TD>
 </TR>
 </TABLE>
 

templates/de/admin.tmpl

@@ -3,23 +3,23 @@
     <H2 CLASS="title">Drucker</H2>
 
     <P>
-    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Füge Drucker hinzu"></FORM>
-    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Finde neue Drucker"></FORM>
-    <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Drucker"></FORM>
-    {have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Exportiere Drucker nach Samba"></FORM>:}
+    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Drucker hinzufügen"></FORM>
+    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Neue Drucker suchen"></FORM>
+    <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Drucker verwalten"></FORM>
+    {have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Drucker für Samba freigeben"></FORM>:}
     </P>
 
     <H2 CLASS="title">Klassen</H2>
 
     <P>
     <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Klasse hinzufügen"></FORM>
-    <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Klasse managen"></FORM>
+    <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Klassen verwalten"></FORM>
     </P>
 
     <H2 CLASS="title">Aufträge</H2>
 
     <P>
-    <FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Aufträge managen"></FORM>
+    <FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Aufträge verwalten"></FORM>
     </P>
   </div>
   <div class="halves">
@@ -27,9 +27,9 @@
 
     <P>
     <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Konfigurationsdatei bearbeiten"></FORM>
-    <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Zugriffs-Log zeigen"></FORM>
-    <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Fehler-Log zeigen"></FORM>
-    <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Seiten-Log zeigen"></FORM>
+    <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Zugriffsprotokoll anzeigen"></FORM>
+    <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Fehlerprotokoll anzeigen"></FORM>
+    <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Seitenprotokoll anzeigen"></FORM>
     </P>
 
     {SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
@@ -43,55 +43,55 @@
     <P><A HREF="/admin/">Erweitert <SMALL>&#x25bc;</SMALL></A><BR>
     <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
     <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
-    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Drucker dieses Systems im Netz freigeben<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max clients\:
+    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Mit diesem System verbundene Drucker freigeben<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximale Anzahl an Clients\:
     <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Erlaube Druck aus dem Internet<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Mache die Web-Schnittstelle bekannt<BR>
-    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Erlaube Fernwartung<BR>
-    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Benutze Kerberos-Authentifizierung (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
-    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Erlaube Benutzern beliebige Aufträge abzubrechen (nicht nur die Eigenen)<BR>
-    <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Behalte die Auftragshistorie<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximale Auftragsanzehl (0 für unbegrenzt)\:
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Drucken aus dem Internet zulassen<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Weboberfläche im Netzwerk bekanntmachen<BR>
+    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Fernwartung zulassen<BR>
+    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)<BR>
+    <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Auftragsverlauf behalten<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximale Auftragsanzahl (0 für unbegrenzt)\:
     <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Behalte Metadaten\:
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Metadaten aufbewahren\:
     <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Behalte Dokumente\:
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Dokumente aufbewahren\:
     <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
-    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximale logDateigrösse\:
+    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Mehr Informationen zur Fehlersuche speichern<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximale Protokoll-Dateigröße\:
     <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
 
-    :<P><B>Server Einstellungen:</B></P>
+    :<P><B>Server-Einstellungen:</B></P>
 
     <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Erweitert <SMALL>&#x25b6;</SMALL></A><BR>
     <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Drucker dieses Systems im Netz freigeben<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Erlaube den Druck aus dem Internet<BR>
-    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Erlaube Fernwartung<BR>
-    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Benutze Kerberos Authentifizierung (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
-    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Erlaube Benutzern alle Aufträge zu löschen (nicht nur die eigenen)<BR>
-    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Speichere debugging Information zur Fehlersuche</P>
+    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Mit diesem System verbundene Drucker freigeben<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Drucken aus dem Internet zulassen<BR>
+    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Fernwartung zulassen<BR>
+    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Kerberos-Authentifizierung verwenden (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Benutzern erlauben beliebige Aufträge abzubrechen (nicht nur die eigenen)<BR>
+    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Mehr Informationen zur Fehlersuche speichern</P>
 
     }
-    <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Ändere Eintellungen"></P>
+    <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Einstellungen ändern"></P>
 
     </FORM>}
   </div>
 </div>
 
 <div class="row">
-  <H2 CLASS="title">RSS Subskriptionen</H2>
+  <H2 CLASS="title">RSS-Abonnements</H2>
 
   <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription hinzufügen"></FORM>
+  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement hinzufügen"></FORM>
   </P>
 
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subskriptionen">
-  <THEAD><TR><TH>Name</TH><TH>Ereignisse</TH><TH>Queue Name</TH></TR></THEAD>
+  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS-Abonnements">
+  <THEAD><TR><TH>Name</TH><TH>Ereignis</TH><TH>Warteschlange</TH></TR></THEAD>
   <TBODY>{[notify_subscription_id]
   <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription kündigen"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
+  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement beenden"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>}
   </TBODY>
   </TABLE>:}
-</div>
+</div>

templates/de/choose-device.tmpl

@@ -15,17 +15,17 @@
 <TH CLASS="label">Lokale Drucker\:</TH>
 <TD>
 {[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unbekannt?|{device_make_and_model}:}">
-{device_info} {?device_make_and_model!Unbekannt?({device_make_and_model}):}<BR>
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
 :}}
 </TD>
 </TR>
 <TR>
-<TH CLASS="label">Entdeckte Netzwerkdrucker\:</TH>
+<TH CLASS="label">Gefundene Netzwerkdrucker\:</TH>
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unbekannt?|{device_make_and_model}:}">
-{device_info} {?device_make_and_model!Unbekannt?({device_make_and_model}):}<BR>
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
 :}:}}
 </TD>
 </TR>
@@ -46,4 +46,4 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 </TABLE>
 
 </FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
-ALT="Busy Indicator"> Suche nach Druckern...</P>}
+ALT="Beschäftigungsanzeige"> Suche nach Druckern…</P>}

templates/de/choose-make.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen (Schritt4/5)}</H2>
+<H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen (Schritt 4/5)}</H2>
 
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
@@ -29,10 +29,10 @@
 <TR>
 <TH CLASS="label">Freigabe:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
-Diesen Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netz freigeben</TD>
+Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk freigeben</TD>
 </TR>
 <TR>
-<TH CLASS="label">Marke:</TH>
+<TH CLASS="label">Hersteller:</TH>
 <TD>
 <SELECT NAME="PPD_MAKE" SIZE="10">
 {[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
@@ -48,13 +48,13 @@ Diesen Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netz
 <TD>&nbsp;</TD>
 </TR>
 <TR>
-<TH CLASS="label">Or Provide a PPD File:</TH>
+<TH CLASS="label">Oder PPD-Datei bereitstellen:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
 TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Add Printer:Modify Printer}"></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Drucker hinzufügen:Drucker ändern}"></TD>
 </TR>
 </TABLE>
 

templates/de/choose-model.tmpl

@@ -28,7 +28,7 @@
 <TR>
 <TH CLASS="label">Freigabe:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
-Dieser Drucker ist {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netz freigeben</TD>
+Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk freigeben</TD>
 </TR>
 <TR>
 <TH CLASS="label">Hersteller:</TH>
@@ -44,7 +44,7 @@ Dieser Drucker ist {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im
 </TD>
 </TR>
 <TR>
-<TH CLASS="label">Oder stelle eine PPD Datei zur Verfügung:</TH>
+<TH CLASS="label">Oder PPD-Datei bereitstellen:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
 TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>

templates/de/choose-serial.tmpl

@@ -11,7 +11,7 @@
 <TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
 </TR>
 <TR>
-<TH CLASS="label">Baud Rate:</TH>
+<TH CLASS="label">Baudrate:</TH>
 <TD><SELECT NAME="BAUDRATE">
 {[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
 </SELECT></TD>
@@ -25,7 +25,7 @@
 </SELECT></TD>
 </TR>
 <TR>
-<TH CLASS="label">Daten Bits:</TH>
+<TH CLASS="label">Datenbits:</TH>
 <TD><SELECT NAME="BITS">
 <OPTION {?bits=8?SELECTED:}>8
 <OPTION {?bits=7?SELECTED:}>7
@@ -34,7 +34,7 @@
 <TR>
 <TH CLASS="label">Flusskontrolle:</TH>
 <TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>None
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Keine
 <OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Software)
 <OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Hardware)
 <OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Hardware)

templates/de/choose-uri.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen (Schritt2/5)}</H2>
+<H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen (Schritt 2/5)}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
@@ -8,7 +8,7 @@
 
 <TABLE>
 <TR>
-<TH CLASS="label">Verbindung-URI:</TH>
+<TH CLASS="label">Verbindung:</TH>
 <TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
 </TR>
 <TR>
@@ -27,7 +27,8 @@
     socket://hostname:9100
 </PRE>
 
-<P>See <A HREF="/help/network.html" TARGET="_blank">"Netzwerkdrucker"</A> für die korrekte URI ihres Druckers.</P>
+<P>Beispiele und gängige URIs finden sich in der Hilfe unter
+<A HREF="/help/network.html" TARGET="_blank">"Netzwerkdrucker"</A>.</P>
 
 </TD>
 </TR>

templates/de/class-confirm.tmpl

@@ -1,6 +1,5 @@
 <H2 CLASS="title">Klasse {printer_name} löschen</H2>
 
-<P><B>Warnung:</B> Sind sie sicher dass sie die Klasse
-{printer_name} löschen wollen?</P>
+<P><B>Warnung:</B> Sind Sie sicher, dass Sie die Klasse {printer_name} wirklich löschen möchten?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Klasse löschen"></FORM></P>

templates/de/class-modified.tmpl

@@ -1,4 +1,4 @@
 <H2 CLASS="title">Klasse {printer_name} ändern</H2>
 
-<P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> wurde
+<P>Die Klasse <A HREF="/classes/{printer_name}">{printer_name}</A> wurde
 erfolgreich geändert.

templates/de/class.tmpl

@@ -1,15 +1,15 @@
 <H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
-({printer_state=3?Im Leerlauf:{printer_state=4?Beschäftigt:Angehalten}},
-{printer_is_accepting_jobs=0?Aufträge werden ablehnt:Aufträge werden akzeptiert},
-{server_is_sharing_printers=0?Keine (Server):{printer_is_shared=0?Keine:}} Netzfreigabe{default_name={printer_name}?, Standarddrucker:})</H2>
+({printer_state=3?Leerlauf:{printer_state=4?Beschäftigt:Angehalten}},
+{printer_is_accepting_jobs=0?Aufträge ablehnen:Aufträge annehmen},
+{server_is_sharing_printers=0?keine:{printer_is_shared=0?keine:}} Netzwerkfreigabe{default_name={printer_name}?, Standardklasse:})</H2>
 
 <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
 <OPTION VALUE="">Wartung</OPTION>
-<OPTION VALUE="print-test-page">Drucke Testseite</OPTION>
-{printer_state=5?<OPTION VALUE="start-class">Klasse starten</OPTION>:<OPTION VALUE="stop-class">Klasse stoppen</OPTION>}
-{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge akzeptieren</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
+<OPTION VALUE="print-test-page">Testseite drucken</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">Klasse starten</OPTION>:<OPTION VALUE="stop-class">Klasse anhalten</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge annehmen</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
 <OPTION VALUE="move-jobs">Alle Aufträge verschieben</OPTION>
 <OPTION VALUE="purge-jobs">Alle Aufträge abbrechen</OPTION>
 </SELECT>
@@ -25,7 +25,7 @@
 <OPTION VALUE="modify-class">Klasse ändern</OPTION>
 <OPTION VALUE="delete-class">Klasse löschen</OPTION>
 <OPTION VALUE="set-class-options">Standardeinstellungen festlegen</OPTION>
-<OPTION VALUE="set-as-default">Als Standard festlegen</OPTION>
+<OPTION VALUE="set-as-default">Als Standardklasse festlegen</OPTION>
 <OPTION VALUE="set-allowed-users">Erlaubte Benutzer festlegen</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
@@ -34,7 +34,7 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Beschreibung:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Ort:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Mitglieder:</TH><TD>{?member_uris=?None:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Mitglieder:</TH><TD>{?member_uris=?Keine:{member_uris}}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Standardeinstellungen:</TH><TD>job-sheets={job_sheets_default}
 media={media_default?{media_default}:unbekannt}
 {sides_default?sides={sides_default}:}</TD></TR>

templates/de/classes.tmpl

@@ -1,11 +1,11 @@
 {#printer_name=0?:
-<TABLE CLASS="list" SUMMARY="Class List">
+<TABLE CLASS="list" SUMMARY="Klassenliste">
 <THEAD>
-<TR><TH>Wartweschlange</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Mitglieder</TH><TH>Status</TH></TR>
+<TR><TH>Klasse</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Mitglieder</TH><TH>Status</TH></TR>
 </THEAD>
 <TBODY>
 {[printer_name]
-<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?Keine:{member_uris}}</TD><TD>{printer_state=3?Im Leerlauf:{printer_state=4?Beschäftigt:Angehalten}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?Keine:{member_uris}}</TD><TD>{printer_state=3?Leerlauf:{printer_state=4?Beschäftigt:Angehalten}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
 }
 </TBODY>
 </TABLE></DIV>}

templates/de/command.tmpl

@@ -1,7 +1,7 @@
 <H2 CLASS="title">{title} auf {printer_name}</H2>
 
 <P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
-ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Drucker Befehlsauftrag
+ALIGN="ABSMIDDLE" ALT="Beschäftigungsanzeige"> }Drucker Befehlsauftrag
 {job_state=3?unerledigt:{job_state=4?gehalten:
 {job_state=5?verarbeite:{job_state=6?gestoppt:
 {job_state=7?gelöscht:{job_state=8?abgebrochen:beendet}}}}}}{job_state=9?:{job_printer_state_message?,

templates/de/edit-config.tmpl

@@ -14,7 +14,7 @@ function reset_config()
 <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
 
 <P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Änderungen speichern">
-<INPUT TYPE="BUTTON" VALUE="Standard Konfigurationsdatei verwenden"
+<INPUT TYPE="BUTTON" VALUE="Standardkonfigurationsdatei verwenden"
 onClick="reset_config();"></P>
 
 </FORM>

templates/de/error-op.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">{?title} {?printer_name} Error</H2>
+<H2 CLASS="title">{?title} {?printer_name} Fehler</H2>
 
 <P>Fehler:</P>
 

templates/de/header.tmpl.in

@@ -20,7 +20,7 @@
       /* Show an error if cookies are disabled */
       function check_cookies() {
 	if (!navigator.cookieEnabled) {
-	      document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+	      document.getElementById('body').innerHTML = 'Diese Seite verwendet Cookies um gängigen Cross-Site-Scripting-Angriffen vorzubeugen. Bitte aktivieren Sie Cookies in Ihrem Browser.';
 	}
       }
     --></SCRIPT>
@@ -30,7 +30,7 @@
     <div class="header">
       <ul>
 	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
-	<li><a href="/">Home</a></li>
+	<li><a href="/">Startseite</a></li>
 	<li><a {SECTION=admin?class="active" :}href="/admin">Verwaltung</a></li>
 	<li><a {SECTION=classes?class="active" :}href="/classes/">Klassen</a></li>
 	<li><a {SECTION=help?class="active" :}href="/help/">Hilfe</a></li>

templates/de/help-header.tmpl

@@ -14,7 +14,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">
 <DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Inhalt">
 <TR><TD>
 
-<H3 CLASS="title">Online Hilfe Dokumente</H3>
+<H3 CLASS="title">Hilfebereiche</H3>
 
 <P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Alle Dokumente</A></P>
 <HR>
@@ -32,10 +32,10 @@ AUTOSAVE="org.cups.help" RESULTS="20">
 <HR NOSHADE>:}
 {HELPTITLE?<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Druckversion anzeigen"></FORM>:
 
-<H1>CUPS Hilfeseiten</H1>
+<H1>CUPS-Hilfesystem</H1>
 
-<P>Dies ist das CUPS online Hilfesystem. Geben Sie Ihren Suchbegriff oben ein oder klicken Sie auf einen der Dokumentationslinks um sich die Online Hilfe Informationen anzeigen zu lassen.</P>
+<P>Dies ist das CUPS-Hilfesystem. Geben Sie Ihren Suchbegriff bzw. Ihre Suchbegriffe oben ein oder klicken Sie auf einen der Dokumentationslinks um einen bestimmten Bereich der Dokumentation anzuzeigen.</P>
 
-<P>Wenn Sie noch unerfahren im Umgang mit CUPS sind, lesen Sie die "<a href="/help/overview.html">CUPS Übersicht</a>". Erfahrene Benutzer sollten "<a href="/help/whatsnew.html">Was ist neu in CUPS 2.0</a>" lesen.</P>
+<P>Wenn Sie noch unerfahren im Umgang mit CUPS sind, lesen Sie die "<a href="/help/overview.html">CUPS-Übersicht</a>". Erfahrene Benutzer sollten "<a href="/help/whatsnew.html">Was ist neu in CUPS 2.0</a>" lesen.</P>
 
-<P>Die <A HREF="http://www.cups.org/">CUPS Webseite</A> bietet ebenfalls viele Angebote inklusive Diskussionsforen für Benutzer, Antworten auf häufig gestellte Fragen, und ein Formular für Fehlerberichte und Wünsche.</P>}
+<P>Die <A HREF="https://www.cups.org/">CUPS-Webseite</A> bietet ebenfalls viele Informationen, einschließlich Diskussionsforen für Benutzer, Antworten auf häufig gestellte Fragen sowie ein Formular für Fehlerberichte und Wünsche.</P>}

templates/de/jobs-header.tmpl

@@ -1,5 +1,5 @@
 {?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Aktive Aufträge anzeigen"></FORM>}
-{?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="Fertige Aufträge anzeigen"></FORM>}
+{?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="Beendete Aufträge anzeigen"></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="Alle Aufträge anzeigen"></FORM>}
 
 <P ALIGN="CENTER">{total=0?Keine Aufträge:Zeige {#job_id} von {total} {?which_jobs=?aktiven:{which_jobs=all?:beendeten}} {total=1?Auftrag:Aufträgen}}.</P>

templates/de/jobs.tmpl

@@ -1,18 +1,18 @@
 {#job_id=0?:
 <TABLE CLASS="list" SUMMARY="Auftragsliste">
 <THEAD>
-<TR><TH>ID</TH><TH>Name</TH><TH>Benutzer</TH><TH>Grösse</TH><TH>Seiten</TH><TH>Status</TH><TH>Steuerung</TH></TR>
+<TR><TH>ID</TH><TH>Name</TH><TH>Benutzer</TH><TH>Größe</TH><TH>Seiten</TH><TH>Status</TH><TH>Steuerung</TH></TR>
 </THEAD>
 <TBODY>
 {[job_id]
 <TR VALIGN="TOP">
 <TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
 <TD>{?job_name=?Unbekannt:{job_name}}&nbsp;</TD>
-<TD>{?job_originating_user_name=?Einbehalten:{job_originating_user_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Zurückbehalten:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
 <TD>{job_media_sheets_completed=0?Unbekannt:{?job_media_sheets_completed}}&nbsp;</TD>
 <TD>{job_state=3?unerledigt seit<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?angehalten seit<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
-{job_state=5?verarbeitet seit<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?gestoppt:
+{job_state=5?verarbeitet seit<BR>{?time_at_processing=?Unknown:{time_at_processing}}:{job_state=6?angehalten:
 {job_state=7?gelöscht am<BR>{?time_at_completed=?Unknown:{time_at_completed}}:{job_state=8?abgebrochen:beendet am<BR>{?time_at_completed=?Unknown:{time_at_completed}}}}}}}}&nbsp;{job_printer_state_message?<BR>
 <EM>"{job_printer_state_message}"</EM>:}</TD>
 <TD>

templates/de/modify-printer.tmpl

@@ -13,12 +13,12 @@
 <TR>
 <TH CLASS="label">Beschreibung:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Menschenlesbare Beschreibung wie zum Beispiel "HP LaserJet mit Duplexer")</SMALL></TD>
+<SMALL>(Menschenlesbare Beschreibung wie etwa "HP LaserJet mit Duplexer")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Ort:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Menschenlesbare Ort wie zum Beispiel "Büro 1")</SMALL></TD>
+<SMALL>(Menschenlesbarer Ort wie etwa "Labor 1")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Verbindung:</TH>
@@ -27,7 +27,7 @@
 <TR>
 <TH CLASS="label">Freigabe:</TH>
 <TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
-Share This Printer</TD>
+Drucker im Netzwerk freigeben</TD>
 </TR>
 <TR>
 <TR>

templates/de/norestart.tmpl

@@ -1,3 +1,3 @@
 <H2 CLASS="title">Einstellungen ändern</H2>
 
-<P>Der Server wurde nicht neu gestartet, da die Konfiguration nicht geändert wurde...</P>
+<P>Der Server wurde nicht neu gestartet, da die Konfiguration nicht geändert wurde…</P>

templates/de/option-conflict.tmpl

@@ -1,7 +1,7 @@
-<P><B>Fehler:</B> die folgenden Optionen stehen im Konflikt:</P>
+<P><B>Fehler:</B> Die folgenden Optionen stehen im Konflikt:</P>
 
 <UL>
 {[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
-<P>Bitte ändern sie eine oder mehrere Einstellungen um die Konflikte zu lösen.</P>
+<P>Bitte ändern Sie eine oder mehrere Einstellungen um die Konflikte zu lösen.</P>

templates/de/option-pickone.tmpl

@@ -10,7 +10,7 @@
 <OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Millimeter</OPTION>
 <OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Zentimeter</OPTION>
 <OPTION VALUE="in"{paramvalue=in? SELECTED:}>Zoll</OPTION>
-<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Fuss</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Fuß</OPTION>
 <OPTION VALUE="m"{paramvalue=m? SELECTED:}>Meter</OPTION>
 </SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
 }</TABLE>

templates/de/pager.tmpl

@@ -2,6 +2,6 @@
 <TR>
 	<TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="&#x25c0;&#x25c0; Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Vorherige anzeigen"></FORM>:&nbsp;}</TD>
 	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Nächste anzeigen &#x25b6;"></FORM>:&nbsp;}
-	{LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last &#x25b6;&#x25b6;"></FORM>:}</TD>
+	{LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Letzte anzeigen &#x25b6;&#x25b6;"></FORM>:}</TD>
 </TR>
 </TABLE>

templates/de/printer-accept.tmpl

@@ -1,5 +1,5 @@
-<H2 CLASS="title">Aufträge von {is_class?Klasse:Drucker} {printer_name} akzeptieren</H2>
+<H2 CLASS="title">Aufträge für {is_class?Klasse:Drucker} {printer_name} annehmen</H2>
 
-<P>{is_class?Klasse:Drucker} <A
+<P>{is_class?Die Klasse:Der Drucker} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-aktzeptiert jetzt Aufträge.</P>
+nimmt jetzt Aufträge an.</P>

templates/de/printer-confirm.tmpl

@@ -1,8 +1,5 @@
-<H2 CLASS="title">Delete Printer {printer_name}</H2>
-
 <H2 CLASS="title">Drucker {printer_name} löschen</H2>
 
-<P><B>Warnung:</B> Sind Sie sicher, dass Sie den Drucker
-{printer_name} löschen wollen?</P>
+<P><B>Warnung:</B> Sind Sie sicher, dass Sie den Drucker {printer_name} wirklich löschen möchten?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Drucker löschen"></FORM></P>

templates/de/printer-default.tmpl

@@ -1,9 +1,9 @@
 <H2 CLASS="title">{is_class?Klasse:Drucker} {printer_name} als Standard festlegen</H2>
 
-<P>{is_class?Klasse:Drucker} <A
+<P>{is_class?Die Klasse:Der Drucker} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wurde zum Standarddrucker für diesen Server gemacht.</P>
+wurde {is_class?zur Standardklasse:zum Standarddrucker} gemacht.</P>
 
-<BLOCKQUOTE><B>Notiz:</B> Die Einstellungen des Standarddruckers
+<BLOCKQUOTE><B>Hinweis:</B> Die Einstellungen {is_class?der Standardklasse:des Standarddruckers}
 welche von Benutzern mittels dem <TT>lpoptions</TT> Befehl gesetzt wurden,
 überschreiben diese Einstellung.</BLOCKQUOTE>

templates/de/printer-reject.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">Aufträge für {is_class?die Klasse:den Drucker} {printer_name} ablehnen</H2>
+<H2 CLASS="title">Aufträge für {is_class?Klasse:Drucker} {printer_name} ablehnen</H2>
 
 <P>{is_class?Die Klasse:Der Drucker} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>

templates/de/printer-start.tmpl

@@ -1,5 +1,5 @@
-<H2 CLASS="title">{is_class?Die Klasse:Den Drucker} {printer_name} fortfahren</H2>
+<H2 CLASS="title">{is_class?Klasse:Drucker} {printer_name} starten</H2>
 
-<P>{is_class?Die Klassen:Der Drucker} <A
+<P>{is_class?Die Klasse:Der Drucker} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
-wird fortgesetzt.</P>
+wird gestartet.</P>

templates/de/printer-stop.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">{is_class?Die Klasse:Den Drucker} {printer_name} anhalten</H2>
+<H2 CLASS="title">{is_class?Klasse:Drucker} {printer_name} anhalten</H2>
 
 <P>{is_class?Die Klasse:Der Drucker} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>

templates/de/printer.tmpl

@@ -1,7 +1,7 @@
 <H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
-({printer_state=3?Im Leerlauf:{printer_state=4?Beschäftigt:Angehalten}},
-{printer_is_accepting_jobs=0?Aufträge werden ablehnt:Aufträge werden akzeptiert},
-{server_is_sharing_printers=0?Keine (Server):{printer_is_shared=0?Keine:}} Netzfreigabe{default_name={printer_name}?, Standarddrucker:}, {printer_is_colormanaged=0?Kein Farbmanagement:Farbmanagement})</H2>
+({printer_state=3?Leerlauf:{printer_state=4?Beschäftigt:Angehalten}},
+{printer_is_accepting_jobs=0?Aufträge ablehnen:Aufträge annehmen},
+{server_is_sharing_printers=0?keine:{printer_is_shared=0?keine:}} Netzwerkfreigabe{default_name={printer_name}?, Standarddrucker:}, {printer_is_colormanaged=0?kein Farbmanagement:Farbmanagement})</H2>
 
 <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
@@ -9,9 +9,9 @@
 <OPTION VALUE="">Wartung</OPTION>
 <OPTION VALUE="print-test-page">Testseite drucken</OPTION>
 {printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Druckköpfe reinigen</OPTION>:}
-{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Selbsttest-Seite drucken</OPTION>:}
-{printer_state=5?<OPTION VALUE="start-printer">Drucker starten</OPTION>:<OPTION VALUE="stop-printer">Drucker stoppen</OPTION>}
-{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge akzeptieren</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Selbsttestseite drucken</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">Drucker starten</OPTION>:<OPTION VALUE="stop-printer">Drucker anhalten</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge annehmen</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
 <OPTION VALUE="move-jobs">Alle Aufträge verschieben</OPTION>
 <OPTION VALUE="purge-jobs">Alle Aufträge abbrechen</OPTION>
 </SELECT>
@@ -22,11 +22,11 @@
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
 <SELECT NAME="OP" ONCHANGE="document.administration.submit();">
-<OPTION VALUE="">Administration</OPTION>
+<OPTION VALUE="">Verwaltung</OPTION>
 <OPTION VALUE="modify-printer">Drucker ändern</OPTION>
 <OPTION VALUE="delete-printer">Drucker löschen</OPTION>
 <OPTION VALUE="set-printer-options">Standardeinstellungen festlegen</OPTION>
-<OPTION VALUE="set-as-default">Als Standard festlegen</OPTION>
+<OPTION VALUE="set-as-default">Als Standarddrucker festlegen</OPTION>
 <OPTION VALUE="set-allowed-users">Erlaubte Benutzer festlegen</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Go"></NOSCRIPT>
@@ -35,9 +35,9 @@
 <TABLE SUMMARY="{printer_name}">
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Beschreibung:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Ort:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Treiber:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Treiber:</TH><TD>{printer_make_and_model} ({color_supported=1?farbig:schwarz-weiß}{sides_supported?, 2-seitiges Drucken:})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Verbindung:</TH><TD>{device_uri}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Einstellungen:</TH><TD>job-sheets={job_sheets_default}
-media={media_default?{media_default}:unknown}
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Standardeinstellungen:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:unbekannt}
 {sides_default?sides={sides_default}:}</TD></TR>
 </TABLE>

templates/de/printers.tmpl

@@ -1,11 +1,11 @@
 {#printer_name=0?:
 <TABLE CLASS="list" SUMMARY="Druckerliste">
 <THEAD>
-<TR><TH>Queue Name</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Marke und Modell</TH><TH>Status</TH></TR>
+<TR><TH>Warteschlange</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Hersteller und Modell</TH><TH>Status</TH></TR>
 </THEAD>
 <TBODY>
 {[printer_name]
-<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{printer_make_and_model}</TD><TD>{printer_state=3?Im Leerlauf:{printer_state=4?Beschäftigt:Angehalten}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{printer_make_and_model}</TD><TD>{printer_state=3?Leerlauf:{printer_state=4?Beschäftigt:Angehalten}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
 }
 </TBODY>
 </TABLE></DIV>}

templates/de/restart.tmpl

@@ -1,4 +1,4 @@
 <H2 CLASS="title">Einstellungen ändern</H2>
 
 <P><IMG SRC="data:image/gif;base64,R0lGODlhEAAQAIQAAP///wAAAPDw8IqKiuDg4EZGRnp6egAAAFhYWCQkJKysrL6+vhQUFJycnAQEBDY2NmhoaP///////////////////////////////////////////////////////////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQABQD/ACwAAAAAEAAQAAAFdyAgAgIJIeWoAkRCCMdBkKtIHIngyMKsErPBYbADpkSCwhDmQCBethRB6Vj4kFCkQPG4IlWDgrNRIwnO4UKBXDufzQvDMaoSDBgFb886MiQadgNABAokfCwzBA8LCg0Egl8jAggGAA1kBIA1BAYzlyILczULC2UhACH5BAEFAB8ALAAAAAAQABAAAAV2ICACAmlAZTmOREEIyUEQjLKKxPHADhEvqxlgcGgkGI1DYSVAIAWMx+lwSKkICJ0QsHi9RgKBwnVTiRQQgwF4I4UFDQQEwi6/3YSGWRRmjhEETAJfIgMFCnAKM0KDV4EEEAQLiF18TAYNXDaSe3x6mjidN1s3IQAh+QQBBQAfACwAAAAAEAAQAAAFeCAgAgLZDGU5jgRECEUiCI+yioSDwDJyLKsXoHFQxBSHAoAAFBhqtMJg8DgQBgfrEsJAEAg4YhZIEiwgKtHiMBgtpg3wbUZXGO7kOb1MUKRFMysCChAoggJCIg0GC2aNe4gqQldfL4l/Ag1AXySJgn5LcoE3QXI3IQAh+QQBBQAfACwAAAAAEAAQAAAFdiAgAgLZNGU5joQhCEjxIssqEo8bC9BRjy9Ag7GILQ4QEoE0gBAEBcOpcBA0DoxSK/e8LRIHn+i1cK0IyKdg0VAoljYIg+GgnRrwVS/8IAkICyosBIQpBAMoKy9dImxPhS+GKkFrkX+TigtLlIyKXUF+NjagNiEAIfkEAQUAHwAsAAAAABAAEAAABWwgIAICaRhlOY4EIgjH8R7LKhKHGwsMvb4AAy3WODBIBBKCsYA9TjuhDNDKEVSERezQEL0WrhXucRUQGuik7bFlngzqVW9LMl9XWvLdjFaJtDFqZ1cEZUB0dUgvL3dgP4WJZn4jkomWNpSTIyEAIfkEAQUAHwAsAAAAABAAEAAABX4gIAICuSxlOY6CIgiD8RrEKgqGOwxwUrMlAoSwIzAGpJpgoSDAGifDY5kopBYDlEpAQBwevxfBtRIUGi8xwWkDNBCIwmC9Vq0aiQQDQuK+VgQPDXV9hCJjBwcFYU5pLwwHXQcMKSmNLQcIAExlbH8JBwttaX0ABAcNbWVbKyEAIfkEAQUAHwAsAAAAABAAEAAABXkgIAICSRBlOY7CIghN8zbEKsKoIjdFzZaEgUBHKChMJtRwcWpAWoWnifm6ESAMhO8lQK0EEAV3rFopIBCEcGwDKAqPh4HUrY4ICHH1dSoTFgcHUiZjBhAJB2AHDykpKAwHAwdzf19KkASIPl9cDgcnDkdtNwiMJCshACH5BAEFAB8ALAAAAAAQABAAAAV3ICACAkkQZTmOAiosiyAoxCq+KPxCNVsSMRgBsiClWrLTSWFoIQZHl6pleBh6suxKMIhlvzbAwkBWfFWrBQTxNLq2RG2yhSUkDs2b63AYDAoJXAcFRwADeAkJDX0AQCsEfAQMDAIPBz0rCgcxky0JRWE1AmwpKyEAIfkEAQUAHwAsAAAAABAAEAAABXkgIAICKZzkqJ4nQZxLqZKv4NqNLKK2/Q4Ek4lFXChsg5ypJjs1II3gEDUSRInEGYAw6B6zM4JhrDAtEosVkLUtHA7RHaHAGJQEjsODcEg0FBAFVgkQJQ1pAwcDDw8KcFtSInwJAowCCA6RIwqZAgkPNgVpWndjdyohACH5BAEFAB8ALAAAAAAQABAAAAV5ICACAimc5KieLEuUKvm2xAKLqDCfC2GaO9eL0LABWTiBYmA06W6kHgvCqEJiAIJiu3gcvgUsscHUERm+kaCxyxa+zRPk0SgJEgfIvbAdIAQLCAYlCj4DBw0IBQsMCjIqBAcPAooCBg9pKgsJLwUFOhCZKyQDA3YqIQAh+QQBBQAfACwAAAAAEAAQAAAFdSAgAgIpnOSonmxbqiThCrJKEHFbo8JxDDOZYFFb+A41E4H4OhkOipXwBElYITDAckFEOBgMQ3arkMkUBdxIUGZpEb7kaQBRlASPg0FQQHAbEEMGDSVEAA1QBhAED1E0NgwFAooCDWljaQIQCE5qMHcNhCkjIQAh+QQBBQAfACwAAAAAEAAQAAAFeSAgAgIpnOSoLgxxvqgKLEcCC65KEAByKK8cSpA4DAiHQ/DkKhGKh4ZCtCyZGo6F6iYYPAqFgYy02xkSaLEMV34tELyRYNEsCQyHlvWkGCzsPgMCEAY7Cg04Uk48LAsDhRA8MVQPEF0GAgqYYwSRlycNcWskCkApIyEAOw==" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
-ALT="Busy Indicator"> Bitte warten bis der Server neu gestartet ist...</P>
+ALT="Beschäftigungsanzeige"> Bitte warten Sie bis der Server neu gestartet ist…</P>

templates/de/samba-export.tmpl

@@ -15,17 +15,18 @@ function select_printers() {
 
 <H2 CLASS="title">Drucker für Samba freigeben</H2>
 
-{error?<P>Kann Drucker nicht für Samba freigeben\:</P>
+{error?<P>Drucker können nicht für Samba freigegeben werden\:</P>
 <BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consult the <A HREF="/admin/log/error_log"
-TARGET="_blank">Fehlerprotokoll</A> Datei um mehr Informationen zu erhalten.</P>:
-<P>Diese Seite erlaubt es Ihnen Drucker für Samba bereitzustellen
-damit auf diese mittels Windows Clients über die Desktopsymbole
-<VAR>Netzwerk Nachbarn</VAR> oder <VAR>Netzwerkumgebung</VAR>
-zugegriffen werden kann. Sie müssen zuerst einen
-Windows PostScript Druckerteiber installieren wie diese in der Hilfe für <A
+<P>Bitte prüfen Sie das <A HREF="/admin/log/error_log"
+TARGET="_blank">Fehlerprotokoll</A> für weitere Informationen.</P>:
+<P>Diese Seite erlaubt es Ihnen Drucker für Samba freizugeben
+damit Windows-Rechner auf diese über das <VAR>Netzwerk</VAR>-
+bzw. <VAR>Netzwerkumgebung</VAR>-Symbol z.B. auf dem Desktop
+zugreifen können. Davor muss allerdings der PostScript-
+Druckertreiber für Windows, wie in der man page <A 
 HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> beschrieben ist.</P>}
+TARGET="_blank">cupsaddsmb(8)</A> beschrieben, installiert
+worden sein.</P>}
 
 <TABLE>
 <TR>
@@ -39,12 +40,12 @@ onChange="select_printers()"> Alle Drucker freigeben
 </TD>
 </TR>
 <TR>
-<TH CLASS="label">Samba Benutzername:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (benötigt)</TD>
+<TH CLASS="label">Samba-Benutzername:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (erforderlich)</TD>
 </TR>
 <TR>
-<TH CLASS="label">Samba Passwort:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (benötigt)</TD>
+<TH CLASS="label">Samba-Passwort:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (erforderlich)</TD>
 </TR>
 <TR>
 <TD></TD>

templates/de/samba-exported.tmpl

@@ -1 +1 @@
-<P>Drucker wurden erfolgreich für Samba freigegeben.</P>
+<P>Die Drucker wurden erfolgreich für Samba freigegeben.</P>

templates/de/search.tmpl

@@ -3,7 +3,7 @@
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 
 <P ALIGN="CENTER"><B>Suche in
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Klassen:{SECTION=jobs?Aufträgen:Drucker}}}:</B>
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Klassen:{SECTION=jobs?Aufträgen:Druckern}}}:</B>
 <INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
 TYPE="SUBMIT" VALUE="Suchen"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Leeren"></P>
 

templates/de/set-printer-options-header.tmpl

@@ -4,7 +4,7 @@
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Frage Drucker nach Voreinstellungen">:}
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Standardeinstellungen des Druckers ermitteln">:}
 
 <SCRIPT TYPE="text/javascript"><!--
 function update_paramtable(option)

templates/de/subscription-added.tmpl

@@ -1 +1 @@
-<P>Subskription {subscription_name} wurde erfolgreich hinzugefügt.</P>
+<P>Das RSS-Abonnement {subscription_name} wurde erfolgreich hinzugefügt.</P>

templates/de/subscription-canceled.tmpl

@@ -1 +1 @@
-<P>Subskription #{notify_subscription_id} wurde gekündigt.</P>
+<P>Das RSS-Abonnement #{notify_subscription_id} wurde beendet.</P>

templates/de/test-page.tmpl

@@ -1,4 +1,4 @@
-<H2 CLASS="title">Drucker Testseite auf {printer_name}</H2>
+<H2 CLASS="title">Testseite für Drucker {printer_name}</H2>
 
-<P>Testseite gesendet; Auftrags-ID ist <A HREF="/{SECTION}/{printer_name}">
+<P>Testseite wurde gesendet; Auftragsnummer lautet <A HREF="/{SECTION}/{printer_name}">
 {printer_name}-{job_id}</A>.</P>

templates/de/trailer.tmpl

@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2015 Apple Inc. Alle Rechte vorbehalten.</div>
+    <div class="footer">CUPS und das CUPS-Logo sind Warenzeichen der <a href="https://www.apple.com/">Apple Inc.</a> Copyright &copy; 2007-2015 Apple Inc. Alle Rechte vorbehalten.</div>
   </body>
 </html>

templates/de/users.tmpl

@@ -12,14 +12,14 @@
 <TD>
 <INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
 <BR>
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Erlaube diesen Benutzern zu drucken
-<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Verbiete diesen Benutzern zu drucken
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Diesen Benutzern das Drucken erlauben
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Diesen Benutzern das Drucken verbieten
 </TD>
 </TR>
 <TR>
 <TD></TD>
 <TD>
-<INPUT TYPE="SUBMIT" VALUE="Set Allowed Users">
+<INPUT TYPE="SUBMIT" VALUE="Erlaubte Benutzer festlegen">
 </TD>
 </TR>
 </TABLE>

templates/es/admin.tmpl

@@ -26,7 +26,7 @@
     <H2 CLASS="title">Servidor</H2>
 
     <P>
-    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editar archivo configuraci&oacute;n"></FORM>
+    <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editar archivo de configuraci&oacute;n"></FORM>
     <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de accesos"></FORM>
     <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de errores"></FORM>
     <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de p&aacute;ginas"></FORM>

templates/es/choose-device.tmpl

@@ -1,21 +1,18 @@
 <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:A&ntilde;adir impresora}</H2>
 
-{CUPS_GET_DEVICES_DONE?:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
-ALT="Busy Indicator"> Buscando impresoras...</P>}
-
-<FORM METHOD="POST" ACTION="/admin">
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 
 <TABLE>
 {op=add-printer?:<TR>
-<TH CLASS="label">Conexi&oacute;n actual:</TH>
+<TH CLASS="label">Conexi&oacute;n actual\:</TH>
 <TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
 {current_device_uri}</TD>
 </TR>}
 <TR>
-<TH CLASS="label">Impresoras locales:</TH>
+<TH CLASS="label">Impresoras locales\:</TH>
 <TD>
 {[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
@@ -24,7 +21,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 </TD>
 </TR>
 <TR>
-<TH CLASS="label">Impresoras en red descubiertas:</TH>
+<TH CLASS="label">Impresoras en red descubiertas\:</TH>
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
@@ -34,7 +31,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 </TR>
 <TR>
 <TR>
-<TH CLASS="label">Otras impresoras en red:</TH>
+<TH CLASS="label">Otras impresoras en red\:</TH>
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">

templates/es/class.tmpl

@@ -8,7 +8,7 @@
 <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
 <OPTION VALUE="">Mantenimiento</OPTION>
 <OPTION VALUE="print-test-page">Imprimir p&aacute;gina de prueba</OPTION>
-{printer_state=5?<OPTION VALUE="start-class">Reanudar impresora</OPTION>:<OPTION VALUE="stop-class">Pausar impresora</OPTION>}
+{printer_state=5?<OPTION VALUE="start-class">Reanudar clase</OPTION>:<OPTION VALUE="stop-class">Pausar clase</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceptar trabajos</OPTION>:<OPTION VALUE="reject-jobs">Rechazar trabajos</OPTION>}
 <OPTION VALUE="move-jobs">Mover todos los trabajos</OPTION>
 <OPTION VALUE="purge-jobs">Cancelar todos los trabajos</OPTION>

templates/es/error-op.tmpl

@@ -2,4 +2,4 @@
 
 <P>Error:</P>
 
-<BLOCKQUOTE>Operaci&oacute;n desconocida "{op}".</BLOCKQUOTE>
+<BLOCKQUOTE>&iexcl;Operaci&oacute;n desconocida "{op}"!</BLOCKQUOTE>

templates/es/header.tmpl.in

@@ -20,7 +20,7 @@
       /* Show an error if cookies are disabled */
       function check_cookies() {
 	if (!navigator.cookieEnabled) {
-	      document.getElementById('body').innerHTML = 'Esta página usa cookies para prevenir ataques comunes de sitios. Por favor, active las cookies en su navegador.';
+	      document.getElementById('body').innerHTML = 'Esta página usa cookies para prevenir ataques comunes de sitios cruzados. Por favor, active las cookies en su navegador.';
 	}
       }
     --></SCRIPT>

templates/es/job-cancel.tmpl

@@ -1,4 +1,3 @@
 <H2 CLASS="title">Cancelar trabajo {job_id}</H2>
 
 <P>Se ha cancelado el <A HREF="{job_printer_uri}">Trabajo {job_id}</A>.
-

templates/es/job-moved.tmpl

@@ -1,4 +1,4 @@
 <H2 CLASS="title">{job_id?Mover trabajo {job_id}:Mover todos los trabajos}</H2>
 
 <P>Se {job_id?ha movido el <A HREF="/jobs/{job_id}">Trabajo {job_id}</A>:han movido todos los trabajos} a
-<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
+<A HREF="/{is_class?classes:printers}/{job_printer_name}">{job_printer_name}</A>.</P>

templates/es/jobs.tmpl

@@ -8,7 +8,7 @@
 <TR VALIGN="TOP">
 <TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
 <TD>{?job_name=?Desconocido:{job_name}}&nbsp;</TD>
-<TD>{job_originating_user_name}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Retenido:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
 <TD>{job_media_sheets_completed=0?Desconocido:{?job_media_sheets_completed}}&nbsp;</TD>
 <TD>{job_state=3?pendiente desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:{job_state=4?retenido desde<BR>{?time_at_creation=?Unknown:{time_at_creation}}:
@@ -18,7 +18,6 @@
 <TD>
 {job_preserved>0?{job_state>5?
 <FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
-<INPUT TYPE="SUBMIT" VALUE="Reimprimir trabajo"></FORM>:}:}
 {job_state=4?
 <FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
 <INPUT TYPE="SUBMIT" VALUE="Liberar trabajo"></FORM>:}

templates/es/pager.tmpl

@@ -1,7 +1,7 @@
 <TABLE CLASS="inset" SUMMARY="Barra de paginaci&oacute;n">
 <TR>
-	<TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="&#x25c0;&#x25c0; Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Mostrar anteriores"></FORM>:&nbsp;}</TD>
-	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar siguientes &#x25b6;"></FORM>:&nbsp;}
-	{LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last &#x25b6;&#x25b6;"></FORM>:}</TD>
+	<TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="&#x25c0;&#x25c0; Mostrar primero"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Mostrar anteriores"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar siguiente &#x25b6;"></FORM>:&nbsp;}
+	{LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Mostrar &uacute;ltimo &#x25b6;&#x25b6;"></FORM>:}</TD>
 </TR>
 </TABLE>

templates/es/printer.tmpl

@@ -37,7 +37,7 @@
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Ubicaci&oacute;n:</TH><TD>{printer_location}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Controlador:</TH><TD>{printer_make_and_model} ({color_supported=1?color:escala de grises}{sides_supported=one-sided?:, d&uacute;plex})<BR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Conexi&oacute;n:</TH><TD>{device_uri}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Opciones predeterminadas:</TH><TD>job-sheets={job_sheets_default}
-media={media_default?{media_default}:desconocido}
-{sides_default?sides={sides_default}:}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Opciones predeterminadas:</TH><TD>r&oacute;tulos={job_sheets_default}
+papel={media_default?{media_default}:desconocido}
+{sides_default?caras={sides_default}:}</TD></TR>
 </TABLE>

vcnet/README.txt

@@ -1,4 +1,4 @@
-README - CUPS on Windows - 2016-05-13
+README - CUPS on Windows - 2016-08-08
 -------------------------------------
 
 This directory contains Visual Studio project and solution files for building

vcnet/cups.sln

@@ -1,59 +1,24 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcxproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcupsimage2", "libcupsimage2.vcproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E1234}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcupsimage2", "libcupsimage2.vcxproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E1234}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "testfile.vcxproj", "{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcproj", "{90B0058C-8393-411F-BD3B-E2C831D4E883}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhttp", "testhttp.vcxproj", "{90B0058C-8393-411F-BD3B-E2C831D4E883}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cupstestppd", "cupstestppd.vcproj", "{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB4AA6F2-3E84-45BE-B505-95CD375E1234} = {CB4AA6F2-3E84-45BE-B505-95CD375E1234}
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cupstestppd", "cupstestppd.vcxproj", "{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcxproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "ipptool-installer.vdproj", "{6AEA263B-92C0-426F-B5FF-F7F5917B704A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B484DA0C-62C8-4C32-83B6-CCEB58968B85} = {B484DA0C-62C8-4C32-83B6-CCEB58968B85}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcxproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcxproj", "{B484DA0C-62C8-4C32-83B6-CCEB58968B85}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "libcups2-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B484DA0C-62C8-4C32-83B6-CCEB58968B85} = {B484DA0C-62C8-4C32-83B6-CCEB58968B85}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcproj", "{B484DA0C-62C8-4C32-83B6-CCEB58968B85}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18950A1B-D37A-40C7-B2DF-C12986C0526E} = {18950A1B-D37A-40C7-B2DF-C12986C0526E}
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippserver", "ippserver.vcproj", "{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippserver", "ippserver.vcxproj", "{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -81,20 +46,16 @@ Global
 		{CB4AA6F2-3E84-45BE-B505-95CD375E1234}.Release|x64.Build.0 = Release|x64
 		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|Win32.Build.0 = Debug|Win32
-		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|x64.ActiveCfg = Debug|x64
-		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|x64.Build.0 = Debug|x64
+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Debug|x64.ActiveCfg = Debug|Win32
 		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.ActiveCfg = Release|Win32
 		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|Win32.Build.0 = Release|Win32
-		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|x64.ActiveCfg = Debug|x64
-		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|x64.Build.0 = Debug|x64
+		{CE75FC5F-E0CF-45DC-AD27-84666D3FBA30}.Release|x64.ActiveCfg = Release|Win32
 		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|Win32.ActiveCfg = Debug|Win32
 		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|Win32.Build.0 = Debug|Win32
-		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|x64.ActiveCfg = Debug|x64
-		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|x64.Build.0 = Debug|x64
+		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Debug|x64.ActiveCfg = Debug|Win32
 		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|Win32.ActiveCfg = Release|Win32
 		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|Win32.Build.0 = Release|Win32
-		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|x64.ActiveCfg = Debug|x64
-		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|x64.Build.0 = Debug|x64
+		{90B0058C-8393-411F-BD3B-E2C831D4E883}.Release|x64.ActiveCfg = Release|Win32
 		{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}.Debug|Win32.Build.0 = Debug|Win32
 		{6BE0CDD3-4ED7-409C-A80F-19DF73664B1F}.Debug|x64.ActiveCfg = Debug|x64
@@ -111,14 +72,6 @@ Global
 		{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}.Release|Win32.Build.0 = Release|Win32
 		{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}.Release|x64.ActiveCfg = Release|x64
 		{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}.Release|x64.Build.0 = Release|x64
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Debug|Win32.ActiveCfg = Debug
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Debug|Win32.Build.0 = Debug
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Debug|x64.ActiveCfg = Debug
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Debug|x64.Build.0 = Debug
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|Win32.ActiveCfg = Release
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|Win32.Build.0 = Release
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.ActiveCfg = Release
-		{6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.Build.0 = Release
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.Build.0 = Debug|Win32
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Debug|x64
@@ -126,14 +79,6 @@ Global
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.ActiveCfg = Release|Win32
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.Build.0 = Release|Win32
 		{18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|x64.ActiveCfg = Release|x64
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|Win32.ActiveCfg = Debug
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|Win32.Build.0 = Debug
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|x64.ActiveCfg = Debug
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Debug|x64.Build.0 = Debug
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|Win32.ActiveCfg = Release
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|Win32.Build.0 = Release
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|x64.ActiveCfg = Release
-		{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}.Release|x64.Build.0 = Release
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|Win32.Build.0 = Debug|Win32
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Debug|x64.ActiveCfg = Debug|x64
@@ -142,14 +87,6 @@ Global
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|Win32.Build.0 = Release|Win32
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.ActiveCfg = Release|x64
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.Build.0 = Release|x64
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|Win32.ActiveCfg = Debug
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|Win32.Build.0 = Debug
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|x64.ActiveCfg = Debug
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|x64.Build.0 = Debug
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|Win32.ActiveCfg = Release
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|Win32.Build.0 = Release
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|x64.ActiveCfg = Release
-		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|x64.Build.0 = Release
 		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|Win32.Build.0 = Debug|Win32
 		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|x64.ActiveCfg = Debug|x64

xcode/CUPS.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 			buildPhases = (
 			);
 			dependencies = (
+				270D02281D707E5100EA9403 /* PBXTargetDependency */,
 				271287361CC1411000E517C7 /* PBXTargetDependency */,
 				2712871C1CC13FFA00E517C7 /* PBXTargetDependency */,
 				271286DC1CC13EF400E517C7 /* PBXTargetDependency */,
@@ -194,6 +195,14 @@
 		270696561CADF3E200FFE5FB /* versioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F0A133305BB00FCA411 /* versioning.h */; settings = {ATTRIBUTES = (); }; };
 		2706965B1CAE1A9A00FFE5FB /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F09133305BB00FCA411 /* util.c */; };
 		270CCDBC135E3D3E00007BE2 /* testmime.c in Sources */ = {isa = PBXBuildFile; fileRef = 270CCDBB135E3D3E00007BE2 /* testmime.c */; };
+		270D02191D707E0200EA9403 /* libcups_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A4332F155844CF002E172D /* libcups_static.a */; };
+		270D021A1D707E0200EA9403 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E5136B64AF00836530 /* CoreFoundation.framework */; };
+		270D021B1D707E0200EA9403 /* Kerberos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E6136B64B000836530 /* Kerberos.framework */; };
+		270D021C1D707E0200EA9403 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7EF1536167A005426E1 /* libiconv.dylib */; };
+		270D021D1D707E0200EA9403 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7F01536167A005426E1 /* libresolv.dylib */; };
+		270D021E1D707E0200EA9403 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7EC1536161C005426E1 /* libz.dylib */; };
+		270D021F1D707E0200EA9403 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E7136B64B000836530 /* Security.framework */; };
+		270D02261D707E3700EA9403 /* testcreds.c in Sources */ = {isa = PBXBuildFile; fileRef = 270D02251D707E3700EA9403 /* testcreds.c */; };
 		271284D21CC1231300E517C7 /* snmp-supplies.c in Sources */ = {isa = PBXBuildFile; fileRef = 7243790C1333E4E3009631B9 /* snmp-supplies.c */; };
 		271284D71CC124D700E517C7 /* libcupscgi_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 724FA76B1CC03AF60092477B /* libcupscgi_static.a */; };
 		271284D81CC124E300E517C7 /* libcupscgi_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 724FA76B1CC03AF60092477B /* libcupscgi_static.a */; };
@@ -901,6 +910,20 @@
 			remoteGlobalIDString = 274FF6891333B1C400317ECB;
 			remoteInfo = libcups_static;
 		};
+		270D02151D707E0200EA9403 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 274FF6891333B1C400317ECB;
+			remoteInfo = libcups_static;
+		};
+		270D02271D707E5100EA9403 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 270D02131D707E0200EA9403;
+			remoteInfo = testcreds;
+		};
 		271284901CC11FA500E517C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
@@ -2341,6 +2364,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
+		270D02201D707E0200EA9403 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 		271284E81CC1261900E517C7 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3115,6 +3147,8 @@
 		270B268117F5C5D600C8A3A9 /* tls-sspi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "tls-sspi.c"; path = "../cups/tls-sspi.c"; sourceTree = "<group>"; };
 		270CCDA7135E3C9E00007BE2 /* testmime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testmime; sourceTree = BUILT_PRODUCTS_DIR; };
 		270CCDBB135E3D3E00007BE2 /* testmime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testmime.c; path = ../scheduler/testmime.c; sourceTree = "<group>"; };
+		270D02241D707E0200EA9403 /* testcreds */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testcreds; sourceTree = BUILT_PRODUCTS_DIR; };
+		270D02251D707E3700EA9403 /* testcreds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testcreds.c; path = ../cups/testcreds.c; sourceTree = "<group>"; };
 		271284DD1CC125FC00E517C7 /* lpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpc.c; path = ../berkeley/lpc.c; sourceTree = "<group>"; };
 		271284DE1CC125FC00E517C7 /* lpq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpq.c; path = ../berkeley/lpq.c; sourceTree = "<group>"; };
 		271284DF1CC125FC00E517C7 /* lpr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lpr.c; path = ../berkeley/lpr.c; sourceTree = "<group>"; };
@@ -3585,6 +3619,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		270D02181D707E0200EA9403 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				270D02191D707E0200EA9403 /* libcups_static.a in Frameworks */,
+				270D021A1D707E0200EA9403 /* CoreFoundation.framework in Frameworks */,
+				270D021B1D707E0200EA9403 /* Kerberos.framework in Frameworks */,
+				270D021C1D707E0200EA9403 /* libiconv.dylib in Frameworks */,
+				270D021D1D707E0200EA9403 /* libresolv.dylib in Frameworks */,
+				270D021E1D707E0200EA9403 /* libz.dylib in Frameworks */,
+				270D021F1D707E0200EA9403 /* Security.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		271284E61CC1261900E517C7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4601,6 +4649,7 @@
 		273BF6B81333B4A90022CAAB /* tests */ = {
 			isa = PBXGroup;
 			children = (
+				270D02251D707E3700EA9403 /* testcreds.c */,
 				2712866A1CC130FF00E517C7 /* rasterbench.c */,
 				724FA65B1CC0389F0092477B /* test1284.c */,
 				727EF041192E3544001EF690 /* testadmin.c */,
@@ -4630,6 +4679,7 @@
 				727EF04F192E3602001EF690 /* testsub.c */,
 				724FA65D1CC0389F0092477B /* testsupplies.c */,
 				727EF03F192E3498001EF690 /* testtemplate.c */,
+				271286681CC130BD00E517C7 /* tlscheck.c */,
 			);
 			name = tests;
 			sourceTree = "<group>";
@@ -4680,7 +4730,6 @@
 		274FF67313333B0A00317ECB /* commands */ = {
 			isa = PBXGroup;
 			children = (
-				271286681CC130BD00E517C7 /* tlscheck.c */,
 				2732E089137A3F5200FAFEF6 /* cancel.c */,
 				2732E08A137A3F5200FAFEF6 /* cupsaccept.c */,
 				276684101337FA7C000D33D0 /* cupsaddsmb.c */,
@@ -4815,6 +4864,7 @@
 				271287031CC13F3F00E517C7 /* rss */,
 				271287181CC13FAB00E517C7 /* mantohtml */,
 				2712872C1CC140BE00E517C7 /* genstrings */,
+				270D02241D707E0200EA9403 /* testcreds */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -5428,6 +5478,24 @@
 			productReference = 270CCDA7135E3C9E00007BE2 /* testmime */;
 			productType = "com.apple.product-type.tool";
 		};
+		270D02131D707E0200EA9403 /* testcreds */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 270D02211D707E0200EA9403 /* Build configuration list for PBXNativeTarget "testcreds" */;
+			buildPhases = (
+				270D02161D707E0200EA9403 /* Sources */,
+				270D02181D707E0200EA9403 /* Frameworks */,
+				270D02201D707E0200EA9403 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				270D02141D707E0200EA9403 /* PBXTargetDependency */,
+			);
+			name = testcreds;
+			productName = testhttp;
+			productReference = 270D02241D707E0200EA9403 /* testcreds */;
+			productType = "com.apple.product-type.tool";
+		};
 		271284E11CC1261900E517C7 /* cancel */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 271284E91CC1261900E517C7 /* Build configuration list for PBXNativeTarget "cancel" */;
@@ -7157,7 +7225,7 @@
 		72BF96371333042100B1EAD7 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Apple Inc.";
 				TargetAttributes = {
 					270695FD1CADF3E200FFE5FB = {
@@ -7257,6 +7325,7 @@
 				724FA6ED1CC03A210092477B /* testcatalog */,
 				724FA6991CC039200092477B /* testcgi */,
 				724FA55D1CC037670092477B /* testconflicts */,
+				270D02131D707E0200EA9403 /* testcreds */,
 				273BF6BC1333B5000022CAAB /* testcups */,
 				2767FC4619266A0D000F61D3 /* testdest */,
 				724FA5701CC037810092477B /* testfile */,
@@ -7334,6 +7403,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		270D02161D707E0200EA9403 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				270D02261D707E3700EA9403 /* testcreds.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		271284E41CC1261900E517C7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -8304,6 +8381,16 @@
 			target = 274FF6891333B1C400317ECB /* libcups_static */;
 			targetProxy = 270CCDB7135E3CFD00007BE2 /* PBXContainerItemProxy */;
 		};
+		270D02141D707E0200EA9403 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 274FF6891333B1C400317ECB /* libcups_static */;
+			targetProxy = 270D02151D707E0200EA9403 /* PBXContainerItemProxy */;
+		};
+		270D02281D707E5100EA9403 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 270D02131D707E0200EA9403 /* testcreds */;
+			targetProxy = 270D02271D707E5100EA9403 /* PBXContainerItemProxy */;
+		};
 		271284911CC11FA500E517C7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 274FF6891333B1C400317ECB /* libcups_static */;
@@ -9379,6 +9466,20 @@
 			};
 			name = Release;
 		};
+		270D02221D707E0200EA9403 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		270D02231D707E0200EA9403 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		271284EA1CC1261900E517C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -10942,6 +11043,7 @@
 		72BF963C1333042100B1EAD7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPRESSION = lossless;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
@@ -10976,6 +11078,7 @@
 		72BF963D1333042100B1EAD7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
@@ -11077,6 +11180,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		270D02211D707E0200EA9403 /* Build configuration list for PBXNativeTarget "testcreds" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				270D02221D707E0200EA9403 /* Debug */,
+				270D02231D707E0200EA9403 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		271284E91CC1261900E517C7 /* Build configuration list for PBXNativeTarget "cancel" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

xcode/README.txt

@@ -0,0 +1,5 @@
+README - CUPS on macOS/iOS - 2016-08-08
+---------------------------------------
+
+This directory contains an Xcode project for building CUPS for macOS and the
+CUPS library for iOS.