Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / modules / gui / wxwidgets / interface.cpp

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 8e1bab970455188eb935770889c19f7d90e77e35..fe8fb736ff46ced9844b6de4998cd2857dc960cd 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -590,7 +590,7 @@ void Interface::CreateOurMenuBar()
     }
     view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
     view_menu->Append( FileInfo_Event,
-                       wxU(_("Stream and Media &info...\tCtrl-I")) );
+                       wxU(_("Stream and Media &Info...\tCtrl-I")) );
     view_menu->Append( VLM_Event,
                        wxU(_("VLM Control...\tCtrl-V")) );
 
@@ -604,7 +604,7 @@ void Interface::CreateOurMenuBar()
     wxMenu *help_menu = new wxMenu;
     help_menu->Append( About_Event, wxU(_("About...")) );
     help_menu->AppendSeparator();
-    help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates...")) );
+    help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
 
     /* Append the freshly created menus to the menu bar... */
     wxMenuBar *menubar = new wxMenuBar();
@@ -1287,7 +1287,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
     {
         char *psz_utf8 = wxDnDFromLocale( filenames[i] );
 
-        playlist_Add( p_playlist, psz_utf8, psz_utf8,
+        playlist_PlaylistAdd( p_playlist, psz_utf8, psz_utf8,
                       PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
                       PLAYLIST_END );
 
@@ -1493,7 +1493,7 @@ wxMenu* Systray::CreatePopupMenu()
     systray_menu->Append( StopStream_Event, wxU(_("Stop")) );
     }
     systray_menu->AppendSeparator();
-    systray_menu->Append( Iconize_Event, wxU(_("Show/Hide interface")) );
+    systray_menu->Append( Iconize_Event, wxU(_("Show/Hide Interface")) );
     return systray_menu;
 }