Explain what "OSD" is in the title (not in the button, however)

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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 5173645805b9e181c0f96d9c9b9a5507cb5d902d..e2e07d4583c45688b55e0fad8e67c27a04a2d24a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -75,9 +75,9 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
                   spref_cone_Interface_64.png, 0 );
     ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 );
     ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 );
-    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles & OSD"),
+    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"),
                   spref_cone_Subtitles_64.png, 3 );
-    ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
+    ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"),
                   spref_cone_Input_64.png, 4 );
     ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
 
@@ -352,11 +352,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             /* Disk Devices */
             {
                 ui.DVDDevice->setToolTip(
-                    //TODO: make this sentence understandable
-                    qtr( "If this property is blank, then you have\n"
-                         "values for DVD, VCD, and CDDA.\n"
-                         "You can define a unique one or set that in"
-                         "the advanced preferences" ) );
+                    qtr( "If this property is blank, different values\n"
+                         "for DVD, VCD, and CDDA are set.\n"
+                         "You can define a unique one or configure them \n"
+                         "individually in the advanced preferences." ) );
                 char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" );
                 char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
                 char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
@@ -484,7 +483,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
             CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
                                                       artFetcher );
-            CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
 
             /* UPDATE options */
 #ifdef UPDATE_CHECK
@@ -507,7 +505,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
         END_SPREFS_CAT;
 
-        START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD Settings") );
+        START_SPREFS_CAT( Subtitles, qtr("Subtitles & On Screen Display Settings") );
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );