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

    of places.

diff --git a/INSTALL b/INSTALL
index 3b6408caed7830fdd7d282ae0c7d38405793673d..8e187bb4e348462af2eed24bf26220b66fda0f44 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,12 @@
-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

diff --git a/INSTALL.win32 b/INSTALL.win32
index 93c5f2815c82f4b080a9dc9d354891fd8bdd99d3..181ce62ef8bd2db79fa9830534bc10bb074962ed 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -1,26 +1,29 @@
-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!
 =======================================

diff --git a/README b/README
index c01b61124a26a7f14faf5adda57983f285d1b752..0f99cd8952d45003e07b3ad410867a338fc9bd89 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-$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.

diff --git a/bootstrap b/bootstrap
index 856b1844d6fb0f33d1d8aa4d562cb5c2a106a530..b83d506c86491a71b65f86e05c360c54c90135ef 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /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>
 

diff --git a/configure.ac.in b/configure.ac.in
index fc1d7ee3b9443e76ec7edd6af3a7e43f2d981131..c0a5495b417da29c68afea401fc308a188bc815e 100644 (file)
--- a/configure.ac.in
+++ b/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/.-/__/'`"

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

diff --git a/modules/gui/win32/about.dfm b/modules/gui/win32/about.dfm
index 10e81f8f196855b96646f52b023d67df55d3f63d..722f6f2e7d9a0dc58ba431b227e6d543569d541b 100644 (file)
--- a/modules/gui/win32/about.dfm
+++ b/modules/gui/win32/about.dfm
@@ -285,7 +285,7 @@ object AboutDlg: TAboutDlg
     Top = 80\r
     Width = 227\r
     Height = 13\r
-    Caption = 'the VideoLAN Team <videolan@videolan.org>'\r
+    Caption = 'the VideoLAN team <videolan@videolan.org>'\r
   end\r
   object Image1: TImage\r
     Left = 32\r

diff --git a/modules/gui/win32/strings.cpp b/modules/gui/win32/strings.cpp
index 7b5a16a7ab1edaf95d5bbd376f4ff1f29c7a23ee..b4e9962262426d9b8db5b08777cbb2df748583c6 100644 (file)
--- a/modules/gui/win32/strings.cpp
+++ b/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" );
 

diff --git a/po/no.po b/po/no.po
index 0c41564ce1483fda1f9479233471fbccd769e323..67c9c9db027c21b61368cb0b6ca03a1d16d64a28 100644 (file)
--- a/po/no.po
+++ b/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"

diff --git a/toolbox b/toolbox
index 7f4823dba7cd0596e2117ffff982d186bd101731..c8ca38b9ede3c724a461dc477a7210d57249ec7b 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /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

diff --git a/vlc.spec b/vlc.spec
index f26b12cce75857e5bcdbb23b7046db020b577f7f..7453644025b27a770de0b93effacccbfbe4d1cc2 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -120,7 +120,7 @@
 
 %{?_with_slp:          %{expand: %%define with_slp 1}}
 
-Summary:       VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
+Summary:       VLC is a free MPEG, MPEG2, DVD and DivX player.
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}
@@ -219,10 +219,10 @@ Buildrequires:    libopenslp-devel
 VideoLAN is an OpenSource streaming solution for every OS developed by
 students from the Ecole Centrale Paris and developers from all over the
 World.
-The VideoLAN Client (vlc) plays MPEG1, MPEG2 and MPEG4 (aka DivX) files,
-DVDs, VCDs, SVCDs, from a satellite card, from an MPEG2 Transport
-Streams sent by the VideoLAN Server (vls) or from a Web server (with the
-HTTP input).
+VLC (VideoLAN Client) is a media player that can play MPEG1, MPEG2 and
+MPEG4 (aka DivX) files, DVDs, VCDs, SVCDs, from a satellite card, from
+a stream sent by VLS (VideoLAN Server), from another VLC, or from a Web
+server.
 You may install vlc-gnome or vlc-gtk to have a nice graphical interface.
 This package contains no CSS unscrambling functionality for DVDs ;
 you need the libdvdcss library available from 
@@ -230,17 +230,15 @@ http://www.videolan.org/libdvdcss/ or http://plf.zarb.org/
 
 #general packages
 %package -n %libname-devel
