* ALL: removed "VideoLAN Client" in favour of "VLC media player" in a lot

    of places.

INSTALL

-INSTALL file for vlc, the VideoLAN Client
+$Id: INSTALL,v 1.24 2003/02/02 04:01:29 sam Exp $
 
+INSTALL file for the VLC media player
 
-Configuring VideoLAN
-====================
 
-A typical way to configure vlc is:
+Configuring VLC
+===============
+
+A typical way to configure VLC is:
 
    ./configure --prefix=/usr --enable-gnome
 
@@ -16,24 +18,24 @@ symbols:
    make distclean ; ./configure --prefix=/usr --enable-gnome --enable-debug
 
 
-Building VideoLAN
-=================
+Building VLC
+============
 
 Have a look at the generated Makefile.opts file, you may want to choose
 which modules will be compiled as plugins, and which ones will remain in
 the core application. The configure script tries to guess for you.
 
-Once configured, run `make' to build vlc.
+Once configured, run `make' to build VLC.
 
 
-Installing and running VideoLAN
-===============================
+Installing and running VLC
+==========================
 
-You can install the vlc and its plugins by typing:
+You can install the VLC and its plugins by typing:
 
    make install
 
-But you don't need to install it if you don't want to; vlc can be launched
+But you don't need to install it if you don't want to; VLC can be launched
 from the current directory as well:
 
    ./vlc

INSTALL.win32

-INSTALL file for the Windows9x/2k/XP version of vlc, the VideoLAN Client
+$Id: INSTALL.win32,v 1.13 2003/02/02 04:01:29 sam Exp $
 
-Running VideoLAN Client
-=======================
+INSTALL file for the Windows9x/2k/XP version of the VLC media player
+
+
+Running VLC
+===========
 
-If you have already built vlc (see below) or are using a binary release,
+If you have already built VLC (see below) or are using a binary release,
 just run 'vlc.exe'.
 
-You can also run vlc from a dos command box, in which case you'll be able
+You can also run VLC from a dos command box, in which case you'll be able
 to use the command line arguments. You can obtain a list of these command
 line arguments by typing 'vlc --help'.
-To store a debug log of the current vlc session, you can use
+To store a debug log of the current VLC session, you can use
 'vlc -vvvvv --intf=logger nameofyourvideofile', but this will unfortunatly
 disable the GUI. You will end-up with a vlc.log file in your current directory.
 
-If you want to play a DVD, run vlc and click on the Disc option in the
+If you want to play a DVD, run VLC and click on the Disc option in the
 interface. You then have to type your drive letter followed by a colon in
 the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive).
 
-Building VideoLAN Client from the source code
-=============================================
+Building VLC from the source code
+=================================
 
-If you want to do the tricky job of building vlc from sources, you can do it
+If you want to do the tricky job of building VLC from sources, you can do it
 in several ways:
 
 - natively on Windows, using MSYS+MINGW (www.mingw.org)
@@ -87,7 +90,7 @@ to build the DirectX, GTK and SDL plugins.
 Configuring the build
 =====================
 
-The best way to configure the build process of vlc is to use the
+The best way to configure the build process of VLC is to use the
 `./configure' script.
 
 See `./configure --help' for more information.
@@ -124,7 +127,7 @@ along those lines:
   --with-directx=/c/dev/dxheaders \
   --with-dvdcss-tree=../libdvdcss-win
 
-If you are using cygwin, you can build vlc with or without the unix emulation
+If you are using cygwin, you can build VLC with or without the unix emulation
 layer (without is usually better). To build without the emulaion layer, use
 something like this:
   ./bootstrap; \
@@ -140,14 +143,14 @@ CXX="g++ -mno-cygwin" line.
 Note: when using the --with-dvdcss-tree you need to compile the libdvdcss tree
 beforehand.
 
-Building VideoLAN Client
-========================
+Building VLC
+============
 
 Have a look at the generated Makefile.opts file, you may want to choose
 which modules will be compiled as plugins, and which ones will remain in
 the core application. The configure script tries to guess for you.
 
-Once configured, to build vlc you have to:
+Once configured, to build VLC you have to:
 
 If you are cross-compiling from Debian or compiling natively on Windoze,
 then just run `make'.
@@ -166,7 +169,7 @@ Building Win32 interface with bcc32 (Borland's compiler)
 they can be symlinks to the Borland bpr2mak and make utilities, or wrappers
 that call them through Wine if you are cross-compiling from Linux.
 
-3) Configure vlc as usual with the --enable-intfwin flag and build it.
+3) Configure VLC as usual with the --enable-intfwin flag and build it.
 
-Well done, now you're ready to use vlc!
+Well done, now you're ready to use VLC!
 =======================================

README

-$Id: README,v 1.14 2003/02/01 23:08:48 sam Exp $
+$Id: README,v 1.15 2003/02/02 04:01:29 sam Exp $
 
-README for vlc, the VideoLAN Client
-===================================
+README for the VLC media player
+===============================
 
 ABOUT-NLS          - Notes on the Free Translation Project.
 AUTHORS            - Main VLC authors.

bootstrap

 #! /bin/sh
 
-##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.41 2003/02/01 18:41:09 sam Exp $
+##  bootstrap file for the VLC media player
+##  $Id: bootstrap,v 1.42 2003/02/02 04:01:29 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 

configure.ac.in

@@ -2826,7 +2826,7 @@ dnl
 dnl  Stuff used by the program
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
 AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
 
 VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"

install-win32

@@ -22,13 +22,13 @@
 
 OutFile ..\vlc-${VERSION}-win32.exe
 
-Name "the VideoLAN Client"
-Caption "VideoLAN Client '${VERSION}' for Win32 Setup"
+Name "VLC media player"
+Caption "VLC '${VERSION}' for Win32 Setup"
 ;Icon ../share/gvlc32x32.ico
 
 CRCCheck on
 
-InstallDir "$PROGRAMFILES\VideoLAN\VideoLAN Client"
+InstallDir "$PROGRAMFILES\VideoLAN\VLC"
 ; check if the program has already been installed, if so, take this dir
 ; as install dir
 InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"
@@ -42,7 +42,7 @@ SetDatablockOptimize on
 SetDateSave off
 SetCompress auto
 
-UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."
+UninstallText "This will uninstall the VLC media player. Hit next to continue."
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Install settings ;

modules/gui/win32/about.dfm

@@ -285,7 +285,7 @@ object AboutDlg: TAboutDlg
     Top = 80
     Width = 227
     Height = 13
-    Caption = 'the VideoLAN Team <videolan@videolan.org>'
+    Caption = 'the VideoLAN team <videolan@videolan.org>'
   end
   object Image1: TImage
     Left = 32

modules/gui/win32/strings.cpp

@@ -8,7 +8,7 @@
     Caption = _( "VLC media player" );
     Caption = _( "(c) 1996-2003 the VideoLAN team" );
     Caption = _(       "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can"       " play MPEG and MPEG2 files from a file or from a network source." );
-    Caption = _( "the VideoLAN Team <videolan@videolan.org>" );
+    Caption = _( "the VideoLAN team <videolan@videolan.org>" );
     Caption = _( "Version x.y.z" );
     Caption = _( "OK" );
 

po/no.po

@@ -2885,9 +2885,8 @@ msgid "Report A Bug"
 msgstr ""
 
 #: modules/gui/macosx/intf.m:327
-#, fuzzy
 msgid "VideoLAN Website"
-msgstr "VideoLAN Client"
+msgstr ""
 
 #: modules/gui/macosx/intf.m:328
 msgid "License"

toolbox

 #! /bin/sh
 
-##  toolbox for vlc, the VideoLAN Client
-##  $Id: toolbox,v 1.8 2003/01/29 18:10:52 sam Exp $
+##  toolbox for the VLC media player
+##  $Id: toolbox,v 1.9 2003/02/02 04:01:29 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -297,7 +297,7 @@ then
   find modules/gui/win32 -name '*.dfm' | while read file
   do
     printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp
-    perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' >> modules/gui/win32/strings.cpp || exit 1
+    perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1
   done
   # clean old potfiles
   cd po