i18n fixes pointed by Marian Hikanik

diff --git a/modules/audio_filter/converter/mono.c b/modules/audio_filter/converter/mono.c
index 9944ef4ae27909839eb0c8922fe1cfa2a1aaee0a..f33aa083cb5796098f329bd3161f6a497c05e539 100644 (file)
--- a/modules/audio_filter/converter/mono.c
+++ b/modules/audio_filter/converter/mono.c
@@ -85,13 +85,13 @@ struct filter_sys_t
     struct atomic_operation_t * p_atomic_operations;
 };
 
-#define MONO_DOWNMIX_TEXT ("Use downmix algorithme.")
-#define MONO_DOWNMIX_LONGTEXT ("This option selects a stereo to mono " \
+#define MONO_DOWNMIX_TEXT N_("Use downmix algorithme.")
+#define MONO_DOWNMIX_LONGTEXT N_("This option selects a stereo to mono " \
     "downmix algorithm that is used in the headphone channel mixer. It" \
     "gives the effect of standing in a room full of speakers." )
 
-#define MONO_CHANNEL_TEXT ("Select channel to keep")
-#define MONO_CHANNEL_LONGTEXT ("This option silences all other channels " \
+#define MONO_CHANNEL_TEXT N_("Select channel to keep")
+#define MONO_CHANNEL_LONGTEXT N_("This option silences all other channels " \
     "except the selected channel. Choose one from (0=left, 1=right " \
     "2=rear left, 3=rear right, 4=center, 5=left front)")
 

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index 28ef0566710afbc6cb90f3aef2c3df80c2f91817..f2ea5ef3a73821145591172cfb79c3d8813f66ad 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -149,7 +149,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define LIBAVCODEC_PP_TEXT N_("FFmpeg post processing filter chains")
 /* FIXME (cut/past from ffmpeg */
 #define LIBAVCODEC_PP_LONGTEXT \
-"<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
+N_("<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
 "long form example:\n" \
 "vdeblock:autoq/hdeblock:autoq/linblenddeint    default,-vdeblock\n" \
 "short form example:\n" \
@@ -181,7 +181,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
 "fa     fast                                    h1:a,v1:a,dr:a,al\n" \
 "tn     tmpnoise        (3 Thresholds)          Temporal Noise Reducer\n" \
 "                       1. <= 2. <= 3.          larger -> stronger filtering\n" \
-"fq     forceQuant      <quantizer>             Force quantizer\n"
+"fq     forceQuant      <quantizer>             Force quantizer\n")
 
 /*
  * Encoder options

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index b6135431d1fb2fb9bff8a3c24790c35571370ca4..20f009da6ca86fb6d2f88a6adbd92f19e553ce57 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -42,10 +42,10 @@ static void DecoderClose  ( vlc_object_t * );
 #define DEBUG_TEXT \
      "Enable debug"
 
-#define DEBUG_LONGTEXT \
+#define DEBUG_LONGTEXT N_( \
     "This integer when viewed in binary is a debugging mask\n" \
     "calls                 1\n" \
-    "packet assembly info  2\n"
+    "packet assembly info  2\n")
 
 vlc_module_begin();
     set_description( _("Philips OGT (SVCD subtitle) decoder") );

diff --git a/modules/gui/wxwidgets/dialogs/bookmarks.cpp b/modules/gui/wxwidgets/dialogs/bookmarks.cpp
index 7759c3ed0db9cee065ecdca70a944c8d37db60bd..f91fcfe6b4f540c0692c61b1065434f8b4749a8f 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/bookmarks.cpp
+++ b/modules/gui/wxwidgets/dialogs/bookmarks.cpp
@@ -166,13 +166,13 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf, wxWindow *p_parent )
     wxButton *button_extract =
         new wxButton( panel, ButtonExtract_Event, wxU(_("Extract")) );
 
-#define ADD_TEXT "Adds a bookmark at the current position in the stream"
-#define REMOVE_TEXT "Removes the selected bookmarks"
-#define CLEAR_TEXT "Removes all the bookmarks for that stream"
-#define EDIT_TEXT "Edit the properties of a bookmark"
-#define EXTRACT_TEXT "If you select two or more bookmarks, this will " \
+#define ADD_TEXT N_("Adds a bookmark at the current position in the stream")
+#define REMOVE_TEXT N_("Removes the selected bookmarks")
+#define CLEAR_TEXT N_("Removes all the bookmarks for that stream")
+#define EDIT_TEXT N_("Edit the properties of a bookmark")
+#define EXTRACT_TEXT N_("If you select two or more bookmarks, this will " \
                "launch the streaming/transcoding wizard to allow you to " \
-              "stream or save the part of the stream between these bookmarks"
+              "stream or save the part of the stream between these bookmarks")
     button_add->SetToolTip(  wxU(_( ADD_TEXT ) ) );
     button_del->SetToolTip(  wxU(_( REMOVE_TEXT ) ) );
     button_clear->SetToolTip(  wxU(_( CLEAR_TEXT ) ) );

diff --git a/modules/gui/wxwidgets/dialogs/fileinfo.cpp b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
index 9bcedbb0f8256d18509529971034ffe2ca0b7770..f831391b82152265854738503afeb1f348052155 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -90,7 +90,7 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
 #endif
 
-    panel_sizer->Add( new wxButton( panel, wxID_CLOSE ) ,
+    panel_sizer->Add( new wxButton( panel, wxID_CLOSE, wxU(_("&Close")) ) ,
                       0, wxALL|wxALIGN_RIGHT, 5 );
 
     panel_sizer->Layout();

diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp
index d3d7d66194606f12f280c0aebc5cdc486bacecfd..f9eeefcd93805cb23394b53c7da8182fb13b462d 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences.cpp
@@ -410,7 +410,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
                         i_image = 6; break;
                 }
                 current_item = AppendItem( root_item,
-                                           wxU( config_data->psz_name ),
+                                           wxU( _(config_data->psz_name) ),
                                            i_image, -1, config_data );
 
                 break;
@@ -483,7 +483,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
                 #else
                 i_image = -1;
                 #endif
-                AppendItem( current_item, wxU( config_data->psz_name ),
+                AppendItem( current_item, wxU( _(config_data->psz_name) ),
                             i_image, -1, config_data );
                 break;
             }

diff --git a/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp b/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
index efea00d1c87d36bd28f92c78389dcf0085dd5c2e..5d2a24b8e163267cf025f1658aa33fb6a8111dc5 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
@@ -709,7 +709,7 @@ void FileConfigControl::OnBrowse( wxCommandEvent& event )
 #if defined( __WXMSW__ )
                              wxOPEN
 #else
-                             wxOPEN | wxSAVE
+                             wxOPEN
 #endif
                            );
         if( dialog.ShowModal() == wxID_OK )

diff --git a/src/libvlc.h b/src/libvlc.h
index b0b9b83a3100f66745a5333b9ef25342661b8dd5..429e1a23ed956addc0e724d8c15f58bdbce33477 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -1360,7 +1360,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_GENERAL );
 
-    add_bool( "france", VLC_FALSE, NULL, "France", FRANCE_LONGTEXT, VLC_TRUE );
+    add_bool( "france", VLC_FALSE, NULL, N_("France"), FRANCE_LONGTEXT, VLC_TRUE );
 
     set_section( N_( "Track settings" ), NULL );
     add_integer( "program", 0, NULL,