Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[fanfix.git] / src / be / nikiroo / utils / resources / Meta.java

diff --git a/src/be/nikiroo/utils/resources/Meta.java b/src/be/nikiroo/utils/resources/Meta.java
index a83bcca418df48fca8f51efa6c1cf9b1275c8174..8ed74dc565b9994f1a6ec7a1b530525dbcd4bdbb 100644 (file)
--- a/src/be/nikiroo/utils/resources/Meta.java
+++ b/src/be/nikiroo/utils/resources/Meta.java
@@ -47,21 +47,15 @@ public @interface Meta {
                 * option to enter a not accounted for value).
                 */
                COMBO_LIST,
-               /**
-                * A list of {@link Format#STRING}s.
-                * <p>
-                * The list items are separated by a comma, each surrounded by
-                * double-quotes, with backslashes and double-quotes escaped by a
-                * backslash.
-                * <p>
-                * Example: <tt>"un", "deux"</tt>
-                */
-               LIST_OF_STRINGS,
        }
 
        /**
-        * A description of this item (what it is or does, how to explain that item
-        * to the user).
+        * A description for this item: what it is or does, how to explain that item
+        * to the user including what can be used here (i.e., %s = file name, %d =
+        * file size...).
+        * <p>
+        * For group, the first line ('\\n'-separated) will be used as a title while
+        * the rest will be the description.
         * 
         * @return what it is
         */
@@ -109,19 +103,20 @@ public @interface Meta {
 
        /**
         * This item is a comma-separated list of values instead of a single value.
+        * <p>
+        * The list items are separated by a comma, each surrounded by
+        * double-quotes, with backslashes and double-quotes escaped by a backslash.
+        * <p>
+        * Example: <tt>"un", "deux"</tt>
         * 
         * @return TRUE if it is
         */
        boolean array() default false;
 
        /**
-        * An addition to the format.
-        * <p>
-        * Free info text to help translate, for instance the parameters order and
-        * type for String translations (i.e., %s = input file name, %d = file size
-        * in MB).
-        * 
-        * @return some info
+        * @deprecated add the info into the description, as only the description
+        *             will be translated.
         */
+       @Deprecated
        String info() default "";
 }