-Summary: Development files for the VideoLAN Client
+Summary: Development files for the VLC media player
 Group: Development/C
 Requires: %name = %version-%release
 Provides: %name-devel = %version-%release
 Provides: lib%name-devel = %version-%release
 %description -n %libname-devel
-Development files for the VideoLAN Client
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
+Development files for the VLC media player
 This package contains headers and a static library required to build plugins
-for the VideoLAN Client, or standalone applications using VideoLAN Client.
+for the VLC media player, or standalone applications using features from VLC.
 
 %package -n mozilla-plugin-vlc
 Summary: A multimedia plugin for Mozilla, based on vlc
@@ -255,137 +253,115 @@ support for fullscreen display.
 
 # intf plugins
 %package -n gvlc
-Summary: Gtk plugin for the VideoLAN client
+Summary: Gtk plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Provides: vlc-gui
 %description -n gvlc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a Gtk+ interface to vlc, the VideoLAN Client. To
+This plugin adds a Gtk+ interface to the VLC media player. To
 activate it, use the `--intf gtk' flag or run the `gvlc' program.
 
 %package -n gnome-vlc
-Summary: Gnome plugin for the VideoLAN client
+Summary: Gnome plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Provides: vlc-gui, vlc-gnome
 Obsoletes: vlc-gnome
 %description -n gnome-vlc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a Gnome interface to vlc, the VideoLAN Client. To
+This plugin adds a Gnome interface to the VLC media player. To
 activate it, use the `--intf gnome' flag or run the `gnome-vlc' program.
 
 %package -n qvlc
-Summary: Qt2 plugin for the VideoLAN client
+Summary: Qt2 plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Provides: vlc-gui, vlc-qt
 Obsoletes: vlc-qt
 %description -n qvlc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a Qt interface to vlc, the VideoLAN Client. To
-activate it, use the `--intf qt' flag or run the `qvlc' program.
+This plugin adds a Qt interface to the VLC media player. To activate it,
+use the `--intf qt' flag or run the `qvlc' program.
 
 %package -n kvlc
-Summary: KDE frontend for the VideoLAN client
+Summary: KDE frontend for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Provides: vlc-gui
 %description -n kvlc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a KDE interface to vlc, the VideoLAN Client. To
+This plugin adds a KDE interface to the VLC media player. To
 activate it, use the `--intf kde' flag or run the `kvlc' program.
 
 %package plugin-ncurses
-Summary: Ncurses console-based plugin for the VideoLAN client
+Summary: Ncurses console-based plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-ncurses
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a ncurses interface to vlc, the VideoLAN Client. To
+This plugin adds a ncurses interface to the VLC media player. To
 activate it, use the `--intf ncurses' flag.
 
 %package plugin-lirc
-Summary: Lirc plugin for the VideoLAN client
+Summary: Lirc plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-lirc
 Provides: vlc-lirc
 %description plugin-lirc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin is an infrared lirc interface for vlc, the
-VideoLAN Client. To activate it, use the `--intf lirc' flag.
+This plugin is an infrared lirc interface for the VLC media player. To
+activate it, use the `--extraintf lirc' flag.
 
 %package -n wxvlc
-Summary: WxWindow plugin for the VideoLAN client
+Summary: WxWindow plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-lirc
 Provides: vlc-lirc
 %description -n wxvlc
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds a wxWindow interface to vlc, the VideoLAN Client. To
+This plugin adds a wxWindow interface to the VLC media player. To
 activate it, use the `--intf wxwin' flag or run the `wxvlc' program.
 
 
 #
 # video plugins
 %package plugin-aa
-Summary: ASCII art video plugin for the VideoLAN client
+Summary: ASCII art video plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-aa
 Provides: vlc-aa
 %description plugin-aa
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This is an ASCII art video output plugin for vlc, the VideoLAN
-Client. To activate it, use the `--vout aa' flag or select the `aa'
-vout plugin from the preferences menu.
+This is an ASCII art video output plugin for the VLC media playe. To
+activate it, use the `--vout aa' flag or select the `aa' video output
+plugin from the preferences menu.
 
 
 %package plugin-sdl
