diff --git a/configure.ac.in b/configure.ac.in
index e7b0e01f93..e9453462e1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,6 +1,6 @@
dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.4-cvs)
+AC_INIT(vlc,0.6.0-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Natalya"
@@ -12,7 +12,7 @@ AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.4-cvs)
+AM_INIT_AUTOMAKE(vlc,0.6.0-cvs)
AM_CONFIG_HEADER(config.h)
dnl
diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index 2c577b4396..26f6ee5a47 100644
--- a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
+++ b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "VLC";
-CFBundleShortVersionString = "0.5.4-cvs";
-CFBundleGetInfoString = "VLC media player 0.5.4-cvs, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.0-cvs";
+CFBundleGetInfoString = "VLC media player 0.6.0-cvs, Copyright (c) 1996-2003 VideoLAN.";
NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";
diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index b461b94566..e68bbfb5c6 100644
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -415,7 +415,7 @@
CFBundleExecutable
VLC
CFBundleGetInfoString
- VLC media player 0.5.4-cvs, Copyright (c) 1996-2003 VideoLAN.
+ VLC media player 0.6.0-cvs, Copyright (c) 1996-2003 VideoLAN.
CFBundleIconFile
vlc.icns
CFBundleIdentifier
@@ -427,7 +427,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.5.4-cvs
+ 0.6.0-cvs
CFBundleSignature
VLC#
CFBundleURLTypes
@@ -474,7 +474,7 @@
CFBundleVersion
- 0.5.4-cvs
+ 0.6.0-cvs
NSAppleScriptEnabled
YES
NSMainNibFile
diff --git a/modules/access/dvd/dvd.c b/modules/access/dvd/dvd.c
index 6115e524e5..02d0ca50a9 100644
--- a/modules/access/dvd/dvd.c
+++ b/modules/access/dvd/dvd.c
@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.6 2003/03/30 18:14:35 gbazin Exp $
+ * $Id: dvd.c,v 1.7 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -62,7 +62,7 @@ static void UnprobeLibDVDCSS( void );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CSSMETHOD_TEXT N_("method to use by libdvdcss for key decryption")
+#define CSSMETHOD_TEXT N_("Method to use by libdvdcss for key decryption")
#define CSSMETHOD_LONGTEXT N_( \
"Set the method used by libdvdcss for key decryption.\n" \
"title: decrypted title key is guessed from the encrypted sectors of " \
diff --git a/modules/access/file.c b/modules/access/file.c
index 7730f0fc8e..94f4277d61 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.19 2003/05/08 15:58:56 gbazin Exp $
+ * $Id: file.c,v 1.20 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Christophe Massiot
*
@@ -66,7 +66,7 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#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." )
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 5ea184b5e4..6bec70002a 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -2,7 +2,7 @@
* ftp.c:
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: ftp.c,v 1.18 2003/05/08 19:51:38 fenrir Exp $
+ * $Id: ftp.c,v 1.19 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Laurent Aimar
*
@@ -83,7 +83,7 @@ static int ftp_StopStream ( input_thread_t *);
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for ftp streams. This " \
"value should be set in miliseconds units." )
diff --git a/modules/access/http.c b/modules/access/http.c
index f66b3792b6..7f0f8b86bb 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.34 2003/04/30 09:11:13 gbazin Exp $
+ * $Id: http.c,v 1.35 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Christophe Massiot
*
@@ -71,13 +71,13 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define PROXY_TEXT N_("specify an HTTP proxy")
+#define PROXY_TEXT N_("Specify an HTTP proxy")
#define PROXY_LONGTEXT N_( \
"Specify an HTTP proxy to use. It must be in the form " \
"http://myproxy.mydomain:myport. If none is specified, the HTTP_PROXY " \
"environment variable will be tried." )
-#define CACHING_TEXT N_("caching value in ms")
+#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for http streams. This " \
"value should be set in miliseconds units." )
diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 47f5d6e818..edf603d1a0 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) 2001, 2002 VideoLAN
- * $Id: mms.c,v 1.33 2003/05/06 02:01:35 fenrir Exp $
+ * $Id: mms.c,v 1.34 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Laurent Aimar
*
@@ -54,7 +54,7 @@ static void Close ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#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." )
diff --git a/modules/access/satellite/satellite.c b/modules/access/satellite/satellite.c
index a0e328a36b..45ec37708a 100644
--- a/modules/access/satellite/satellite.c
+++ b/modules/access/satellite/satellite.c
@@ -38,28 +38,28 @@ void E_(Close) ( vlc_object_t * );
* Module descriptor
*****************************************************************************/
-#define FREQ_TEXT N_("satellite default transponder frequency")
+#define FREQ_TEXT N_("Satellite default transponder frequency")
#define FREQ_LONGTEXT ""
-#define POL_TEXT N_("satellite default transponder polarization")
+#define POL_TEXT N_("Satellite default transponder polarization")
#define POL_LONGTEXT ""
-#define FEC_TEXT N_("satellite default transponder FEC")
+#define FEC_TEXT N_("Satellite default transponder FEC")
#define FEC_LONGTEXT ""
-#define SRATE_TEXT N_("satellite default transponder symbol rate")
+#define SRATE_TEXT N_("Satellite default transponder symbol rate")
#define SRATE_LONGTEXT ""
-#define DISEQC_TEXT N_("use diseqc with antenna")
+#define DISEQC_TEXT N_("Use diseqc with antenna")
#define DISEQC_LONGTEXT ""
-#define LNB_LOF1_TEXT N_("antenna lnb_lof1 (kHz)")
+#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
#define LNB_LOF1_LONGTEXT ""
-#define LNB_LOF2_TEXT N_("antenna lnb_lof2 (kHz)")
+#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
#define LNB_LOF2_LONGTEXT ""
-#define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
+#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
#define LNB_SLOF_LONGTEXT ""
vlc_module_begin();
diff --git a/modules/access/slp.c b/modules/access/slp.c
index dc034fc3ed..efae932218 100644
--- a/modules/access/slp.c
+++ b/modules/access/slp.c
@@ -2,7 +2,7 @@
* slp.c: SLP access plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: slp.c,v 1.10 2003/03/30 18:14:35 gbazin Exp $
+ * $Id: slp.c,v 1.11 2003/05/15 22:27:36 massiot Exp $
*
* Authors: Loïc Minier
*
@@ -69,7 +69,7 @@ static int Demux ( input_thread_t * );
#define FILTER_LONGTEXT "This is a query formulated of attribute pattern " \
"matching expressions in the form of an LDAPv3 " \
"search filter or empty for all answers"
-#define LANG_TEXT "language requested in SLP requests"
+#define LANG_TEXT "Language requested in SLP requests"
#define LANG_LONGTEXT "RFC 1766 Language Tag for the natural language " \
"locale of requests, leave empty to use the " \
"default locale; it is used in all SLP queries"
diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index 1d8c241512..b11d27b34e 100644
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -2,7 +2,7 @@
* v4l.c : Video4Linux input module for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.15 2003/05/08 19:26:59 fenrir Exp $
+ * $Id: v4l.c,v 1.16 2003/05/15 22:27:36 massiot Exp $
*
* Author: Samuel Hocevar
*
@@ -61,7 +61,7 @@ static int Demux ( input_thread_t * );
/*****************************************************************************
* Module descriptior
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for v4l streams. This " \
"value should be set in miliseconds units." )
diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 2d49482838..7530b5c33a 100644
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -3,7 +3,7 @@
* -> gives the feeling of a real room with a simple headphone
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: headphone.c,v 1.4 2003/03/29 12:22:15 gbazin Exp $
+ * $Id: headphone.c,v 1.5 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Boris Dorès
*
@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define HEADPHONE_DIM_TEXT N_("characteristic dimension")
+#define HEADPHONE_DIM_TEXT N_("Characteristic dimension")
#define HEADPHONE_DIM_LONGTEXT N_( \
"Headphone virtual spatialization effect parameter: "\
"distance between front left speaker and listener in meters.")
diff --git a/modules/audio_output/coreaudio.c b/modules/audio_output/coreaudio.c
index 1daa702439..b5d6e15c85 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.4 2003/05/11 01:00:26 massiot Exp $
+ * $Id: coreaudio.c,v 1.5 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Colin Delacroix
* Jon Lech Johansen
@@ -215,7 +215,7 @@ static OSStatus StreamListener ( AudioStreamID inStream,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ADEV_TEXT N_("audio device")
+#define ADEV_TEXT N_("Audio device")
vlc_module_begin();
set_description( _("CoreAudio output") );
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index e30dd6037b..63e72093d5 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.21 2003/04/20 22:52:03 gbazin Exp $
+ * $Id: file.c,v 1.22 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Christophe Massiot
* Gildas Bazin
@@ -79,12 +79,12 @@ static void Play ( aout_instance_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define FORMAT_TEXT N_("output format")
-#define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\", " \
+#define FORMAT_TEXT N_("Output format")
+#define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \
"\"u16_le\", \"s16_le\", \"u16_be\", " \
"\"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
-#define WAV_TEXT N_("add wave header")
-#define WAV_LONGTEXT N_("instead of writing a raw file, you can add a wav " \
+#define WAV_TEXT N_("Add wave header")
+#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",
@@ -101,8 +101,8 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
VLC_FOURCC('f','l','3','2'),
VLC_FOURCC('s','p','i','f') };
-#define FILE_TEXT N_("output file")
-#define FILE_LONGTEXT N_("file to which the audio samples will be written to")
+#define FILE_TEXT N_("Output file")
+#define FILE_LONGTEXT N_("File to which the audio samples will be written to")
vlc_module_begin();
add_category_hint( N_("Audio"), NULL, VLC_FALSE );
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index f4d1b0eeaa..5f864409b8 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.59 2003/05/09 22:03:06 sigmunau Exp $
+ * $Id: oss.c,v 1.60 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Michel Kaempf
* Samuel Hocevar
@@ -98,7 +98,7 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define BUGGY_TEXT N_("try to work around buggy OSS drivers")
+#define BUGGY_TEXT N_("Try to work around buggy OSS drivers")
#define BUGGY_LONGTEXT N_( \
"Some buggy OSS drivers just don't like when their internal buffers " \
"are completely filled (the sound gets heavily hashed). If you have one " \
diff --git a/modules/codec/mpeg_video/parser.c b/modules/codec/mpeg_video/parser.c
index 4074f49865..7ad5b9c568 100644
--- a/modules/codec/mpeg_video/parser.c
+++ b/modules/codec/mpeg_video/parser.c
@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: parser.c,v 1.12 2003/03/30 18:14:36 gbazin Exp $
+ * $Id: parser.c,v 1.13 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Christophe Massiot
* Samuel Hocevar
@@ -62,18 +62,18 @@ static void BitstreamCallback ( bit_stream_t *, vlc_bool_t );
"decoder. The default behavior is to automatically select the best " \
"module available.")
-#define VDEC_MOTION_TEXT N_("motion compensation module")
+#define VDEC_MOTION_TEXT N_("Motion compensation module")
#define VDEC_MOTION_LONGTEXT N_( \
"This option allows you to select the motion compensation module used by "\
"this video decoder. The default behavior is to automatically select the "\
"best module available.")
-#define VDEC_SMP_TEXT N_("use additional processors")
+#define VDEC_SMP_TEXT N_("Use additional processors")
#define VDEC_SMP_LONGTEXT N_( \
"This video decoder can benefit from a multiprocessor computer. If you " \
"have one, you can specify the number of processors here.")
-#define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
+#define VPAR_SYNCHRO_TEXT N_("Force synchro algorithm {I|I+|IP|IP+|IPB}")
#define VPAR_SYNCHRO_LONGTEXT N_( \
"This allows you to force the synchro algorithm, by directly selecting " \
"the types of picture you want to decode. Please bear in mind that if " \
diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c
index 05b4197ec5..1eae73bf4e 100644
--- a/modules/codec/spudec/spudec.c
+++ b/modules/codec/spudec/spudec.c
@@ -2,7 +2,7 @@
* spudec.c : SPU decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: spudec.c,v 1.17 2003/03/30 18:14:37 gbazin Exp $
+ * $Id: spudec.c,v 1.18 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -45,7 +45,7 @@ static vout_thread_t *FindVout( spudec_thread_t * );
/*****************************************************************************
* Module descriptor.
*****************************************************************************/
-#define FONT_TEXT N_("font used by the text subtitler")
+#define FONT_TEXT N_("Font used by the text subtitler")
#define FONT_LONGTEXT N_(\
"When the subtitles are coded in text form then, you can choose " \
"which font will be used to display them.")
diff --git a/modules/control/http.c b/modules/control/http.c
index b914137ec2..ffaa9f109d 100644
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -2,7 +2,7 @@
* http.c : http remote control plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: http.c,v 1.5 2003/05/09 16:01:17 gbazin Exp $
+ * $Id: http.c,v 1.6 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Gildas Bazin
*
@@ -71,10 +71,10 @@ struct intf_sys_t
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define PORT_TEXT N_( "http interface bind port" )
+#define PORT_TEXT N_( "HTTP interface bind port" )
#define PORT_LONGTEXT N_( \
"You can set the port on which the http interface will accept connections" )
-#define ADDR_TEXT N_( "http interface bind address" )
+#define ADDR_TEXT N_( "HTTP interface bind address" )
#define ADDR_LONGTEXT N_( \
"You can set the address on which the http interface will bind" )
diff --git a/modules/control/rc/rc.c b/modules/control/rc/rc.c
index faf4be8ae7..c2e6306d12 100644
--- a/modules/control/rc/rc.c
+++ b/modules/control/rc/rc.c
@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.33 2003/05/13 12:09:29 gbazin Exp $
+ * $Id: rc.c,v 1.34 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Peter Surda
*
@@ -74,10 +74,10 @@ static int AudioConfig ( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define POS_TEXT N_("show stream position")
+#define POS_TEXT N_("Show stream position")
#define POS_LONGTEXT N_("Show the current position in seconds within the stream from time to time.")
-#define TTY_TEXT N_("fake TTY")
+#define TTY_TEXT N_("Fake TTY")
#define TTY_LONGTEXT N_("Force the rc plugin to use stdin as if it was a TTY.")
vlc_module_begin();
diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index f92503f7a1..e9ba85c2ca 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -2,7 +2,7 @@
* demuxdump.c : Pseudo demux module for vlc (dump raw stream)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: demuxdump.c,v 1.8 2003/03/30 18:14:37 gbazin Exp $
+ * $Id: demuxdump.c,v 1.9 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Laurent Aimar
*
@@ -45,9 +45,9 @@ static void Desactivate ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define FILE_TEXT N_("dump file name")
+#define FILE_TEXT N_("Dump file name")
#define FILE_LONGTEXT N_( \
- "specify a file name to which the raw stream will be dumped." )
+ "Specify a file name to which the raw stream will be dumped." )
vlc_module_begin();
set_description( _("file dump demuxer") );
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 71533666f6..5bd94b45f7 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.23 2003/05/06 21:01:58 gbazin Exp $
+ * $Id: ts.c,v 1.24 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Henri Fallon
* Johan Bilien
@@ -94,13 +94,13 @@ static void TS_DVBPSI_HandlePMT ( input_thread_t *, dvbpsi_pmt_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define VLS_BACKWARDS_COMPAT_TEXT N_("compatibility with pre-0.4 VLS")
+#define VLS_BACKWARDS_COMPAT_TEXT N_("Compatibility with pre-0.4 VLS")
#define VLS_BACKWARDS_COMPAT_LONGTEXT N_( \
"The protocol for transmitting A/52 audio streams changed between VLC " \
"0.3.x and 0.4. By default VLC assumes you have the latest VLS. In case " \
"you're using an old version, select this option.")
-#define BUGGY_PSI_TEXT N_("buggy PSI")
+#define BUGGY_PSI_TEXT N_("Buggy PSI")
#define BUGGY_PSI_LONGTEXT N_( \
"If you have a stream whose PSI packets do not feature incremented " \
"continuity counters, select this option.")
diff --git a/modules/gui/familiar/familiar.c b/modules/gui/familiar/familiar.c
index 54cdccb912..3517680e04 100644
--- a/modules/gui/familiar/familiar.c
+++ b/modules/gui/familiar/familiar.c
@@ -2,7 +2,7 @@
* familiar.c : familiar plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: familiar.c,v 1.34 2003/03/30 18:14:37 gbazin Exp $
+ * $Id: familiar.c,v 1.35 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Jean-Paul Saman
* Marc Ariberti
@@ -59,8 +59,8 @@ gint E_(GtkModeManage) ( intf_thread_t * p_intf );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define AUTOPLAYFILE_TEXT N_("autoplay selected file")
-#define AUTOPLAYFILE_LONGTEXT N_("automatically play a file when selected in the "\
+#define AUTOPLAYFILE_TEXT N_("Autoplay selected file")
+#define AUTOPLAYFILE_LONGTEXT N_("Automatically play a file when selected in the "\
"file selection list")
/*****************************************************************************
diff --git a/modules/gui/gtk/gnome.c b/modules/gui/gtk/gnome.c
index 2d49e68608..8fa9fa0c78 100644
--- a/modules/gui/gtk/gnome.c
+++ b/modules/gui/gtk/gnome.c
@@ -2,7 +2,7 @@
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: gnome.c,v 1.15 2003/03/30 18:14:37 gbazin Exp $
+ * $Id: gnome.c,v 1.16 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -52,13 +52,13 @@ static void Manage ( intf_thread_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define TOOLTIPS_TEXT N_("show tooltips")
+#define TOOLTIPS_TEXT N_("Show tooltips")
#define TOOLTIPS_LONGTEXT N_("Show tooltips for configuration options.")
-#define TOOLBAR_TEXT N_("show text on toolbar buttons")
+#define TOOLBAR_TEXT N_("Show text on toolbar buttons")
#define TOOLBAR_LONGTEXT N_("Show the text below icons on the toolbar.")
-#define PREFS_MAXH_TEXT N_("maximum height for the configuration windows")
+#define PREFS_MAXH_TEXT N_("Maximum height for the configuration windows")
#define PREFS_MAXH_LONGTEXT N_( \
"You can set the maximum height that the configuration windows in the " \
"preferences menu will occupy.")
diff --git a/modules/gui/gtk/gtk.c b/modules/gui/gtk/gtk.c
index c6cc37d80d..17e79c2d1c 100644
--- a/modules/gui/gtk/gtk.c
+++ b/modules/gui/gtk/gtk.c
@@ -2,7 +2,7 @@
* gtk.c : Gtk+ plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: gtk.c,v 1.20 2003/03/30 18:14:37 gbazin Exp $
+ * $Id: gtk.c,v 1.21 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -54,10 +54,10 @@ static int Manage ( intf_thread_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define TOOLTIPS_TEXT N_("show tooltips")
+#define TOOLTIPS_TEXT N_("Show tooltips")
#define TOOLTIPS_LONGTEXT N_("Show tooltips for configuration options.")
-#define PREFS_MAXH_TEXT N_("maximum height for the configuration windows")
+#define PREFS_MAXH_TEXT N_("Maximum height for the configuration windows")
#define PREFS_MAXH_LONGTEXT N_( \
"You can set the maximum height that the configuration windows in the " \
"preferences menu will occupy.")
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 72f5d56246..af6f4524d5 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.9 2003/05/09 01:19:43 hartman Exp $
+ * $Id: macosx.m,v 1.10 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Colin Delacroix
* Eugenio Jarosiewicz
@@ -44,14 +44,14 @@ void E_(CloseVideo) ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define VDEV_TEXT N_("video device")
+#define VDEV_TEXT N_("Video device")
-#define OPAQUENESS_TEXT N_("opaqueness")
+#define OPAQUENESS_TEXT N_("Opaqueness")
#define OPAQUENESS_LONGTEXT N_( \
"Set the transparency of the video output. 1 is non-transparent (default) " \
"0 is fully transparent.")
-#define FLOAT_TEXT N_("float on top")
+#define FLOAT_TEXT N_("Float on top")
#define FLOAT_LONGTEXT N_( \
"Let the video window float on top of other windows.")
diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp
index b0fd112c4d..3c3de8c826 100644
--- a/modules/gui/win32/win32.cpp
+++ b/modules/gui/win32/win32.cpp
@@ -2,7 +2,7 @@
* win32.cpp : Win32 interface plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: win32.cpp,v 1.18 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: win32.cpp,v 1.19 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Olivier Teulière
*
@@ -299,11 +299,11 @@ int Win32Manage( intf_thread_t *p_intf )
* Module descriptor
*****************************************************************************/
-#define MAX_LINES_TEXT N_( "maximum number of lines in the log window" )
+#define MAX_LINES_TEXT N_( "Maximum number of lines in the log window" )
#define MAX_LINES_LONGTEXT N_( \
"You can set the maximum number of lines that the log window will display."\
" Enter -1 if you want to keep all messages." )
-#define SHOW_CAPTIONS_TEXT N_( "display text under images in the toolbar" )
+#define SHOW_CAPTIONS_TEXT N_( "Display text under images in the toolbar" )
#define SHOW_CAPTIONS_LONGTEXT N_( \
"Check this option if you want to display the caption of the buttons in " \
"the toolbar. Beware, the display may be messed up" )
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index e9e701417a..f7f7803c9f 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -2,7 +2,7 @@
* dummy.c : dummy plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: dummy.c,v 1.6 2003/05/04 22:42:17 gbazin Exp $
+ * $Id: dummy.c,v 1.7 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -34,14 +34,14 @@
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CHROMA_TEXT N_("dummy image chroma format")
+#define CHROMA_TEXT N_("Dummy image chroma format")
#define CHROMA_LONGTEXT N_( \
"Force the dummy video output to create images using a specific chroma " \
"format instead of trying to improve performances by using the most " \
"efficient one.")
#ifdef WIN32
-#define QUIET_TEXT N_("don't open a dos command box interface")
+#define QUIET_TEXT N_("Don't open a dos command box interface")
#define QUIET_LONGTEXT N_( \
"By default the dummy interface plugin will start a dos command box. " \
"Enabling the quiet mode will not bring this command box but can also " \
diff --git a/modules/misc/logger/logger.c b/modules/misc/logger/logger.c
index 2f274d99cb..69ca66b566 100644
--- a/modules/misc/logger/logger.c
+++ b/modules/misc/logger/logger.c
@@ -2,7 +2,7 @@
* logger.c : file logging plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: logger.c,v 1.7 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: logger.c,v 1.8 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -82,8 +82,9 @@ static void HtmlPrint ( const msg_item_t *, FILE * );
* Module descriptor
*****************************************************************************/
static char *mode_list[] = { "text", "html", NULL };
-#define LOGMODE_TEXT N_("log format")
+#define LOGMODE_TEXT N_("Log format")
#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default) and \"html\"")
+
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
add_file( "logfile", NULL, NULL, N_("log filename"), N_("Specify the log filename."), VLC_FALSE );
diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index e43aa77e11..105dd41f9f 100644
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -2,7 +2,7 @@
* adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: adjust.c,v 1.11 2003/03/18 23:30:28 gbazin Exp $
+ * $Id: adjust.c,v 1.12 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Simon Latapie
*
@@ -57,13 +57,13 @@ static int SendEvents( vlc_object_t *, char const *,
* Module descriptor
*****************************************************************************/
-#define CONT_TEXT N_("set image contrast")
+#define CONT_TEXT N_("Set image contrast")
#define CONT_LONGTEXT N_("Set the image contrast. Defaults to 1")
-#define HUE_TEXT N_("set image hue")
+#define HUE_TEXT N_("Set image hue")
#define HUE_LONGTEXT N_("Set the image hue, between 0 and 360. Defaults to 0")
-#define SAT_TEXT N_("set image saturation")
+#define SAT_TEXT N_("Set image saturation")
#define SAT_LONGTEXT N_("Set the image saturation. Defaults to 1")
-#define LUM_TEXT N_("set image brightness")
+#define LUM_TEXT N_("Set image brightness")
#define LUM_LONGTEXT N_("Set the image brightness. Defaults to 1")
diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index 1e0bf351e6..b1d4325457 100644
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -2,7 +2,7 @@
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
- * $Id: clone.c,v 1.9 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: clone.c,v 1.10 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -52,11 +52,11 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define COUNT_TEXT N_("number of clones")
+#define COUNT_TEXT N_("Number of clones")
#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_TEXT N_("List of vout modules")
#define VOUTLIST_LONGTEXT N_("Select the specific vout modules that you want to activate")
vlc_module_begin();
diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index 62331de5ff..506b719e1e 100644
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -2,7 +2,7 @@
* crop.c : Crop video plugin for vlc
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
- * $Id: crop.c,v 1.10 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: crop.c,v 1.11 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -51,10 +51,10 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define GEOMETRY_TEXT N_("crop geometry")
+#define GEOMETRY_TEXT N_("Crop geometry")
#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop")
-#define AUTOCROP_TEXT N_("automatic cropping")
+#define AUTOCROP_TEXT N_("Automatic cropping")
#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping")
vlc_module_begin();
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 280afed990..202220e073 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: deinterlace.c,v 1.11 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: deinterlace.c,v 1.12 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -72,8 +72,8 @@ static int FilterCallback ( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MODE_TEXT N_("deinterlace mode")
-#define MODE_LONGTEXT N_("you can choose the default deinterlace mode")
+#define MODE_TEXT N_("Deinterlace mode")
+#define MODE_LONGTEXT N_("You can choose the default deinterlace mode")
static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", NULL };
diff --git a/modules/video_filter/distort.c b/modules/video_filter/distort.c
index ad3911c16d..1569de7a21 100644
--- a/modules/video_filter/distort.c
+++ b/modules/video_filter/distort.c
@@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: distort.c,v 1.9 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: distort.c,v 1.10 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -56,7 +56,7 @@ static int SendEvents ( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MODE_TEXT N_("distort mode")
+#define MODE_TEXT N_("Distort mode")
#define MODE_LONGTEXT N_("Distort mode, one of \"wave\" and \"ripple\"")
static char *mode_list[] = { "wave", "ripple", NULL };
diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index f63f8181a0..b53ec569e4 100644
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -2,7 +2,7 @@
* motion_blur.c : motion blur filter for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: motionblur.c,v 1.10 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: motionblur.c,v 1.11 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Sigmund Augdal
*
@@ -51,7 +51,7 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MODE_TEXT N_("blur factor")
+#define MODE_TEXT N_("Blur factor")
#define MODE_LONGTEXT N_("The degree of blurring from 1 to 127")
vlc_module_begin();
diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 819f8a518c..5a8a4a3f8c 100644
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -2,7 +2,7 @@
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: transform.c,v 1.11 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: transform.c,v 1.12 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -54,7 +54,7 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define TYPE_TEXT N_("transform type")
+#define TYPE_TEXT N_("Transform type")
#define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'")
static char *type_list[] = { "90", "180", "270", "hflip", "vflip", NULL };
diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index f907474727..ce94b3359b 100644
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: wall.c,v 1.9 2003/03/30 18:14:38 gbazin Exp $
+ * $Id: wall.c,v 1.10 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Samuel Hocevar
*
@@ -50,15 +50,15 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define COLS_TEXT N_("number of columns")
+#define COLS_TEXT N_("Number of columns")
#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
"which to split the video")
-#define ROWS_TEXT N_("number of rows")
+#define ROWS_TEXT N_("Number of rows")
#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
"which to split the video")
-#define ACTIVE_TEXT N_("active windows")
+#define ACTIVE_TEXT N_("Active windows")
#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
"defaults to all")
diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index 9046438f46..88e6a42fb4 100644
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -2,7 +2,7 @@
* vout.c: Windows DirectX video output display method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: directx.c,v 1.18 2003/05/05 16:09:37 gbazin Exp $
+ * $Id: directx.c,v 1.19 2003/05/15 22:27:37 massiot Exp $
*
* Authors: Gildas Bazin
*
@@ -87,19 +87,19 @@ static int DirectXUnlockSurface ( vout_thread_t *p_vout, picture_t *p_pic );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ON_TOP_TEXT N_("always on top")
-#define ON_TOP_LONGTEXT N_("place the directx window on top of other windows")
-#define HW_YUV_TEXT N_("use hardware YUV->RGB conversions")
+#define ON_TOP_TEXT N_("Always on top")
+#define ON_TOP_LONGTEXT N_("Place the directx window on top of other windows")
+#define HW_YUV_TEXT N_("Use hardware YUV->RGB conversions")
#define HW_YUV_LONGTEXT N_( \
"Try to use hardware acceleration for YUV->RGB conversions. " \
"This option doesn't have any effect when using overlays." )
-#define SYSMEM_TEXT N_("use video buffers in system memory")
+#define SYSMEM_TEXT N_("Use video buffers in system memory")
#define SYSMEM_LONGTEXT N_( \
"Create video buffers in system memory instead of video memory. This " \
"isn't recommended as usually using video memory allows to benefit from " \
"more hardware acceleration (like rescaling or YUV->RGB conversions). " \
"This option doesn't have any effect when using overlays." )
-#define TRIPLEBUF_TEXT N_("use triple buffering for overlays")
+#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 " \
"much better video quality (no flickering)." )
diff --git a/modules/video_output/mga/xmga.c b/modules/video_output/mga/xmga.c
index dcb85f7be7..4f3be16d27 100644
--- a/modules/video_output/mga/xmga.c
+++ b/modules/video_output/mga/xmga.c
@@ -2,7 +2,7 @@
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xmga.c,v 1.5 2003/05/05 16:09:37 gbazin Exp $
+ * $Id: xmga.c,v 1.6 2003/05/15 22:27:38 massiot Exp $
*
* Authors: Vincent Seguin
* Samuel Hocevar
@@ -84,7 +84,7 @@ static void ToggleCursor ( vout_thread_t * );
* Module descriptor
*****************************************************************************/
-#define ALT_FS_TEXT N_("alternate fullscreen method")
+#define ALT_FS_TEXT N_("Alternate fullscreen method")
#define ALT_FS_LONGTEXT N_( \
"There are two ways to make a fullscreen window, unfortunately each one " \
"has its drawbacks.\n" \
diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 46342259fb..41d0d519db 100644
--- 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.6 2003/03/30 18:14:39 gbazin Exp $
+ * $Id: x11.c,v 1.7 2003/05/15 22:27:38 massiot Exp $
*
* Authors: Vincent Seguin
* Samuel Hocevar
@@ -40,7 +40,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ALT_FS_TEXT N_("alternate fullscreen method")
+#define ALT_FS_TEXT N_("Alternate fullscreen method")
#define ALT_FS_LONGTEXT N_( \
"There are two ways to make a fullscreen window, unfortunately each one " \
"has its drawbacks.\n" \
@@ -54,7 +54,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
"Specify the X11 hardware display you want to use. By default VLC will " \
"use the value of the DISPLAY environment variable.")
-#define SHM_TEXT N_("use shared memory")
+#define SHM_TEXT N_("Use shared memory")
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 72cdeafe88..8eb3244164 100644
--- 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.6 2003/03/30 18:14:39 gbazin Exp $
+ * $Id: xvideo.c,v 1.7 2003/05/15 22:27:38 massiot Exp $
*
* Authors: Shane Harper
* Vincent Seguin
@@ -46,7 +46,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
"If you graphics card provides several adaptors, this option allows you " \
"to choose which one will be used (you shouldn't have to change this).")
-#define ALT_FS_TEXT N_("alternate fullscreen method")
+#define ALT_FS_TEXT N_("Alternate fullscreen method")
#define ALT_FS_LONGTEXT N_( \
"There are two ways to make a fullscreen window, unfortunately each one " \
"has its drawbacks.\n" \
@@ -65,7 +65,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
"Force the XVideo renderer to use a specific chroma format instead of " \
"trying to improve performances by using the most efficient one.")
-#define SHM_TEXT N_("use shared memory")
+#define SHM_TEXT N_("Use shared memory")
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
diff --git a/modules/visualization/xosd/xosd.c b/modules/visualization/xosd/xosd.c
index 136e20baea..72b7fbfc70 100644
--- a/modules/visualization/xosd/xosd.c
+++ b/modules/visualization/xosd/xosd.c
@@ -2,7 +2,7 @@
* xosd.c : X On Screen Display interface
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: xosd.c,v 1.9 2003/03/30 18:14:39 gbazin Exp $
+ * $Id: xosd.c,v 1.10 2003/05/15 22:27:38 massiot Exp $
*
* Authors: Loïc Minier
*
@@ -58,17 +58,17 @@ static void Run ( intf_thread_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define POSITION_TEXT N_("flip vertical position")
+#define POSITION_TEXT N_("Flip vertical position")
#define POSITION_LONGTEXT N_("Display xosd output on the bottom of the " \
"screen instead of the top")
-#define TXT_OFS_TEXT N_("vertical offset")
+#define TXT_OFS_TEXT N_("Vertical offset")
#define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed text")
-#define SHD_OFS_TEXT N_("shadow offset")
+#define SHD_OFS_TEXT N_("Shadow offset")
#define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow")
-#define FONT_TEXT N_("font")
+#define FONT_TEXT N_("Font")
#define FONT_LONGTEXT N_("Font used to display text in the xosd output")
vlc_module_begin();