macosx: same as previous commit plus revert of [24799] for prefs.m (unintended commit)

extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

@@ -473,8 +473,6 @@
                 "o_audio_vol_txt" = id; 
                 "o_intf_art_pop" = id; 
                 "o_intf_art_txt" = id; 
-                "o_intf_black_ckb" = id; 
-                "o_intf_embvout_ckb" = id; 
                 "o_intf_fspanel_ckb" = id; 
                 "o_intf_lang_pop" = id; 
                 "o_intf_lang_txt" = id; 

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>398 124 505 518 0 0 1280 778 </string>
+	<string>-145 -8 505 518 0 0 1280 778 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>2311</key>
-		<string>310 385 660 305 0 0 1280 778 </string>
+		<string>345 417 590 241 0 0 1280 778 </string>
 		<key>2330</key>
-		<string>190 210 660 502 0 0 1280 778 </string>
+		<string>345 266 590 502 0 0 1280 778 </string>
+		<key>2440</key>
+		<string>179 151 586 376 0 0 1280 778 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -32,8 +34,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2265</integer>
 		<integer>2330</integer>
+		<integer>2265</integer>
+		<integer>2311</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8S2167</string>

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -169,7 +169,7 @@
 			productName = vlc;
 			productReference = 014CEA410018CDE011CA2923 /* VLC.bundle */;
 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
 <plist version=\"1.0\">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -1523,7 +1523,6 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
-			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* vlc */;
 			projectDirPath = "";