Index: /pykota/trunk/pykota/version.py
===================================================================
--- /pykota/trunk/pykota/version.py (revision 3053)
+++ /pykota/trunk/pykota/version.py (revision 3073)
@@ -22,5 +22,5 @@
 #
 
-__version__ = "1.25alpha16_unofficial"
+__version__ = "1.25alpha17_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."
Index: /pykota/trunk/bin/pkprinters
===================================================================
--- /pykota/trunk/bin/pkprinters (revision 3052)
+++ /pykota/trunk/bin/pkprinters (revision 3073)
@@ -54,5 +54,7 @@
   
   -D | --description d Adds a textual description to printers.
-                       
+
+  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf
+
   -c | --charge p[,j]  Sets the price per page and per job to charge.
                        Job price is optional.
@@ -171,4 +173,6 @@
             raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
             
+        docups = options["cups"]
+        
         if not options["list"] :    
             percent = Percent(self)
@@ -202,16 +206,17 @@
             percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyPrinters(printers)
-            percent.display("\n%s...\n" % _("Rerouting printers to CUPS"))
-            for printer in printers :
-                uri = self.getPrinterDeviceURI(printer.Name)
-                if self.isPrinterCaptured(deviceuri=uri) :
-                     newuri = uri.replace("cupspykota:", "")
-                     if newuri.startswith("//") :
-                         newuri = newuri[2:]
-                     self.regainPriv() # to avoid having to enter password.
-                     os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
-                     self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
-                     self.dropPriv()    
-                percent.oneMore()
+            if docups :
+                percent.display("\n%s...\n" % _("Rerouting printers to CUPS"))
+                for printer in printers :
+                    uri = self.getPrinterDeviceURI(printer.Name)
+                    if self.isPrinterCaptured(deviceuri=uri) :
+                         newuri = uri.replace("cupspykota:", "")
+                         if newuri.startswith("//") :
+                             newuri = newuri[2:]
+                         self.regainPriv() # to avoid having to enter password.
+                         os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+                         self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+                         self.dropPriv()    
+                    percent.oneMore()
             percent.display("\n")
         else :
@@ -268,11 +273,12 @@
                             oldprinter = self.storage.addPrinter(printer)               
                             
-                            uri = self.getPrinterDeviceURI(printer.Name)
-                            if not self.isPrinterCaptured(deviceuri=uri) :
-                                 newuri = "cupspykota://%s" % uri
-                                 self.regainPriv() # to avoid having to enter password.
-                                 os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
-                                 self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
-                                 self.dropPriv()
+                            if docups :
+                                 uri = self.getPrinterDeviceURI(printer.Name)
+                                 if not self.isPrinterCaptured(deviceuri=uri) :
+                                      newuri = "cupspykota://%s" % uri
+                                      self.regainPriv() # to avoid having to enter password.
+                                      os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+                                      self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+                                      self.dropPriv()
                                      
                             if oldprinter is not None :
@@ -315,6 +321,6 @@
     retcode = 0
     try :
