* extras/MacOSX/Resources/English.lproj/MainMenu.nib/*: minor fixes & added the servi...

* extras/MacOSX/vlc.pbproj/*: Added "m4a" to the file-types and corrected some descriptions
* share/http/index.html: another minor layout fix
* src/libvlc.h: changed the default hotkey for "subtitle delay down" from command-h to command-j and for "subtitle delay up" from command-j to command-k due to a conflict with a default OSX-shortcut

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 2856308604c68f58fbd3f98023c5ce7c192c4a5b..4727507eb29e012e0b7197211b003fbfc63525e7 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,23 +3,27 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>492 225 505 517 0 0 1024 746 </string>
+       <string>219 45 505 517 0 0 800 578 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
                <string>542 480 104 149 0 0 1024 746 </string>
                <key>29</key>
-               <string>544 598 419 44 0 0 1024 746 </string>
+               <string>117 522 419 44 0 0 800 578 </string>
                <key>915</key>
                <string>54 452 118 149 0 0 1024 746 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>349.0</string>
+       <string>364.0</string>
        <key>IBLockedObjects</key>
-       <array/>
+       <array>
+               <integer>1789</integer>
+       </array>
        <key>IBOpenObjects</key>
        <array>
                <integer>21</integer>
+               <integer>29</integer>
+               <integer>1789</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7F44</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index c6c5be6b8dd00317b6831d5cb158e8c21af00869..dc25345b9c97132e3eb30ce7fa6781a4a6abc5ae 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 688b140f30021338b1b21a044e2ebe642de6fdef..4d614c21aa4a7f6aed3bafe337b5926fe9f95786 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -148,7 +148,7 @@
                        <key>CFBundleTypeIconFile</key>
                        <string>asx.icns</string>
                        <key>CFBundleTypeName</key>
-                       <string>ASX File</string>
+                       <string>ASX file</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -161,7 +161,7 @@
                        <key>CFBundleTypeIconFile</key>
                        <string>sub.icns</string>
                        <key>CFBundleTypeName</key>
-                       <string>Subtitle File</string>
+                       <string>Subtitle file</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -232,7 +232,7 @@
                                <string>bin</string>
                        </array>
                        <key>CFBundleTypeName</key>
-                       <string>Iso file</string>
+                       <string>ISO file</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -255,7 +255,7 @@
                                <string>aac</string>
                        </array>
                        <key>CFBundleTypeName</key>
-                       <string>Advanced Audio Coding</string>
+                       <string>AAC file</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -291,7 +291,7 @@
                        <key>CFBundleTypeIconFile</key>
                        <string>avi.icns</string>
                        <key>CFBundleTypeName</key>
-                       <string>Avi container</string>
+                       <string>AVI container</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -497,7 +497,7 @@
                                <string>mka</string>
                        </array>
                        <key>CFBundleTypeName</key>
-                       <string>Matroska Audio</string>
+                       <string>Matroska Audio File</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -507,7 +507,7 @@
                                <string>mkv</string>
                        </array>
                        <key>CFBundleTypeName</key>
-                       <string>Matroska Video</string>
+                       <string>Matroska Video File</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
@@ -521,6 +521,16 @@
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>m4a</string>
+                       </array>
+                       <key>CFBundleTypeName</key>
+                       <string>MPEG-4 Audio File</string>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+               </dict>
        </array>
        <key>CFBundleExecutable</key>
        <string>VLC</string>

diff --git a/share/http/index.html b/share/http/index.html
index 6dd838e7d53ccbe704559122a138c8c7c52f39b6..c4132843ec5a03478d68d08b98035bbaef7477e0 100644 (file)
--- a/share/http/index.html
+++ b/share/http/index.html
@@ -15,7 +15,7 @@
  </head>
  <body>
     <h2>
-     <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
+     <a href="http://www.videolan.org/">VLC media player <vlc id="value" param1="version" /></a> (http interface)</h2>
     <div class="sectitle">Control VLC</div>
     <div class="section">
      <table class="add">

diff --git a/src/libvlc.h b/src/libvlc.h
index 906084c70139a1cab5be13c97dbd4f3dc4a67c8c..c442f75df11634885651e55ca3de7b723fae38ae 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -999,9 +999,9 @@ vlc_module_begin();
     add_key( "key-vol-up", KEY_MODIFIER_COMMAND|KEY_UP, NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE );
     add_key( "key-vol-down", KEY_MODIFIER_COMMAND|KEY_DOWN, NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE );
     add_key( "key-vol-mute", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE );
-    add_key( "key-subdelay-up", KEY_MODIFIER_COMMAND|'j', NULL,
+    add_key( "key-subdelay-up", KEY_MODIFIER_COMMAND|'k', NULL,
              SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_FALSE );
-    add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'h', NULL,
+    add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'j', NULL,
              SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_FALSE );
     add_key( "key-set-bookmark1", KEY_MODIFIER_COMMAND|KEY_F1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
     add_key( "key-set-bookmark2", KEY_MODIFIER_COMMAND|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );