Skip to content

V
vlc
Commit 1e9ff270 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

projects/mozilla: Use an hyphen in "plug-in". This closes #1474. (Patch by timeless@gmail.com)

parent 153a80c8
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
projects/mozilla/npvlc_rc.rc
View file @ 1e9ff270
...@@ -31,7 +31,7 @@ BEGIN ...@@ -31,7 +31,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "ProductName", "VLC Multimedia Plugin\0" VALUE "ProductName", "VLC Multimedia Plug-in\0"
VALUE "ProductVersion", STRINGIFY( VERSION ) VALUE "ProductVersion", STRINGIFY( VERSION )
VALUE "OriginalFilename", "npvlc.dll\0" VALUE "OriginalFilename", "npvlc.dll\0"
VALUE "FileVersion", STRINGIFY( VERSION ) VALUE "FileVersion", STRINGIFY( VERSION )
...@@ -41,7 +41,7 @@ BEGIN ...@@ -41,7 +41,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright \251 1996-2006 The VideoLAN Team\0" VALUE "LegalCopyright", "Copyright \251 1996-2006 The VideoLAN Team\0"
VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|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\0" VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|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\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\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\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 plugin|Windows Media video|Windows Media video|Windows Media plugin|Windows Media video|Google VLC plugin|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video\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\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
projects/mozilla/test.html
View file @ 1e9ff270
<HTML> <HTML>
<TITLE>VLC Mozilla plugin test page</TITLE> <TITLE>VLC Mozilla plug-in test page</TITLE>
<BODY> <BODY>
<TABLE> <TABLE>
<TR><TD colspan="2"> <TR><TD colspan="2">
......
projects/mozilla/vlc.r
View file @ 1e9ff270
...@@ -15,7 +15,7 @@ resource 'STR#' (126) ...@@ -15,7 +15,7 @@ resource 'STR#' (126)
{ {
"Version 0.9.0, copyright 1996-2007 The VideoLAN Team" "Version 0.9.0, copyright 1996-2007 The VideoLAN Team"
"<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>", "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
"VLC Multimedia Plugin" "VLC Multimedia Plug-in"
}; };
}; };
...@@ -43,14 +43,14 @@ resource 'STR#' (127) ...@@ -43,14 +43,14 @@ resource 'STR#' (127)
"Ogg stream", "Ogg stream",
"Ogg stream", "Ogg stream",
/* VLC */ /* VLC */
"VLC plugin", "VLC plug-in",
/* Windows Media */ /* Windows Media */
"Windows Media video", "Windows Media video",
"Windows Media video", "Windows Media video",
"Windows Media plugin", "Windows Media plug-in",
"Windows Media video", "Windows Media video",
/* Google VLC */ /* Google VLC */
"Google VLC plugin", "Google VLC plug-in",
/* WAV audio */ /* WAV audio */
"WAV audio", "WAV audio",
"WAV audio", "WAV audio",
......
projects/mozilla/vlcplugin.h
View file @ 1e9ff270
...@@ -129,7 +129,7 @@ private: ...@@ -129,7 +129,7 @@ private:
/******************************************************************************* /*******************************************************************************
* Plugin properties. * Plugin properties.
******************************************************************************/ ******************************************************************************/
#define PLUGIN_NAME "VLC Multimedia Plugin" #define PLUGIN_NAME "VLC Multimedia Plug-in"
#define PLUGIN_DESCRIPTION \ #define PLUGIN_DESCRIPTION \
"Version %s, copyright 1996-2007 The VideoLAN Team" \ "Version %s, copyright 1996-2007 The VideoLAN Team" \
"<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>" "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
...@@ -155,7 +155,7 @@ private: ...@@ -155,7 +155,7 @@ private:
"application/x-ogg:ogg:Ogg stream;" \ "application/x-ogg:ogg:Ogg stream;" \
"application/ogg:ogg:Ogg stream;" \ "application/ogg:ogg:Ogg stream;" \
/* VLC */ \ /* VLC */ \
"application/x-vlc-plugin:vlc:VLC plugin;" \ "application/x-vlc-plugin:vlc:VLC plug-in;" \
/* Windows Media */ \ /* Windows Media */ \
"video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \ "video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
"video/x-ms-asf:asf,asx:Windows Media Video;" \ "video/x-ms-asf:asf,asx:Windows Media Video;" \
...@@ -163,7 +163,7 @@ private: ...@@ -163,7 +163,7 @@ private:
"video/x-ms-wmv:wmv:Windows Media;" \ "video/x-ms-wmv:wmv:Windows Media;" \
"video/x-ms-wvx:wvx:Windows Media Video;" \ "video/x-ms-wvx:wvx:Windows Media Video;" \
/* Google VLC */ \ /* Google VLC */ \
"application/x-google-vlc-plugin::Google VLC plugin;" \ "application/x-google-vlc-plugin::Google VLC plug-in;" \
/* WAV audio */ \ /* WAV audio */ \
"audio/wav:wav:WAV audio;" \ "audio/wav:wav:WAV audio;" \
"audio/x-wav:wav:WAV audio;" \ "audio/x-wav:wav:WAV audio;" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment