]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 153a80c)
projects/mozilla: Use an hyphen in "plug-in". This closes #1474. (Patch by timeless...
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 23 Feb 2008 19:39:07 +0000 (19:39 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 23 Feb 2008 19:39:07 +0000 (19:39 +0000)
projects/mozilla/npvlc_rc.rc patch | blob | history
projects/mozilla/test.html patch | blob | history
projects/mozilla/vlc.r patch | blob | history
projects/mozilla/vlcplugin.h patch | blob | history

diff --git a/projects/mozilla/npvlc_rc.rc b/projects/mozilla/npvlc_rc.rc
index db1e42bbc80adb16edaed64cf5db7c5c59119200..e5e28c53276c179164016146b1ba0e319eea7187 100644 (file)
--- a/projects/mozilla/npvlc_rc.rc
+++ b/projects/mozilla/npvlc_rc.rc
@@ -31,7 +31,7 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "ProductName", "VLC Multimedia Plugin\0"
+            VALUE "ProductName", "VLC Multimedia Plug-in\0"
             VALUE "ProductVersion", STRINGIFY( VERSION )
             VALUE "OriginalFilename", "npvlc.dll\0"
             VALUE "FileVersion", STRINGIFY( VERSION )
@@ -41,7 +41,7 @@ BEGIN
             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 "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
     BLOCK "VarFileInfo"
diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 4f61cdc9c8c5aa638f15d788996816e9d818797c..66bc3e9598b9a2d7eefb09af8564751324ed434d 100644 (file)
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>VLC Mozilla plugin test page</TITLE>
+<TITLE>VLC Mozilla plug-in test page</TITLE>
 <BODY>
 <TABLE>
 <TR><TD colspan="2">
diff --git a/projects/mozilla/vlc.r b/projects/mozilla/vlc.r
index 0fc5c76310d6474130491d23a3a4fb0425cc174a..ccbb6c650b1b49919167883cbbab3272a71f5ed8 100644 (file)
--- a/projects/mozilla/vlc.r
+++ b/projects/mozilla/vlc.r
@@ -15,7 +15,7 @@ resource 'STR#' (126)
     {
         "Version 0.9.0, copyright 1996-2007 The VideoLAN Team"
         "<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)
         "Ogg stream",
         "Ogg stream",
         /* VLC */
-        "VLC plugin",
+        "VLC plug-in",
         /* Windows Media */
         "Windows Media video",
         "Windows Media video",
-        "Windows Media plugin",
+        "Windows Media plug-in",
         "Windows Media video",
         /* Google VLC */
-        "Google VLC plugin",
+        "Google VLC plug-in",
         /* WAV audio */
         "WAV audio",
         "WAV audio",
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 6d48bf3bb8f13f385427d8070312ad25e6b36c3a..413ea4079440f963c39b14785b265fb1a10e8b6c 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -129,7 +129,7 @@ private:
 /*******************************************************************************
  * Plugin properties.
  ******************************************************************************/
-#define PLUGIN_NAME         "VLC Multimedia Plugin"
+#define PLUGIN_NAME         "VLC Multimedia Plug-in"
 #define PLUGIN_DESCRIPTION \
     "Version %s, copyright 1996-2007 The VideoLAN Team" \
     "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
@@ -155,7 +155,7 @@ private:
     "application/x-ogg:ogg:Ogg stream;" \
     "application/ogg:ogg:Ogg stream;" \
     /* VLC */ \
-    "application/x-vlc-plugin:vlc:VLC plugin;" \
+    "application/x-vlc-plugin:vlc:VLC plug-in;" \
     /* Windows Media */ \
     "video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
     "video/x-ms-asf:asf,asx:Windows Media Video;" \
@@ -163,7 +163,7 @@ private:
     "video/x-ms-wmv:wmv:Windows Media;" \
     "video/x-ms-wvx:wvx:Windows Media Video;" \
     /* Google VLC */ \
-    "application/x-google-vlc-plugin::Google VLC plugin;" \
+    "application/x-google-vlc-plugin::Google VLC plug-in;" \
     /* WAV audio */ \
     "audio/wav:wav:WAV audio;" \
     "audio/x-wav:wav:WAV audio;" \
Unnamed repository; edit this file 'description' to name the repository.