Qt: Menus updates. Change position and removal of ...

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index d0173c7ad9cc1de6595779ed60139b9f19a80a83..ef0b677d8b4809729c1a7da09d8a2421cfef2586 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -39,15 +39,15 @@
 
 /******************* Menus *****************/
 
-#define I_MENU_INFO  N_("Media &Information...")
-#define I_MENU_CODECINFO  N_("&Codec Information...")
-#define I_MENU_MSG   N_("&Messages...")
-#define I_MENU_EXT   N_("&Extended Settings...")
-#define I_MENU_GOTOTIME N_("Go to Specific &Time...")
-#define I_MENU_BOOKMARK N_("&Bookmarks...")
-#define I_MENU_VLM N_("&VLM Configuration...")
+#define I_MENU_INFO  N_("Media &Information")
+#define I_MENU_CODECINFO  N_("&Codec Information")
+#define I_MENU_MSG   N_("&Messages")
+#define I_MENU_EXT   N_("&Extended Settings")
+#define I_MENU_GOTOTIME N_("Go to Specific &Time")
+#define I_MENU_BOOKMARK N_("&Bookmarks")
+#define I_MENU_VLM N_("&VLM Configuration")
 
-#define I_MENU_ABOUT N_("&About...")
+#define I_MENU_ABOUT N_("&About")
 
 /* Playlist popup */
 #define I_POP_PLAY N_("Play")
@@ -82,7 +82,7 @@
 #define I_PL_SEARCH     N_("Search")
 #define I_PL_FILTER     N_("Search Filter")
 
-#define I_PL_SD         N_("Additional &Sources")
+#define I_PL_SD         N_("&Services Discovery" )
 
 /*************** Preferences *************/
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 8ca30a4ae2ef5ae31b6a3f6b5f991ff5ce037ace..999fd576a87e45308953fa39e33bbae99979d610 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -360,26 +360,30 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf )
 
     addDPStaticEntry( menu, qtr( I_MENU_EXT ), ":/settings",
             SLOT( extendedDialog() ), "Ctrl+E" );
-    addDPStaticEntry( menu, qtr( I_MENU_MSG ),
-        ":/messages", SLOT( messagesDialog() ),
-        "Ctrl+M" );
+
     addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/info",
         SLOT( mediaInfoDialog() ), "Ctrl+I" );
     addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
         ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+
     addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ),"",
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
 #ifdef ENABLE_VLM
     addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ),
         "Ctrl+W" );
 #endif
+
+    addDPStaticEntry( menu, qtr( I_MENU_MSG ),
+        ":/messages", SLOT( messagesDialog() ),
+        "Ctrl+M" );
+
     addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ),
         "", SLOT( pluginDialog() ) );
     menu->addSeparator();
 
     addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
         ":/preferences", SLOT( toolbarDialog() ) );
-    addDPStaticEntry( menu, qtr( "&Preferences..." ),
+    addDPStaticEntry( menu, qtr( "&Preferences" ),
         ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
 
     return menu;
@@ -714,7 +718,7 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu )
     menu->addMenu( toolsmenu );
 #endif
 
-    QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
+    QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
     addDPStaticEntry( openmenu, qtr( "&Open File..." ),
         ":/file-asym", SLOT( openFileDialog() ) );
     addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ),