Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.2 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.3
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.2	Mon Dec 31 03:34:21 2007
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java	Tue Jan  1 17:21:31 2008
@@ -73,7 +73,7 @@
         Resource.addDefaultClassLoader(new File(i18nCP).toURI().toURL());
         Resource.addDefaultClassLoader(out.toURI().toURL());
         // init i18n
-        I18n.init2(System.getProperty("user.language"), System.getProperty("user.country"), "ISO-8859-1");
+        I18n.initISO88591(System.getProperty("user.language"), System.getProperty("user.country"));
 
         checkInstanceOf(parserFQN, OptionParser.class);
 

Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.3 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.4
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.3	Mon Dec 31 05:36:31 2007
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java	Tue Jan  1 17:21:31 2008
@@ -160,7 +160,7 @@
 
     protected void initAction() throws Exception {
         // init i18n
-        I18n.init2(System.getProperty("user.language"), System.getProperty("user.country"), "ISO-8859-1");
+        I18n.initISO88591(System.getProperty("user.language"), System.getProperty("user.country"));
         
         checkInstanceOf(parserSuperClass, OptionParser.class);
         checkInstanceOf(optionSuperClass, Option.class);

Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.3 maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.4
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.3	Mon Dec 31 03:34:21 2007
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java	Tue Jan  1 17:21:31 2008
@@ -48,6 +48,12 @@
     protected String prefix;
 
     /**
+     * @description prefix i18n pour la génération des clefs .
+     * @parameter expression="${commandline.i18nPrefix}"
+     */
+    protected String i18nPrefix;
+
+    /**
      * @description flag pour afficher verbeusement ou non les logs
      * @parameter expression="${commandline.verbose}" default-value="${maven.verbose}"
      */
@@ -56,9 +62,6 @@
     /** timestamp au démarrage (est positionné juste après l'init i18n) */
     protected long t0;
 
-    /** prefix i18n pour la génération des clefs */
-    protected String i18nPrefix;
-
     protected AbstractGeneratorGoal() {
     }
 
@@ -73,7 +76,9 @@
 
     public void execute() throws MojoExecutionException, MojoFailureException {
         t0 = System.currentTimeMillis();
-        i18nPrefix = prefix.toLowerCase();
+        if (i18nPrefix==null) {
+            i18nPrefix = prefix.toLowerCase();
+        }
         try {
             Logger logger = Logger.getLogger("org.codelutin.option");
             if (verbose) {
@@ -95,7 +100,6 @@
         } finally {
             log.info("total time " + StringUtil.convertTime(System.currentTimeMillis() - t0));
         }
-
     }
 
     protected void checkInstanceOf(String givenClass, Class<?> expectedClass) {