Merge changes from CUPS 1.5svn-r8849.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1725 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 72 insertions, 72 deletions

diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 0a044fe4c..5069a8777 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -227,7 +227,7 @@ ppdcSource::find_include(
     if (*ptr != '>')
     {
       _cupsLangPrintf(stderr,
-                      _("ppdc: Invalid #include/#po filename \"%s\"!\n"), n);
+                      _("ppdc: Invalid #include/#po filename \"%s\"\n"), n);
       return (0);
     }
 
@@ -353,7 +353,7 @@ ppdcSource::get_attr(ppdcFile *fp, 	// I - File to read
   if (!get_token(fp, name, sizeof(name)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected name after %s on line %d of %s!\n"),
+                    _("ppdc: Expected name after %s on line %d of %s\n"),
 		    loc ? "LocAttribute" : "Attribute", fp->line, fp->filename);
     return (0);
   }
@@ -361,7 +361,7 @@ ppdcSource::get_attr(ppdcFile *fp, 	// I - File to read
   if (!get_token(fp, selector, sizeof(selector)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected selector after %s on line %d of %s!\n"),
+                    _("ppdc: Expected selector after %s on line %d of %s\n"),
 		    loc ? "LocAttribute" : "Attribute", fp->line, fp->filename);
     return (0);
   }
@@ -372,7 +372,7 @@ ppdcSource::get_attr(ppdcFile *fp, 	// I - File to read
   if (!get_token(fp, value, sizeof(value)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected value after %s on line %d of %s!\n"),
+                    _("ppdc: Expected value after %s on line %d of %s\n"),
 		    loc ? "LocAttribute" : "Attribute", fp->line, fp->filename);
     return (0);
   }
@@ -480,7 +480,7 @@ ppdcSource::get_color_model(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected name/text combination for ColorModel on "
-		      "line %d of %s!\n"), fp->line, fp->filename);
+		      "line %d of %s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -493,7 +493,7 @@ ppdcSource::get_color_model(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected colorspace for ColorModel on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -504,7 +504,7 @@ ppdcSource::get_color_model(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected color order for ColorModel on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -515,7 +515,7 @@ ppdcSource::get_color_model(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected compression for ColorModel on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -573,7 +573,7 @@ ppdcSource::get_color_profile(
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected resolution/mediatype following "
-		      "ColorProfile on line %d of %s!\n"),
+		      "ColorProfile on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -696,7 +696,7 @@ ppdcSource::get_constraint(ppdcFile *fp)// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected constraints string for UIConstraints on "
-		      "line %d of %s!\n"), fp->line, fp->filename);
+		      "line %d of %s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -705,7 +705,7 @@ ppdcSource::get_constraint(ppdcFile *fp)// I - File to read
   if (*ptr != '*')
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Option constraint must *name on line %d of %s!\n"),
+                    _("ppdc: Option constraint must *name on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -728,7 +728,7 @@ ppdcSource::get_constraint(ppdcFile *fp)// I - File to read
   if (*ptr != '*')
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected two option names on line %d of %s!\n"),
+                    _("ppdc: Expected two option names on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -827,7 +827,7 @@ ppdcSource::get_duplex(ppdcFile   *fp,	// I - File to read from
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected duplex type after Duplex on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return;
   }
 
@@ -906,7 +906,7 @@ ppdcSource::get_duplex(ppdcFile   *fp,	// I - File to read from
   }
   else
     _cupsLangPrintf(stderr,
-                    _("ppdc: Unknown duplex type \"%s\" on line %d of %s!\n"),
+                    _("ppdc: Unknown duplex type \"%s\" on line %d of %s\n"),
 		    temp, fp->line, fp->filename);
 }
 
