Index: pykota/trunk/pykota/version.py
===================================================================
--- pykota/trunk/pykota/version.py (revision 2452)
+++ pykota/trunk/pykota/version.py (revision 2465)
@@ -22,5 +22,5 @@
 #
 
-__version__ = "1.23alpha30_unofficial"
+__version__ = "1.23alpha31_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."
Index: pykota/trunk/bin/pkprinters
===================================================================
--- pykota/trunk/bin/pkprinters (revision 2463)
+++ pykota/trunk/bin/pkprinters (revision 2465)
@@ -80,4 +80,15 @@
   -s | --skipexisting  In combination with the --add option above, tells
                        pkprinters to not modify existing printers.
+                       
+  -m | --maxjobsize s  Sets the maximum job size allowed on the printer
+                       to s pages.
+                       
+  -p | --passthrough   Activate passthrough mode for the printer. In this
+                       mode, users are allowed to print without any impact
+                       on their quota or account balance.
+                       
+  -n | --nopassthrough Deactivate passthrough mode for the printer.
+                       Without -p or -n, printers are created in 
+                       normal mode, i.e. no passthrough.
   
   printer1 through printerN can contain wildcards if the --add option 
@@ -137,4 +148,15 @@
                     charges = [charges[0], None]
                 (perpage, perjob) = charges
+                
+        if options["maxjobsize"] :        
+            try :
+                maxjobsize = int(options["maxjobsize"])
+                if maxjobsize < 0 :
+                    raise ValueError
+            except ValueError :    
+                raise PyKotaToolError, _("Invalid maximum job size value %s") % options["maxjobsize"]
+        else :        
+            maxjobsize = None
+                
                 
         if options["add"] :    
@@ -181,4 +203,10 @@
                 if options["description"] is not None :
                     printer.setDescription(options["description"].strip())
+                if options["nopassthrough"] and printer.PassThrough :    
+                    self.storage.setPrinterPassThroughMode(printer, 0)
+                if options["passthrough"] and not printer.PassThrough :    
+                    self.storage.setPrinterPassThroughMode(printer, 1)
+                if (maxjobsize is not None) and (printer.MaxJobSize != maxjobsize) :    
+                    self.storage.setPrinterMaxJobSize(printer, maxjobsize)
                 if options["groups"] :    
                     for pgroup in printersgroups :
@@ -191,6 +219,9 @@
     retcode = 0
     try :
-        short_options = "hvac:D:dg:lrs"
-        long_options = ["help", "version", "add", "charge=", "description=", "delete", "groups=", "list", "remove", "skipexisting"]
+        short_options = "hvac:D:dg:lrsnpm:"
+        long_options = ["help", "version", "add", "charge=", "description=", \
+                        "delete", "groups=", "list", "remove", \
+                        "skipexisting", "passthrough", "nopassthrough", \
+                        "maxjobsize="]
         
         # Initializes the command line tool
@@ -212,4 +243,7 @@
         options["remove"] = options["r"] or options["remove"]
         options["skipexisting"] = options["s"] or options["skipexisting"]
+        options["maxjobsize"] = options["m"] or options["maxjobsize"]
+        options["passthrough"] = options["p"] or options["passthrough"]
+        options["nopassthrough"] = options["n"] or options["nopassthrough"]
         
         if options["help"] :
