Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3599 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/ppd.c b/cups/ppd.c
index cf4bf2af19ab9ec6163e5bfe93ab3c8363c289a4..4244b11ef6942184874949defcc5d030599b340c 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51.2.50 2003/04/10 03:01:48 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.51 2003/04/11 13:07:36 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -689,6 +689,24 @@ ppdOpen(FILE *fp)                  /* I - File to read from */
                    sizeof(option->defchoice));
            break;
          }
+
+        if (strcmp(keyword, "PageSize") == 0)
+         strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
+                  sizeof(option->text));
+       else if (strcmp(keyword, "MediaType") == 0)
+         strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
+                  sizeof(option->text));
+       else if (strcmp(keyword, "InputSlot") == 0)
+         strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
+                  sizeof(option->text));
+       else if (strcmp(keyword, "ColorModel") == 0)
+         strlcpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
+                  sizeof(option->text));
+       else if (strcmp(keyword, "Resolution") == 0)
+         strlcpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
+                  sizeof(option->text));
+        else
+         strlcpy(option->text, keyword, sizeof(option->text));
       }
     }
 
@@ -3343,5 +3361,5 @@ ppd_read(FILE *fp,                        /* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51.2.50 2003/04/10 03:01:48 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.51 2003/04/11 13:07:36 mike Exp $".
  */