-        short_options = "hvac:D:dg:lrsnpm:"
-        long_options = ["help", "version", "add", "charge=", "description=", \
+        short_options = "hvaCc:D:dg:lrsnpm:"
+        long_options = ["help", "version", "add", "cups", "charge=", "description=", \
                         "delete", "groups=", "list", "remove", \
                         "skipexisting", "passthrough", "nopassthrough", \
@@ -332,4 +338,5 @@
         options["version"] = options["v"] or options["version"]
         options["add"] = options["a"] or options["add"]
+        options["cups"] = options["C"] or options["cups"]
         options["charge"] = options["c"] or options["charge"]
         options["description"] = options["D"] or options["description"]
Index: /pykota/trunk/man/sv_SE/pkprinters.1
===================================================================
--- /pykota/trunk/man/sv_SE/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/sv_SE/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/de/pkprinters.1
===================================================================
--- /pykota/trunk/man/de/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/de/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/nb_NO/pkprinters.1
===================================================================
--- /pykota/trunk/man/nb_NO/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/nb_NO/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/pkprinters.1
===================================================================
--- /pykota/trunk/man/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/pt_BR/pkprinters.1
===================================================================
--- /pykota/trunk/man/pt_BR/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/pt_BR/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/fr/pkprinters.1
===================================================================
--- /pykota/trunk/man/fr/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/fr/pkprinters.1 (revision 3073)
@@ -30,4 +30,8 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Ajoute une description textuelle aux imprimantes.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Modifie �lement la DeviceURI dans le fichier
+printers.conf de CUPS.
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/th/pkprinters.1
===================================================================
--- /pykota/trunk/man/th/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/th/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/pl/pkprinters.1
===================================================================
--- /pykota/trunk/man/pl/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/pl/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/pt/pkprinters.1
===================================================================
--- /pykota/trunk/man/pt/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/pt/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/tr/pkprinters.1
===================================================================
--- /pykota/trunk/man/tr/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/tr/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/el_GR/pkprinters.1
===================================================================
--- /pykota/trunk/man/el_GR/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/el_GR/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/zh_TW/pkprinters.1
===================================================================
--- /pykota/trunk/man/zh_TW/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/zh_TW/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/es/pkprinters.1
===================================================================
--- /pykota/trunk/man/es/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/es/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/man/it/pkprinters.1
===================================================================
--- /pykota/trunk/man/it/pkprinters.1 (revision 3065)
+++ /pykota/trunk/man/it/pkprinters.1 (revision 3073)
@@ -29,4 +29,7 @@
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
+.TP
+\fB\-C\fR | \fB\-\-cups\fR
+Also modifies the DeviceURI in CUPS' printers.conf
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
Index: /pykota/trunk/NEWS
===================================================================
--- /pykota/trunk/NEWS (revision 3052)
+++ /pykota/trunk/NEWS (revision 3073)
@@ -22,4 +22,19 @@
 PyKota NEWS :
        
+    - 1.25alpha17 (2006-11-27) :
+    
+        - pkprinters now only modifies CUPS' printers.conf when the
+          -C | --cups command line switch is used.
+          
+    - 1.25alpha16 (2006-11-12) :
+      
+        - Several fixes to CGI scripts wrt i18n.
+        
+        - Introduced the pkrefund command line tool to refund jobs.
+        
+        - Several i18n fixes.
+        
+        - Several minor fixes to documentation and translations.
+        
     - 1.25alpha15 (2006-11-06) :   
     
Index: /pykota/trunk/po/sv_SE/pykota.po
===================================================================
--- /pykota/trunk/po/sv_SE/pykota.po (revision 3069)
+++ /pykota/trunk/po/sv_SE/pykota.po (revision 3073)
@@ -1755,5 +1755,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/pt/pykota.po
===================================================================
--- /pykota/trunk/po/pt/pykota.po (revision 3069)
+++ /pykota/trunk/po/pt/pykota.po (revision 3073)
@@ -1740,5 +1740,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/tr/pykota.po
===================================================================
--- /pykota/trunk/po/tr/pykota.po (revision 3069)
+++ /pykota/trunk/po/tr/pykota.po (revision 3073)
@@ -1745,5 +1745,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/el_GR/pykota.po
===================================================================
--- /pykota/trunk/po/el_GR/pykota.po (revision 3069)
+++ /pykota/trunk/po/el_GR/pykota.po (revision 3073)
@@ -1740,5 +1740,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/de/pykota.po
===================================================================
--- /pykota/trunk/po/de/pykota.po (revision 3069)
+++ /pykota/trunk/po/de/pykota.po (revision 3073)
@@ -1739,5 +1739,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/zh_TW/pykota.po
===================================================================
--- /pykota/trunk/po/zh_TW/pykota.po (revision 3069)
+++ /pykota/trunk/po/zh_TW/pykota.po (revision 3073)
@@ -1725,5 +1725,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/nb_NO/pykota.po
===================================================================
--- /pykota/trunk/po/nb_NO/pykota.po (revision 3069)
+++ /pykota/trunk/po/nb_NO/pykota.po (revision 3073)
@@ -1749,5 +1749,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/pt_BR/pykota.po
===================================================================
--- /pykota/trunk/po/pt_BR/pykota.po (revision 3072)
+++ /pykota/trunk/po/pt_BR/pykota.po (revision 3073)
@@ -1737,5 +1737,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/fr/pykota.po
===================================================================
--- /pykota/trunk/po/fr/pykota.po (revision 3069)
+++ /pykota/trunk/po/fr/pykota.po (revision 3073)
@@ -2810,5 +2810,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
@@ -2905,5 +2907,8 @@
 "  \n"
 "  -D | --description d Ajoute une description textuelle aux imprimantes.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Modifie �lement la DeviceURI dans le fichier\n"
+"                       printers.conf de CUPS.\n"
+"\n"
 "  -c | --charge p[,j]  Fixes les co�ar page et par travail.\n"
 "                       Le co�r travail d'impression est optionnel.\n"
Index: /pykota/trunk/po/es/pykota.po
===================================================================
--- /pykota/trunk/po/es/pykota.po (revision 3069)
+++ /pykota/trunk/po/es/pykota.po (revision 3073)
@@ -1756,5 +1756,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/pykota.pot
===================================================================
--- /pykota/trunk/po/pykota.pot (revision 3069)
+++ /pykota/trunk/po/pykota.pot (revision 3073)
@@ -1719,5 +1719,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/th/pykota.po
===================================================================
--- /pykota/trunk/po/th/pykota.po (revision 3069)
+++ /pykota/trunk/po/th/pykota.po (revision 3073)
@@ -1733,5 +1733,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
Index: /pykota/trunk/po/pl/pykota.po
===================================================================
--- /pykota/trunk/po/pl/pykota.po (revision 3069)
+++ /pykota/trunk/po/pl/pykota.po (revision 3073)
@@ -2252,5 +2252,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
@@ -2350,5 +2352,7 @@
 "  \n"
 "  -D | --description d Dodaje opis tekstowy dla drukarki.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Ustala cen�a stron�raz za zadanie drukowania.\n"
 "                       Cena za zadanie drukowania jest argumentem "
Index: /pykota/trunk/po/it/pykota.po
===================================================================
--- /pykota/trunk/po/it/pykota.po (revision 3069)
+++ /pykota/trunk/po/it/pykota.po (revision 3073)
@@ -1742,5 +1742,7 @@
 "  \n"
 "  -D | --description d Adds a textual description to printers.\n"
-"                       \n"
+"\n"
+"  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf\n"
+"\n"
 "  -c | --charge p[,j]  Sets the price per page and per job to charge.\n"
 "                       Job price is optional.\n"