-Summary: Simple DirectMedia Layer video plugin for the VideoLAN client
+Summary: Simple DirectMedia Layer video plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-sdl
 Provides: vlc-sdl
 %description plugin-sdl
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 This plugin adds support for the Simple DirectMedia Layer library to
-vlc, the VideoLAN Client. To activate it, use the `--vout sdl' or
-`--aout sdl' flags or select the `sdl' vout or aout plugin from the
-preferences menu.
+the VLC media player. To activate it, use the `--vout sdl' or
+`--aout sdl' flags or select the `sdl' video or audio output plugin
+from the preferences menu.
 
 %package plugin-ggi
-Summary: GGI video plugin for the VideoLAN client
+Summary: GGI video plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-ggi
 Provides: vlc-ggi
 %description plugin-ggi
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This is a GGI plugin for vlc, the VideoLAN Client.  To activate it, use
-the `--vout ggi' flag or select the `ggi' vout plugin from the preferences
-menu.
+This is a GGI plugin for the VLC media player. To activate it, use
+the `--vout ggi' flag or select the `ggi' video output plugin from
+the preferences menu.
 
 %package plugin-svgalib
-Summary: SVGAlib video plugin for the VideoLAN client
+Summary: SVGAlib video plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-svgalib
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds support for SVGAlib to vlc, the VideoLAN Client. To
+This plugin adds support for SVGAlib to the VLC media player. To
 activate it, use the `--vout svgalib' flag or select the `svgalib' video
 output plugin from the preferences menu. Note that you will need root
 permissions to use SVGAlib.
@@ -394,124 +370,104 @@ permissions to use SVGAlib.
 #
 # visualization plugins
 %package plugin-xosd
-Summary: X On-Screen Display plugin for the VideoLAN client
+Summary: X On-Screen Display plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-xosd
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This is an On-Screen Display plugin for vlc, the VideoLAN Client. To
-activate it, use the `--intf xosd' flag or select the `xosd' interface
-plugin from the preferences menu.
+This is an On-Screen Display plugin for the VLC media player. To activate
+it, use the `--extraintf xosd' flag or select the `xosd' interface plugin
+from the preferences menu.
 
 # codec plugins
 %package plugin-mad
-Summary: MAD audio codec plugin for the VideoLAN client
+Summary: MAD audio codec plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-mad
 Provides: vlc-mad
 %description plugin-mad
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 This plugin adds support for libmad, the MPEG audio decoder library,
-to the VideoLAN Client. MAD is 100% fixed-point based. To activate
+to the VLC media player. MAD is 100% fixed-point based. To activate
 this plugin, use the `--mpeg_adec mad' flag or select the `mad' MPEG
 decoder from the preferences menu.
 
 %package plugin-ogg
-Summary: Ogg demuxer and Vorbis codec plugin for the VideoLAN client
+Summary: Ogg demuxer and Vorbis codec plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-ogg
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 These plugins add support for the Ogg bitstream format and the Ogg Vorbis
-compressed audio format to vlc, the VideoLAN Client. They are autodetected.
+compressed audio format to the VLC media player. They are autodetected.
 
 %package plugin-a52
-Summary: A-52 (AC-3) codec plugin for the VideoLAN client
+Summary: A-52 (AC-3) codec plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-a52
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 This plugin adds support for the ATSC A-52 (aka. AC-3) audio format to
-vlc, the VideoLAN Client. The plugin is autodetected.
+the VLC media player. The plugin is autodetected.
 
 %package plugin-dv
-Summary: DV codec plugin for the VideoLAN client
+Summary: DV codec plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-dv
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds support for the DV video format to vlc, the VideoLAN
-Client. The plugin is autodetected.
+This plugin adds support for the DV video format to the VLC media player.
+The plugin is autodetected.
 
 #
 # input plugins
 %package plugin-dvb
-Summary: DVB input plugin for the VideoLAN client
+Summary: DVB input plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-dvb
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds support for DVB cards to vlc, the VideoLAN Client. Note
+This plugin adds support for DVB cards to the VLC media player. Note
 that your card needs to be supported by your kernel before vlc can use it.
 
 #
 # audio plugins
 %package plugin-esd
-Summary: Enlightened Sound Daemon audio plugin for the VideoLAN client
+Summary: Enlightened Sound Daemon audio plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-esd
 Provides: vlc-esd
 %description plugin-esd
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds support for the Enlightened Sound Daemon to vlc, the
-VideoLAN Client. To activate it, use the `--aout esd' flag or select
-the `esd' aout plugin from the preferences menu.
+This plugin adds support for the Enlightened Sound Daemon to the VLC
+media player. To activate it, use the `--aout esd' flag or select the
+`esd' audio output plugin from the preferences menu.
 
 %package plugin-arts
-Summary: aRts audio plugin for the VideoLAN client
+Summary: aRts audio plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-arts
 Provides: vlc-arts
 %description plugin-arts
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
-This plugin adds support for the aRts Sound System to vlc, the
-VideoLAN Client. To activate it, use the `--aout arts' flag or
-select the `arts' aout plugin from the preferences menu.
+This plugin adds support for the aRts Sound System to the VLC media
+player. To activate it, use the `--aout arts' flag or select the `arts'
+audio output plugin from the preferences menu.
 
 %package plugin-alsa
-Summary: Advanced Linux Sound Architecture audio plugin for the VideoLAN client
+Summary: Advanced Linux Sound Architecture audio plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 Obsoletes: vlc-alsa
 Provides: vlc-alsa
 %description plugin-alsa
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 This plugin adds support for the Advanced Linux Sound Architecture to
-vlc, the VideoLAN Client. To activate it, use the `--aout alsa' flag or
-select the `alsa' aout plugin from the preferences menu.
+the VLC media player. To activate it, use the `--aout alsa' flag or
+select the `alsa' audio output plugin from the preferences menu.
 
 
 %package plugin-slp
-Summary: Service Location Protocol acces plugin for the VideoLAN client
+Summary: Service Location Protocol acces plugin for the VLC media player
 Group: Video
 Requires: %{name} = %{version}
 %description plugin-slp
-VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
-
 This plugin adds support for the Service Location Protocol to
-vlc, the VideoLAN Client.
+the VLC media player.
 
 
 %prep
@@ -636,30 +592,30 @@ install doc/vlc-config.1 %buildroot/%_mandir/man1
 # menu
 mkdir -p %buildroot/%_menudir
 cat > %buildroot/%_menudir/vlc << EOF
-?package(vlc): command="%_bindir/vlc" hotkey="V" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="VideoLAN Client" icon="vlc.png" hints="Video"
+?package(vlc): command="%_bindir/vlc" hotkey="V" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC media player" icon="vlc.png" hints="Video"
 EOF
 %if %with_gtk
 cat > %buildroot/%_menudir/gvlc << EOF
-?package(gvlc): command="%_bindir/gvlc" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="Gtk VideoLAN Client" icon="gvlc.png" hints="Video"
+?package(gvlc): command="%_bindir/gvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gtk media player" icon="gvlc.png" hints="Video"
 EOF
 %endif
 %if %with_gnome
 cat > %buildroot/%_menudir/gnome-vlc << EOF
-?package(gnome-vlc): command="%_bindir/gnome-vlc" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="Gnome VideoLAN Client" icon="gnome-vlc.png" hints="Video"
+?package(gnome-vlc): command="%_bindir/gnome-vlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gnome media player" icon="gnome-vlc.png" hints="Video"
 EOF
 %endif
 %if %with_qt
 cat > %buildroot/%_menudir/qvlc << EOF
-?package(qvlc): command="%_bindir/qvlc" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="Qt VideoLAN Client" icon="qvlc.png" hints="Video"
+?package(qvlc): command="%_bindir/qvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Qt media player" icon="qvlc.png" hints="Video"
 EOF
 %endif
 %if %with_kde
 cat > %buildroot/%_menudir/kvlc << EOF
-?package(kvlc): command="%_bindir/kvlc" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="KDE VideoLAN Client" icon="kvlc.png" hints="Video"
+?package(kvlc): command="%_bindir/kvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC KDE media player" icon="kvlc.png" hints="Video"
 EOF
 %endif
 %if %with_wx
-?package(wxvlc): command="%_bindir/wxvlc" needs="X11" longtitle="VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution" section="Multimedia/Video" title="wxWindow VideoLAN Client" icon="vlc.png" hints="Video"
+?package(wxvlc): command="%_bindir/wxvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC wxWindow media player" icon="vlc.png" hints="Video"
 %endif
 
 # icons