* Remove Advanced/Misc

* Move out Advanced/Misc/Misc options
* Don't show any Stuff/General category anymore
* For interfaces, split out "General" from main interface settings
* Remove dummy from prefs
* Clean hotkeys settings

(Closes:#598)

diff --git a/include/configuration.h b/include/configuration.h
index f6bd71351648626ea7322877aa45562ce24a76c1..b6ffad4385d767e38daa8a73321dc707c5e1ab50 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -62,8 +62,9 @@
  *******************************************************************/
 #define CAT_INTERFACE 1
    #define SUBCAT_INTERFACE_GENERAL 101
-   #define SUBCAT_INTERFACE_CONTROL 102
-   #define SUBCAT_INTERFACE_HOTKEYS 103
+   #define SUBCAT_INTERFACE_MAIN 102
+   #define SUBCAT_INTERFACE_CONTROL 103
+   #define SUBCAT_INTERFACE_HOTKEYS 104
 
 #define CAT_AUDIO 2
    #define SUBCAT_AUDIO_GENERAL 201

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 9c828dabb07eb473f738d92817d31057866e485d..bddc9992e0428439221beca901746feedfcfe959 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -41,6 +41,9 @@
 
 #define INTF_GENERAL_HELP N_( "General interface setttings" )
 
+#define INTF_MAIN_TITLE  N_( "Main interfaces" )
+#define INTF_MAIN_HELP N_( "Settings for the main interface" )
+
 #define INTF_CONTROL_TITLE N_( "Control interfaces" )
 #define INTF_CONTROL_HELP N_( "Settings for VLC's Control interfaces" )
 
@@ -183,7 +186,7 @@
 #define CPU_TITLE N_( "CPU features" )
 #define CPU_HELP N_( "You can choose to disable some CPU accelerations here. You should probably not touch that." )
 
-#define MISC_TITLE N_( "Other" )
+#define MISC_TITLE N_( "Advanced settings" )
 #define MISC_HELP N_( "Other advanced settings")
 
 #define NETWORK_TITLE N_( "Network" )
@@ -284,6 +287,7 @@ static struct config_category_t categories_array[] =
     /* Interface */
     { CAT_INTERFACE, INTF_TITLE, INTF_HELP },
     { SUBCAT_INTERFACE_GENERAL, GENERAL_TITLE, INTF_GENERAL_HELP },
+    { SUBCAT_INTERFACE_MAIN, INTF_MAIN_TITLE, INTF_MAIN_HELP },
     { SUBCAT_INTERFACE_CONTROL, INTF_CONTROL_TITLE, INTF_CONTROL_HELP },
     { SUBCAT_INTERFACE_HOTKEYS, INTF_HOTKEYS_TITLE, INTF_HOTKEYS_HELP },
 
@@ -299,7 +303,6 @@ static struct config_category_t categories_array[] =
     { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
     { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
     { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
-//    { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
     { SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP },
@@ -326,7 +329,6 @@ static struct config_category_t categories_array[] =
     { CAT_ADVANCED, AADVANCED_TITLE, AADVANCED_HELP },
     { SUBCAT_ADVANCED_CPU, CPU_TITLE, CPU_HELP },
     { SUBCAT_ADVANCED_MISC, MISC_TITLE, MISC_HELP },
-    { SUBCAT_ADVANCED_NETWORK, NETWORK_TITLE, NETWORK_HELP },
 
     { -1, NULL, NULL }
 };

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index b84671974bf7e24b1a7e41fac7112b45eb480c03..8a0904a677ae75dcfbc386988dd2a43cc5b13ebc 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -97,30 +97,6 @@ static void ClearChannels  ( intf_thread_t *, vout_thread_t * );
 vlc_module_begin();
     set_shortname( _("Hotkeys") );
     set_description( _("Hotkeys management interface") );
-    set_category( CAT_INTERFACE );
-//    set_subcategory( SUBCAT_INTERFACE_GENERAL );
-
-    add_string( "bookmark1", NULL, NULL,
-                BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark2", NULL, NULL,
-                BOOKMARK2_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark3", NULL, NULL,
-                BOOKMARK3_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark4", NULL, NULL,
-                BOOKMARK4_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark5", NULL, NULL,
-                BOOKMARK5_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark6", NULL, NULL,
-                BOOKMARK6_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark7", NULL, NULL,
-                BOOKMARK7_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark8", NULL, NULL,
-                BOOKMARK8_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark9", NULL, NULL,
-                BOOKMARK9_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-    add_string( "bookmark10", NULL, NULL,
-                BOOKMARK10_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
 vlc_module_end();

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index d2a6276550a7976dadd0cd5364190e377b71ce73..207a36058d3387951d39a55f9f92c7758158238a 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -58,7 +58,7 @@ vlc_module_begin();
     set_shortname( _("HTTP"));
     set_description( _("HTTP remote control interface") );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
         add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
         add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  VLC_TRUE );
         add_string ( "http-charset", "UTF-8", NULL, CHARSET_TEXT, CHARSET_LONGTEXT, VLC_TRUE );

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 1fd71e6627c78e6f5714343a4a9c3126584c27d4..56d37cf797bef0320379927aa1698264f0d98320 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -178,7 +178,7 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 vlc_module_begin();
     set_shortname( _("RC"));
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     set_description( _("Remote control interface") );
     add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
 #ifdef HAVE_ISATTY

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index 799a6e8bb25915f0e3cba3ef2d297303a7e2f05e..cfa482d211e21ec8c95082877ba997237858b54f 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -86,7 +86,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "Telnet" );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_CONTROL );
     add_string( "telnet-host", "", NULL, TELNETHOST_TEXT,
                  TELNETHOST_LONGTEXT, VLC_TRUE );
     add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT,

diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp
index c5b935e47a616460c6ae283c9a024fc33a99e301..a33901150af2655222ab3e9037d9c8564df46a29 100644 (file)
--- a/modules/gui/beos/BeOS.cpp
+++ b/modules/gui/beos/BeOS.cpp
@@ -48,7 +48,7 @@ void E_(CloseVideo)   ( vlc_object_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_bool( "beos-dvdmenus", 0, NULL, _("Use DVD Menus"), "", VLC_TRUE );
     set_shortname( "BeOS" );
     set_description( _("BeOS standard API interface") );

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index c23243b891f6d13263a5ff2c20c5e5fcb65fc08a..31c295c380d8b5a92efad55887d491bc04e9ce89 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -88,7 +88,7 @@ vlc_module_begin();
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
                      VLC_FALSE );
     add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT,

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 86fe2306977f9fbcf5472fe2defd38ea80ec2e66..571bd9f7f07e5452892becf83f13d732e3ada78c 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -338,6 +338,10 @@ static VLCTreeItem *o_root_item = nil;
                             localizedString: config_CategoryHelpGet( p_item->i_value ) ];
                         if( p_item->i_value != SUBCAT_PLAYLIST_GENERAL &&
                             p_item->i_value != SUBCAT_VIDEO_GENERAL &&
+                            p_item->i_value != SUBCAT_INPUT_GENERAL &&
+                            p_item->i_value != SUBCAT_INTERFACE_GENERAL &&
+                            p_item->i_value != SUBCAT_SOUT_GENERAL &&
+                            p_item->i_value != SUBCAT_ADVANCED_MISC &&
                             p_item->i_value != SUBCAT_AUDIO_GENERAL )
                             [p_last_category->o_children
                                 addObject:[[VLCTreeItem alloc]

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index f1baac00b0b95472091849025d2531f7c6735846..e02831573d297c4f49158ce09e628b4a75cf9f25 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -101,7 +101,7 @@ vlc_module_begin();
     set_description( _("Ncurses interface") );
     set_capability( "interface", 10 );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     set_callbacks( Open, Close );
     add_shortcut( "curses" );
     add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, VLC_FALSE );

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index bb34a5547edb76229215ddb5966950de01f190e9..6182caa8ceb2e8394ff44d046d68023edaf48d90 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -65,7 +65,7 @@ gint E_(GtkModeManage)   ( intf_thread_t * p_intf );
 vlc_module_begin();
     set_description( N_("PDA Linux Gtk2+ interface") );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
 //    add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );
     set_capability( "interface", 70 );
     set_callbacks( Open, Close );

diff --git a/modules/gui/qnx/qnx.c b/modules/gui/qnx/qnx.c
index 40fe2d03883e7769ea71617965645f1383564976..a408200c9ed84af49eaa88b1f00fa9fc1652b119 100644 (file)
--- a/modules/gui/qnx/qnx.c
+++ b/modules/gui/qnx/qnx.c
@@ -45,7 +45,7 @@ vlc_module_begin();
     set_capability( "video output", 100 );
     set_callbacks( E_(OpenVideo), E_(CloseVideo) );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_submodule();
         set_capability( "audio output", 100 );
         set_callbacks( E_(OpenAudio), E_(CloseAudio) );

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index b6bcff3ce7f6c95ff8a5c3a730d9c66f33531b10..0ff8b46a1f69484aba5c069da5804974685b653a 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -340,10 +340,12 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 //---------------------------------------------------------------------------
 // Module descriptor
 //---------------------------------------------------------------------------
-#define SKINS2_LAST      N_("Last skin used")
-#define SKINS2_LAST_LONG N_("Select the path to the last skin used.")
+#define SKINS2_LAST      N_("Skin to use")
+#define SKINS2_LAST_LONG N_("Path to the skin to use.")
 #define SKINS2_CONFIG      N_("Config of last used skin")
-#define SKINS2_CONFIG_LONG N_("Config of last used skin.")
+#define SKINS2_CONFIG_LONG N_("Windows configuration of the last used. " \
+        "This option is updated automatically by the skins module." )
+
 #define SKINS2_TRANSPARENCY      N_("Enable transparency effects")
 #define SKINS2_TRANSPARENCY_LONG N_("You can disable all transparency effects"\
     " if you want. This is mainly useful when moving windows does not behave" \
@@ -351,7 +353,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 
 vlc_module_begin();
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_string( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG,
                 VLC_TRUE );
         change_autosave();

diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp
index 875da01a4313eb3230da35545ddca1c2c2ed6ae2..e8d8c5309d8af7fa0a367e17f151fb2e04c3d25b 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences.cpp
@@ -415,7 +415,14 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
                 break;
             case CONFIG_SUBCATEGORY:
                 if( p_item->i_value == -1 ) break; // Don't display it
+                /* Special case: move the "general" subcategories to their
+                 * parent category */
                 if( p_item->i_value == SUBCAT_VIDEO_GENERAL ||
+                    p_item->i_value == SUBCAT_ADVANCED_MISC ||
+                    p_item->i_value == SUBCAT_INPUT_GENERAL ||
+                    p_item->i_value == SUBCAT_INTERFACE_GENERAL ||
+                    p_item->i_value == SUBCAT_SOUT_GENERAL||
+                    p_item->i_value == SUBCAT_PLAYLIST_GENERAL||
                     p_item->i_value == SUBCAT_AUDIO_GENERAL )
                 {
                     ConfigTreeData *cd = (ConfigTreeData *)

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 3112e3cb37b06d9f2a52057d53d037d68d689733..7f0cf72b47c51e141f10b7ce8cb53953e77ce7b1 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -122,7 +122,7 @@ vlc_module_begin();
     set_shortname( (char*) "wxWidgets" );
     set_description( (char *) _("wxWidgets interface module") );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     set_capability( "interface", i_score );
     set_callbacks( Open, Close );
     add_shortcut( "wxwindows" );

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 9defd5fa057d22b62353d66ed99c2a17357c0407..83591830b8d0a21d3558624bb40d49d7fc80a5e8 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -58,8 +58,6 @@ vlc_module_begin();
     set_shortname( _("Dummy"));
     set_description( _("Dummy interface function") );
     set_capability( "interface", 0 );
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
     add_shortcut( "vlc" );
     set_callbacks( E_(OpenIntf), NULL );
 #ifdef WIN32

diff --git a/src/libvlc.h b/src/libvlc.h
index eaeb5bacae049591fe558515cddcd74d61430c13..5276ed7a28d5fea662ac2945c488fa192a2c0027 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -973,6 +973,20 @@ static char *ppsz_clock_descriptions[] =
 #define SET_BOOKMARK8_KEY_TEXT N_("Set playlist bookmark 8")
 #define SET_BOOKMARK9_KEY_TEXT N_("Set playlist bookmark 9")
 #define SET_BOOKMARK10_KEY_TEXT N_("Set playlist bookmark 10")
+
+#define BOOKMARK1_TEXT N_("Playlist bookmark 1")
+#define BOOKMARK2_TEXT N_("Playlist bookmark 2")
+#define BOOKMARK3_TEXT N_("Playlist bookmark 3")
+#define BOOKMARK4_TEXT N_("Playlist bookmark 4")
+#define BOOKMARK5_TEXT N_("Playlist bookmark 5")
+#define BOOKMARK6_TEXT N_("Playlist bookmark 6")
+#define BOOKMARK7_TEXT N_("Playlist bookmark 7")
+#define BOOKMARK8_TEXT N_("Playlist bookmark 8")
+#define BOOKMARK9_TEXT N_("Playlist bookmark 9")
+#define BOOKMARK10_TEXT N_("Playlist bookmark 10")
+#define BOOKMARK_LONGTEXT N_( \
+      "This option allows you to define playlist bookmarks.")
+
 #define SET_BOOKMARK_KEY_LONGTEXT N_("Select the key to set this playlist bookmark.")
 
 #define HISTORY_BACK_TEXT N_("Go back in browsing history")
@@ -1328,6 +1342,12 @@ vlc_module_begin();
     add_bool( "sout-spu", 1, NULL, SOUT_SPU_TEXT,
                                 SOUT_SPU_LONGTEXT, VLC_TRUE );
 
+    set_section( N_("VLM"), NULL );
+    add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
+                    VLM_CONF_LONGTEXT, VLC_TRUE );
+
+
+
     set_subcategory( SUBCAT_SOUT_STREAM );
     set_subcategory( SUBCAT_SOUT_MUX );
     add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT,
@@ -1407,17 +1427,6 @@ vlc_module_begin();
                   WIN9X_CV_LONGTEXT, VLC_TRUE );
 #endif
 
-    set_section( N_("Miscellaneous" ), NULL );
-    add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
-                    VLM_CONF_LONGTEXT, VLC_TRUE );
-
-    add_bool ( "stats", VLC_TRUE, NULL, STATS_TEXT, STATS_LONGTEXT, VLC_TRUE );
-
-#if !defined(WIN32)
-    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
-        change_short('d');
-#endif
-
 /* Playlist options */
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_GENERAL );
@@ -1442,23 +1451,21 @@ vlc_module_begin();
 /* Interface options */
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );
-    add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE );
-    set_section ( N_("Interfaces" ), NULL );
-    add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
-                INTF_LONGTEXT, VLC_FALSE );
-        change_short('I');
-
-    add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL,
+        add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL,
                          NULL, NULL, EXTRAINTF_TEXT,
                          EXTRAINTF_LONGTEXT, VLC_FALSE );
 
-    set_section ( N_("Miscellaneous"), NULL );
     add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT,
                  VLC_FALSE );
         change_short('v');
     add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE );
         change_short('q');
 
+#if !defined(WIN32)
+    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
+        change_short('d');
+#endif
+
     add_bool( "file-logging", VLC_FALSE, NULL, FILE_LOG_TEXT, FILE_LOG_LONGTEXT,
               VLC_TRUE );
 #if HAVE_SYSLOG_H
