* Massive spelling corrections.

diff --git a/include/vlc_help.h b/include/vlc_help.h
index 5a914aa35815849f75cb48ce5bb29dbc93cb3f85..9e36b3ca5c13e65ea708b4f36edc3f6d4afd02a1 100644 (file)
--- a/include/vlc_help.h
+++ b/include/vlc_help.h
@@ -31,14 +31,14 @@
  */
 #define GENERAL_TITLE N_( "VLC preferences" )
 #define GENERAL_HELP N_( \
-    "Configure some global options in General Settings " \
+    "Configure the global options in General Settings " \
     "and configure each VLC module in the Modules section.\n" \
     "Click on \"Advanced Options\" to see all options." )
 
 #define PLUGIN_TITLE N_( "VLC modules preferences" )
 #define PLUGIN_HELP N_( \
     "In this tree, you can set options for every module used by VLC.\n" \
-    "Modules are sorted by type.\nHave fun tuning VLC!" )
+    "Modules are sorted by type." )
 
 /*
  *  Then, help for each module capabilities.
@@ -83,7 +83,7 @@
 
 #define SOUT_TITLE N_("Stream output access modules settings")
 #define SOUT_HELP N_( \
-    "In this section you can set the caching value for the UDP stream" \
+    "In this section you can set the caching value for the UDP stream " \
     "output access module.")
 
 #define SUBTITLE_DEMUX_TITLE N_("Subtitle demuxer settings")

diff --git a/modules/access/directory.c b/modules/access/directory.c
index a94f2dfb45da8cb5a9dfbf3f9b4683764fb7e1fb..39c36637d65968e3f6353cd11d73ce631fb36ceb 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -74,7 +74,7 @@ int ReadDir( playlist_t *p_playlist, char *psz_name , int i_mode, int *pi_pos );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define RECURSIVE_TEXT N_("Subdirectory behaviour")
+#define RECURSIVE_TEXT N_("Subdirectory behavior")
 #define RECURSIVE_LONGTEXT N_( \
         "Select whether subdirectories must be expanded.\n" \
         "none: subdirectories do not appear in the playlist.\n" \

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index d3c68ccd03bc4a49fc127af0ba51f3cc14d8f930..b709ecfeae0b08a0c8e940d2602bbb3fcd1b9e0f 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -107,7 +107,7 @@ static char *ppsz_adev_text[] = { N_("Default"), N_("None") };
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for directshow streams. " \
+    "Allows you to modify the default caching value for DirectShow streams. " \
     "This value should be set in milliseconds units." )
 #define VDEV_TEXT N_("Video device name")
 #define VDEV_LONGTEXT N_( \

diff --git a/modules/access/dvb/qpsk.c b/modules/access/dvb/qpsk.c
index 33cbf21efd99538a3f202a05f3d293eb58301888..4d43fca4cb662bce02c7a377557084cc20032758 100644 (file)
--- a/modules/access/dvb/qpsk.c
+++ b/modules/access/dvb/qpsk.c
@@ -76,7 +76,7 @@ void E_(Close)   ( vlc_object_t * );
 
 /* Cable */
 #define MODULATION_TEXT N_("Modulation type")
-#define MODULATION_LONGTEXT N_("Modulation type for frontend device.")
+#define MODULATION_LONGTEXT N_("Modulation type for front-end device.")
 
 /* Terrestrial */
 #define CODE_RATE_HP_TEXT N_("Terrestrial high priority stream code rate (FEC)")

diff --git a/modules/access/file.c b/modules/access/file.c
index d1df70ac931b70273516b640dd2df0607adbb165..07ba7356bbc88550950826ba324a7c5f9e8eafb3 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -78,11 +78,11 @@ static int     _OpenFile( input_thread_t *, char * );
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
     "Allows you to modify the default caching value for file streams. This " \
-    "value should be set in miliseconds units." )
+    "value should be set in millisecond units." )
 #define CAT_TEXT N_("Concatenate with additional files")
 #define CAT_LONGTEXT N_( \
-    "Allows you to play splitted files as they were part of a unique file. " \
-    "Specify a coma (',') separated list of files." )
+    "Allows you to play split files as if they were part of a unique file. " \
+    "Specify a comma-separated list of files." )
 
 vlc_module_begin();
     set_description( _("Standard filesystem file input") );

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index b2e985b38a085e0ee3e07060487bef6cb51a5af3..e7451d3aee8caa272b67a92d7ca639223a3730ac 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -2,7 +2,7 @@
  * ftp.c: FTP input module
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
- * $Id: ftp.c,v 1.25 2004/01/25 17:31:22 gbazin Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -39,7 +39,7 @@ static void    Close    ( vlc_object_t * );
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for ftp streams. This " \
+    "Allows you to modify the default caching value for FTP streams. This " \
     "value should be set in millisecond units." )
 #define USER_TEXT N_("FTP user name")
 #define USER_LONGTEXT N_("Allows you to modify the user name that will " \

diff --git a/modules/access/http.c b/modules/access/http.c
index deca3277a28f1de739aed9828d0880b87e2e9196..892267df0a528c4a98d8115078886e226a49fc47 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -52,7 +52,7 @@ static void Close( vlc_object_t * );
 
 #define USER_TEXT N_("HTTP user name")
 #define USER_LONGTEXT N_("Allows you to modify the user name that will " \
-    "be used for the connection (Basic authentification only).")
+    "be used for the connection (Basic authentication only).")
 
 #define PASS_TEXT N_("HTTP password")
 #define PASS_LONGTEXT N_("Allows you to modify the password that will be " \

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 9ca477031bc7513b1f9f09cfc46fea9150934b7b..81ed96183e2b511e2f34e8f3497dc7c833926466 100644 (file)
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -2,7 +2,7 @@
  * mms.c: MMS over tcp, udp and http access plug-in
  *****************************************************************************
  * Copyright (C) 2002-2004 VideoLAN
- * $Id: mms.c,v 1.37 2004/03/02 12:39:25 hartman Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -56,8 +56,8 @@ static void Close       ( vlc_object_t * );
  *****************************************************************************/
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for mms streams. This " \
-    "value should be set in miliseconds units." )
+    "Allows you to modify the default caching value for MMS streams. This " \
+    "value should be set in millisecond units." )
 
 #define ALL_TEXT N_("Force selection of all streams")
 

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index e7b6b801f1cdfb01f33e8d67825ff99057e08181..e5b31ee3161d351fd49ac6fd88a0fb3e6ce906b2 100644 (file)
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -2,7 +2,7 @@
  * tcp.c: TCP input module
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: tcp.c,v 1.4 2004/01/25 17:31:22 gbazin Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -36,8 +36,8 @@
  *****************************************************************************/
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for udp streams. This " \
-    "value should be set in miliseconds units." )
+    "Allows you to modify the default caching value for TCP streams. This " \
+    "value should be set in millisecond units." )
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );

diff --git a/modules/access/udp.c b/modules/access/udp.c
index cb91b6d5bf6f7272fc36323f2060b2add3926577..9352f63659bb75269b980761ffdc815471cbe804 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -40,8 +40,8 @@
  *****************************************************************************/
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for udp streams. This " \
-    "value should be set in miliseconds units." )
+    "Allows you to modify the default caching value for UDP streams. This " \
+    "value should be set in millisecond units." )
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index c7cdb04da2e2f170a7f281912c56dfd235c6080e..a44471d5c20de02b5fe5a505e8610b59344a6631 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -70,7 +70,7 @@ int  E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
 "   %A : The album information\n" \
 "   %C : The VCD volume count - the number of CDs in the collection\n" \
 "   %c : The VCD volume num - the number of the CD in the collection.\n" \
-"   %F : The VCD Format, e.g. VCD 1.0, VCD 1.1, VCD 2.0, or SVC\n" \
+"   %F : The VCD Format, e.g. VCD 1.0, VCD 1.1, VCD 2.0, or SVCD\n" \
 "   %I : The current entry/segment/playback type, e.g. ENTRY, TRACK, SEGMENT...\n" \
 "   %L : The playlist ID prefixed with \" LID\" if it exists\n" \
 "   %N : The current number of the %I - a decimal number\n" \

diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index 3f9ee82fa716dc72c744fec94782cc2afdec9e4d..34484eec559e2fd3154195254871e5453d1bee88 100644 (file)
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -37,7 +37,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Dummy stream ouput") );
+    set_description( _("Dummy stream output") );
     set_capability( "sout access", 0 );
     add_shortcut( "dummy" );
     set_callbacks( Open, Close );

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index fc0e83d3a8ac98e95276beee3c05ae31c796521b..117e40e3343770312c2f83a8eddfbc47ebc62f64 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -64,7 +64,7 @@ static void Close( vlc_object_t * );
                             "of replacing it.")
 
 vlc_module_begin();
