* modules/gui/wxwindows/*: few modifications to the strings.

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 1263e99d4efbcff27209eb754e7946743691b2a4..b261bb47fb79787fe32ed336158426454fa67803 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.17 2003/03/30 19:56:11 gbazin Exp $
+ * $Id: interface.cpp,v 1.18 2003/04/01 00:18:29 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -391,7 +391,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
           "\nIt can play MPEG and MPEG2 files from a file or from a "
           "network source.")) );
 
-    wxMessageBox( msg, wxString(_("About ")) + VOUT_TITLE,
+    wxMessageBox( msg, wxString::Format(_("About %s"), VOUT_TITLE),
                   wxOK | wxICON_INFORMATION, this );
 }
 

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index f7e5245e18acfe4e83f129c428f94c15585cc14f..0d13d04ee2babb4cadd8561b7837bd0f9ab1993a 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: open.cpp,v 1.10 2003/03/30 16:26:42 gbazin Exp $
+ * $Id: open.cpp,v 1.11 2003/04/01 00:18:29 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -173,7 +173,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
     /* Create Stream Output checkox */
     wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
     sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
-                                           _("Stream Output") );
+                                           _("Stream output") );
     sout_checkbox->SetToolTip( _("Use VLC has a stream server") );
     sout_sizer->Add( sout_checkbox, 0,
                      wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
@@ -319,7 +319,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
                                 WXSIZEOF(disc_type_array), wxRA_SPECIFY_COLS );
     sizer_row->Add( disc_type, 0, wxEXPAND | wxALL, 5 );
 
-    wxStaticText *label = new wxStaticText( panel, -1, _("Device Name") );
+    wxStaticText *label = new wxStaticText( panel, -1, _("Device name") );
     disc_device = new wxTextCtrl( panel, DiscDevice_Event, "",
                                   wxDefaultPosition, wxDefaultSize,
                                   wxTE_PROCESS_ENTER);
@@ -378,7 +378,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
     subpanel_sizer = new wxFlexGridSizer( 2, 1, 20 );
     label = new wxStaticText( net_subpanels[0], -1, _("Port") );
     net_ports[0] = new wxSpinCtrl( net_subpanels[0], NetPort1_Event,
-                                   wxString::Format(_("%d"), val),
+                                   wxString::Format("%d", val),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    0, 16000, val);
@@ -401,7 +401,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
 
     label = new wxStaticText( net_subpanels[1], -1, _("Port") );
     net_ports[1] = new wxSpinCtrl( net_subpanels[1], NetPort2_Event,
-                                   wxString::Format(_("%d"), val),
+                                   wxString::Format("%d", val),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    0, 16000, val);
@@ -423,7 +423,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
 
     label = new wxStaticText( net_subpanels[2], -1, _("Port") );
     net_ports[2] = new wxSpinCtrl( net_subpanels[2], NetPort3_Event,
-                                   wxString::Format(_("%d"), val),
+                                   wxString::Format("%d", val),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    0, 16000, val);

diff --git a/modules/gui/wxwindows/popup.cpp b/modules/gui/wxwindows/popup.cpp
index 07a7d339b1a9d62886d244b6de9d95fa2d7029ed..17fe2a37420622c81e53caa1ce5370bcfd411bad 100644 (file)
--- a/modules/gui/wxwindows/popup.cpp
+++ b/modules/gui/wxwindows/popup.cpp
@@ -2,7 +2,7 @@
  * popup.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: popup.cpp,v 1.4 2003/03/11 23:56:54 gbazin Exp $
+ * $Id: popup.cpp,v 1.5 2003/04/01 00:18:29 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -258,7 +258,7 @@ wxMenu *PopupMenu::CreateSubMenu( char *psz_var, vlc_object_t *p_object )
         case VLC_VAR_INTEGER:
           menuitem =
               new wxMenuItemExt( this, i_item_id++,
-                                 wxString::Format(_("%d"),
+                                 wxString::Format("%d",
                                  val_list.p_list->p_values[i].i_int),
                                  "", wxITEM_RADIO, strdup(psz_var),
                                  p_object->i_object_id,

diff --git a/modules/gui/wxwindows/preferences.cpp b/modules/gui/wxwindows/preferences.cpp
index 9ef4c5db5e1597d568d0185bce14df409e244ecb..1c61f7d30543c73d2f618d44fc7f759a916692fa 100644 (file)
--- a/modules/gui/wxwindows/preferences.cpp
+++ b/modules/gui/wxwindows/preferences.cpp
@@ -2,7 +2,7 @@
  * preferences.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: preferences.cpp,v 1.8 2003/03/30 16:26:42 gbazin Exp $
+ * $Id: preferences.cpp,v 1.9 2003/04/01 00:18:29 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -662,7 +662,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
         case CONFIG_ITEM_INTEGER:
             label = new wxStaticText(panel, -1, p_item->psz_text);
             spin = new wxSpinCtrl( panel, -1,
-                                   wxString::Format(_("%d"), p_item->i_value),
+                                   wxString::Format("%d", p_item->i_value),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    0, 16000, p_item->i_value);
@@ -677,7 +677,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
         case CONFIG_ITEM_FLOAT:
             label = new wxStaticText(panel, -1, p_item->psz_text);
             spin = new wxSpinCtrl( panel, -1,
-                                   wxString::Format(_("%d"), p_item->i_value),
+                                   wxString::Format("%d", p_item->i_value),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    0, 16000, p_item->i_value);

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index d98c15fa66e82128a49ed9d417b06286a77334b8..def6ab20c8c0e7596a223e488e3cb8eeac442319 100644 (file)
--- a/modules/gui/wxwindows/streamout.cpp
+++ b/modules/gui/wxwindows/streamout.cpp
@@ -2,7 +2,7 @@
  * streamout.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: streamout.cpp,v 1.3 2003/03/29 11:15:14 gbazin Exp $
+ * $Id: streamout.cpp,v 1.4 2003/04/01 00:18:29 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -126,7 +126,7 @@ END_EVENT_TABLE()
  * Constructor.
  *****************************************************************************/
 SoutDialog::SoutDialog( intf_thread_t *_p_intf, Interface *_p_main_interface ):
-    wxDialog( _p_main_interface, -1, _("Stream Output"), wxDefaultPosition,
+    wxDialog( _p_main_interface, -1, _("Stream output"), wxDefaultPosition,
              wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
     /* Initializations */
@@ -140,7 +140,7 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, Interface *_p_main_interface ):
     /* Create MRL combobox */
     wxBoxSizer *mrl_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
     wxStaticBox *mrl_box = new wxStaticBox( panel, -1,
-                               _("Stream Output MRL") );
+                               _("Stream output MRL") );
     wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
                                                         wxHORIZONTAL );
     wxStaticText *mrl_label = new wxStaticText( panel, -1,
@@ -302,7 +302,7 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
     int val = config_GetInt( p_intf, "server-port" );
     label = new wxStaticText( access_subpanels[2], -1, _("Port") );
     net_port = new wxSpinCtrl( access_subpanels[2], NetPort_Event,
-                               wxString::Format(_("%d"), val),
+                               wxString::Format("%d", val),
                                wxDefaultPosition, wxDefaultSize,
                                wxSP_ARROW_KEYS,
                                0, 16000, val );