@@ -932,7 +932,7 @@ ppdcSource::get_filter(ppdcFile *fp)	// I - File to read
   if (!get_token(fp, type, sizeof(type)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected a filter definition on line %d of %s!\n"),
+                    _("ppdc: Expected a filter definition on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -955,7 +955,7 @@ ppdcSource::get_filter(ppdcFile *fp)	// I - File to read
     if (!get_token(fp, program, sizeof(program)))
     {
       _cupsLangPrintf(stderr,
-                      _("ppdc: Expected a program name on line %d of %s!\n"),
+                      _("ppdc: Expected a program name on line %d of %s\n"),
 		      fp->line, fp->filename);
       return (NULL);
     }
@@ -965,14 +965,14 @@ ppdcSource::get_filter(ppdcFile *fp)	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Invalid empty MIME type for filter on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
   if (cost < 0 || cost > 200)
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Invalid cost for filter on line %d of %s!\n"),
+                    _("ppdc: Invalid cost for filter on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -981,7 +981,7 @@ ppdcSource::get_filter(ppdcFile *fp)	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Invalid empty program name for filter on line %d "
-		      "of %s!\n"), fp->line, fp->filename);
+		      "of %s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1004,7 +1004,7 @@ ppdcSource::get_float(ppdcFile *fp)	// I - File to read
   // Get the number from the file and range-check...
   if (!get_token(fp, temp, sizeof(temp)))
   {
-    _cupsLangPrintf(stderr, _("ppdc: Expected real number on line %d of %s!\n"),
+    _cupsLangPrintf(stderr, _("ppdc: Expected real number on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (-1.0f);
   }
@@ -1015,7 +1015,7 @@ ppdcSource::get_float(ppdcFile *fp)	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Unknown trailing characters in real number \"%s\" "
-		      "on line %d of %s!\n"), temp, fp->line, fp->filename);
+		      "on line %d of %s\n"), temp, fp->line, fp->filename);
     return (-1.0f);
   }
   else
@@ -1058,7 +1058,7 @@ ppdcSource::get_font(ppdcFile *fp)	// I - File to read
   if (!get_token(fp, name, sizeof(name)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected name after Font on line %d of %s!\n"),
+                    _("ppdc: Expected name after Font on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (0);
   }
@@ -1078,7 +1078,7 @@ ppdcSource::get_font(ppdcFile *fp)	// I - File to read
     {
       _cupsLangPrintf(stderr,
                       _("ppdc: Expected encoding after Font on line %d of "
-		        "%s!\n"), fp->line, fp->filename);
+		        "%s\n"), fp->line, fp->filename);
       return (0);
     }
 
@@ -1086,7 +1086,7 @@ ppdcSource::get_font(ppdcFile *fp)	// I - File to read
     {
       _cupsLangPrintf(stderr,
                       _("ppdc: Expected version after Font on line %d of "
-		        "%s!\n"), fp->line, fp->filename);
+		        "%s\n"), fp->line, fp->filename);
       return (0);
     }
 
@@ -1094,14 +1094,14 @@ ppdcSource::get_font(ppdcFile *fp)	// I - File to read
     {
       _cupsLangPrintf(stderr,
                       _("ppdc: Expected charset after Font on line %d of "
-		        "%s!\n"), fp->line, fp->filename);
+		        "%s\n"), fp->line, fp->filename);
       return (0);
     }
 
     if (!get_token(fp, temp, sizeof(temp)))
     {
       _cupsLangPrintf(stderr,
-                      _("ppdc: Expected status after Font on line %d of %s!\n"),
+                      _("ppdc: Expected status after Font on line %d of %s\n"),
 		      fp->line, fp->filename);
       return (0);
     }
@@ -1113,7 +1113,7 @@ ppdcSource::get_font(ppdcFile *fp)	// I - File to read
     else
     {
       _cupsLangPrintf(stderr,
-                      _("ppdc: Bad status keyword %s on line %d of %s!\n"),
+                      _("ppdc: Bad status keyword %s on line %d of %s\n"),
 		      temp, fp->line, fp->filename);
       return (0);
     }
@@ -1156,7 +1156,7 @@ ppdcSource::get_generic(ppdcFile   *fp,	// I - File to read
   if (!get_token(fp, name, sizeof(name)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected name/text after %s on line %d of %s!\n"),
+                    _("ppdc: Expected name/text after %s on line %d of %s\n"),
 		    keyword, fp->line, fp->filename);
     return (NULL);
   }
@@ -1205,7 +1205,7 @@ ppdcSource::get_group(ppdcFile   *fp,	// I - File to read
   if (!get_token(fp, name, sizeof(name)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected group name/text on line %d of %s!\n"),
+                    _("ppdc: Expected group name/text on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -1246,7 +1246,7 @@ ppdcSource::get_installable(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected name/text after Installable on line %d "
-		      "of %s!\n"), fp->line, fp->filename);
+		      "of %s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1501,7 +1501,7 @@ ppdcSource::get_integer(ppdcFile *fp)	// I - File to read
 
   if (!get_token(fp, temp, sizeof(temp)))
   {
-    _cupsLangPrintf(stderr, _("ppdc: Expected integer on line %d of %s!\n"),
+    _cupsLangPrintf(stderr, _("ppdc: Expected integer on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (-1);
   }
@@ -1573,7 +1573,7 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
   if (!get_token(fp, name, sizeof(name)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected option name/text on line %d of %s!\n"),
+                    _("ppdc: Expected option name/text on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -1585,7 +1585,7 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
 
   if (!get_token(fp, type, sizeof(type)))
   {
-    _cupsLangPrintf(stderr, _("ppdc: Expected option type on line %d of %s!\n"),
+    _cupsLangPrintf(stderr, _("ppdc: Expected option type on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -1599,7 +1599,7 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
   else
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Invalid option type \"%s\" on line %d of %s!\n"),
+                    _("ppdc: Invalid option type \"%s\" on line %d of %s\n"),
 		    type, fp->line, fp->filename);
     return (NULL);
   }
@@ -1607,7 +1607,7 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
   if (!get_token(fp, type, sizeof(type)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected option section on line %d of %s!\n"),
+                    _("ppdc: Expected option section on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -1628,7 +1628,7 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Invalid option section \"%s\" on line %d of "
-		      "%s!\n"), type, fp->line, fp->filename);
+		      "%s\n"), type, fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1644,14 +1644,14 @@ ppdcSource::get_option(ppdcFile   *fp,	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Option %s redefined with a different type on line "
-		      "%d of %s!\n"), name, fp->line, fp->filename);
+		      "%d of %s\n"), name, fp->line, fp->filename);
     return (NULL);
   }
   else if (g != mg)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Option %s defined in two different groups on line "
-		      "%d of %s!\n"), name, fp->line, fp->filename);
+		      "%d of %s\n"), name, fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1680,7 +1680,7 @@ ppdcSource::get_po(ppdcFile *fp)	// I - File to read
   if (!get_token(fp, locale, sizeof(locale)))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Expected locale after #po on line %d of %s!\n"),
+                    _("ppdc: Expected locale after #po on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -1689,7 +1689,7 @@ ppdcSource::get_po(ppdcFile *fp)	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected filename after #po %s on line %d of "
-		      "%s!\n"), locale, fp->line, fp->filename);
+		      "%s\n"), locale, fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1697,7 +1697,7 @@ ppdcSource::get_po(ppdcFile *fp)	// I - File to read
   if (find_po(locale))
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Duplicate #po for locale %s on line %d of %s!\n"),
+                    _("ppdc: Duplicate #po for locale %s on line %d of %s\n"),
 		    locale, fp->line, fp->filename);
     return (NULL);
   }
@@ -1729,7 +1729,7 @@ ppdcSource::get_po(ppdcFile *fp)	// I - File to read
   else
   {
     _cupsLangPrintf(stderr,
-                    _("ppdc: Unable to find #po file %s on line %d of %s!\n"),
+                    _("ppdc: Unable to find #po file %s on line %d of %s\n"),
 		    poname, fp->line, fp->filename);
     return (NULL);
   }
@@ -1765,7 +1765,7 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected override field after Resolution on line "
-		      "%d of %s!\n"), fp->line, fp->filename);
+		      "%d of %s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1782,7 +1782,7 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
   {
     _cupsLangPrintf(stderr,
 		    _("ppdc: Expected name/text after Resolution on line %d of "
-		      "%s!\n"), fp->line, fp->filename);
+		      "%s\n"), fp->line, fp->filename);
     return (NULL);
   }
 
@@ -1796,7 +1796,7 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
     case 0 :
         _cupsLangPrintf(stderr,
 	                _("ppdc: Bad resolution name \"%s\" on line %d of "
-			  "%s!\n"), name, fp->line, fp->filename);
+			  "%s\n"), name, fp->line, fp->filename);
         break;
     case 1 :
         ydpi = xdpi;
@@ -1863,7 +1863,7 @@ ppdcSource::get_simple_profile(ppdcFile *fp)
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Expected resolution/mediatype following "
-		      "SimpleColorProfile on line %d of %s!\n"),
+		      "SimpleColorProfile on line %d of %s\n"),
 		    fp->line, fp->filename);
     return (NULL);
   }
@@ -2164,7 +2164,7 @@ ppdcSource::get_token(ppdcFile *fp,	// I - File to read
   {
     _cupsLangPrintf(stderr,
                     _("ppdc: Unterminated string starting with %c on line %d "
-		      "of %s!\n"), quote, startline, fp->filename);
+		      "of %s\n"), quote, startline, fp->filename);
     return (NULL);
   }
 
@@ -2401,7 +2401,7 @@ ppdcSource::read_file(const char  *f,	// I - File to read
   delete fp;
 
   if (cond_current != cond_stack)
-    _cupsLangPrintf(stderr, _("ppdc: Missing #endif at end of \"%s\"!\n"), f);
+    _cupsLangPrintf(stderr, _("ppdc: Missing #endif at end of \"%s\"\n"), f);
 }
 
 
@@ -2484,7 +2484,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       if ((cond_current - cond_stack) >= 100)
       {
         _cupsLangPrintf(stderr,
-	                _("ppdc: Too many nested #if's on line %d of %s!\n"),
+	                _("ppdc: Too many nested #if's on line %d of %s\n"),
 			fp->line, fp->filename);
 	break;
       }
@@ -2502,7 +2502,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
     {
       if (cond_current == cond_stack)
       {
-        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s!\n"),
+        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s\n"),
 	                fp->line, fp->filename);
         break;
       }
@@ -2537,7 +2537,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
     {
       if (cond_current == cond_stack)
       {
-        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s!\n"),
+        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s\n"),
 		        fp->line, fp->filename);
         break;
       }
@@ -2567,7 +2567,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
     {
       if (cond_current == cond_stack)
       {
-        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s!\n"),
+        _cupsLangPrintf(stderr, _("ppdc: Missing #if on line %d of %s\n"),
 	                fp->line, fp->filename);
         break;
       }
@@ -2609,7 +2609,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected include filename on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
         break;
       }
 
@@ -2633,7 +2633,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
 	delete incfile;
 
 	if (cond_current != old_current)
-	  _cupsLangPrintf(stderr, _("ppdc: Missing #endif at end of \"%s\"!\n"),
+	  _cupsLangPrintf(stderr, _("ppdc: Missing #endif at end of \"%s\"\n"),
 	                  incname);
       }
       else
@@ -2641,7 +2641,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
 	// Can't find it!
 	_cupsLangPrintf(stderr,
 		        _("ppdc: Unable to find include file \"%s\" on line %d "
-			  "of %s!\n"), inctemp, fp->line, fp->filename);
+			  "of %s\n"), inctemp, fp->line, fp->filename);
 	break;
       }
     }
