Index: pykota/trunk/bin/warnpykota
===================================================================
--- pykota/trunk/bin/warnpykota (revision 791)
+++ pykota/trunk/bin/warnpykota (revision 842)
@@ -17,4 +17,7 @@
 #
 # $Log$
+# Revision 1.9  2003/03/09 23:39:14  jalet
+# Simplified translations.
+#
 # Revision 1.8  2003/02/10 12:07:30  jalet
 # Now repykota should output the recorded total page number for each printer too.
@@ -146,9 +149,9 @@
             sender.display_version_and_quit()
         elif options["users"] and options["groups"] :    
-            raise PyKotaToolError, _("warnpykota: options --users and --groups are incompatible.")
+            raise PyKotaToolError, _("incompatible options, see help.")
         elif options["groups"] :    
-            raise PyKotaToolError, _("warnpykota: option --groups is currently not implemented.")
+            raise PyKotaToolError, _("option --groups is currently not implemented.")
         elif args :    
-            raise PyKotaToolError, _("warnpykota: unused arguments [%s]. Aborting.") % ", ".join(args)
+            raise PyKotaToolError, _("unused arguments [%s]. Aborting.") % ", ".join(args)
         else :
             sys.exit(sender.main(options))
Index: pykota/trunk/bin/repykota
===================================================================
--- pykota/trunk/bin/repykota (revision 814)
+++ pykota/trunk/bin/repykota (revision 842)
@@ -17,4 +17,7 @@
 #
 # $Log$
+# Revision 1.15  2003/03/09 23:39:14  jalet
+# Simplified translations.
+#
 # Revision 1.14  2003/02/27 09:04:02  jalet
 # Missing translation
@@ -199,9 +202,9 @@
             reporter.display_version_and_quit()
         elif options["users"] and options["groups"] :    
-            raise PyKotaToolError, _("repykota: options --users and --groups are incompatible.")
+            raise PyKotaToolError, _("incompatible options, see help.")
         elif options["groups"] :    
-            raise PyKotaToolError, _("repykota: option --groups is currently not implemented.")
+            raise PyKotaToolError, _("option --groups is currently not implemented.")
         elif args :    
-            raise PyKotaToolError, _("repykota: unused arguments [%s]. Aborting.") % ", ".join(args)
+            raise PyKotaToolError, _("unused arguments [%s]. Aborting.") % ", ".join(args)
         else :
             sys.exit(reporter.main(options))
Index: pykota/trunk/po/en/pykota.po
===================================================================
--- pykota/trunk/po/en/pykota.po (revision 816)
+++ pykota/trunk/po/en/pykota.po (revision 842)
@@ -15,4 +15,7 @@
 #
 # $Log$
+# Revision 1.9  2003/03/09 23:38:43  jalet
+# Simplified translations.
+#
 # Revision 1.8  2003/02/27 09:08:39  jalet
 # Updated translations.
@@ -64,16 +67,7 @@
 msgstr ""
 
-msgid "warnpykota: option --group is currently not implemented."
-msgstr ""
-
-msgid "edpykota: option --group is currently not implemented."
-msgstr ""
-
 msgid "Pages grace time: %idays"
 msgstr ""
 
-msgid "repykota: unused arguments [%s]. Aborting."
-msgstr ""
-
 msgid "Invalid softlimit value %s."
 msgstr ""
@@ -82,11 +76,8 @@
 msgstr ""
 
-msgid "edpykota: options --softlimit or --hardlimit and --prototype are incompatible."
-msgstr ""
-
 msgid "Printer %s not registered in the PyKota system"
 msgstr ""
 
-msgid "repykota: option --group is currently not implemented."
+msgid "option --groups is currently not implemented."
 msgstr ""
 
@@ -94,7 +85,4 @@
 msgstr ""
 
-msgid "repykota: options --users and --groups are incompatible."
-msgstr ""
-
 msgid "Invalid user name %s"
 msgstr ""
@@ -103,14 +91,11 @@
 msgstr ""
 
-msgid "warnpykota: options --users and --groups are incompatible."
-msgstr ""
-
 msgid "Undefined hard limit set to soft limit (%s) on printer %s."
 msgstr ""
 
-msgid "edpykota: options --users and --groups are incompatible."
-msgstr ""
-
-msgid "warnpykota: unused arguments [%s]. Aborting."
+msgid "incompatible options, see help."
+msgstr ""
+
+msgid "unused arguments [%s]. Aborting."
 msgstr ""
 
Index: pykota/trunk/po/fr/pykota.po
===================================================================
--- pykota/trunk/po/fr/pykota.po (revision 816)
+++ pykota/trunk/po/fr/pykota.po (revision 842)
@@ -15,4 +15,7 @@
 #
 # $Log$
+# Revision 1.7  2003/03/09 23:38:43  jalet
+# Simplified translations.
+#
 # Revision 1.6  2003/02/27 09:08:39  jalet
 # Updated translations.
@@ -65,15 +68,12 @@
 msgstr "Limite dure %i est inf�eure �a limite souple %i, les valeurs seront �ang�. "
 
-msgid "warnpykota: option --groups is currently not implemented."
-msgstr "warnpykota: l'option --groups n'est pas encore impl�nt�"
-
-msgid "edpykota: option --groups is currently not implemented."
-msgstr "edpykota: l'option --groups n'est pas encore impl�nt�"
+msgid "option --groups is currently not implemented."
+msgstr "l'option --groups n'est pas encore impl�nt�"
 
 msgid "Pages grace time: %idays"
 msgstr "D�i de gr�: %ijours"
 
-msgid "repykota: unused arguments [%s]. Aborting."
-msgstr "repykota: arguments [%s] inutilis� Abandon."
+msgid "unused arguments [%s]. Aborting."
+msgstr "arguments [%s] inutilis� Abandon."
 
 msgid "Invalid softlimit value %s."
@@ -83,19 +83,13 @@
 msgstr "Prototype %s non trouv�ans le Quota Storage pour l'imprimante %s."
 
-msgid "edpykota: options --softlimit or --hardlimit and --prototype are incompatible."
-msgstr "edpykota: les options --softlimit ou --hardlimit et --prototype sont incompatibles."
+msgid "incompatible options, see help."
+msgstr "options incompatibles, voir l'aide."
 
 msgid "Printer %s not registered in the PyKota system"
 msgstr "Imprimante %s non enregistr�dans le syst� PyKota"
 
-msgid "repykota: option --groups is currently not implemented."
-msgstr "repykota: l'option --groups n'est pas encore impl�nt�"
-
 msgid "Quota not found for object %s on printer %s."
 msgstr "Quota non trouv�our l'objet %s sur l'imprimante %s."
 
-msgid "repykota: options --users and --groups are incompatible."
-msgstr "repykota: les options --users et --groups sont incompatibles."
-
 msgid "Invalid user name %s"
 msgstr "Nom d'utilisateur %s invalide"
@@ -104,15 +98,6 @@
 msgstr "Les limites dures et souples doivent �e positionn� ! Abandon."
 
-msgid "warnpykota: options --users and --groups are incompatible."
-msgstr "warnpykota: les options --users et --groups sont incompatibles."
-
 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."
-
-msgid "edpykota: options --users and --groups are incompatible."
-msgstr "edykota: les options --users et --groups sont incompatibles."
-
-msgid "warnpykota: unused arguments [%s]. Aborting."
-msgstr "warnkota: arguments [%s] inutilis� Abandon."
 
 msgid "Invalid hardlimit value %s."
Index: pykota/trunk/po/pykota.pot
===================================================================
--- pykota/trunk/po/pykota.pot (revision 816)
+++ pykota/trunk/po/pykota.pot (revision 842)
@@ -15,4 +15,7 @@
 #
 # $Log$
+# Revision 1.9  2003/03/09 23:38:43  jalet
+# Simplified translations.
+#
 # Revision 1.8  2003/02/27 09:08:39  jalet
 # Updated translations.
@@ -64,16 +67,7 @@
 msgstr ""
 
-msgid "warnpykota: option --group is currently not implemented."
-msgstr ""
-
-msgid "edpykota: option --group is currently not implemented."
-msgstr ""
-
 msgid "Pages grace time: %idays"
 msgstr ""
 
-msgid "repykota: unused arguments [%s]. Aborting."
-msgstr ""
-
 msgid "Invalid softlimit value %s."
 msgstr ""
@@ -82,11 +76,8 @@
 msgstr ""
 
-msgid "edpykota: options --softlimit or --hardlimit and --prototype are incompatible."
-msgstr ""
-
 msgid "Printer %s not registered in the PyKota system"
 msgstr ""
 
-msgid "repykota: option --group is currently not implemented."
+msgid "option --groups is currently not implemented."
 msgstr ""
 
@@ -94,7 +85,4 @@
 msgstr ""
 
-msgid "repykota: options --users and --groups are incompatible."
-msgstr ""
-
 msgid "Invalid user name %s"
 msgstr ""
@@ -103,14 +91,11 @@
 msgstr ""
 
-msgid "warnpykota: options --users and --groups are incompatible."
-msgstr ""
-
 msgid "Undefined hard limit set to soft limit (%s) on printer %s."
 msgstr ""
 
-msgid "edpykota: options --users and --groups are incompatible."
-msgstr ""
-
-msgid "warnpykota: unused arguments [%s]. Aborting."
+msgid "incompatible options, see help."
+msgstr ""
+
+msgid "unused arguments [%s]. Aborting."
 msgstr ""
 