@@ -1466,7 +1473,7 @@ vlc_module_begin();
                VLC_TRUE );
 #endif
 
-add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
+    add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
                 VLC_FALSE );
         change_string_list( ppsz_language, ppsz_language_text, 0 );
     add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
@@ -1476,6 +1483,13 @@ add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
     add_bool( "show-intf", VLC_FALSE, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT,
               VLC_FALSE );
 
+    add_bool ( "stats", VLC_TRUE, NULL, STATS_TEXT, STATS_LONGTEXT, VLC_TRUE );
+
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
+    add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
+                INTF_LONGTEXT, VLC_FALSE );
+        change_short('I');
+
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
     add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
                          CONTROL_TEXT, CONTROL_LONGTEXT, VLC_FALSE );
@@ -1749,6 +1763,8 @@ add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
              HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
     add_key( "key-record", KEY_RECORD, NULL,
              RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
+
+    set_section ( N_("Jump sizes" ), NULL );
     add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
                                     JIEXTRASHORT_LONGTEXT, VLC_FALSE );
     add_integer( "short-jump-size", 10, NULL, JISHORT_TEXT,
@@ -1802,6 +1818,28 @@ add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
     add_key( "key-play-bookmark10", KEY_PLAY_BOOKMARK10, NULL,
              PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
 
+
+    add_string( "bookmark1", NULL, NULL,
+             BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark2", NULL, NULL,
+             BOOKMARK2_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark3", NULL, NULL,
+             BOOKMARK3_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark4", NULL, NULL,
+             BOOKMARK4_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark5", NULL, NULL,
+             BOOKMARK5_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark6", NULL, NULL,
+             BOOKMARK6_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark7", NULL, NULL,
+             BOOKMARK7_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark8", NULL, NULL,
+             BOOKMARK8_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark9", NULL, NULL,
+             BOOKMARK9_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+    add_string( "bookmark10", NULL, NULL,
+              BOOKMARK10_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
+
     /* Usage (mainly useful for cmd line stuff) */
     /* add_usage_hint( PLAYLIST_USAGE ); */