From 4b9f4ff644a2bec2461a882fb4e064195cf19b2d Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 27 Apr 2004 16:35:15 +0000 Subject: [PATCH] * Massive spelling corrections. --- include/vlc_help.h | 6 +- modules/access/directory.c | 2 +- modules/access/dshow/dshow.cpp | 2 +- modules/access/dvb/qpsk.c | 2 +- modules/access/file.c | 6 +- modules/access/ftp.c | 4 +- modules/access/http.c | 2 +- modules/access/mms/mms.c | 6 +- modules/access/tcp.c | 6 +- modules/access/udp.c | 4 +- modules/access/vcdx/vcd.c | 2 +- modules/access_output/dummy.c | 2 +- modules/access_output/file.c | 2 +- modules/access_output/http.c | 2 +- modules/access_output/udp.c | 4 +- modules/audio_filter/converter/a52tofloat32.c | 4 +- modules/audio_filter/resampler/bandlimited.c | 8 +- modules/audio_mixer/spdif.c | 4 +- modules/audio_output/file.c | 4 +- modules/audio_output/oss.c | 12 +- modules/codec/ffmpeg/ffmpeg.h | 22 +- .../ffmpeg/postprocessing/postprocessing.c | 4 +- modules/codec/ogt/subtitle.h | 4 +- modules/codec/subsdec.c | 2 +- modules/control/joystick.c | 4 +- modules/demux/dvdnav.c | 4 +- modules/demux/livedotcom.cpp | 2 +- modules/demux/rawdv.c | 14 +- modules/demux/util/id3genres.h | 4 +- modules/gui/kde/interface.cpp | 4 +- modules/gui/macosx/intf.m | 2 +- modules/gui/macosx/macosx.m | 6 +- modules/gui/wxwindows/interface.cpp | 2 +- modules/misc/sap.c | 2 +- modules/stream_out/rtp.c | 2 +- modules/stream_out/standard.c | 6 +- modules/video_chroma/i420_yuy2.c | 2 +- modules/video_filter/clone.c | 4 +- modules/video_filter/crop.c | 2 +- modules/video_filter/wall.c | 4 +- modules/video_output/caca.c | 4 +- modules/video_output/directx/directx.c | 9 +- modules/video_output/x11/x11.c | 4 +- modules/video_output/x11/xvideo.c | 4 +- modules/visualization/goom.c | 2 +- src/libvlc.h | 32 +- src/misc/iso-639_def.h | 335 +++++++++--------- src/misc/iso_lang.c | 8 +- 48 files changed, 293 insertions(+), 285 deletions(-) diff --git a/include/vlc_help.h b/include/vlc_help.h index 5a914aa358..9e36b3ca5c 100644 --- 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 a94f2dfb45..39c36637d6 100644 --- 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 d3c68ccd03..b709ecfeae 100644 --- 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 33cbf21efd..4d43fca4cb 100644 --- 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 d1df70ac93..07ba7356bb 100644 --- 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 b2e985b38a..e7451d3aee 100644 --- 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 * @@ -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 deca3277a2..892267df0a 100644 --- 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 9ca477031b..81ed96183e 100644 --- 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 * @@ -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 e7b6b801f1..e5b31ee316 100644 --- 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 * @@ -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 cb91b6d5bf..9352f63659 100644 --- 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 c7cdb04da2..a44471d5c2 100644 --- 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 3f9ee82fa7..34484eec55 100644 --- 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 fc0e83d3a8..117e40e334 100644 --- 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 2a5ff457a5..836385295d 100644 --- 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 19648f9922..883db29316 100644 --- 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 17d2781e6c..ad46043e10 100644 --- 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 * Christophe Massiot @@ -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 907d2d28d6..1e01cc9e51 100644 --- 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 * @@ -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 d1689b50aa..e21fc7b7cb 100644 --- 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 * @@ -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 000110577c..47dafb7a58 100644 --- 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 * Gildas Bazin @@ -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 68c24312f6..6b07c97497 100644 --- 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 * Sam Hocevar @@ -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 16f6461df9..e520c76c7e 100644 --- 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 \ "[: