Skip to content

V
vlc-2-2
Commit 7190da5b authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

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

* extras/MacOSX/Resources/English.lproj/MainMenu.nib/*: minor fixes & added the services-menu again. It isn't yet translatable, since the string-freeze came first. I'll add that after the release.
* 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
parent 2da3b30b
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 14 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 7190da5b
...@@ -3,23 +3,27 @@ ...@@ -3,23 +3,27 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <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> <key>IBEditorPositions</key>
<dict> <dict>
<key>1617</key> <key>1617</key>
<string>542 480 104 149 0 0 1024 746 </string> <string>542 480 104 149 0 0 1024 746 </string>
<key>29</key> <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> <key>915</key>
<string>54 452 118 149 0 0 1024 746 </string> <string>54 452 118 149 0 0 1024 746 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>349.0</string> <string>364.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
<array/> <array>
<integer>1789</integer>
</array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>21</integer> <integer>21</integer>
<integer>29</integer>
<integer>1789</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>7F44</string> <string>7F44</string>
......
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 7190da5b
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>asx.icns</string> <string>asx.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>ASX File</string> <string>ASX file</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>sub.icns</string> <string>sub.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Subtitle File</string> <string>Subtitle file</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<string>bin</string> <string>bin</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Iso file</string> <string>ISO file</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<string>aac</string> <string>aac</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Advanced Audio Coding</string> <string>AAC file</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>avi.icns</string> <string>avi.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Avi container</string> <string>AVI container</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
<string>mka</string> <string>mka</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Matroska Audio</string> <string>Matroska Audio File</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<string>mkv</string> <string>mkv</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Matroska Video</string> <string>Matroska Video File</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -521,6 +521,16 @@ ...@@ -521,6 +521,16 @@
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </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> </array>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>VLC</string> <string>VLC</string>
......
share/http/index.html
View file @ 7190da5b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</head> </head>
<body> <body>
<h2> <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="sectitle">Control VLC</div>
<div class="section"> <div class="section">
<table class="add"> <table class="add">
......
src/libvlc.h
View file @ 7190da5b
...@@ -999,9 +999,9 @@ vlc_module_begin(); ...@@ -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-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-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-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 ); 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 ); 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-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 ); add_key( "key-set-bookmark2", KEY_MODIFIER_COMMAND|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
......
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