* now 0.6.0-cvs

* ALL: Capitalize all preferences text strings

configure.ac.in

 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

extras/MacOSX/Resources/English.lproj/InfoPlist.strings

 /* 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.";

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -415,7 +415,7 @@
 	<key>CFBundleExecutable</key>
 	<string>VLC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>VLC media player 0.5.4-cvs, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.6.0-cvs, Copyright (c) 1996-2003 VideoLAN.</string>
 	<key>CFBundleIconFile</key>
 	<string>vlc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -427,7 +427,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.4-cvs</string>
+	<string>0.6.0-cvs</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.5.4-cvs</string>
+	<string>0.6.0-cvs</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

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 <sam@zoy.org>
  *
@@ -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 " \

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 <massiot@via.ecp.fr>
  *
@@ -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." )

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 <fenrir@via.ecp.fr>
  *
@@ -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." )

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 <massiot@via.ecp.fr>
  *
@@ -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." )

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 <fenrir@via.ecp.fr>
  *
@@ -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." )

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();

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: Loc Minier <lool@videolan.org>
  *
@@ -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"

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 <sam@zoy.org>
  *
@@ -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." )

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 Dors <babal@via.ecp.fr>
  *
@@ -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.")

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 <colin@zoy.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -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") );

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 <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -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 );

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 <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -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 " \

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 <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -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 " \

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 <sam@zoy.org>
  *
@@ -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.")

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 <gbazin@netcourrier.com>
  *
@@ -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" )
 

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 <shurdeek@panorama.sth.ac.at>
  *
@@ -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();

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 <fenrir@via.ecp.fr>
  *
@@ -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") );