[vlc-commits] commit: Naming consistency over Web Plugins (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Tue Apr 27 01:57:20 CEST 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 27 01:57:06 2010 +0200| [0af86a1812824a0eb655fdedb6ed9b24bdaf6098] | committer: Jean-Baptiste Kempf
Naming consistency over Web Plugins
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0af86a1812824a0eb655fdedb6ed9b24bdaf6098
---
projects/activex/axvlc_rc.rc.in | 4 ++--
projects/activex/main.cpp | 2 +-
projects/mozilla/install.rdf.in | 2 +-
projects/mozilla/manifest.json.in | 4 ++--
projects/mozilla/npvlc_rc.rc.in | 6 +++---
projects/mozilla/vlcplugin.h | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/projects/activex/axvlc_rc.rc.in b/projects/activex/axvlc_rc.rc.in
index f3cf3a8..7d1918d 100644
--- 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 8db6bdf..6fa8a76 100644
--- 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 694277a..8abdc45 100644
--- 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 at videolan.org</em:id>
- <em:name>VideoLAN</em:name>
+ <em:name>VLC Web Plugin</em:name>
<em:version>@VERSION_MAJOR at .@VERSION_MINOR at .@VERSION_REVISION@@VERSION_EXTRA@</em:version>
<em:targetApplication>
<Description>
diff --git a/projects/mozilla/manifest.json.in b/projects/mozilla/manifest.json.in
index bed95d1..fb38093 100644
--- 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 at .@VERSION_MINOR at .@VERSION_REVISION at .@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 975bf0d..5a45093 100644
--- 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 ff2e4cf..cefa1ab 100644
--- 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 \
More information about the vlc-commits
mailing list