From: Derk-Jan Hartman Date: Fri, 6 Jun 2003 02:23:30 +0000 (+0000) Subject: * All: some spelling corrections and description string clarifications. X-Git-Tag: 0.6.0~136 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d693470b3b2f21d0bc68bf8ffc4c4fbf94e28b8e;p=vlc * All: some spelling corrections and description string clarifications. There is a lot of improvement left here. --- diff --git a/modules/audio_output/coreaudio.c b/modules/audio_output/coreaudio.c index b5d6e15c85..5b5318dedd 100644 --- a/modules/audio_output/coreaudio.c +++ b/modules/audio_output/coreaudio.c @@ -2,7 +2,7 @@ * coreaudio.c: CoreAudio output plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: coreaudio.c,v 1.5 2003/05/15 22:27:37 massiot Exp $ + * $Id: coreaudio.c,v 1.6 2003/06/06 02:23:30 hartman Exp $ * * Authors: Colin Delacroix * Jon Lech Johansen @@ -216,13 +216,16 @@ static OSStatus StreamListener ( AudioStreamID inStream, * Module descriptor *****************************************************************************/ #define ADEV_TEXT N_("Audio device") +#define ADEV_LONGTEXT N_("Choose a number corresponding to the number of an " \ + "audio device, as listed in your 'audio device' menu. This device will " \ + "then be used by default for audio playback.") vlc_module_begin(); set_description( _("CoreAudio output") ); set_capability( "audio output", 100 ); set_callbacks( Open, Close ); add_category_hint( N_("Audio"), NULL, VLC_FALSE ); - add_integer( "coreaudio-dev", -1, NULL, ADEV_TEXT, ADEV_TEXT, VLC_FALSE ); + add_integer( "coreaudio-dev", -1, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_FALSE ); vlc_module_end(); /***************************************************************************** diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index ed99ceb48d..2e8f745373 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -2,7 +2,7 @@ * ffmpeg.c: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ffmpeg.c,v 1.40 2003/05/25 10:14:20 gbazin Exp $ + * $Id: ffmpeg.c,v 1.41 2003/06/06 02:23:30 hartman Exp $ * * Authors: Laurent Aimar * @@ -88,9 +88,9 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** ); #define ERROR_TEXT N_("Error resilience") #define ERROR_LONGTEXT N_( \ "ffmpeg can make errors resiliences. \n" \ - "Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) " \ + "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 disable all errors resiliences).") + "Valid range is -1 to 99 (-1 disables all errors resiliences).") #define BUGS_TEXT N_("Workaround bugs") #define BUGS_LONGTEXT N_( \ @@ -100,22 +100,23 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** ); "4 xvid interlaced\n" \ "8 ump4 \n" \ "16 no padding\n" \ - "32 ac vlc" \ + "32 ac vlc\n" \ "64 Qpel chroma") #define HURRYUP_TEXT N_("Hurry up") #define HURRYUP_LONGTEXT N_( \ "Allow the decoder to partially decode or skip frame(s) " \ - "when there not enough time.\n It's usefull with low CPU power " \ - "but it could produce broken pictures.") + "when there is not enough time. It's useful with low CPU power " \ + "but it can produce distorted pictures.") #define TRUNC_TEXT N_("Truncated stream") #define TRUNC_LONGTEXT N_("truncated stream -1:auto,0:disable,:1:enable") #define PP_Q_TEXT N_("Post processing quality") #define PP_Q_LONGTEXT N_( \ - "Quality of post processing\n"\ - "Valid range is 0 to 6" ) + "Quality of post processing. Valid range is 0 to 6\n" \ + "Higher levels require considerable more CPU power, but produce " \ + "better looking pictures." ) #define LIBAVCODEC_PP_TEXT N_("Ffmpeg postproc filter chains") /* FIXME (cut/past from ffmpeg */ @@ -124,7 +125,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** ); "long form example:\n" \ "vdeblock:autoq/hdeblock:autoq/linblenddeint default,-vdeblock\n" \ "short form example:\n" \ -"vb:a/hb:a/lb de,-vb\n" \ +"vb:a/hb:a/lb de,-vb\n" \ "more examples:\n" \ "tn:64:128:256\n" \ "Filters Options\n" \ diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 0e10326aac..81f2c6e5aa 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -2,7 +2,7 @@ * macosx.m: MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: macosx.m,v 1.12 2003/05/24 02:48:55 hartman Exp $ + * $Id: macosx.m,v 1.13 2003/06/06 02:23:30 hartman Exp $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -45,6 +45,9 @@ void E_(CloseVideo) ( vlc_object_t * ); * Module descriptor *****************************************************************************/ #define VDEV_TEXT N_("Video device") +#define VDEV_LONGTEXT N_("Choose a number corresponding to " \ + "a screen in you video device selection menu and this screen " + "will be used by default as the screen for 'fullscreen'.") #define OPAQUENESS_TEXT N_("Opaqueness") #define OPAQUENESS_LONGTEXT N_( \ @@ -64,7 +67,7 @@ vlc_module_begin(); set_capability( "video output", 200 ); set_callbacks( E_(OpenVideo), E_(CloseVideo) ); add_category_hint( N_("Video"), NULL, VLC_FALSE ); - add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_TEXT, VLC_FALSE ); + add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE ); add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL, OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE ); add_bool( "macosx-float", 0, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, VLC_FALSE ); diff --git a/src/libvlc.h b/src/libvlc.h index b892502cd7..f4b8f65631 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -2,7 +2,7 @@ * libvlc.h: main libvlc header ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.h,v 1.72 2003/05/28 03:53:04 hartman Exp $ + * $Id: libvlc.h,v 1.73 2003/06/06 02:23:30 hartman Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -48,7 +48,8 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define EXTRAINTF_LONGTEXT N_( \ "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.") + "interface. Use a comma separated list of interface modules. (common " \ + "values are: logger,gestures,sap,rc,http,screensaver)") #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ @@ -71,8 +72,9 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define ADVANCED_TEXT N_("Show advanced options") #define ADVANCED_LONGTEXT N_( \ - "When this option is turned on, the interfaces will show all the " \ - "available options, including those that most users should never touch") + "When this option is turned on, the preferences and/or interfaces will " \ + "show all the available options, including those that most users should " \ + "never touch") #define INTF_PATH_TEXT N_("Interface default search path") #define INTF_PATH_LONGTEXT N_( \ @@ -93,7 +95,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define AUDIO_TEXT N_("Enable audio") #define AUDIO_LONGTEXT N_( \ "You can completely disable the audio output. In this case the audio " \ - "decoding stage won't be done, and it will save some processing power.") + "decoding will not take place, and it will save some processing power.") #define MONO_TEXT N_("Force mono audio") #define MONO_LONGTEXT N_("This will force a mono audio output") @@ -131,7 +133,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define HEADPHONE_TEXT N_("Headphone virtual spatialization effect") #define HEADPHONE_LONGTEXT N_( \ - "This effect gives you the feeling that you stands in a real room " \ + "This effect gives you the feeling that you are standing in a room " \ "with a complete 5.1 speaker set when using only a headphone, " \ "providing a more realistic sound experience. It should also be " \ "more comfortable and less tiring when listening to music for " \ @@ -147,16 +149,16 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define VIDEO_TEXT N_("Enable video") #define VIDEO_LONGTEXT N_( \ "You can completely disable the video output. In this case the video " \ - "decoding stage won't be done, which will save some processing power.") + "decoding stage will not take place, which will save some processing power.") #define WIDTH_TEXT N_("Video width") #define WIDTH_LONGTEXT N_( \ - "You can enforce the video width here. By default VLC will " \ + "You can enforce the video width here. By default (-1) VLC will " \ "adapt to the video characteristics.") #define HEIGHT_TEXT N_("Video height") #define HEIGHT_LONGTEXT N_( \ - "You can enforce the video height here. By default VLC will " \ + "You can enforce the video height here. By default (-1) VLC will " \ "adapt to the video characteristics.") #define ZOOM_TEXT N_("Zoom video") @@ -176,7 +178,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define OVERLAY_TEXT N_("Overlay video output") #define OVERLAY_LONGTEXT N_( \ "If enabled, VLC will try to take advantage of the overlay capabilities " \ - "of your graphic card.") + "of your graphics card.") #define SPUMARGIN_TEXT N_("Force SPU position") #define SPUMARGIN_LONGTEXT N_( \ @@ -234,7 +236,8 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", #define INPUT_AUDIO_TEXT N_("Choose audio") #define INPUT_AUDIO_LONGTEXT N_( \ - "Give the default type of audio you want to use in a DVD.") + "Give the default type of audio you want to use in a DVD. " \ + "(Developers only)") #define INPUT_CHAN_TEXT N_("Choose channel") #define INPUT_CHAN_LONGTEXT N_( \ @@ -441,7 +444,7 @@ vlc_module_begin(); add_module_with_short( "intf", 'I', "interface", NULL, NULL, INTF_TEXT, INTF_LONGTEXT, VLC_TRUE ); add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, VLC_TRUE ); - add_integer_with_short( "verbose", 'v', -1, NULL, + add_integer_with_short( "verbose", 'v', 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, VLC_FALSE ); add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); add_string_from_list( "language", "auto", ppsz_language, NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, VLC_FALSE ); @@ -480,7 +483,9 @@ vlc_module_begin(); add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, VLC_TRUE ); add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, VLC_FALSE ); +#ifndef SYS_DARWIN add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); +#endif add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT, VLC_TRUE ); add_module( "filter", "video filter", NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT, VLC_TRUE );