Naming consistency over Web Plugins

diff --git a/projects/activex/axvlc_rc.rc.in b/projects/activex/axvlc_rc.rc.in
index f3cf3a83aa958ecf57f0238c5e2749dea986dc80..7d1918d4dac73e86b1fff716d539b2493e50976f 100644 (file)
--- a/projects/activex/axvlc_rc.rc.in
+++ b/projects/activex/axvlc_rc.rc.in
@@ -11,10 +11,10 @@ BEGIN
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "the VideoLAN Team"
+      VALUE "CompanyName", "VideoLAN"
       VALUE "FileVersion", "@VERSION@"
       VALUE "FileDescription", "VLC media player (Activex Plugin)"
-      VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
+      VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ VideoLAN and Authors"
       VALUE "OLESelfRegister", "\0"
     END
   END

diff --git a/projects/activex/main.cpp b/projects/activex/main.cpp
index 8db6bdffe667cec3eb48e905079f7527892eece3..6fa8a7676851925e63031712b3a7e82c085cd30e 100644 (file)
--- a/projects/activex/main.cpp
+++ b/projects/activex/main.cpp
@@ -36,7 +36,7 @@ using namespace std;
 
 #define COMPANY_STR "VideoLAN"
 #define PROGRAM_STR "VLCPlugin"
-#define DESCRIPTION "VideoLAN VLC ActiveX Plugin"
+#define DESCRIPTION "VLC ActiveX Plugin and IE Web Plugin"
 
 #define THREADING_MODEL "Apartment"
 #define MISC_STATUS     "131473"

diff --git a/projects/mozilla/install.rdf.in b/projects/mozilla/install.rdf.in
index 694277a2ea4da9bfe761adfdcf8df1dfdd9c9980..8abdc45a610858fcf436b3ad65bbf5772212e552 100644 (file)
--- a/projects/mozilla/install.rdf.in
+++ b/projects/mozilla/install.rdf.in
@@ -1,7 +1,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>vlc-plugin@videolan.org</em:id>
-    <em:name>VideoLAN</em:name>
+    <em:name>VLC Web Plugin</em:name>
     <em:version>@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@@VERSION_EXTRA@</em:version>
     <em:targetApplication>
       <Description>

diff --git a/projects/mozilla/manifest.json.in b/projects/mozilla/manifest.json.in
index bed95d1d9e8d8ddb3a9517004712bedbd377cc8b..fb38093dc51f7280e69beb6127688e3794552646 100644 (file)
--- a/projects/mozilla/manifest.json.in
+++ b/projects/mozilla/manifest.json.in
@@ -1,6 +1,6 @@
 {
-  "name": "VideoLAN",
+  "name": "VLC Web Plugin",
   "version": "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@.@VERSION_EXTRA_RC@",
-  "description": "VLC Web Plugin Bundle",
+  "description": "VLC Web Plugin Bundle, by VideoLAN",
   "plugins": [{"path":"plugins/npvlc.dll", "public":true }]
 }

diff --git a/projects/mozilla/npvlc_rc.rc.in b/projects/mozilla/npvlc_rc.rc.in
index 975bf0d57e91dcf5d8cee2a2509f10c608614282..5a45093f737463356c2cb1dccf29e73e7914e2cc 100644 (file)
--- a/projects/mozilla/npvlc_rc.rc.in
+++ b/projects/mozilla/npvlc_rc.rc.in
@@ -23,14 +23,14 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "ProductName", "VLC Multimedia Plug-in\0"
+            VALUE "ProductName", "VLC Web Plugin\0"
             VALUE "ProductVersion", "@VERSION@"
             VALUE "OriginalFilename", "npvlc.dll\0"
             VALUE "FileVersion", "@VERSION@"
             VALUE "FileDescription", "Version @VERSION@, copyright @COPYRIGHT_YEARS@ The VideoLAN Team<br><a href=""http://www.videolan.org/"">http://www.videolan.org/</a>\0"
             VALUE "InternalName", "npvlc\0"
-            VALUE "CompanyName", "the VideoLAN Team\0"
-            VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ The VideoLAN Team\0"
+            VALUE "CompanyName", "VideoLAN\0"
+            VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and Authors\0"
             VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mp4|audio/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav|audio/3gpp|video/3gpp|audio/3gpp2|video/3gpp2|video/divx|video/flv|video/x-flv|video/x-matroska|audio/x-matroska|application/xspf+xml|audio/x-m4a|audio/x-mpegurl|audio/x-ms-wma\0"
             VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg|vlc|asf,asx|asf,asx||wmv||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m4a|m3u|wma\0"
             VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plug-in|Windows Media video|Windows Media video|Windows Media plug-in|Windows Media video|Google VLC plug-in|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video|FLV video|FLV video|Matroska video|Matroska audio|Playlist xspf|MPEG-4 audio|Playlist M3U|Windows Media Audio\0"

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index ff2e4cf237f77b0deab084c2a069d1ff13aaaf2d..cefa1ab21dd95c5bef20e6d1652fd09e862d75f1 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -358,9 +358,9 @@ private:
 /*******************************************************************************
  * Plugin properties.
  ******************************************************************************/
-#define PLUGIN_NAME         "VLC Multimedia Plug-in"
+#define PLUGIN_NAME         "VLC Web Plugin"
 #define PLUGIN_DESCRIPTION \
-    "Version %s, copyright 1996-2007 The VideoLAN Team" \
+    "Version %s, copyright 1996-2010 VideoLAN and Authors" \
     "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
 
 #define PLUGIN_MIMETYPES \