Index: pykota/trunk/po/fr/pykota.po
===================================================================
--- pykota/trunk/po/fr/pykota.po (revision 1817)
+++ pykota/trunk/po/fr/pykota.po (revision 1824)
@@ -79,10 +79,10 @@
 "du solde.\n"
 "\n"
-"CET OUTIL NE DOIT PAS ETRE UTILISE SI VOUS LIMITEZ VOS UTILISATEURS PAR\n"
+"CET OUTIL NE DOIT PAS �RE UTILIS�SI VOUS LIMITEZ VOS UTILISATEURS PAR\n"
 "QUOTA !\n"
 "\n"
 "ligne de commande :\n"
 "\n"
-"  CET OUTIL NE DOIT PAS ETRE UTILISE DEPUIS LA LIGNE DE COMMANDE MAIS\n"
+"  CET OUTIL NE DOIT PAS �RE UTILIS�DEPUIS LA LIGNE DE COMMANDE MAIS\n"
 "  SEULEMENT DANS UNE external policy DANS pykota.conf\n"
 "  \n"
@@ -294,134 +294,169 @@
 "Please e-mail bugs to: %s"
 msgstr ""
-
-msgid "You're not allowed to use this command."
-msgstr "Vous n'�s pas autoris�) �tiliser cette commande."
-
-#, python-format
-msgid "Invalid softlimit value %s."
-msgstr "Valeur %s invalide pour la limite souple."
-
-#, python-format
-msgid "Invalid hardlimit value %s."
-msgstr "Valeur %s invalide pour la limite dure."
-
-#, python-format
-msgid "Hard limit %i is less than soft limit %i, values will be exchanged."
-msgstr ""
-"Limite dure %i est inf�eure �a limite souple %i, les valeurs seront "
-"�ang�. "
-
-#, python-format
-msgid "Invalid balance value %s"
-msgstr "Valeur %s du solde invalide"
-
-#, python-format
-msgid "Invalid charge amount value %s"
-msgstr "Montant �omptabiliser %s invalide"
-
-#, python-format
-msgid "Invalid limitby value %s"
-msgstr "Valeur de l'option limitby %s invalide"
-
-#, python-format
-msgid "Impossible to add printer %s"
-msgstr "Impossible d'ajouter l'imprimante %s"
-
-#, python-format
-msgid "Invalid printer name %s"
-msgstr "Nom d'imprimante %s invalide"
-
-#, python-format
-msgid "There's no printer matching %s"
-msgstr "Aucune imprimante ne correspond �s"
-
-msgid "You have to pass user or group names on the command line"
-msgstr ""
-"Vous devez passer des noms d'utilisateurs ou de groupes sur la ligne de "
-"commande"
-
-#, python-format
-msgid "Prototype %s not found in Quota Storage for printer %s."
-msgstr "Prototype %s non trouv�ans le Quota Storage pour l'imprimante %s."
-
-#, python-format
-msgid "Prototype object %s not found in Quota Storage."
-msgstr "Objet prototype %s introuvable dans le Quota Storage."
-
-#, python-format
-msgid "Undefined hard limit set to soft limit (%s) on printer %s."
-msgstr ""
-"Limite dure ind�nie, positionn��a limite souple (%s) sur l'imprimante %"
-"s."
-
-#, python-format
-msgid "Undefined soft limit set to hard limit (%s) on printer %s."
-msgstr ""
-"Limite souple ind�nie, positionn��a limite dure (%s) sur l'imprimante %"
-"s."
-
-#, python-format
-msgid "Invalid email address %s"
-msgstr "Adresse �ctronique %s invalide"
-
-#, python-format
-msgid "Invalid group name %s"
-msgstr "Nom de groupe %s invalide"
-
-#, python-format
-msgid "Invalid user name %s"
-msgstr "Nom d'utilisateur %s invalide"
-
-#, python-format
-msgid "Quota not found for object %s on printer %s."
-msgstr "Quota non trouv�our l'objet %s sur l'imprimante %s."
-
-#, python-format
-msgid "Group %s not found in the PyKota Storage."
-msgstr "Groupe %s non trouv�ans le Quota Storage."
-
-msgid "incompatible options, see help."
-msgstr "options incompatibles, voir l'aide."
-
-#, python-format
-msgid ""
-"pykosd v%s (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres\n"
-"An OSD quota monitor for PyKota.\n"
-"\n"
-"command line usage :\n"
-"\n"
-"  pykosd [options]\n"
+"edpykota v%s (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres\n"
+"Un �teur de quotas pour PyKota.\n"
+"\n"
+"ligne de commande :\n"
+"\n"
+"  edpykota [options] utilisateur1 utilisateur2 ... utilisateurN\n"
+"  \n"
+"  edpykota [options] groupe1 groupe2 ... groupeN\n"
 "\n"
 "options :\n"
 "\n"