@@ -219,5 +253,6 @@
         elif (options["delete"] and (options["add"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) \
            or (options["skipexisting"] and not options["add"]) \
-           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) :
+           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) \
+           or (options["passthrough"] and options["nopassthrough"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
         elif options["remove"] and not options["groups"] :    
Index: pykota/trunk/man/sv_SE/pkprinters.1
===================================================================
--- pykota/trunk/man/sv_SE/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/sv_SE/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/pt/pkprinters.1
===================================================================
--- pykota/trunk/man/pt/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/pt/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/tr/pkprinters.1
===================================================================
--- pykota/trunk/man/tr/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/tr/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/el_GR/pkprinters.1
===================================================================
--- pykota/trunk/man/el_GR/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/el_GR/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/de/pkprinters.1
===================================================================
--- pykota/trunk/man/de/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/de/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/nb_NO/pkprinters.1
===================================================================
--- pykota/trunk/man/nb_NO/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/nb_NO/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/zh_TW/pkprinters.1
===================================================================
--- pykota/trunk/man/zh_TW/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/zh_TW/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/pkprinters.1
===================================================================
--- pykota/trunk/man/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "September 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkprinters \- manual page for pkprinters 1.23alpha30_unofficial
+pkprinters \- manual page for pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/pt_BR/pkprinters.1
===================================================================
--- pykota/trunk/man/pt_BR/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/pt_BR/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/fr/pkprinters.1
===================================================================
--- pykota/trunk/man/fr/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/fr/pkprinters.1 (revision 2465)
@@ -2,95 +2,106 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
-Un gestionnaire d'imprimantes pour PyKota.
+A Printers Manager for PyKota.
 .PP
-ligne de commande :
+command line usage :
 .IP
-pkprinters [options] impr1 impr2 impr3 ... imprN
+pkprinters [options] printer1 printer2 printer3 ... printerN
 .PP
 options :
 .TP
 \fB\-v\fR | \fB\-\-version\fR
-Affiche la version de pkprinters et quitte.
+Prints pkprinters's version number then exits.
 .TP
 \fB\-h\fR | \fB\-\-help\fR
-Affiche ce message et quitte.
+Prints this message then exits.
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Ajoute les imprimantes si elles n'existent pas d�
-dans la base de donn�. Si elles existent, alors
-elles sont modifi� sauf si l'option de ligne de
-commande \fB\-s\fR|\-\-skipexisting est aussi utilis�
+Adds printers if they don't exist on the Quota
+Storage Server. If they exist, they are modified
+unless \fB\-s\fR|\-\-skipexisting is also used.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Supprime les imprimantes de la base de donn�.
+Deletes printers from the quota storage.
 .HP
-\fB\-D\fR | \fB\-\-description\fR d Ajoute une description textuelle aux imprimantes.
+\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to printers.
 .TP
 \fB\-c\fR | \fB\-\-charge\fR p[,j]
-Fixes les co�ar page et par travail.
-Le co�r travail d'impression est optionnel.
-Si les deux sont utilis� s�rez les nombres par
-une virgule.
-Les nombres n�tifs ou avec d�males sont autoris�
+Sets the price per page and per job to charge.
+Job price is optional.
+If both are to be set, separate them with a comma.
+Floating point and negative values are allowed.
 .TP
-\fB\-g\fR | \fB\-\-groups\fR pg1[,pg2...] Ajoute ou supprime les imprimantes des groupes
-pg1, pg2, etc... qui doivent d� exister.
-Un groupe d'imprimantes est comme une imprimante
-normale mais est inconnu du syst� d'impression.
-On cr�les groupes d'imprimantes de la m� mani�
-que l'on cr�des imprimantes, et ensuite on leur
-ajoute des imprimantes avec cette option.
-Le d�mpte et la v�fication sont effectu�sur
-une imprimante et sur tous les groupes auxquels elle
-appartient.
-Si l'option \fB\-\-remove\fR ci\-dessous n'est pas utilis�
-l'action par d�ut est d'ajouter les imprimantes aux
-groupes d'imprimantes sp�fi�
+\fB\-g\fR | \fB\-\-groups\fR pg1[,pg2...] Adds or Remove the printer(s) to the printer
+groups pg1, pg2, etc... which must already exist.
+A printer group is just like a normal printer,
+only that it is usually unknown from the printing
+system. Create printer groups exactly the same
+way that you create printers, then add other
+printers to them with this option.
+Accounting is done on a printer and on all
+the printer groups it belongs to, quota checking
+is done on a printer and on all the printer groups
+it belongs to.
+If the \fB\-\-remove\fR option below is not used, the
+default action is to add printers to the specified
+printer groups.
 .TP
 \fB\-l\fR | \fB\-\-list\fR
-Liste les informations sur les imprimantes et les
-groupes dont elles sont membres.
+List informations about the printer(s) and the
+printers groups it is a member of.
 .TP
 \fB\-r\fR | \fB\-\-remove\fR
-Combin�avec l'option \fB\-\-groups\fR ci\-dessus, supprime
-les imprimantes des groupes sp�fi�
+In combination with the \fB\-\-groups\fR option above,
+remove printers from the specified printers groups.
 .TP
 \fB\-s\fR | \fB\-\-skipexisting\fR
-Combin�avec l'option \fB\-\-add\fR ci\-dessus, indique
-�kprinters de ne pas modifier les imprimantes
-existantes.
+In combination with the \fB\-\-add\fR option above, tells
+pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
-Les noms d'imprimantes peuvent contenir des caract�s jokers si l'option
-\fB\-\-add\fR n'est pas utilis�
+printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
+is not set.
 .PP
-exemples :
+examples :
 .IP
-\f(CW$ pkprinters --add -D "Imprimante HP" --charge 0.05,0.1 hp2100 hp2200 hp8000\fR
+\f(CW$ pkprinters --add -D "HP Printer" --charge 0.05,0.1 hp2100 hp2200 hp8000\fR
 .IP
-Ceci va cr� les trois imprimantes hp2100, hp2200 and hp8000.
-Leur co�r page sera fix� 0.05 unit�et leur co�r travail sera
-fix� 0.1 unit�Les unit�sont dans votre propre monnaie,
-ou dans ce que vous voulez qu'elles signifient.
-Leurs descriptions seront positionn� �Imprimante HP".
-Si l'une de ces imprimantes existe d�, elle sera modifi��oins que
-l'option \fB\-s\fR|\-\-skipexisting ne soit aussi utilis�
+Will create three printers named hp2100, hp2200 and hp8000.
+Their price per page will be set at 0.05 unit, and their price
+per job will be set at 0.1 unit. Units are in your own currency,
+or whatever you want them to mean.
+All of their descriptions will be set to the string "HP Printer".
+If any of these printers already exists, it will also be modified
+unless the \fB\-s\fR|\-\-skipexisting command line option is also used.
 .IP
 \f(CW$ pkprinters --delete "*"\fR
 .IP
-Ceci va compl�ment effacer toutes les imprimantes, leurs informations
-de quota ainsi que leurs historiques des travaux. SOYEZ PRUDENTS !
+This will completely delete all printers and associated quota information,
+as well as their job history. USE WITH CARE !
 .IP
 \f(CW$ pkprinters --groups Laser,HP "hp*"\fR
 .IP
-Ceci ba mettre toutes les imprimantes dont le nom correspond �hp*"
-dans les groupes Laser et HP, qui DOIVENT d� exister.
+This will put all printers which name matches "hp*" into printers groups
+Laser and HP, which MUST already exist.
 .IP
 \f(CW$ pkprinters --groups LexMark --remove hp2200\fR
 .IP
-Ceci va enlever l'imprimante hp2200 du groupe LexMark.
+This will remove the hp2200 printer from the LexMark printer group.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: pykota/trunk/man/es/pkprinters.1
===================================================================
--- pykota/trunk/man/es/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/es/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/th/pkprinters.1
===================================================================
--- pykota/trunk/man/th/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/th/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/man/it/pkprinters.1
===================================================================
--- pykota/trunk/man/it/pkprinters.1 (revision 2453)
+++ pykota/trunk/man/it/pkprinters.1 (revision 2465)
@@ -2,7 +2,7 @@
 .TH PKPRINTERS "1" "septembre 2005" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkprinters \- page de manuel de pkprinters 1.23alpha30_unofficial
+pkprinters \- page de manuel de pkprinters 1.23alpha31_unofficial
 .SH DESCRIPTION
-pkprinters v1.23alpha30_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
+pkprinters v1.23alpha31_unofficial (c) 2003, 2004, 2005 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Printers Manager for PyKota.
@@ -62,4 +62,17 @@
 In combination with the \fB\-\-add\fR option above, tells
 pkprinters to not modify existing printers.
+.TP
+\fB\-m\fR | \fB\-\-maxjobsize\fR s
+Sets the maximum job size allowed on the printer
+to s pages.
+.TP
+\fB\-p\fR | \fB\-\-passthrough\fR
+Activate passthrough mode for the printer. In this
+mode, users are allowed to print without any impact
+on their quota or account balance.
+.TP
+\fB\-n\fR | \fB\-\-nopassthrough\fR Deactivate passthrough mode for the printer.
+Without \fB\-p\fR or \fB\-n\fR, printers are created in
+normal mode, i.e. no passthrough.
 .IP
 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option
Index: pykota/trunk/NEWS
===================================================================
--- pykota/trunk/NEWS (revision 2455)
+++ pykota/trunk/NEWS (revision 2465)
@@ -22,4 +22,9 @@
 PyKota NEWS :
        
+    - 1.23alpha31 :
+    
+        - Added support for --maxjobsize, --passthrough and --nopassthrough
+          in pkprinters. These modes are now also honored when printing.
+          
     - 1.23alpha30 :
     