-    set_description( _("File stream ouput") );
+    set_description( _("File stream output") );
     set_capability( "sout access", 50 );
     add_shortcut( "file" );
     add_shortcut( "stream" );

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 2a5ff457a53772b64e574f134e790ec12b9a942c..836385295dd5f9e6bbd09abe51bf222621cd428b 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -52,7 +52,7 @@ static void Close( vlc_object_t * );
 
 
 vlc_module_begin();
-    set_description( _("HTTP stream ouput") );
+    set_description( _("HTTP stream output") );
     set_capability( "sout access", 0 );
     add_shortcut( "http" );
     add_shortcut( "mmsh" );

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 19648f9922863abe4c85be608fe4e43b56a192fd..883db293168456ab0ecadb35cb6554ef9d437978 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -62,7 +62,7 @@ static void Close( vlc_object_t * );
 
 #define CACHING_TEXT N_("Caching value (ms)")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for udp streams. This " \
+    "Allows you to modify the default caching value for UDP streams. This " \
     "value should be set in millisecond units." )
 
 #define TTL_TEXT N_("Time To Live")
@@ -86,7 +86,7 @@ static void Close( vlc_object_t * );
                        "in order to improve streaming)." )
 
 vlc_module_begin();
-    set_description( _("UDP stream ouput") );
+    set_description( _("UDP stream output") );
     add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
     add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL,TTL_TEXT, TTL_LONGTEXT,
                                  VLC_TRUE );

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 17d2781e6cccfe7b795b4a85506fa0330dc83498..ad46043e100358f6bc7687e62f12d1357ece31f2 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -4,7 +4,7 @@
  *   (http://liba52.sf.net/).
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.17 2004/01/25 18:53:06 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -82,7 +82,7 @@ struct aout_filter_sys_t
     "listening room.")
 
 vlc_module_begin();
-    set_description( _("ATSC A/52 aka AC-3 audio decoder") );
+    set_description( _("ATSC A/52 (AC-3) audio decoder") );
     add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 907d2d28d6ce138d25e6bd43eae164403933383b..1e01cc9e513ec19ed9e1df774c6afa5e67dbe1da 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * bandlimited.c : bandlimited interpolation resampler
+ * bandlimited.c : band-limited interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: bandlimited.c,v 1.6 2003/05/17 11:35:14 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -24,7 +24,7 @@
 /*****************************************************************************
  * Preamble:
  *
- * This implementation of the bandlimited interpolationis based on the
+ * This implementation of the band-limited interpolationis based on the
  * following paper:
  * http://ccrma-www.stanford.edu/~jos/resample/resample.html
  *
@@ -79,7 +79,7 @@ struct aout_filter_sys_t
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("audio filter for bandlimited interpolation resampling") );
+    set_description( _("audio filter for band-limited interpolation resampling") );
     set_capability( "audio filter", 20 );
     set_callbacks( Create, Close );
 vlc_module_end();

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index d1689b50aae8f77b9d647775ba2c32bccfe79be8..e21fc7b7cb8bea9f076a3a323f06ab1e115f1d76 100644 (file)
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -2,7 +2,7 @@
  * spdif.c : dummy mixer for S/PDIF output (1 input only)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: spdif.c,v 1.10 2004/01/25 17:20:18 kuehne Exp $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -42,7 +42,7 @@ static void DoWork    ( aout_instance_t *, aout_buffer_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Dummy spdif audio mixer") );
+    set_description( _("Dummy S/PDIF audio mixer") );
     set_capability( "audio mixer", 1 );
     set_callbacks( Create, NULL );
 vlc_module_end();

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 000110577c0b23f0d389c76b411b45b9c95b0f89..47dafb7a58dd590d73c30bc8aa69cc251bbaac85 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.30 2004/02/14 17:03:33 gbazin Exp $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -86,7 +86,7 @@ static void    Play        ( aout_instance_t * );
     "will be saved but you can restrict the number of channels here.")
 
 #define WAV_TEXT N_("Add wave header")
-#define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a wav " \
+#define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
                         "header to the file")
 
 static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 68c24312f6165374c0874b9eebd289c436813b74..6b07c97497e84e522fe83cdcd015a7137ae362f5 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.64 2004/01/25 18:53:07 gbazin Exp $
+ * $Id$
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -70,7 +70,7 @@
  * aout_sys_t: OSS audio output method descriptor
  *****************************************************************************
  * This structure is part of the audio output thread descriptor.
- * It describes the dsp specific properties of an audio device.
+ * It describes the DSP specific properties of an audio device.
  *****************************************************************************/
 struct aout_sys_t
 {
@@ -108,7 +108,7 @@ vlc_module_begin();
     set_description( _("Linux OSS audio output") );
 
     add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
-              N_("OSS dsp device"), NULL, VLC_FALSE );
+              N_("OSS DSP device"), NULL, VLC_FALSE );
     add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
 
     set_capability( "audio output", 100 );
@@ -262,7 +262,7 @@ static void Probe( aout_instance_t * p_aout )
 /*****************************************************************************
  * Open: open the audio device (the digital sound processor)
  *****************************************************************************
- * This function opens the dsp as a usual non-blocking write-only file, and
+ * This function opens the DSP as a usual non-blocking write-only file, and
  * modifies the p_aout->p_sys->i_fd with the file's descriptor.
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
@@ -283,7 +283,7 @@ static int Open( vlc_object_t *p_this )
     /* Get device name */
     if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL )
     {
-        msg_Err( p_aout, "no audio device given (maybe /dev/dsp ?)" );
+        msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -533,7 +533,7 @@ static void Play( aout_instance_t *p_aout )
 }
 
 /*****************************************************************************
- * Close: close the dsp audio device
+ * Close: close the DSP audio device
  *****************************************************************************/
 static void Close( vlc_object_t * p_this )
 {

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index 16f6461df9e9aad4f9e4e16f5e19327a13c04106..e520c76c7e48ed3bc6daa2bba1ec6210bb822932 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -80,10 +80,10 @@ void E_(ClosePostproc)( decoder_t *, void * );
 
 #define ERROR_TEXT N_("Error resilience")
 #define ERROR_LONGTEXT N_( \
-    "ffmpeg can make error resiliences.          \n" \
-    "Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) " \
-    "this will produce a lot of errors.\n" \
-    "Valid range is -1 to 99 (-1 disables all errors resiliences).")
+    "ffmpeg can do error resilience.\n" \
+    "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) " \
+    "this can produce a lot of errors.\n" \
+    "Valid values range from -1 to 99 (-1 disables all errors resilience).")
 
 #define BUGS_TEXT N_("Workaround bugs")
 #define BUGS_LONGTEXT N_( \
@@ -111,7 +111,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define DEBUG_TEXT N_( "Debug mask" )
 #define DEBUG_LONGTEXT N_( "Set ffmpeg debug mask" )
 
-#define LIBAVCODEC_PP_TEXT N_("ffmpeg postproc filter chains")
+#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" \
@@ -181,9 +181,9 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define ENC_RC_BUF_LONGTEXT N_( "Allows you to specify the rate control " \
   "buffer size." )
 
-#define ENC_RC_BUF_AGGR_TEXT N_( "Rate control buffer aggressivity" )
+#define ENC_RC_BUF_AGGR_TEXT N_( "Rate control buffer aggressiveness" )
 #define ENC_RC_BUF_AGGR_LONGTEXT N_( "Allows you to specify the rate control "\
-  "buffer aggressivity." )
+  "buffer aggressiveness." )
 
 #define ENC_IQUANT_FACTOR_TEXT N_( "I quantization factor" )
 #define ENC_IQUANT_FACTOR_LONGTEXT N_( "Allows you to specify the " \
@@ -195,8 +195,8 @@ void E_(ClosePostproc)( decoder_t *, void * );
   "reduction algorithm to lower the encoding length and bitrate, at the " \
   "expense of lower quality frames." )
 
-#define ENC_MPEG4_MATRIX_TEXT N_( "Enable mpeg4 quantization matrix" )
-#define ENC_MPEG4_MATRIX_LONGTEXT N_( "Allows you to use the mpeg4 " \
+#define ENC_MPEG4_MATRIX_TEXT N_( "Enable MPEG4 quantization matrix" )
+#define ENC_MPEG4_MATRIX_LONGTEXT N_( "Allows you to use the MPEG4 " \
   "quantization matrix for mpeg2 encoding. This generally yields a " \
   "better looking picture, while still retaining the compatibility with " \
   "standard MPEG-2 decoders.")
@@ -210,7 +210,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define ENC_HURRYUP_LONGTEXT N_( "Allows you to specify if the encoder " \
   "should make on-the-fly quality tradeoffs if your CPU can't keep up with " \
   "the encoding rate. It will disable trellis quantization, then the rate " \
-  "distorsion of motion vectors (hq), and raise the noise reduction " \
+  "distortion of motion vectors (hq), and raise the noise reduction " \
   "threshold to ease the encoder's task." )
 
 #define ENC_QMIN_TEXT N_( "Minimum video quantizer scale" )
@@ -223,4 +223,4 @@ void E_(ClosePostproc)( decoder_t *, void * );
 
 #define ENC_TRELLIS_TEXT N_( "Enable trellis quantization" )
 #define ENC_TRELLIS_LONGTEXT N_( "Allows you to enable trellis " \
-  "quantization (rate distorsion for block coefficients)." )
+  "quantization (rate distortion for block coefficients)." )

diff --git a/modules/codec/ffmpeg/postprocessing/postprocessing.c b/modules/codec/ffmpeg/postprocessing/postprocessing.c
index 1363aacc0c73494580eac5c263e5e80b6b461e9d..122887436df2b25b55db6d7fe77bb3dbd2da55c8 100644 (file)
--- a/modules/codec/ffmpeg/postprocessing/postprocessing.c
+++ b/modules/codec/ffmpeg/postprocessing/postprocessing.c
@@ -2,7 +2,7 @@
  * postprocessing.c
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: postprocessing.c,v 1.5 2003/12/22 02:24:51 sam Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -55,7 +55,7 @@ vlc_module_begin();
     add_requirement( MMX );
     add_shortcut( "mmx" );
 #elif defined( MODULE_NAME_IS_postprocessing_mmxext )
-    set_description( _("MMXEXT post processing") );
+    set_description( _("MMX EXT post processing") );
     set_capability( "postprocessing", 150 );
     add_requirement( MMXEXT );
     add_shortcut( "mmxext" );

diff --git a/modules/codec/ogt/subtitle.h b/modules/codec/ogt/subtitle.h
index 81ad7f36a1df9439848b2c7f52b98fbd6f9e5dc5..fac2fc09a985986e48b5a931f0f6148e9377540c 100644 (file)
--- a/modules/codec/ogt/subtitle.h
+++ b/modules/codec/ogt/subtitle.h
@@ -2,7 +2,7 @@
  * subtitle.h : Common SVCD and CVD subtitles header
  *****************************************************************************
  * Copyright (C) 2003,2004 VideoLAN
- * $Id: subtitle.h,v 1.15 2004/01/30 13:17:12 rocky Exp $
+ * $Id$
  *
  * Author: Rocky Bernstein
  *   based on code from:
@@ -76,7 +76,7 @@
   N_("Add this to starting horizontal position of subtitle.")
 #define HORIZONTAL_CORRECT_LONGTEXT N_(                            \
   "If you need to adjust the subtitle starting position horizontally, " \
-  "set this. Negative values shift left and postive values right. 0 would " \
+  "set this. Negative values shift left and positive values right. 0 would " \
   "be no deviation from where the position specified in the subtitle." \
   )
 

diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index cfdc6dab5ca71cc30452d88fbd1585d412c52e50..ef1fba48d0064c32f82334ded8a051a82fd3e63b 100644 (file)
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -95,7 +95,7 @@ static char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
 #define ENCODING_TEXT N_("Subtitles text encoding")
 #define ENCODING_LONGTEXT N_("Set the encoding used in text subtitles")
 #define ALIGN_TEXT N_("Subtitles justification")
-#define ALIGN_LONGTEXT N_("Set the justification of substitles")
+#define ALIGN_LONGTEXT N_("Set the justification of subtitles")
 
 vlc_module_begin();
     set_description( _("text subtitles decoder") );

diff --git a/modules/control/joystick.c b/modules/control/joystick.c
index 970a4bab1de2de2600841a28be9db3a8dead0f94..7993f77d59a5d6f1dfd8c944844ebcfa0f6adc81 100644 (file)
--- a/modules/control/joystick.c
+++ b/modules/control/joystick.c
@@ -2,7 +2,7 @@
  * joystick.c: control vlc with a joystick
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: joystick.c,v 1.4 2004/01/25 16:17:03 anil Exp $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
  *
@@ -155,7 +155,7 @@ static void Run       ( intf_thread_t *p_intf );
 
 #define SEEK_TEXT N_( "Max seek interval (seconds)")
 #define SEEK_LONGTEXT N_(\
-   "The maximum number of seconds that will be seeked at a time." )
+   "The maximum number of seconds that will be sought at a time." )
 
 #define MAP_TEXT N_( "Action mapping")
 #define MAP_LONGTEXT N_( "Allows you to remap the actions." )

diff --git a/modules/demux/dvdnav.c b/modules/demux/dvdnav.c
index 2936717ba315c8f49d3fd989aed4aa724d40cd9e..08a3750d71e69b16a1854f048436fce4206788ea 100644 (file)
--- a/modules/demux/dvdnav.c
+++ b/modules/demux/dvdnav.c
@@ -41,8 +41,8 @@
  *****************************************************************************/
 #define CACHING_TEXT N_("caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for dvdnav streams. This "\
-    "value should be set in miliseconds units." )
+    "Allows you to modify the default caching value for DVDnav streams. This "\
+    "value should be set in millisecond units." )
 
 static int  AccessOpen ( vlc_object_t * );
 static void AccessClose( vlc_object_t * );

diff --git a/modules/demux/livedotcom.cpp b/modules/demux/livedotcom.cpp
index 4d558b7e2d8044bad86a2d39d2e46ca15141f397..6efab9c9f72b196425b5aecd7fb0bb578cb7190e 100644 (file)
--- a/modules/demux/livedotcom.cpp
+++ b/modules/demux/livedotcom.cpp
@@ -53,7 +53,7 @@ static void AccessClose( vlc_object_t * );
 #define CACHING_TEXT N_("Caching value (ms)")
 #define CACHING_LONGTEXT N_( \
     "Allows you to modify the default caching value for RTSP streams. This " \
-    "value should be set in miliseconds units." )
+    "value should be set in millisecond units." )
 
 vlc_module_begin();
     set_description( _("live.com (RTSP/RTP/SDP) demuxer" ) );

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 7c460d633df94b4c29a1df958aa5ce68a3251008..6508579bee436a44f5c5ec91d03d8a2f4735d65e 100644 (file)
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * rawdv.c : raw dv input module for vlc
+ * rawdv.c : raw DV input module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
  * $Id$
@@ -36,7 +36,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("raw dv demuxer") );
+    set_description( _("raw DV demuxer") );
     set_capability( "demux2", 2 );
     set_callbacks( Open, Close );
     add_shortcut( "rawdv" );