-"  -v | --version       Prints pkprinters's version number then exits.\n"
-"  -h | --help          Prints this message then exits.\n"
-"  \n"
-"  -c | --color #rrggbb Sets the color to use for display as an hexadecimal\n"
-"                       triplet, for example #FF0000 is 100%% red.\n"
-"                       Defaults to 100%% green (#00FF00).\n"
-"                       \n"
-"  -d | --duration d    Sets the duration of the display in seconds. \n"
-"                       Defaults to 3 seconds.\n"
-"                       \n"
-"  -f | --font f        Sets the font to use for "
-"display.                      \n"
-"                       Defaults to the Python OSD library's default.\n"
-"  \n"
-"  -l | --loop n        Sets the number of times the info will be displayed.\n"
-"                       Defaults to 0, which means loop forever.\n"
-"                       \n"
-"  -s | --sleep s       Sets the sleeping duration between two displays \n"
-"                       in seconds. Defaults to 180 seconds (3 minutes).\n"
-"                       \n"
+"  -v | --version       Affiche la version d'edpykota et quitte.\n"
+"  -h | --help          Affiche ce message et quitte.\n"
+"  \n"
+"  -a | --add           Ajoute des utilisateurs et/ou des imprimantes\n"
+"                       s'ils n'existent pas d� dans la base de donn�.\n"
+"                       \n"
+"  -d | --delete        Efface des utilisateurs ou des groupes depuis\n"
+"                       la base de donn�.                       Les "
+"imprimantes ne sont jamais effac�.\n"
+"                       \n"
+"  -c | --charge p[,j]  Positionne le co�r page et par travail\n"
+"                       sur l'imprimante. Le prix par travail est optionel.\n"
+"                       Si les deux sont positionn� il faut les s�rer\n"
+"                       par une virgule. Les nombres r�s sont autoris�\n"
+"  \n"
+"  -i | --ingroups g1[,g2...] Place les utilisateurs dans chacun des groupes\n"
+"                             list� separ�par des virgules. Les groupes\n"
+"                             doivent d� exister dans la base de donn�.\n"
+"  \n"
+"  -u | --users         Modifie les quotas utilisateur, c'est la valeur\n"
+"                       par d�ut.\n"
+"  \n"
+"  -P | --printer p     Modifie les quotas sur l'imprimante p seulement.\n"
+"                       En fait p peut contenir des caract�s jokers\n"
+"                       pour s�ctionner seulement certaines imprimantes.\n"
+"                       La valeur par d�ut est *, qui signifie toutes les\n"
+"                       imprimantes. \n"
+"                       Vous pouvez sp�fier plusieurs noms ou jokers,\n"
+"                       en les s�rant avec des virgules.\n"
+"  \n"
+"  -G | --pgroups pg1[,pg2...] Adds the printer(s) to the printer groups\n"
+"                       pg1, pg2, etc... which must already exist.\n"
+"                       A printer group is just like a normal printer,\n"
+"                       only that it is usually unknown from the printing\n"
+"                       system. Create printer groups exactly the same\n"
+"                       way that you create printers, then add other \n"
+"                       printers to them with this option.\n"
+"                       Accounting is done on a printer and on all\n"
+"                       the printer groups it belongs to, quota checking\n"
+"                       is done on a printer and on all the printer groups\n"
+"                       it belongs to.\n"
+"  \n"
+"  -g | --groups        Edit users groups print quotas instead of users.\n"
+"                          \n"
+"  -p | --prototype u|g Uses user u or group g as a prototype to set\n"
+"                       print quotas\n"
+"                       \n"
+"  -n | --noquota       Doesn't set a quota but only does accounting.\n"
+"  \n"
+"  -r | --reset         Resets the actual page counter for the user\n"
+"                       or group to zero on the specified printers. \n"
+"                       The life time page counter is kept unchanged.\n"
+"                       \n"
+"  -R | --hardreset     Resets the actual and life time page counters\n"
+"                       for the user or group to zero on the specified \n"
+"                       printers. \n"
+"                       \n"
+"  -l | --limitby l     Choose if the user/group is limited in "
+"printing                     \n"
+"                       by its account balance or by its page quota.\n"
+"                       The default value is 'quota'. Allowed values\n"
+"                       are 'quota' 'balance' 'quota-then-balance' and\n"
+"                       'balance-then-quota'.\n"
+"                       WARNING : quota-then-balance and balance-then-quota\n"
+"                       are not yet implemented.\n"
+"                       \n"
+"  -b | --balance b     Sets the user's account balance to "
+"b.                     \n"
+"                       Account balance may be increase or decreased\n"
+"                       if b is prefixed with + or -.\n"
+"                       WARNING : when decreasing account balance,\n"
+"                       the total paid so far by the user is decreased\n"
+"                       too.\n"
+"                       Groups don't have a real balance, but the\n"
+"                       sum of their users' account balance.\n"
+"                       \n"
+"  -S | --softlimit sl  Sets the quota soft limit to sl "
+"pages.                       \n"
+"  \n"
+"  -H | --hardlimit hl  Sets the quota hard limit to hl pages.\n"
+"  \n"
+"  user1 through userN and group1 through groupN can use wildcards\n"
+"  if the --add option is not set.\n"
 "  \n"
 "examples :                              \n"
 "\n"
