Update svn:keyword properties.

[thirdparty/cups.git] / backend / usb-unix.c

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index 92d63bfd2c9f85f2632f0d82e9c565c8c626033c..3fe18b68ffe59b29a68ef9cf974c636850c323e2 100644 (file)
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,11 +1,11 @@
 /*
- * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id$"
  *
  *   USB port backend for CUPS.
  *
  *   This file is included from "usb.c" when compiled on UNIX/Linux.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -128,16 +128,12 @@ print_device(const char *uri,             /* I - Device URI */
 
       if (errno == EBUSY)
       {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer busy, will retry in 10 seconds."));
+        _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(10);
       }
       else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
                errno == ENODEV)
       {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer not connected, will retry in 30 "
-                              "seconds."));
        sleep(30);
       }
       else
@@ -261,7 +257,6 @@ list_devices(void)
 
     close(fd);
   }
-#elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
   int  i;                      /* Looping var */
   int  fd;                     /* File descriptor */
@@ -425,8 +420,7 @@ open_device(const char *uri,                /* I - Device URI */
       */
 
       if (busy)
-       _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer is busy, will retry in 5 seconds."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
       sleep(5);
     }
@@ -509,8 +503,7 @@ open_device(const char *uri,                /* I - Device URI */
 
       if (busy)
       {
-       _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer is busy, will retry in 5 seconds."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(5);
       }
     }
@@ -619,5 +612,5 @@ side_cb(int         print_fd,               /* I - Print file */
 
 
 /*
- * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id$".
  */