@@ -113,7 +113,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
                                   block_t* p_frame_block );
 
 /*****************************************************************************
- * Open: initializes raw dv demux structures
+ * Open: initializes raw DV demux structures
  *****************************************************************************/
 static int Open( vlc_object_t * p_this )
 {
@@ -127,12 +127,12 @@ static int Open( vlc_object_t * p_this )
     dv_id_t     dv_id;
     char        *psz_ext;
 
-    /* It isn't easy to recognize a raw dv stream. The chances that we'll
-     * mistake a stream from another type for a raw dv stream are too high, so
+    /* It isn't easy to recognize a raw DV stream. The chances that we'll
+     * mistake a stream from another type for a raw DV stream are too high, so
      * we'll rely on the file extension to trigger this demux. Alternatively,
      * it is possible to force this demux. */
 
-    /* Check for dv file extension */
+    /* Check for DV file extension */
     psz_ext = strrchr( p_demux->psz_path, '.' );
     if( ( !psz_ext || strcasecmp( psz_ext, ".dv") ) &&
         strcmp(p_demux->psz_demux, "rawdv") )
@@ -162,7 +162,7 @@ static int Open( vlc_object_t * p_this )
 
     if( dv_id.sct != 0 )
     {
-        msg_Warn( p_demux, "not a raw dv stream header" );
+        msg_Warn( p_demux, "not a raw DV stream header" );
         return VLC_EGENERIC;
     }
 

diff --git a/modules/demux/util/id3genres.h b/modules/demux/util/id3genres.h
index 284bdd49c5cd3311710c9782b4135044a421b50a..557e0340da554dd7ae4433fd504bd957b2dee443 100644 (file)
--- a/modules/demux/util/id3genres.h
+++ b/modules/demux/util/id3genres.h
@@ -2,7 +2,7 @@
  * id3genres.h: list of genres for id3 genre tags
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: id3genres.h,v 1.4 2004/01/25 20:05:29 hartman Exp $
+ * $Id$
  *
  * Author: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *         list found at http://www.id3.org/id3v2.4.0-frames.txt
@@ -92,7 +92,7 @@ static char *ppsz_genres[] = {
     N_("Native American"),
     N_("Cabaret"),
     N_("New wave"),
-    N_("Psychadelic"),
+    N_("Psychedelic"),
     N_("Rave"),
     N_("Showtunes"),
     N_("Trailer"),

diff --git a/modules/gui/kde/interface.cpp b/modules/gui/kde/interface.cpp
index 6fce91721aa5613866255f39443ff2a30e4b7ccd..3e76dfb5c954e7e8d993df2829b03c47e2eb4f41 100644 (file)
--- a/modules/gui/kde/interface.cpp
+++ b/modules/gui/kde/interface.cpp
@@ -149,7 +149,7 @@ void KInterface::initActions()
     fileOpenRecent->setStatusText(i18n(_("Opens a recently used file")));
     fileQuit->setStatusText(i18n(_("Quits the application")));
     viewToolBar->setStatusText(i18n(_("Enables/disables the toolbar")));
-    viewStatusBar->setStatusText(i18n(_("Enables/disables the statusbar")));
+    viewStatusBar->setStatusText(i18n(_("Enables/disables the status bar")));
 
     diskOpen->setStatusText( i18n( _("Opens a disk") ) );
     streamOpen->setStatusText( i18n( _("Opens a network stream") ) );
@@ -249,7 +249,7 @@ void KInterface::slotViewToolBar()
 
 void KInterface::slotViewStatusBar()
 {
-  slotStatusMsg(i18n(_("Toggle the statusbar...")));
+  slotStatusMsg(i18n(_("Toggle the status bar...")));
   ///////////////////////////////////////////////////////////////////
   //turn Statusbar on or off
   if(!viewStatusBar->isChecked())

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 92bcb220372475a7609065de1ad11cc78087f932..9b536045dda67f548e1a3f72938d72b94091236b 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -630,7 +630,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; 
     [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
     [o_err_btn_dismiss setTitle: _NS("Dismiss")];
-    [o_err_ckbk_surpress setTitle: _NS("Surpress further errors")];
+    [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
 
     [o_info_window setTitle: _NS("Info")];
 }

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index f23bf31f8d7f6f1b8887dc19e349884edf7bb4bc..ac0d9d03082a3ec2b3e9243ca18bbea1796b9569 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * macosx.m: MacOS X module for vlc
+ * macosx.m: Mac OS X module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
  * $Id$
@@ -71,7 +71,7 @@ void E_(CloseVideo)   ( vlc_object_t * );
 
 #define FILL_TEXT N_("Fill fullscreen")
 #define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \
-        "necessary in order to fill the screen without black" \
+        "necessary in order to fill the screen without black " \
         "borders (OpenGL only)." )
 
 static char * effect_list[] = { "none", "cube", "transparent-cube" };
@@ -82,7 +82,7 @@ static char *ppsz_vout_list[] = { "auto", "quartz", "opengl" };
 static char *ppsz_vout_list_text[] = { N_("Auto"), "Quartz", "OpenGL" };
     
 vlc_module_begin();
-    set_description( _("MacOS X interface, sound and video") );
+    set_description( _("Mac OS X interface, sound and video") );
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     add_submodule();

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 5acc76811bd388f0e09e1a300e96b9de57c6e539..e744b238727438fd304af9808140388e370e725b 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -620,7 +620,7 @@ void Interface::CreateOurExtendedPanel()
     wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
-                                            wxU(_("Visualisations")) );
+                                            wxU(_("Visualizations")) );
 
     visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
     visual_sizer->Layout();

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index f4d145aaae8360c8b2c3bd1b58fa071178b4603b..607d83e240a455cc3cae946d95f2389ee735de02 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -101,7 +101,7 @@
        "is received.")
 #define SAP_PARSE_TEXT N_("Try to parse the SAP")
 #define SAP_PARSE_LONGTEXT N_( \
-       "When SAP can it will try to parse the SAP. Normal behaviour is" \
+       "When SAP can it will try to parse the SAP. Normal behavior is " \
        "to have livedotcom parse the announce." )
 
 static int  Open ( vlc_object_t * );

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index f069ffe9c17e883c0cde226de13fb33b1807bd3e..c240b52f3dcdedbe16d70ac5eb391cfee4a62963 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -47,7 +47,7 @@
     "Allows you to specify the SDP used for the streaming output. " \
     "You must use an url: http://location to access the SDP via HTTP, " \
     "rtsp://location for RTSP access, and sap:// for the SDP to be " \
-    "annnounced via SAP" )
+    "announced via SAP" )
 #define MUX_TEXT N_("Muxer")
 #define MUX_LONGTEXT N_( \
     "Allows you to specify the muxer used for the streaming output." )

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index d3171cc50cfea7d1dc6d87f9db0492d5325bb1ca..9a7e8149d295330929b876511da6ce1e492d9db8 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -39,15 +39,15 @@
  *****************************************************************************/
 #define ACCESS_TEXT N_("Output access method")
 #define ACCESS_LONGTEXT N_( \
-    "Allows you to pecify the output access method used for the streaming " \
+    "Allows you to specify the output access method used for the streaming " \
     "output." )
 #define MUX_TEXT N_("Output muxer")
 #define MUX_LONGTEXT N_( \
-    "Allows you to pecify the output muxer method used for the streaming " \
+    "Allows you to specify the output muxer method used for the streaming " \
     "output." )
 #define URL_TEXT N_("Output URL")
 #define URL_LONGTEXT N_( \
-    "Allows you to pecify the output URL used for the streaming output." )
+    "Allows you to specify the output URL used for the streaming output." )
 
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index e42e0cace24b617879608b90d46eb84e8870d572..03ec04215df0c5ba05c8089b861cad73caabd10d 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -83,7 +83,7 @@ vlc_module_begin();
     i_80w   = 0x0000000080808080ULL;
 #elif defined (MODULE_NAME_IS_i420_yuy2_altivec)
     set_description(
-            _("Altivec conversions from " SRC_FOURCC " to " DEST_FOURCC) );
+            _("AltiVec conversions from " SRC_FOURCC " to " DEST_FOURCC) );
     set_capability( "chroma", 100 );
     add_requirement( ALTIVEC );
 #endif

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index 3198591ac582140dd4e9dc1797fd24b389197791..32c1dbc48ae16e03f091e608cf5ee6fcc9f8ace6 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -56,8 +56,8 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define COUNT_LONGTEXT N_("Select the number of video windows in which to "\
     "clone the video")
 
-#define VOUTLIST_TEXT N_("List of vout modules")
-#define VOUTLIST_LONGTEXT N_("Select the specific vout modules that you want to activate")
+#define VOUTLIST_TEXT N_("List of video output modules")
+#define VOUTLIST_LONGTEXT N_("Select the specific video output modules that you want to activate")
 
 vlc_module_begin();
     set_description( _("Clone video filter") );

diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index b5fb82188aa548c8cb3d58b62715f2fdc7e11082..02457614f35bc0e08b5b7eec8a5fa2bcf79d9cb3 100644 (file)
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -52,7 +52,7 @@ static int  SendEvents( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 #define GEOMETRY_TEXT N_("Crop geometry (pixels)")
-#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop. This is set as width x heigth + left offset + top offset.")
+#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop. This is set as <width> x <height> + <left offset> + <top offset>.")
 
 #define AUTOCROP_TEXT N_("Automatic cropping")
 #define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping.")

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index 32845c1ecf781651322302e6fed2cafc377eec52..a727a6a29f5b75691f43433a56e1cf9635bfb90e 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -51,11 +51,11 @@ static int  SendEvents( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 #define COLS_TEXT N_("Number of columns")
-#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
+#define COLS_LONGTEXT N_("Select the number of horizontal video windows in " \
     "which to split the video")
 
 #define ROWS_TEXT N_("Number of rows")
-#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
+#define ROWS_LONGTEXT N_("Select the number of vertical video windows in " \
     "which to split the video")
 
 #define ACTIVE_TEXT N_("Active windows")

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index e568f6f4357aaa6b0d8e6e8dfbd5673a1fd64e8c..ee0ec51818fbc1ed455072886a2f0b5908b0752c 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -2,7 +2,7 @@
  * caca.c: Color ASCII Art video output plugin using libcaca
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: caca.c,v 1.9 2004/01/26 16:45:02 zorglub Exp $
+ * $Id$
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *
@@ -51,7 +51,7 @@ static void Display   ( vout_thread_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("colour ASCII art video output") );
+    set_description( _("color ASCII art video output") );
     set_capability( "video output", 12 );
     set_callbacks( Create, Destroy );
 vlc_module_end();

diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index f9370e47c449f4ace8afa517717700a1f5fe3fe1..22537a6264ade9981f5e2fe58f2661a510389aa4 100644 (file)
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -114,13 +114,14 @@ static int FindDevicesCallback( vlc_object_t *, char const *,
 
 #define TRIPLEBUF_TEXT N_("Use triple buffering for overlays")
 #define TRIPLEBUF_LONGTEXT N_( \
-    "Try to use triple bufferring when using YUV overlays. That results in " \
+    "Try to use triple buffering when using YUV overlays. That results in " \
     "much better video quality (no flickering)." )
 
 #define DEVICE_TEXT N_("Name of desired display device")
-#define DEVICE_LONGTEXT N_("In a multimonitor configuration, you can specify "\
-    "the Windows device name of the display that you want the video window " \
-    "to open on. For example, \"\\\\.\\DISPLAY1\" or \"\\\\.\\DISPLAY2\"." )
+#define DEVICE_LONGTEXT N_("In a multiple monitor configuration, you can " \
+    "specify the Windows device name of the display that you want the video " \
+    "window to open on. For example, \"\\\\.\\DISPLAY1\" or " \
+    "\"\\\\.\\DISPLAY2\"." )
 
 static char *ppsz_dev[] = { "" };
 static char *ppsz_dev_text[] = { N_("Default") };

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 94f50caeb10cd93a35bb988359de9f1354ed2ebc..5a22e596e8b55d625eb4b3d5fbeac9aa064bd879 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -2,7 +2,7 @@
  * x11.c : X11 plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: x11.c,v 1.9 2004/01/26 16:45:03 zorglub Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -46,7 +46,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "has its drawbacks.\n" \
     "1) Let the window manager handle your fullscreen window (default), but " \
     "things like taskbars will likely show on top of the video.\n" \
-    "2) Completly bypass the window manager, but then nothing will be able " \
+    "2) Completely bypass the window manager, but then nothing will be able " \
     "to show on top of the video.")
 
 #define DISPLAY_TEXT N_("X11 display name")

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index b53945e01cad2d69d937190b0edd140a0839a9d6..3631483d67ffbc8e0c7a412c2f6e6098e621df2d 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -2,7 +2,7 @@
  * xvideo.c : Xvideo plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xvideo.c,v 1.9 2004/01/26 16:45:03 zorglub Exp $
+ * $Id$
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -52,7 +52,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "has its drawbacks.\n" \
     "1) Let the window manager handle your fullscreen window (default), but " \
     "things like taskbars will likely show on top of the video.\n" \
-    "2) Completly bypass the window manager, but then nothing will be able " \
+    "2) Completely bypass the window manager, but then nothing will be able " \
     "to show on top of the video.")
 
 #define DISPLAY_TEXT N_("X11 display name")

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index e584ab6c1f6132a84fb45a2161b88abdad9de303..88e9cb92637af8a3f1beb34adee2cee0d382f0e2 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -48,7 +48,7 @@ static void Close        ( vlc_object_t * );
 #define WIDTH_TEXT N_("Goom display width")
 #define HEIGHT_TEXT N_("Goom display height")
 #define RES_LONGTEXT N_("Allows you to change the resolution of the " \
-  "goom display (bigger resolution will be prettier but more CPU intensive).")
+  "Goom display (bigger resolution will be prettier but more CPU intensive).")
 
 #define SPEED_TEXT N_("Goom animation speed")
 #define SPEED_LONGTEXT N_("Allows you to reduce the speed of the animation " \

diff --git a/src/libvlc.h b/src/libvlc.h
index e38d155600a7e6077b17d2b6ebe1fb32371d6d78..906084c70139a1cab5be13c97dbd4f3dc4a67c8c 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -59,7 +59,7 @@ static char *ppsz_language_text[] =
     "This option allows you to select additional interfaces used by VLC. " \
     "They will be launched in the background in addition to the default " \
     "interface. Use a comma separated list of interface modules. (common " \
-    "values are: logger,gestures,sap,rc,http,screensaver)")
+    "values are logger, gestures, sap, rc, http or screensaver)")
 
 #define VERBOSE_TEXT N_("Verbosity (0,1,2)")
 #define VERBOSE_LONGTEXT N_( \
@@ -97,9 +97,9 @@ static char *ppsz_language_text[] =
     "for its modules.")
 
 #define AOUT_CAT_LONGTEXT N_( \
-    "These options allow you to modify the behaviour of the audio " \
+    "These options allow you to modify the behavior of the audio " \
     "subsystem, and to add audio filters which can be used for " \
-    "postprocessing or visual effects (spectrum analyzer, ...).\n" \
+    "post processing or visual effects (spectrum analyzer, ...).\n" \
     "Enable these filters here, and configure them in the \"audio filters\" " \
     "modules section.")
 
@@ -158,7 +158,7 @@ static char *ppsz_language_text[] =
 
 #define AUDIO_FILTER_TEXT N_("Audio filters")
 #define AUDIO_FILTER_LONGTEXT N_( \
-    "This allows you to add audio postprocessing filters, to modify " \
+    "This allows you to add audio post processing filters, to modify " \
     "the sound, or audio visualization modules (spectrum analyzer, ...).")
 
 #define AUDIO_CHANNEL_MIXER N_("Channel mixer")
@@ -168,8 +168,8 @@ static char *ppsz_language_text[] =
      "with a headphone.")
 
 #define VOUT_CAT_LONGTEXT N_( \
-    "These options allow you to modify the behaviour of the video output " \
-    "subsytem. You can for example enable video filters (deinterlacing, " \
+    "These options allow you to modify the behavior of the video output " \
+    "subsystem. You can for example enable video filters (deinterlacing, " \
     "image adjusting, ...). Enable these filters here and configure " \
     "them in the \"video filters\" modules section. You can also set many " \
     "miscellaneous video options." )
@@ -211,7 +211,7 @@ static char *ppsz_language_text[] =
 
 #define ALIGN_TEXT N_("Video alignment")
 #define ALIGN_LONGTEXT N_( \
-    "You can enforce the video alignement in its window. By default (0) it " \
+    "You can enforce the video alignment in its window. By default (0) it " \
     "will be centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
     "also use combinations of these values).")
 static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
@@ -268,7 +268,7 @@ static char *ppsz_align_descriptions[] =
     "squareness.")
 
 #define INPUT_CAT_LONGTEXT N_( \
-    "These options allow you to modify the behaviour of the input " \
+    "These options allow you to modify the behavior of the input " \
     "subsystem, such as the DVD or VCD device, the network interface " \
     "settings or the subtitle channel.")
 
@@ -337,7 +337,7 @@ static char *ppsz_align_descriptions[] =
 
 #define SUB_FUZZY_TEXT N_("Subtitle autodetection fuzziness")
 #define SUB_FUZZY_LONGTEXT \
-    N_("This determines how fuzzy subtitle and movie filenaming matching " \
+    N_("This determines how fuzzy subtitle and movie filename matching " \
     "will be. Options are:\n" \
     "0 = no subtitles autodetected\n" \
     "1 = any subtitle file\n" \
@@ -359,7 +359,7 @@ static char *ppsz_align_descriptions[] =
 #ifdef WIN32
 #define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD drive (or file) to use. Don't forget the colon " \
-    "after the drive letter (eg D:)")
+    "after the drive letter (eg. D:)")
 #else
 #define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD device to use.")
@@ -469,10 +469,10 @@ static char *ppsz_align_descriptions[] =
     "This allows you to choose if the video stream should be redirected to " \
     "the stream output facility when this last one is enabled.")
 
-#define SOUT_KEEP_TEXT N_("Keep sout open" )
+#define SOUT_KEEP_TEXT N_("Keep stream output open" )
 #define SOUT_KEEP_LONGTEXT N_( \
-    "This allows you to keep an unique sout instance across " \
-    "multiple playlist item (automatically insert gather stream_out " \
+    "This allows you to keep an unique stream output instance across " \
+    "multiple playlist item (automatically insert the gather stream output " \
     "if not specified)" )
 
 #define PACKETIZER_TEXT N_("Preferred packetizer list")
@@ -533,7 +533,7 @@ static char *ppsz_align_descriptions[] =
 
 #define PLAYLIST_CAT_LONGTEXT N_( \
      "These options define the behavior of the playlist. Some " \
-     "of them can be overriden in the playlist dialog box." )
+     "of them can be overridden in the playlist dialog box." )
 
 #define RANDOM_TEXT N_("Play files randomly forever")
 #define RANDOM_LONGTEXT N_( \
@@ -605,7 +605,7 @@ static char *ppsz_align_descriptions[] =
 #define FAST_MUTEX_TEXT N_("Fast mutex on NT/2K/XP (developers only)")
 #define FAST_MUTEX_LONGTEXT N_( \
     "On Windows NT/2K/XP we use a slow mutex implementation but which " \
-    "allows us to correctely implement condition variables. " \
+    "allows us to correctly implement condition variables. " \
     "You can also use the faster Win9x implementation but you might " \
     "experience problems with it.")
 
@@ -669,7 +669,7 @@ static char *ppsz_align_descriptions[] =
 #define NAV_LEFT_KEY_TEXT N_("Navigate left")
 #define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in DVD menus.")
 #define NAV_RIGHT_KEY_TEXT N_("Navigate right")
-#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in dvd menus.")
+#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.")
 #define NAV_ACTIVATE_KEY_TEXT N_("Activate")
 #define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.")
 #define VOL_UP_KEY_TEXT N_("Volume up")

diff --git a/src/misc/iso-639_def.h b/src/misc/iso-639_def.h
index 63b3f9da6a6dbee341a02e509f566f2a89be5d50..34830229eddddf8ba997813a054ef03dc95b5c7b 100644 (file)
--- a/src/misc/iso-639_def.h
+++ b/src/misc/iso-639_def.h
@@ -2,7 +2,7 @@
  * iso_lang.h: languages codes and abbreviations
  *****************************************************************************
  * Copyright (C) 1998-2004 VideoLAN