@@ -2709,7 +2709,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Choice found on line %d of %s with no "
-			  "Option!\n"), fp->line, fp->filename);
+			  "Option\n"), fp->line, fp->filename);
         break;
       }
 
@@ -2784,7 +2784,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected string after Copyright on line %d "
-			  "of %s!\n"), fp->line, fp->filename);
+			  "of %s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -2872,7 +2872,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
 	_cupsLangPrintf(stderr,
 			_("ppdc: Option %s defined in two different groups on "
-			  "line %d of %s!\n"), "cupsDarkness", fp->line,
+			  "line %d of %s\n"), "cupsDarkness", fp->line,
 		        fp->filename);
 	c->release();
 	continue;
@@ -2895,7 +2895,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected driver type keyword following "
-			  "DriverType on line %d of %s!\n"),
+			  "DriverType on line %d of %s\n"),
 			fp->line, fp->filename);
         continue;
       }
@@ -2913,7 +2913,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
         d->type = PPDC_DRIVER_LABEL;
       else
         _cupsLangPrintf(stderr,
-	                _("ppdc: Unknown driver type %s on line %d of %s!\n"),
+	                _("ppdc: Unknown driver type %s on line %d of %s\n"),
 			temp, fp->line, fp->filename);
     }
     else if (!strcasecmp(temp, "Duplex"))
@@ -2958,7 +2958,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
 	_cupsLangPrintf(stderr,
 			_("ppdc: Option %s defined in two different groups on "
-			  "line %d of %s!\n"), "cupsFinishing", fp->line,
+			  "line %d of %s\n"), "cupsFinishing", fp->line,
 		        fp->filename);
 	c->release();
 	continue;
@@ -3051,7 +3051,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
 	_cupsLangPrintf(stderr,
 			_("ppdc: Option %s defined in two different groups on "
-			  "line %d of %s!\n"), "InputSlot", fp->line,
+			  "line %d of %s\n"), "InputSlot", fp->line,
 		        fp->filename);
 	c->release();
 	continue;
@@ -3098,7 +3098,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 			_("ppdc: Expected name after Manufacturer on line %d "
-			  "of %s!\n"), fp->line, fp->filename);
+			  "of %s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3131,7 +3131,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected name after MediaSize on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3144,7 +3144,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Unknown media size \"%s\" on line %d of "
-			  "%s!\n"), name, fp->line, fp->filename);
+			  "%s\n"), name, fp->line, fp->filename);
 	break;
       }
 
@@ -3184,7 +3184,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
 	_cupsLangPrintf(stderr,
 			_("ppdc: Option %s defined in two different groups on "
-			  "line %d of %s!\n"), "MediaType", fp->line,
+			  "line %d of %s\n"), "MediaType", fp->line,
 		        fp->filename);
 	c->release();
 	continue;
@@ -3221,7 +3221,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected name after ModelName on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3267,7 +3267,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected name after FileName on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3284,7 +3284,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected name after PCFileName on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3317,7 +3317,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
 	_cupsLangPrintf(stderr,
 			_("ppdc: Option %s defined in two different groups on "
-			  "line %d of %s!\n"), "Resolution", fp->line,
+			  "line %d of %s\n"), "Resolution", fp->line,
 		        fp->filename);
 	c->release();
 	continue;
@@ -3387,7 +3387,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
       {
         _cupsLangPrintf(stderr,
 	                _("ppdc: Expected string after Version on line %d of "
-			  "%s!\n"), fp->line, fp->filename);
+			  "%s\n"), fp->line, fp->filename);
 	break;
       }
 
@@ -3397,7 +3397,7 @@ ppdcSource::scan_file(ppdcFile   *fp,	// I - File to read
     else
     {
       _cupsLangPrintf(stderr,
-                      _("ppdc: Unknown token \"%s\" seen on line %d of %s!\n"),
+                      _("ppdc: Unknown token \"%s\" seen on line %d of %s\n"),
 		      temp, fp->line, fp->filename);
       break;
     }