-"  $ pykosd -s 60 --loop 5\n"
-"  \n"
-"  Will launch pykosd. Display will be refreshed every 60 seconds,\n"
-"  and will last for 3 seconds (the default) each time. After five\n"
-"  iterations, the program will exit.\n"
-"  \n"
+"  $ edpykota --add -p jerome john paul george ringo/ringo@example.com\n"
+"  \n"
+"  This will add users john, paul, george and ringo to the quota\n"
+"  database, and set their print quotas to the same values than user \n"
+"  jerome. User jerome must already exist.\n"
+"  User ringo's email address will also be set to 'ringo@example.com'\n"
+"  \n"
+"  $ edpykota --printer lp -S 50 -H 60 jerome\n"
+"  \n"
+"  This will set jerome's print quota on the lp printer to a soft limit\n"
+"  of 50 pages, and a hard limit of 60 pages. If either user jerome or\n"
+"  printer lp doesn't exist on the Quota Storage Server then nothing is "
+"done.\n"
+"\n"
+"  $ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\n"
+"  \n"
+"  Same as above, but if either user jerome or printer lp doesn't exist \n"
+"  on the Quota Storage Server they are automatically added. Also\n"
+"  user jerome is put into the groups \"coders\" and \"it\" which must\n"
+"  already exist in the Quota Storage.\n"
+"            \n"
+"  $ edpykota -g -S 500 -H 550 financial support            \n"
+"  \n"
+"  This will set print quota soft limit to 500 pages and hard limit\n"
+"  to 550 pages for groups financial and support on all printers.\n"
+"  \n"
+"  $ edpykota --reset jerome \"jo*\"\n"
+"  \n"
+"  This will reset jerome's page counter to zero on all printers, as\n"
+"  well as every user whose name begins with 'jo'.\n"
+"  Their life time page counter on each printer will be kept unchanged.\n"
+"  You can also reset the life time page counters by using the\n"
+"  --hardreset | -R command line option.\n"
+"  \n"
+"  $ edpykota --printer hpcolor --noquota jerome\n"
+"  \n"
+"  This will tell PyKota to not limit jerome when printing on the \n"
+"  hpcolor printer. All his jobs will be allowed on this printer, but \n"
+"  accounting of the pages he prints will still be kept.\n"
+"  Print Quotas for jerome on other printers are unchanged.\n"
+"  \n"
+"  $ edpykota --limitby balance jerome\n"
+"  \n"
+"  This will tell PyKota to limit jerome by his account's balance\n"
+"  when printing.\n"
+"  \n"
+"  $ edpykota --balance +10.0 jerome\n"
+"  \n"
+"  This will increase jerome's account balance by 10.0 (in your\n"
+"  own currency). You can decrease the account balance with a\n"
+"  dash prefix, and set it to a fixed amount with no prefix.\n"
+"  \n"
+"  $ edpykota --delete jerome rachel\n"
+"  \n"
+"  This will completely delete jerome and rachel from the Quota Storage\n"
+"  database. All their quotas and jobs will be deleted too.\n"
+"  \n"
+"  $ edpykota --printer lp --charge 0.1\n"
+"  \n"
+"  This will set the page price for printer lp to 0.1. Job price\n"
+"  will not be changed.\n"
+"  \n"
+"  $ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\n"
+"  \n"
+"  This will put printers hplj1 and hplj2 in printers groups Laser and HP.\n"
+"  When printing either on hplj1 or hplj2, print quota will also be \n"
+"  checked and accounted for on virtual printers Laser and HP.\n"
+"\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -439,4 +474,149 @@
 "\n"
 "Please e-mail bugs to: %s"
