Don't commit stuff that shouldn't have been commited.

[vlc] / modules / gui / qt4 / qt4.cpp

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 1ccd77369588de9286c2388c342131dd14251512..ceeac567deead721864aeb76388c9d90fc242120 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <QApplication>
@@ -43,6 +43,12 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+#define ALWAYS_VIDEO_TEXT N_("Always show a video screen, with a cone " \
+                                "when there is audio only.")
+#define ALWAYS_VIDEO_LONGTEXT N_("Start VLC with a cone image, and display it" \
+                                   " when there is no video track. " \
+                                    "Visualisations are enabled." )
+
 #define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple")
 #define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple" \
                                    "preferences when opening the preferences " \
@@ -69,8 +75,10 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define ADVANCED_OPTIONS_LONGTEXT N_("Activate by default all the" \
                                      "Advanced options for geeks")
 
-#define SHOWFLAGS_TEXT N_("Define what titles to show in playlist window")
-#define SHOWFLAGS_LONGTEXT N_(" ")
+#define SHOWFLAGS_TEXT N_("Define what columns to show in playlist window")
+#define SHOWFLAGS_LONGTEXT N_("Enter the sum of the options that you want:\n" \
+        "Title: 1\nDuration: 2\nArtist: 4\nGenre: 8\nCopyright: 10\n"         \
+        "Collection/album: 20\nRating: 100\n")
 
 vlc_module_begin();
     set_shortname( (char *)"Qt" );
@@ -86,15 +94,15 @@ vlc_module_begin();
     add_submodule();
         set_description( "Dialogs provider" );
         set_capability( "dialogs provider", 51 );
-        add_bool( "qt-always-video", VLC_FALSE, NULL, "FIXME", "FIXME",
-                VLC_TRUE );
+        add_bool( "qt-always-video", VLC_FALSE, NULL, ALWAYS_VIDEO_TEXT,
+                ALWAYS_VIDEO_LONGTEXT, VLC_TRUE );
         add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT,
                 ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
         add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT,
                 SYSTRAY_LONGTEXT, VLC_FALSE);
-        add_bool( "qt-start-mininimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
+        add_bool( "qt-start-minimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
                 MINIMIZED_LONGTEXT, VLC_TRUE);
-        add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT, 
+        add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT,
                   TITLE_LONGTEXT, VLC_FALSE );
         add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
                 FILEDIALOG_PATH_LONGTEXT, VLC_TRUE);