Index: /pykota/trunk/TODO
===================================================================
--- /pykota/trunk/TODO (revision 2917)
+++ /pykota/trunk/TODO (revision 2937)
@@ -22,7 +22,4 @@
 TODO, in no particular order :
         
-        - Add a --email command line option to pkusers, to allow
-          modification of an existing email address.
-          
         - Add a pkrefund command line tool & optional CGI script.
         
Index: /pykota/trunk/pykota/storage.py
===================================================================
--- /pykota/trunk/pykota/storage.py (revision 2880)
+++ /pykota/trunk/pykota/storage.py (revision 2937)
@@ -104,4 +104,9 @@
         """Sets the user's overcharging coefficient."""
         self.OverCharge = factor
+        self.isDirty = True
+        
+    def setEmail(self, email) :    
+        """Sets the user's email address."""
+        self.Email = email
         self.isDirty = True
         
Index: /pykota/trunk/pykota/version.py
===================================================================
--- /pykota/trunk/pykota/version.py (revision 2919)
+++ /pykota/trunk/pykota/version.py (revision 2937)
@@ -22,5 +22,5 @@
 #
 
-__version__ = "1.25alpha6_unofficial"
+__version__ = "1.25alpha7_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."
Index: /pykota/trunk/bin/pkusers
===================================================================
--- /pykota/trunk/bin/pkusers (revision 2829)
+++ /pykota/trunk/bin/pkusers (revision 2937)
@@ -54,5 +54,10 @@
                        
   -d | --delete        Deletes users from the quota storage.
-  
+
+  -e | --email addr    Sets the email address for the users.
+                       If the addr parameter begins with @, then
+                       the username is prepended to addr to form
+                       a valid email address.
+
   -D | --description d Adds a textual description to users or groups.
                        
@@ -154,4 +159,8 @@
   cost of each print job will be multiplied by zero before charging
   his account.
+
+  $ pkusers --email @example.com
+
+  This will set the email address for each user to username@example.com
 """)
         
@@ -165,6 +174,10 @@
             entry.setLimitBy(limitby)
         if not groups :
-            if email :
-                entry.Email = email
+            if email is not None :      # we allow "" to empty the field
+                if email.startswith("@") :
+                    email = "%s%s" % (entry.Name, email)
+                if email and email.count('@') != 1 :
+                    raise PyKotaCommandLineError, _("Invalid email address %s") % email
+                entry.setEmail(email)
             if overcharge is not None : # NB : 0 is allowed !     
                 entry.setOverChargeFactor(overcharge)
@@ -279,9 +292,12 @@
             description = options["description"]
             if description :
-                description = options["description"].strip()
+                description = description.strip()
                 
             comment = options["comment"]
             if comment :
-                comment = options["comment"].strip()
+                comment = comment.strip()
+            email = options["email"]    
+            if email :
+                email = email.strip()
             skipexisting = options["skipexisting"]    
             groups = options["groups"]
@@ -294,12 +310,10 @@
                     percent.setSize(len(names))
                     for ename in names :
-                        email = None
+                        useremail = None
                         if not groups :
                             splitname = ename.split('/', 1)     # username/email
                             if len(splitname) == 1 :
                                 splitname.append("")
-                            (ename, email) = splitname
-                            if email and (email.count('@') != 1) :
-                                raise PyKotaCommandLineError, _("Invalid email address %s") % email
+                            (ename, useremail) = splitname
                         if self.isValidName(ename) :
                             reject = 0
@@ -326,5 +340,5 @@
                                                      description, overcharge,\
                                                      balance, balancevalue, \
-                                                     comment, email)
+                                                     comment, useremail or email)
                                 oldentry = getattr(self.storage, "add%s" % suffix)(entry)
                                 if oldentry is not None :
@@ -340,5 +354,5 @@
                                                      description, overcharge,\
                                                      balance, balancevalue, \
-                                                     comment, email)
+                                                     comment, useremail or email)
                                         oldentry.save()
                                         if not groups :
@@ -359,5 +373,5 @@
                             self.modifyEntry(entry, groups, limitby, description, \
                                              overcharge, balance, balancevalue, \
-                                             comment)
+                                             comment, email)
                             self.manageUsersGroups(usersgroups, entry, remove)                
                         entry.save()    
@@ -378,8 +392,8 @@
                      "comment" : "", \
                    }
-        short_options = "hvaD:dgl:rso:i:b:C:L"
+        short_options = "hvaD:dgl:rso:i:b:C:Le:"
         long_options = ["help", "version", "add", "description=", \
                         "delete", "groups", "list", "remove", \
-                        "skipexisting", "overcharge=", \
+                        "skipexisting", "overcharge=", "email=", \
                         "ingroups=", "limitby=", "balance=", "comment=", \
                        ]
@@ -408,4 +422,5 @@
         options["overcharge"] = options["o"] or options["overcharge"]
         options["comment"] = options["C"] or options["comment"] or defaults["comment"]
+        options["email"] = options["e"] or options["email"]
         
         if options["help"] :
@@ -413,7 +428,7 @@
         elif options["version"] :
             manager.display_version_and_quit()
-        elif (options["delete"] and (options["add"] or options["remove"] or options["description"])) \
+        elif (options["delete"] and (options["add"] or options["remove"] or options["description"] or options["email"])) \
            or (options["skipexisting"] and not options["add"]) \
-           or (options["list"] and (options["add"] or options["delete"] or options["remove"] or options["description"])) \
+           or (options["list"] and (options["add"] or options["delete"] or options["remove"] or options["description"] or options["email"])) \
            or (options["groups"] and (options["balance"] or options["ingroups"] or options["overcharge"])) :
             raise PyKotaCommandLineError, _("incompatible options, see help.")
Index: /pykota/trunk/man/sv_SE/pkusers.1
===================================================================
--- /pykota/trunk/man/sv_SE/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/sv_SE/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/de/pkusers.1
===================================================================
--- /pykota/trunk/man/de/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/de/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/nb_NO/pkusers.1
===================================================================
--- /pykota/trunk/man/nb_NO/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/nb_NO/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pt_BR/pkusers.1
===================================================================
--- /pykota/trunk/man/pt_BR/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/pt_BR/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/fr/pkusers.1
===================================================================
--- /pykota/trunk/man/fr/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/fr/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Un gestionnaire d'utilisateurs et de groupes pour PyKota.
@@ -30,4 +30,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Efface des utilisateurs de la base de donn�.
+.TP
+\fB\-e\fR | \fB\-\-email\fR adr
+Positionne l'adresse email des utilisateurs.
+Si le param�e adr commence par @, alors
+cette valeur est pr�x�par le nom d'utilisateur
+pour former une adresse email valide.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Ajoute une description textuelle aux utilisateurs.
@@ -136,4 +142,8 @@
 car le co� chaque job sera multipli�ar 0 avant de modifier le solde
 de son compte.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+Ceci va fixer l'adresse email de chaque utilisateur �om@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/th/pkusers.1
===================================================================
--- /pykota/trunk/man/th/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/th/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pl/pkusers.1
===================================================================
--- /pykota/trunk/man/pl/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/pl/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pt/pkusers.1
===================================================================
--- /pykota/trunk/man/pt/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/pt/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/tr/pkusers.1
===================================================================
--- /pykota/trunk/man/tr/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/tr/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/el_GR/pkusers.1
===================================================================
--- /pykota/trunk/man/el_GR/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/el_GR/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/zh_TW/pkusers.1
===================================================================
--- /pykota/trunk/man/zh_TW/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/zh_TW/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pkusers.1
===================================================================
--- /pykota/trunk/man/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "June 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkusers \- manual page for pkusers 1.25alpha5_unofficial
+pkusers \- manual page for pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/es/pkusers.1
===================================================================
--- /pykota/trunk/man/es/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/es/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/it/pkusers.1
===================================================================
--- /pykota/trunk/man/it/pkusers.1 (revision 2910)
+++ /pykota/trunk/man/it/pkusers.1 (revision 2937)
@@ -2,7 +2,7 @@
 .TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkusers \- page de manuel de pkusers 1.25alpha5_unofficial
+pkusers \- page de manuel de pkusers 1.25alpha7_unofficial
 .SH DESCRIPTION
-pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An Users and Groups Manager for PyKota.
@@ -31,4 +31,10 @@
 \fB\-d\fR | \fB\-\-delete\fR
 Deletes users from the quota storage.
+.TP
+\fB\-e\fR | \fB\-\-email\fR addr
+Sets the email address for the users.
+If the addr parameter begins with @, then
+the username is prepended to addr to form
+a valid email address.
 .HP
 \fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups.
@@ -140,4 +146,8 @@
 cost of each print job will be multiplied by zero before charging
 his account.
+.IP
+\f(CW$ pkusers --email @example.com\fR
+.IP
+This will set the email address for each user to username@example.com
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/NEWS
===================================================================
--- /pykota/trunk/NEWS (revision 2929)
+++ /pykota/trunk/NEWS (revision 2937)
@@ -22,4 +22,11 @@
 PyKota NEWS :
        
+    - 1.25alpha6 (2006-06-13) :
+    
+        - pkusers now supports the --email command line switch.
+          The old method to set the email address is still supported,
+          but the new one allows the email address to be modified
+          as well.
+          
     - 1.25alpha6 (2006-06-09) :
     
Index: /pykota/trunk/po/sv_SE/pykota.po
===================================================================
--- /pykota/trunk/po/sv_SE/pykota.po (revision 2909)
+++ /pykota/trunk/po/sv_SE/pykota.po (revision 2937)
@@ -1225,5 +1225,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1329,4 +1334,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/pt/pykota.po
===================================================================
--- /pykota/trunk/po/pt/pykota.po (revision 2909)
+++ /pykota/trunk/po/pt/pykota.po (revision 2937)
@@ -1210,5 +1210,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1314,4 +1319,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/tr/pykota.po
===================================================================
--- /pykota/trunk/po/tr/pykota.po (revision 2909)
+++ /pykota/trunk/po/tr/pykota.po (revision 2937)
@@ -1215,5 +1215,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1319,4 +1324,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/el_GR/pykota.po
===================================================================
--- /pykota/trunk/po/el_GR/pykota.po (revision 2909)
+++ /pykota/trunk/po/el_GR/pykota.po (revision 2937)
@@ -1210,5 +1210,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1314,4 +1319,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/de/pykota.po
===================================================================
--- /pykota/trunk/po/de/pykota.po (revision 2909)
+++ /pykota/trunk/po/de/pykota.po (revision 2937)
@@ -1209,5 +1209,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1313,4 +1318,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/zh_TW/pykota.po
===================================================================
--- /pykota/trunk/po/zh_TW/pykota.po (revision 2909)
+++ /pykota/trunk/po/zh_TW/pykota.po (revision 2937)
@@ -1195,5 +1195,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1299,4 +1304,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/nb_NO/pykota.po
===================================================================
--- /pykota/trunk/po/nb_NO/pykota.po (revision 2909)
+++ /pykota/trunk/po/nb_NO/pykota.po (revision 2937)
@@ -1219,5 +1219,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1323,4 +1328,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/pt_BR/pykota.po
===================================================================
--- /pykota/trunk/po/pt_BR/pykota.po (revision 2909)
+++ /pykota/trunk/po/pt_BR/pykota.po (revision 2937)
@@ -1207,5 +1207,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1311,4 +1316,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/fr/pykota.po
===================================================================
--- /pykota/trunk/po/fr/pykota.po (revision 2909)
+++ /pykota/trunk/po/fr/pykota.po (revision 2937)
@@ -1861,5 +1861,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1965,4 +1970,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 "pkusers v%(__version__)s (c) %(__years__)s %(__author__)s\n"
@@ -1989,4 +1998,9 @@
 "\n"
 "  -d | --delete        Efface des utilisateurs de la base de donn�.\n"
+"\n"
+"  -e | --email adr     Positionne l'adresse email des utilisateurs.\n"
+"                       Si le param�e adr commence par @, alors\n"
+"                       cette valeur est pr�x�par le nom d'utilisateur\n"
+"                       pour former une adresse email valide.\n"
 "\n"
 "  -D | --description d Ajoute une description textuelle aux utilisateurs.\n"
@@ -2102,4 +2116,8 @@
 "  car le co� chaque job sera multipli�ar 0 avant de modifier le solde\n"
 "  de son compte.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  Ceci va fixer l'adresse email de chaque utilisateur �om@example.com\n"
 
 #, python-format
Index: /pykota/trunk/po/es/pykota.po
===================================================================
--- /pykota/trunk/po/es/pykota.po (revision 2909)
+++ /pykota/trunk/po/es/pykota.po (revision 2937)
@@ -1226,5 +1226,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1330,4 +1335,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/pykota.pot
===================================================================
--- /pykota/trunk/po/pykota.pot (revision 2909)
+++ /pykota/trunk/po/pykota.pot (revision 2937)
@@ -1189,5 +1189,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1293,4 +1298,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/th/pykota.po
===================================================================
--- /pykota/trunk/po/th/pykota.po (revision 2909)
+++ /pykota/trunk/po/th/pykota.po (revision 2937)
@@ -1203,5 +1203,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1307,4 +1312,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/pl/pykota.po
===================================================================
--- /pykota/trunk/po/pl/pykota.po (revision 2909)
+++ /pykota/trunk/po/pl/pykota.po (revision 2937)
@@ -1616,5 +1616,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1720,4 +1725,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
Index: /pykota/trunk/po/it/pykota.po
===================================================================
--- /pykota/trunk/po/it/pykota.po (revision 2909)
+++ /pykota/trunk/po/it/pykota.po (revision 2937)
@@ -1212,5 +1212,10 @@
 "                       \n"
 "  -d | --delete        Deletes users from the quota storage.\n"
-"  \n"
+"\n"
+"  -e | --email addr    Sets the email address for the users.\n"
+"                       If the addr parameter begins with @, then\n"
+"                       the username is prepended to addr to form\n"
+"                       a valid email address.\n"
+"\n"
 "  -D | --description d Adds a textual description to users or groups.\n"
 "                       \n"
@@ -1316,4 +1321,8 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
+"\n"
+"  $ pkusers --email @example.com\n"
+"\n"
+"  This will set the email address for each user to username@example.com\n"
 msgstr ""
 