+
+msgid "You're not allowed to use this command."
+msgstr "Vous n'�s pas autoris�) �tiliser cette commande."
+
+#, python-format
+msgid "Invalid softlimit value %s."
+msgstr "Valeur %s invalide pour la limite souple."
+
+#, python-format
+msgid "Invalid hardlimit value %s."
+msgstr "Valeur %s invalide pour la limite dure."
+
+#, python-format
+msgid "Hard limit %i is less than soft limit %i, values will be exchanged."
+msgstr ""
+"Limite dure %i est inf�eure �a limite souple %i, les valeurs seront "
+"�ang�. "
+
+#, python-format
+msgid "Invalid balance value %s"
+msgstr "Valeur %s du solde invalide"
+
+#, python-format
+msgid "Invalid charge amount value %s"
+msgstr "Montant �omptabiliser %s invalide"
+
+#, python-format
+msgid "Invalid limitby value %s"
+msgstr "Valeur de l'option limitby %s invalide"
+
+#, python-format
+msgid "Impossible to add printer %s"
+msgstr "Impossible d'ajouter l'imprimante %s"
+
+#, python-format
+msgid "Invalid printer name %s"
+msgstr "Nom d'imprimante %s invalide"
+
+#, python-format
+msgid "There's no printer matching %s"
+msgstr "Aucune imprimante ne correspond �s"
+
+msgid "You have to pass user or group names on the command line"
+msgstr ""
+"Vous devez passer des noms d'utilisateurs ou de groupes sur la ligne de "
+"commande"
+
+#, python-format
+msgid "Prototype %s not found in Quota Storage for printer %s."
+msgstr "Prototype %s non trouv�ans le Quota Storage pour l'imprimante %s."
+
+#, python-format
+msgid "Prototype object %s not found in Quota Storage."
+msgstr "Objet prototype %s introuvable dans le Quota Storage."
+
+#, python-format
+msgid "Undefined hard limit set to soft limit (%s) on printer %s."
+msgstr ""
+"Limite dure ind�nie, positionn��a limite souple (%s) sur l'imprimante %"
+"s."
+
+#, python-format
+msgid "Undefined soft limit set to hard limit (%s) on printer %s."
+msgstr ""
+"Limite souple ind�nie, positionn��a limite dure (%s) sur l'imprimante %"
+"s."
+
+#, python-format
+msgid "Invalid email address %s"
+msgstr "Adresse �ctronique %s invalide"
+
+#, python-format
+msgid "Invalid group name %s"
+msgstr "Nom de groupe %s invalide"
+
+#, python-format
+msgid "Invalid user name %s"
+msgstr "Nom d'utilisateur %s invalide"
+
+#, python-format
+msgid "Quota not found for object %s on printer %s."
+msgstr "Quota non trouv�our l'objet %s sur l'imprimante %s."
+
+#, python-format
+msgid "Group %s not found in the PyKota Storage."
+msgstr "Groupe %s non trouv�ans le Quota Storage."
+
+msgid "incompatible options, see help."
+msgstr "options incompatibles, voir l'aide."
+
+#, python-format
+msgid ""
+"pykosd v%s (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres\n"
+"An OSD quota monitor for PyKota.\n"
+"\n"
+"command line usage :\n"
+"\n"
+"  pykosd [options]\n"
+"\n"
+"options :\n"
+"\n"
+"  -v | --version       Prints pkprinters's version number then exits.\n"
+"  -h | --help          Prints this message then exits.\n"
+"  \n"
+"  -c | --color #rrggbb Sets the color to use for display as an hexadecimal\n"
+"                       triplet, for example #FF0000 is 100%% red.\n"
+"                       Defaults to 100%% green (#00FF00).\n"
+"                       \n"
+"  -d | --duration d    Sets the duration of the display in seconds. \n"
+"                       Defaults to 3 seconds.\n"
+"                       \n"
+"  -f | --font f        Sets the font to use for "
+"display.                      \n"
+"                       Defaults to the Python OSD library's default.\n"
+"  \n"
+"  -l | --loop n        Sets the number of times the info will be displayed.\n"
+"                       Defaults to 0, which means loop forever.\n"
+"                       \n"
+"  -s | --sleep s       Sets the sleeping duration between two displays \n"
+"                       in seconds. Defaults to 180 seconds (3 minutes).\n"
+"                       \n"
+"  \n"
+"examples :                              \n"
+"\n"
+"  $ pykosd -s 60 --loop 5\n"
+"  \n"
+"  Will launch pykosd. Display will be refreshed every 60 seconds,\n"
+"  and will last for 3 seconds (the default) each time. After five\n"
+"  iterations, the program will exit.\n"
+"  \n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -463,5 +643,5 @@
 #, python-format
 msgid "Pages used on %s : %s"
-msgstr "Pages utilisees sur %s : %s"
+msgstr "Pages utilis� sur %s : %s"
 
 #, python-format