- * $Id: iso-639_def.h,v 1.3 2004/01/06 12:02:06 zorglub Exp $
+ * $Id$
  *
  * This is used in iso_lang.cpp and is taken from the GNU glibc 2.2.5
  * tarball. It has been partially completed with native language names.
@@ -28,172 +28,177 @@
  * Format is:( "English name", 639-1-code, 639-2/T-code, 639-2/B-code)
  * If you find something missing or wrong contact <bug-glibc@gnu.org> */
 
+/* Some spellings were converted to pure ASCII:
+ *  Provençal -> Provencal
+ *  Volapük -> Volapuk
+ *  Bokmål -> Bokmaal */
+
 static const iso639_lang_t p_languages[] =
 {
-    { "Afar",           "",            "aa", "aar", "aar" },
-    { "Abkhazian",      "",            "ab", "abk", "abk" },
-    { "Afrikaans",      "",            "af", "afr", "afr" },
-    { "Albanian",       "",            "sq", "sqi", "alb" },
-    { "Amharic",        "",            "am", "amh", "amh" },
-    { "Arabic",         "",            "ar", "ara", "ara" },
-    { "Armenian",       "",            "hy", "hye", "arm" },
-    { "Assamese",       "",            "as", "asm", "asm" },
-    { "Avestan",        "",            "ae", "ave", "ave" },
-    { "Aymara",         "",            "ay", "aym", "aym" },
-    { "Azerbaijani",    "",            "az", "aze", "aze" },
-    { "Bashkir",        "",            "ba", "bak", "bak" },
-    { "Basque",         "",            "eu", "eus", "baq" },
-    { "Belarusian",     "",            "be", "bel", "bel" },
-    { "Bengali",        "",            "bn", "ben", "ben" },
-    { "Bihari",         "",            "bh", "bih", "bih" },
-    { "Bislama",        "",            "bi", "bis", "bis" },
-    { "Bosnian",        "",            "bs", "bos", "bos" },
-    { "Breton",         "",            "br", "bre", "bre" },
-    { "Bulgarian",      "",            "bg", "bul", "bul" },
-    { "Burmese",        "",            "my", "mya", "bur" },
-    { "Catalan",        "",            "ca", "cat", "cat" },
-    { "Chamorro",       "",            "ch", "cha", "cha" },
-    { "Chechen",        "",            "ce", "che", "che" },
-    { "Chinese",        "",            "zh", "zho", "chi" },
-    { "Church Slavic",  "",            "cu", "chu", "chu" },
-    { "Chuvash",        "",            "cv", "chv", "chv" },
-    { "Cornish",        "",            "kw", "cor", "cor" },
-    { "Corsican",       "",            "co", "cos", "cos" },
-    { "Czech",          "",            "cs", "ces", "cze" },
-    { "Danish",         "Dansk",       "da", "dan", "dan" },
-    { "Dutch",          "Nederlands",  "nl", "nld", "dut" },
-    { "Dzongkha",       "",            "dz", "dzo", "dzo" },
-    { "English",        "English",     "en", "eng", "eng" },
-    { "Esperanto",      "",            "eo", "epo", "epo" },
-    { "Estonian",       "",            "et", "est", "est" },
-    { "Faroese",        "",            "fo", "fao", "fao" },
-    { "Fijian",         "",            "fj", "fij", "fij" },
-    { "Finnish",        "Suomi",       "fi", "fin", "fin" },
-    { "French",         "Francais",    "fr", "fra", "fre" },
-    { "Frisian",        "",            "fy", "fry", "fry" },
-    { "Georgian",       "",            "ka", "kat", "geo" },
-    { "German",         "Deutsch",     "de", "deu", "ger" },
-    { "Gaelic (Scots)", "",            "gd", "gla", "gla" },
-    { "Irish",          "",            "ga", "gle", "gle" },
-    { "Gallegan",       "",            "gl", "glg", "glg" },
-    { "Manx",           "",            "gv", "glv", "glv" },
-    { "Greek, Modern ()", "",          "el", "gre", "ell" },
-    { "Guarani",        "",            "gn", "grn", "grn" },
-    { "Gujarati",       "",            "gu", "guj", "guj" },
-    { "Hebrew",         "",            "he", "heb", "heb" },
-    { "Herero",         "",            "hz", "her", "her" },
-    { "Hindi",          "",            "hi", "hin", "hin" },
-    { "Hiri Motu",      "",            "ho", "hmo", "hmo" },
-    { "Hungarian",      "Magyar",      "hu", "hun", "hun" },
-    { "Icelandic",      "Islenska",    "is", "isl", "ice" },
-    { "Inuktitut",      "",            "iu", "iku", "iku" },
-    { "Interlingue",    "",            "ie", "ile", "ile" },
-    { "Interlingua",    "",            "ia", "ina", "ina" },
-    { "Indonesian",     "",            "id", "ind", "ind" },
-    { "Inupiaq",        "",            "ik", "ipk", "ipk" },
-    { "Italian",        "Italiano",    "it", "ita", "ita" },
-    { "Javanese",       "",            "jv", "jaw", "jav" },
-    { "Japanese",       "",            "ja", "jpn", "jpn" },
-    { "Kalaallisut (Greenlandic)", "", "kl", "kal", "kal" },
-    { "Kannada",        "",            "kn", "kan", "kan" },
-    { "Kashmiri",       "",            "ks", "kas", "kas" },
-    { "Kazakh",         "",            "kk", "kaz", "kaz" },
-    { "Khmer",          "",            "km", "khm", "khm" },
-    { "Kikuyu",         "",            "ki", "kik", "kik" },
-    { "Kinyarwanda",    "",            "rw", "kin", "kin" },
-    { "Kirghiz",        "",            "ky", "kir", "kir" },
-    { "Komi",           "",            "kv", "kom", "kom" },
-    { "Korean",         "",            "ko", "kor", "kor" },
-    { "Kuanyama",       "",            "kj", "kua", "kua" },
-    { "Kurdish",        "",            "ku", "kur", "kur" },
-    { "Lao",            "",            "lo", "lao", "lao" },
-    { "Latin",          "",            "la", "lat", "lat" },
-    { "Latvian",        "",            "lv", "lav", "lav" },
-    { "Lingala",        "",            "ln", "lin", "lin" },
-    { "Lithuanian",     "",            "lt", "lit", "lit" },
-    { "Letzeburgesch",  "",            "lb", "ltz", "ltz" },
-    { "Macedonian",     "",            "mk", "mkd", "mac" },
-    { "Marshall",       "",            "mh", "mah", "mah" },
-    { "Malayalam",      "",            "ml", "mal", "mal" },
-    { "Maori",          "",            "mi", "mri", "mao" },
-    { "Marathi",        "",            "mr", "mar", "mar" },
-    { "Malay",          "",            "ms", "msa", "may" },
-    { "Malagasy",       "",            "mg", "mlg", "mlg" },
-    { "Maltese",        "",            "mt", "mlt", "mlt" },
-    { "Moldavian",      "",            "mo", "mol", "mol" },
-    { "Mongolian",      "",            "mn", "mon", "mon" },
-    { "Nauru",          "",            "na", "nau", "nau" },
-    { "Navajo",         "",            "nv", "nav", "nav" },
-    { "Ndebele, South", "",            "nr", "nbl", "nbl" },
-    { "Ndebele, North", "",            "nd", "nde", "nde" },
-    { "Ndonga",         "",            "ng", "ndo", "ndo" },
-    { "Nepali",         "",            "ne", "nep", "nep" },
-    { "Norwegian",      "Norsk",       "no", "nor", "nor" },
-    { "Norwegian Nynorsk", "",         "nn", "nno", "nno" },
-    { "Norwegian Bokmål", "",          "nb", "nob", "nob" },
-    { "Chichewa; Nyanja", "",          "ny", "nya", "nya" },
-    { "Occitan (post 1500); Provençal", "", "oc", "oci", "oci" },
-    { "Oriya",          "",            "or", "ori", "ori" },
-    { "Oromo",          "",            "om", "orm", "orm" },
-    { "Ossetian; Ossetic", "",         "os", "oss", "oss" },
-    { "Panjabi",        "",            "pa", "pan", "pan" },
-    { "Persian",        "",            "fa", "fas", "per" },
-    { "Pali",           "",            "pi", "pli", "pli" },
-    { "Polish",         "",            "pl", "pol", "pol" },
-    { "Portuguese",     "Portugues",   "pt", "por", "por" },
-    { "Pushto",         "",            "ps", "pus", "pus" },
-    { "Quechua",        "",            "qu", "que", "que" },
-    { "Raeto-Romance",  "",            "rm", "roh", "roh" },
-    { "Romanian",       "",            "ro", "ron", "rum" },
-    { "Rundi",          "",            "rn", "run", "run" },
-    { "Russian",        "",            "ru", "rus", "rus" },
-    { "Sango",          "",            "sg", "sag", "sag" },
-    { "Sanskrit",       "",            "sa", "san", "san" },
-    { "Serbian",        "",            "sr", "srp", "scc" },
-    { "Croatian",       "Hrvatski",    "hr", "hrv", "scr" },
-    { "Sinhalese",      "",            "si", "sin", "sin" },
-    { "Slovak",         "",            "sk", "slk", "slo" },
-    { "Slovenian",      "",            "sl", "slv", "slv" },
-    { "Northern Sami",  "",            "se", "sme", "sme" },
-    { "Samoan",         "",            "sm", "smo", "smo" },
-    { "Shona",          "",            "sn", "sna", "sna" },
-    { "Sindhi",         "",            "sd", "snd", "snd" },
-    { "Somali",         "",            "so", "som", "som" },
-    { "Sotho, Southern", "",           "st", "sot", "sot" },
-    { "Spanish",        "Espanol",     "es", "spa", "spa" },
-    { "Sardinian",      "",            "sc", "srd", "srd" },
-    { "Swati",          "",            "ss", "ssw", "ssw" },
-    { "Sundanese",      "",            "su", "sun", "sun" },
-    { "Swahili",        "",            "sw", "swa", "swa" },
-    { "Swedish",        "Svenska",     "sv", "swe", "swe" },
-    { "Tahitian",       "",            "ty", "tah", "tah" },
-    { "Tamil",          "",            "ta", "tam", "tam" },
-    { "Tatar",          "",            "tt", "tat", "tat" },
-    { "Telugu",         "",            "te", "tel", "tel" },
-    { "Tajik",          "",            "tg", "tgk", "tgk" },
-    { "Tagalog",        "",            "tl", "tgl", "tgl" },
-    { "Thai",           "",            "th", "tha", "tha" },
-    { "Tibetan",        "",            "bo", "bod", "tib" },
-    { "Tigrinya",       "",            "ti", "tir", "tir" },
-    { "Tonga (Tonga Islands)", "",     "to", "ton", "ton" },
-    { "Tswana",         "",            "tn", "tsn", "tsn" },
-    { "Tsonga",         "",            "ts", "tso", "tso" },
-    { "Turkish",        "",            "tr", "tur", "tur" },
-    { "Turkmen",        "",            "tk", "tuk", "tuk" },
-    { "Twi",            "",            "tw", "twi", "twi" },
-    { "Uighur",         "",            "ug", "uig", "uig" },
-    { "Ukrainian",      "",            "uk", "ukr", "ukr" },
-    { "Urdu",           "",            "ur", "urd", "urd" },
-    { "Uzbek",          "",            "uz", "uzb", "uzb" },
-    { "Vietnamese",     "",            "vi", "vie", "vie" },
-    { "Volapük",        "",            "vo", "vol", "vol" },
-    { "Welsh",          "",            "cy", "cym", "wel" },
-    { "Wolof",          "",            "wo", "wol", "wol" },
-    { "Xhosa",          "",            "xh", "xho", "xho" },
-    { "Yiddish",        "",            "yi", "yid", "yid" },
-    { "Yoruba",         "",            "yo", "yor", "yor" },
-    { "Zhuang",         "",            "za", "zha", "zha" },
-    { "Zulu",           "",            "zu", "zul", "zul" },
+    { N_( "Afar" ),             "",            "aa", "aar", "aar" },
+    { N_( "Abkhazian" ),        "",            "ab", "abk", "abk" },
+    { N_( "Afrikaans" ),        "",            "af", "afr", "afr" },
+    { N_( "Albanian" ),         "",            "sq", "sqi", "alb" },
+    { N_( "Amharic" ),          "",            "am", "amh", "amh" },
+    { N_( "Arabic" ),           "",            "ar", "ara", "ara" },
+    { N_( "Armenian" ),         "",            "hy", "hye", "arm" },
+    { N_( "Assamese" ),         "",            "as", "asm", "asm" },
+    { N_( "Avestan" ),          "",            "ae", "ave", "ave" },
+    { N_( "Aymara" ),           "",            "ay", "aym", "aym" },
+    { N_( "Azerbaijani" ),      "",            "az", "aze", "aze" },
+    { N_( "Bashkir" ),          "",            "ba", "bak", "bak" },
+    { N_( "Basque" ),           "",            "eu", "eus", "baq" },
+    { N_( "Belarusian" ),       "",            "be", "bel", "bel" },
+    { N_( "Bengali" ),          "",            "bn", "ben", "ben" },
+    { N_( "Bihari" ),           "",            "bh", "bih", "bih" },
+    { N_( "Bislama" ),          "",            "bi", "bis", "bis" },
+    { N_( "Bosnian" ),          "",            "bs", "bos", "bos" },
+    { N_( "Breton" ),           "",            "br", "bre", "bre" },
+    { N_( "Bulgarian" ),        "",            "bg", "bul", "bul" },
+    { N_( "Burmese" ),          "",            "my", "mya", "bur" },
+    { N_( "Catalan" ),          "",            "ca", "cat", "cat" },
+    { N_( "Chamorro" ),         "",            "ch", "cha", "cha" },
+    { N_( "Chechen" ),          "",            "ce", "che", "che" },
+    { N_( "Chinese" ),          "",            "zh", "zho", "chi" },
+    { N_( "Church Slavic" ),    "",            "cu", "chu", "chu" },
+    { N_( "Chuvash" ),          "",            "cv", "chv", "chv" },
+    { N_( "Cornish" ),          "",            "kw", "cor", "cor" },
+    { N_( "Corsican" ),         "",            "co", "cos", "cos" },
+    { N_( "Czech" ),            "",            "cs", "ces", "cze" },
+    { N_( "Danish" ),           "Dansk",       "da", "dan", "dan" },
+    { N_( "Dutch" ),            "Nederlands",  "nl", "nld", "dut" },
+    { N_( "Dzongkha" ),         "",            "dz", "dzo", "dzo" },
+    { N_( "English" ),          "English",     "en", "eng", "eng" },
+    { N_( "Esperanto" ),        "",            "eo", "epo", "epo" },
+    { N_( "Estonian" ),         "",            "et", "est", "est" },
+    { N_( "Faroese" ),          "",            "fo", "fao", "fao" },
+    { N_( "Fijian" ),           "",            "fj", "fij", "fij" },
+    { N_( "Finnish" ),          "Suomi",       "fi", "fin", "fin" },
+    { N_( "French" ),           "Francais",    "fr", "fra", "fre" },
+    { N_( "Frisian" ),          "",            "fy", "fry", "fry" },
+    { N_( "Georgian" ),         "",            "ka", "kat", "geo" },
+    { N_( "German" ),           "Deutsch",     "de", "deu", "ger" },
+    { N_( "Gaelic (Scots)" ),   "",            "gd", "gla", "gla" },
+    { N_( "Irish" ),            "",            "ga", "gle", "gle" },
+    { N_( "Gallegan" ),         "",            "gl", "glg", "glg" },
+    { N_( "Manx" ),             "",            "gv", "glv", "glv" },
+    { N_( "Greek, Modern ()" ), "",            "el", "gre", "ell" },
+    { N_( "Guarani" ),          "",            "gn", "grn", "grn" },
+    { N_( "Gujarati" ),         "",            "gu", "guj", "guj" },
+    { N_( "Hebrew" ),           "",            "he", "heb", "heb" },
+    { N_( "Herero" ),           "",            "hz", "her", "her" },
+    { N_( "Hindi" ),            "",            "hi", "hin", "hin" },
+    { N_( "Hiri Motu" ),        "",            "ho", "hmo", "hmo" },
+    { N_( "Hungarian" ),        "Magyar",      "hu", "hun", "hun" },
+    { N_( "Icelandic" ),        "Islenska",    "is", "isl", "ice" },
+    { N_( "Inuktitut" ),        "",            "iu", "iku", "iku" },
+    { N_( "Interlingue" ),      "",            "ie", "ile", "ile" },
+    { N_( "Interlingua" ),      "",            "ia", "ina", "ina" },
+    { N_( "Indonesian" ),       "",            "id", "ind", "ind" },
+    { N_( "Inupiaq" ),          "",            "ik", "ipk", "ipk" },
+    { N_( "Italian" ),          "Italiano",    "it", "ita", "ita" },
+    { N_( "Javanese" ),         "",            "jv", "jaw", "jav" },
+    { N_( "Japanese" ),         "",            "ja", "jpn", "jpn" },
+    { N_( "Kalaallisut (Greenlandic)" ), "",   "kl", "kal", "kal" },
+    { N_( "Kannada" ),          "",            "kn", "kan", "kan" },
+    { N_( "Kashmiri" ),         "",            "ks", "kas", "kas" },
+    { N_( "Kazakh" ),           "",            "kk", "kaz", "kaz" },
+    { N_( "Khmer" ),            "",            "km", "khm", "khm" },
+    { N_( "Kikuyu" ),           "",            "ki", "kik", "kik" },
+    { N_( "Kinyarwanda" ),      "",            "rw", "kin", "kin" },
+    { N_( "Kirghiz" ),          "",            "ky", "kir", "kir" },
+    { N_( "Komi" ),             "",            "kv", "kom", "kom" },
+    { N_( "Korean" ),           "",            "ko", "kor", "kor" },
+    { N_( "Kuanyama" ),         "",            "kj", "kua", "kua" },
+    { N_( "Kurdish" ),          "",            "ku", "kur", "kur" },
+    { N_( "Lao" ),              "",            "lo", "lao", "lao" },
+    { N_( "Latin" ),            "",            "la", "lat", "lat" },
+    { N_( "Latvian" ),          "",            "lv", "lav", "lav" },
+    { N_( "Lingala" ),          "",            "ln", "lin", "lin" },
+    { N_( "Lithuanian" ),       "",            "lt", "lit", "lit" },
+    { N_( "Letzeburgesch" ),    "",            "lb", "ltz", "ltz" },
+    { N_( "Macedonian" ),       "",            "mk", "mkd", "mac" },
+    { N_( "Marshall" ),         "",            "mh", "mah", "mah" },
+    { N_( "Malayalam" ),        "",            "ml", "mal", "mal" },
+    { N_( "Maori" ),            "",            "mi", "mri", "mao" },
+    { N_( "Marathi" ),          "",            "mr", "mar", "mar" },
+    { N_( "Malay" ),            "",            "ms", "msa", "may" },
+    { N_( "Malagasy" ),         "",            "mg", "mlg", "mlg" },
+    { N_( "Maltese" ),          "",            "mt", "mlt", "mlt" },
+    { N_( "Moldavian" ),        "",            "mo", "mol", "mol" },
+    { N_( "Mongolian" ),        "",            "mn", "mon", "mon" },
+    { N_( "Nauru" ),            "",            "na", "nau", "nau" },
+    { N_( "Navajo" ),           "",            "nv", "nav", "nav" },
+    { N_( "Ndebele, South" ),   "",            "nr", "nbl", "nbl" },
+    { N_( "Ndebele, North" ),   "",            "nd", "nde", "nde" },
+    { N_( "Ndonga" ),           "",            "ng", "ndo", "ndo" },
+    { N_( "Nepali" ),           "",            "ne", "nep", "nep" },
+    { N_( "Norwegian" ),        "Norsk",       "no", "nor", "nor" },
+    { N_( "Norwegian Nynorsk" ), "",           "nn", "nno", "nno" },
+    { N_( "Norwegian Bokmaal" ), "",           "nb", "nob", "nob" },
+    { N_( "Chichewa; Nyanja" ), "",            "ny", "nya", "nya" },
+    { N_( "Occitan (post 1500); Provencal" ), "", "oc", "oci", "oci" },
+    { N_( "Oriya" ),            "",            "or", "ori", "ori" },
+    { N_( "Oromo" ),            "",            "om", "orm", "orm" },
+    { N_( "Ossetian; Ossetic" ), "",           "os", "oss", "oss" },
+    { N_( "Panjabi" ),          "",            "pa", "pan", "pan" },
+    { N_( "Persian" ),          "",            "fa", "fas", "per" },
+    { N_( "Pali" ),             "",            "pi", "pli", "pli" },
+    { N_( "Polish" ),           "",            "pl", "pol", "pol" },
+    { N_( "Portuguese" ),       "Portugues",   "pt", "por", "por" },
+    { N_( "Pushto" ),           "",            "ps", "pus", "pus" },
+    { N_( "Quechua" ),          "",            "qu", "que", "que" },
+    { N_( "Raeto-Romance" ),    "",            "rm", "roh", "roh" },
+    { N_( "Romanian" ),         "",            "ro", "ron", "rum" },
+    { N_( "Rundi" ),            "",            "rn", "run", "run" },
+    { N_( "Russian" ),          "",            "ru", "rus", "rus" },
+    { N_( "Sango" ),            "",            "sg", "sag", "sag" },
+    { N_( "Sanskrit" ),         "",            "sa", "san", "san" },
+    { N_( "Serbian" ),          "",            "sr", "srp", "scc" },
+    { N_( "Croatian" ),         "Hrvatski",    "hr", "hrv", "scr" },
+    { N_( "Sinhalese" ),        "",            "si", "sin", "sin" },
+    { N_( "Slovak" ),           "",            "sk", "slk", "slo" },
+    { N_( "Slovenian" ),        "",            "sl", "slv", "slv" },
+    { N_( "Northern Sami" ),    "",            "se", "sme", "sme" },
+    { N_( "Samoan" ),           "",            "sm", "smo", "smo" },
+    { N_( "Shona" ),            "",            "sn", "sna", "sna" },
+    { N_( "Sindhi" ),           "",            "sd", "snd", "snd" },
+    { N_( "Somali" ),           "",            "so", "som", "som" },
+    { N_( "Sotho, Southern" ),  "",            "st", "sot", "sot" },
+    { N_( "Spanish" ),          "Espanol",     "es", "spa", "spa" },
+    { N_( "Sardinian" ),        "",            "sc", "srd", "srd" },
+    { N_( "Swati" ),            "",            "ss", "ssw", "ssw" },
+    { N_( "Sundanese" ),        "",            "su", "sun", "sun" },
+    { N_( "Swahili" ),          "",            "sw", "swa", "swa" },
+    { N_( "Swedish" ),          "Svenska",     "sv", "swe", "swe" },
+    { N_( "Tahitian" ),         "",            "ty", "tah", "tah" },
+    { N_( "Tamil" ),            "",            "ta", "tam", "tam" },
+    { N_( "Tatar" ),            "",            "tt", "tat", "tat" },
+    { N_( "Telugu" ),           "",            "te", "tel", "tel" },
+    { N_( "Tajik" ),            "",            "tg", "tgk", "tgk" },
+    { N_( "Tagalog" ),          "",            "tl", "tgl", "tgl" },
+    { N_( "Thai" ),             "",            "th", "tha", "tha" },
+    { N_( "Tibetan" ),          "",            "bo", "bod", "tib" },
+    { N_( "Tigrinya" ),         "",            "ti", "tir", "tir" },
+    { N_( "Tonga (Tonga Islands)" ), "",       "to", "ton", "ton" },
+    { N_( "Tswana" ),           "",            "tn", "tsn", "tsn" },
+    { N_( "Tsonga" ),           "",            "ts", "tso", "tso" },
+    { N_( "Turkish" ),          "",            "tr", "tur", "tur" },
+    { N_( "Turkmen" ),          "",            "tk", "tuk", "tuk" },
+    { N_( "Twi" ),              "",            "tw", "twi", "twi" },
+    { N_( "Uighur" ),           "",            "ug", "uig", "uig" },
+    { N_( "Ukrainian" ),        "",            "uk", "ukr", "ukr" },
+    { N_( "Urdu" ),             "",            "ur", "urd", "urd" },
+    { N_( "Uzbek" ),            "",            "uz", "uzb", "uzb" },
+    { N_( "Vietnamese" ),       "",            "vi", "vie", "vie" },
+    { N_( "Volapuk" ),          "",            "vo", "vol", "vol" },
+    { N_( "Welsh" ),            "",            "cy", "cym", "wel" },
+    { N_( "Wolof" ),            "",            "wo", "wol", "wol" },
+    { N_( "Xhosa" ),            "",            "xh", "xho", "xho" },
+    { N_( "Yiddish" ),          "",            "yi", "yid", "yid" },
+    { N_( "Yoruba" ),           "",            "yo", "yor", "yor" },
+    { N_( "Zhuang" ),           "",            "za", "zha", "zha" },
+    { N_( "Zulu" ),             "",            "zu", "zul", "zul" },
     { NULL, NULL, NULL, NULL, NULL }
 };
 

diff --git a/src/misc/iso_lang.c b/src/misc/iso_lang.c
index d84613facbc51e7ba025f7bb812494ab37fe5f13..5cd1532b7db5618d3ca7e0ab24b13b143e1ebde8 100644 (file)
--- a/src/misc/iso_lang.c
+++ b/src/misc/iso_lang.c
@@ -2,7 +2,7 @@
  * iso_lang.c: function to decode language code (in dvd or a52 for instance).
  *****************************************************************************
  * Copyright (C) 1998-2004 VideoLAN
- * $Id: iso_lang.c,v 1.11 2004/01/06 12:02:06 zorglub Exp $
+ * $Id$
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *         Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -56,16 +56,18 @@ const char * DecodeLanguage( uint16_t i_code )
     {
         if( !strncmp( p_lang->psz_iso639_1, psz_code, 2 ) )
         {
+# if 0
             if( *p_lang->psz_native_name )
             {
                 return p_lang->psz_native_name;
             }
+#endif
 
-            return p_lang->psz_eng_name;
+            return _( p_lang->psz_eng_name );
         }
     }
 
-    return "Unknown";
+    return _( "Unknown" );
 }
 
 const iso639_lang_t * GetLang_1( const char * psz_code )