* Removed legacy mentions of "VideoLAN C*****" in favour of "VLC media

    player". A couple are remaining, but I don't want to break the string
    freeze yet.

README.MacOSX.rtf

@@ -12,7 +12,7 @@ Mac OS X-specific information
 \cf0 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
-\cf0 Welcome to the VideoLAN Client! VLC media player is a multi-purpose multimedia tool. It can play DVDs, VCDs or read a stream from the network. It plays DivX/MPEG-4 files (and many other files) and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in QuickTime Player. You can also stream content to the network or a file. But above all it is the ONLY media player on Mac OS X, which has support for multi-channel sound-output.\
+\cf0 Welcome to the VLC media player! VLC media player is a multi-purpose multimedia tool. It can play DVDs, VCDs or read a stream from the network. It plays DivX/MPEG-4 files (and many other files) and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in QuickTime Player. You can also stream content to the network or a file. But above all it is the ONLY media player on Mac OS X, which has support for multi-channel sound-output.\
 For a full list of features visit: \ul http://www.videolan.org/vlc/features.html\ulnone \
 \
 VLC media player was originally developed for GNU/Linux systems, but has been ported to numerous operating systems, including Mac OS X and Win32. Though there probably are bugs, we are always working hard to improve VLC media player and if you think you can help us in any way, please drop us a line: \ul http://www.videolan.org/support/lists.html\
@@ -135,4 +135,4 @@ Thanks for reading this file. For additional information, subscribe to the VLC m
 -- \
 Christophe Massiot <massiot@via.ecp.fr> and\
 Derk-Jan Hartman <thedj@users.sourceforge.net> for the VideoLAN team.\
-$Id: README.MacOSX.rtf,v 1.24 2003/12/23 00:23:31 hartman Exp $}
\ No newline at end of file
+$Id$}

doc/developer/decoders.xml

@@ -307,7 +307,7 @@ be described in the following section.
     <sect1> <title> The MPEG video decoder </title>
 
       <para>
-VideoLAN Client provides an MPEG-1, and an MPEG-2 Main Profile @
+VLC media player provides an MPEG-1, and an MPEG-2 Main Profile @
 Main Level decoder. It has been natively written for VLC, and is quite
 mature. Its status is a bit special, since it is splitted between two
 logicial entities : video parser and video decoder.

doc/developer/glossary.xml

@@ -3,7 +3,7 @@
       <warning> <para>
         Please note that this book is in no way a reference documentation
         on how DVDs work. Its only purpose is to describe the API
-        available for programmers in VideoLAN Client. It is assumed that
+        available for programmers in VLC media player. It is assumed that
         you have basic knowledge of what MPEG is. The following paragraph
         is just here as a reminder :
       </para> </warning>

doc/developer/history.xml

@@ -49,7 +49,7 @@ At that time it was still closed-source and only-for-demo code.
 
   </sect1>
 
-  <sect1> <title> VideoLAN Client design </title>
+  <sect1> <title> VLC media player design </title>
 
     <para>
 In 1998, <ulink url="mailto:seguin@via.ecp.fr"> Vincent Seguin</ulink>

doc/developer/manual.xml

@@ -17,7 +17,7 @@
 
 <book>
 
-<title> VideoLAN Client API Documentation </title>
+<title> VLC media player API Documentation </title>
 
 <bookinfo>
 
@@ -57,7 +57,7 @@
       <orgname> VideoLAN project </orgname>
     </affiliation>
   </collab>
-  <pubdate> $Id: manual.xml,v 1.8 2004/02/13 11:33:38 rocky Exp $ </pubdate>
+  <pubdate> $Id$ </pubdate>
   <copyright> <year> 2001 </year>
               <holder> Christophe Massiot, for IDEALX S.A.S. </holder>
   </copyright>

doc/developer/manual.xml.in

@@ -17,7 +17,7 @@
 
 <book>
 
-<title> VideoLAN Client API Documentation </title>
+<title> VLC media player API Documentation </title>
 
 <bookinfo>
 
@@ -57,7 +57,7 @@
       <orgname> VideoLAN project </orgname>
     </affiliation>
   </collab>
-  <pubdate> $Id: manual.xml.in,v 1.1 2004/02/13 04:22:39 rocky Exp $ </pubdate>
+  <pubdate> $Id$ </pubdate>
   <copyright> <year> 2001 </year>
               <holder> Christophe Massiot, for IDEALX S.A.S. </holder>
   </copyright>

doc/vlc-howto.sgml

@@ -85,7 +85,7 @@ name="VideoLAN Quickstart">,
 name="VideoLAN HOWTO">,
 <item>the <htmlurl url="http://www.videolan.org/vls/doc/vls-guide.html"
 name="VideoLAN Server user guide">,
-<item>this VideoLAN Client Howto.
+<item>this VLC Howto.
 </itemize>
 
 The up-to-date version of these documents can be found on the <htmlurl

doc/web-streaming.html

@@ -70,7 +70,7 @@ Of course your mileage may vary. The last step is to customize xswallow.conf
 so that it launches VLC to handle MPEG files. Comment out all lines you
 don't need, and add :
 <pre>
-video/mpeg; mpeg,mpg,vob;   vlc -I dummy -V xvideo %s; VideoLAN Client 0.2.83 (XVideo output); VideoLAN
+video/mpeg; mpeg,mpg,vob;   vlc -I dummy -V xvideo %s; VLC (XVideo output); VideoLAN
 </pre> <p>
 
 Notes :
@@ -185,7 +185,7 @@ instance :
   <h3> Configuring XSwallow </h3>
 
 You need to add an entry video/x-mpeg-ts in you xswallow.conf :
-<pre> video/x-mpeg-ts; ts; video-streaming.sh %s; VideoLAN Client 0.2.83 (XVideo output); VideoLAN </pre> <p>
+<pre> video/x-mpeg-ts; ts; video-streaming.sh %s; VLC (XVideo output); VideoLAN </pre> <p>
 
 The same provisions as before apply here. The video-streaming.sh file is a
 simple shell script which retrieves the server's name and spawns VLC :
@@ -204,7 +204,7 @@ release of VLC.
 This page has been written by <a href="mailto:massiot@via.ecp.fr">
 Christophe Massiot</a> for <a href="http://www.idealx.com/"> IDEALX
 S.A.S</a>. <br>
-<em> $Id: web-streaming.html,v 1.1 2001/08/22 18:47:52 massiot Exp $ </em>
+<em> $Id$ </em>
 
 </body>
 

evc/config.h.in

@@ -20,7 +20,7 @@
 #define CONFIGURE_LINE "eMbedded Visual C++"
 
 /* Copyright string */
-#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
+#define COPYRIGHT_MESSAGE "VLC media player - version @VERSION@ @CODENAME@ - (c) 1996-2004 VideoLAN"
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.

ipkg/control.gpe

@@ -9,10 +9,10 @@ Conflicts: gpe-vlc-h3600, vlc, opie-vlc, opie-base, libffmpeg-h3600
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, libgtk2.0-0, esddsp, liba52, libfaac, libfaad, libffmpeg, libflac, libid3tag, libmad, libmp3lame, libmpeg2dec, libslp
 Copyright: GPL
-Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+Description: VLC media player is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
  source can be found on: 
  http://www.videolan.org/pub/videolan/vlc/
- The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
+ The VLC media player allows to play MPEG1, MPEG2 Transport Streams and 
  Program Streams, MP3, DivX and other codes from the network or from a file,
  as well as direct DVD playback. 

ipkg/control.h3600

@@ -9,10 +9,10 @@ Conflicts: gpe-vlc, vlc, opie-vlc, opie-base, libffmpeg, gpe-vlc
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, libgtk2.0-0, esddsp, libflac, libffmpeg-h3600, libid3tag, libmad
 Copyright: GPL
-Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+Description: VLC media player is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
  source can be found on: 
  http://www.videolan.org/pub/videolan/vlc/
- The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
+ The VLC media player allows to play MPEG1, MPEG2 Transport Streams and 
  Program Streams, MP3, DivX and other codes from the network or from a file,
  as well as direct DVD playback. 

ipkg/control.opie

@@ -9,10 +9,10 @@ Source: http://www.videolan.org/vlc/download-sources.html
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, opie-base, opie-libsdl
 Copyright: GPL
-Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+Description: VLC media player is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
  source can be found on: 
  http://www.videolan.org/pub/videolan/vlc/
- The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
- Program Streams, MP3, DivX and lots of other codecs  from the network or 
+ The VLC media player allows to play MPEG1, MPEG2 Transport Streams and 
+ Program Streams, MP3, DivX and lots of other codecs from the network or 
  from a file, as well as direct DVD playback. 

ipkg/control.zaurus

@@ -9,10 +9,10 @@ Source: http://www.videolan.org/vlc/download-sources.html
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, opie-base, zaurus-libsdl
 Copyright: GPL
-Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+Description: VLC media player is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
  source can be found on: 
  http://www.videolan.org/pub/videolan/vlc/
- The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
+ The VLC media player allows to play MPEG1, MPEG2 Transport Streams and 
  Program Streams, MP3, DivX and lots of other codecs  from the network or 
  from a file, as well as direct DVD playback. 

ipkg/rules.gpe

 #!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
+# debian/rules for the VLC media player - uses debhelper.
 # based on Joey Hess's one.
 # Kludged for ipkg
 

ipkg/rules.h3600

 #!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
+# debian/rules for the VLC media player - uses debhelper.
 # based on Joey Hess's one.
 # Kludged for ipkg
 

ipkg/rules.opie

 #!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
+# debian/rules for the VLC media player - uses debhelper.
 # based on Joey Hess's one.
 # Kludged for ipkg
 

ipkg/rules.zaurus

 #!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
+# debian/rules for the VLC media player - uses debhelper.
 # based on Joey Hess's one.
 # Kludged for ipkg
 

ipkg/vlc.desktop

@@ -2,4 +2,4 @@
 Comment=Multiplatform Multimedia Player
 Exec=opie-vlc
 Icon=vlc/vlc48x48.png
-Name=VideoLAN Client
+Name=VLC media player

menuconfig

@@ -1332,7 +1332,7 @@ Use the <TAB> key to move from the input field to the buttons below it."
 
 DIALOG="./lxdialog/lxdialog"
 
-backtitle="VideoLAN Client Configuration"
+backtitle="VLC media player configuration"
 
 trap "cleanup ; exit 1" 1 2 15
 

modules/gui/qnx/vout.c

@@ -670,7 +670,7 @@ static int QNXCreateWnd( vout_thread_t * p_vout )
     PtSetArg( &args[0], Pt_ARG_POS, &pos, 0 );
     PtSetArg( &args[1], Pt_ARG_DIM, &p_vout->p_sys->dim, 0 );
     PtSetArg( &args[2], Pt_ARG_FILL_COLOR, color, 0 );
-    PtSetArg( &args[3], Pt_ARG_WINDOW_TITLE, "VideoLan Client", 0 );
+    PtSetArg( &args[3], Pt_ARG_WINDOW_TITLE, "VLC media player", 0 );
     PtSetArg( &args[4], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_FALSE, Ph_WM_CLOSE );
     PtSetArg( &args[5], Pt_ARG_WINDOW_NOTIFY_FLAGS, Pt_TRUE,
               Ph_WM_MOVE | Ph_WM_RESIZE | Ph_WM_CLOSE );

modules/gui/qt/intf.cpp

@@ -2,7 +2,7 @@
  * intf.cpp: Qt interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf.cpp,v 1.6 2004/01/05 13:07:03 zorglub Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -321,10 +321,10 @@ void IntfWindow::FileQuit( void )
 void IntfWindow::About( void )
 {
     QMessageBox::about( this, "About",
-        "VideoLAN Client\n"
-        "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team\n"
+        "VLC media player\n"
+        "(C) 1996 - 2004 - the VideoLAN Team\n"
         "\n"
-        "This is the VideoLAN client, a DVD and MPEG player.\n"
+        "This is the VLC media player, a DVD and MPEG player.\n"
         "It can play MPEG and MPEG 2 files from a file "
             "or from a network source.\n"
         "\n"

msvc/config.h.in

@@ -4,7 +4,7 @@
 #define CONFIGURE_LINE "Visual C++"
 
 /* Copyright string */
-#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
+#define COPYRIGHT_MESSAGE "VLC media player - version @VERSION@ @CODENAME@ - (c) 1996-2004 VideoLAN"
 
 /* Maximum supported data alignment */
 #define ATTRIBUTE_ALIGNED_MAX 16

vlc.spec

@@ -104,7 +104,7 @@ video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVD's,
 VCD's, and various streaming protocols. It can also be used as a server to 
 stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network.
 
-Install this package if you need to build Videolan Client plugins or intend
+Install this package if you need to build VLC media player plugins or intend
 to link statically to it.