Index: branches/blackosx/package/OptionalSettings/General.txt =================================================================== --- branches/blackosx/package/OptionalSettings/General.txt (revision 1592) +++ branches/blackosx/package/OptionalSettings/General.txt (revision 1593) @@ -31,6 +31,7 @@ ForceHPET:ForceHPET=Yes ForceWake:ForceWake=Yes RestartFix:RestartFix=No +SMBIOSdefault:SMBIOSdefault=Yes UHCIreset:UHCIreset=Yes UseMemDetect:UseMemDetect=No UseKernelCache:UseKernelCache=Yes Index: branches/blackosx/package/OptionalSettings/KernelFlags.txt =================================================================== --- branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 1592) +++ branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 1593) @@ -29,3 +29,4 @@ Singleusermode:KFflag=-s Ignorecaches:KFflag=-f Npci:KFflag=npci=0x2000 +Darkwake:KFflag=darkwake=0 Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1592) +++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1593) @@ -1,4 +1,16 @@ -ÿþ// General +ÿþ// ============================================================================ +// Error strings +// ---------------------------------------------------------------------------- +"ERROR_BOOTVOL" = "This software must be installed on the startup volume."; +"ERROR_INSTALL" = "This volume does not meet the requirements for this update."; + +"Newer_Package_Installed_message" = "A newer version of Chameleon is already installed"; +"Intel_Mac_message" = "This software cannot be installed on this computer."; + + +// ============================================================================ +// Bootloader +// ---------------------------------------------------------------------------- "Chameleon_title" = "Bootloader"; "Chameleon_description" = "Chameleon requires three essential files. (in simple terms) boot0 (On the drive's MBR) responsible for loading boot1. @@ -14,8 +26,10 @@ "noboot_title" = "Don't install the Bootloader"; "noboot_description" = "Useful if you only want to install the extra's."; + +// ============================================================================ // Modules - +// ---------------------------------------------------------------------------- "Module_title" = "Modules"; "Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file. "; @@ -57,7 +71,10 @@ "Keylayout_description" = "This module permits the user to define the keyboard key mappings."; +// ============================================================================ // Utility +// These are currently unused!!! +// ---------------------------------------------------------------------------- "Utility_title" = "Utilities"; "Utility_description" = "Optional files to help setup"; @@ -70,15 +87,15 @@ "Documentation_title" = "Documentation"; "Documentation_description" = "Documentation for Chameleon manual install and use"; -// Boot Options + +// ============================================================================ +// Boot Options - The follow options are split to match the layout OptionalSettings text files. +// but they can be changed to suit however anyone wants to do it. +// ---------------------------------------------------------------------------- + "Options_title" = "Settings"; "Options_description" = "Create an /Extra/org.chameleon.Boot.plist by selecting any of these boot options and kernel flags."; - -// Control -"Control_title" = "Control Options"; -"Control_description" = "Settings to control how Chameleon works."; - "BootBanner_title" = "BootBanner=No"; "BootBanner_description" = "Hides Chameleon's boot banner in GUI. This is the text that is drawn at the top left corner of the screen displaying the release version etc."; @@ -100,12 +117,8 @@ "Wait_title" = "Wait=Yes"; "Wait_description" = "Pauses the boot process after Chameleon has finished it's setup then waits for a key press before it starts the mach kernel. Useful when combined with verbose boot for troubleshooting."; +// ---------------------------------------------------------------------------- - -// General -"General_title" = "General Options"; -"General_description" = "Choose from a selection of base options."; - "arch_title" = "arch=i386"; "arch_description" = "Boots the kernel in 32bit mode rather than the default 64bit mode."; @@ -124,6 +137,9 @@ "RestartFix_title" = "RestartFix=No"; "RestartFix_description" = "Disables the automatically enabled restart fix."; +"SMBios_title" = "SMBIOS Override"; +"SMBios_description" = "Install default SMBIOS overrides smbios.plist into Extra"; + "UHCIreset_title" = "UHCIreset=Yes"; "UHCIreset_description" = "Enables the option to reset UHCI controllers before starting OS X."; @@ -136,28 +152,8 @@ "Wake_title" = "Wake=Yes"; "Wake_description" = "Attempts to load the sleep image saved from last hibernation."; +// ---------------------------------------------------------------------------- -// KernelFlags -"KernelFlags_title" = "Kernel Flags"; -"KernelFlags_description" = "Choose from a selection of kernel flags."; - -"Npci_title" = "npci=0x2000"; -"Npci_description" = "For overcoming a hang at 'PCI configuration begin' on some systems. 0x2000 is the kIOPCIConfiguratorPFM64 flag, as seen in the IOPCIFamily source code."; - -"Verbose_title" = "Verbose Mode"; -"Verbose_description" = "Turns on verbose logging and allows you to see messages from both Chameleon and the OS X kernel at boot time. Essential for troubleshooting."; - -"Singleusermode_title" = "Single User Mode"; -"Singleusermode_description" = "A troubleshooting option used for booting into OS X's BSD/Unix command line."; - -"Ignorecaches_title" = "Ignore Caches"; -"Ignorecaches_description" = "Not an option that's needed for everyday booting, but it can be useful if you want OS X to load all files from it's system folders, rather than relying on it's pre-built caches."; - - -// PowerManagement -"PowerManagement_title" = "Power Management"; -"PowerManagement_description" = "A selection of options that deal with power management and speedstep."; - "CSTUsingSystemIO_title" = "Generate C-States=Yes"; "CSTUsingSystemIO_description" = "New C-State _CST generation method using SystemIO registers instead of FixedHW."; @@ -179,11 +175,8 @@ "GeneratePStates_title" = "Generate P-States=Yes"; "GeneratePStates_description" = "Enable auto generation of processor power performance states (P-States)."; +// ---------------------------------------------------------------------------- -// Resolution -"Resolution_title" = "Resolution"; -"Resolution_description" = "Set one resolution to use, or select 'None' if you don't want to select a resolution."; - "1024x600x32_title" = "1024x600x32"; "1024x600x32_description" = "Set Graphics Mode to 1024x600x32"; @@ -217,11 +210,8 @@ "1920x1200x32_title" = "1920x1200x32"; "1920x1200x32_description" = "Set Graphics Mode to 1920x1200x32"; +// ---------------------------------------------------------------------------- -// Video -"Video_title" = "Video"; -"Video_description" = "A selection of options that deal with video."; - "GraphicsEnabler_title" = "GraphicsEnabler=Yes"; "GraphicsEnabler_description" = "Enables the option to autodetect NVIDIA based GPUs and inject the correct info."; @@ -234,11 +224,30 @@ "VBIOS_title" = "VBIOS=Yes"; "VBIOS_description" = "Enables VBIOS option"; +// ---------------------------------------------------------------------------- +// Boot options - KERNEL FLAGS +// ---------------------------------------------------------------------------- -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Set one keylayout to use, or select 'None' if you don't want to select a keylayout."; +"Verbose_title" = "Verbose Mode"; +"Verbose_description" = "Turns on verbose logging and allows you to see messages from both Chameleon and the OS X kernel at boot time. Essential for troubleshooting."; +"Singleusermode_title" = "Single User Mode"; +"Singleusermode_description" = "A troubleshooting option used for booting into OS X's BSD/Unix command line."; + +"Ignorecaches_title" = "Ignore Caches"; +"Ignorecaches_description" = "Not an option that's needed for everyday booting, but it can be useful if you want OS X to load all files from it's system folders, rather than relying on it's pre-built caches."; + +"Npci_title" = "npci=0x2000"; +"Npci_description" = "For overcoming a hang at 'PCI configuration begin' on some systems. 0x2000 is the kIOPCIConfiguratorPFM64 flag, as seen in the IOPCIFamily source code."; + +"Darkwake_title" = "darkwake=0"; +"Darkwake_description" = "Lion only. Disables the 'low power wake' feature which can sometimes leave the screen black after wake from sleep."; + + +// ---------------------------------------------------------------------------- +// Boot options - KEYLAYOUTS +// ---------------------------------------------------------------------------- + "mac-de_title" = "German Mac Keyboard"; "mac-de_description" = "Use the keyboard layout for a German Mac keyboard"; @@ -258,10 +267,9 @@ "pc-fr_description" = "Use the keyboard layout for a French PC keyboard"; -// Themes -"Themes_title" = "Themes"; -"Themes_description" = "A collection of sample themes -More themes can be found at http://forum.voodooprojects.org/index.php/board,7.0.html"; +// ---------------------------------------------------------------------------- +// Boot options - THEMES +// ---------------------------------------------------------------------------- "Embed_title" = "Embed"; "Embed_description" = "A smaller simple version of the new default theme used when building a version of Chameleon which requires an embedded theme."; @@ -275,28 +283,54 @@ "Bullet_title" = "Bullet"; "Bullet_description" = "A lovely simple theme by NoSmokingBandit from April 2009."; -// Extras -"Extras_title" = "Extras"; -"Extras_description" = "A collection of useful addons"; -"SMBios_title" = "SMBIOS Override"; -"SMBios_description" = "Install default SMBIOS overrides smbios.plist into Extra"; +// ============================================================================ +// The filenames from OptionalSettings text files' become sub menu headings. +// These sub menu headings need titles and descriptions. +// ---------------------------------------------------------------------------- +// Control -// Error strings -"ERROR_BOOTVOL" = "This software must be installed on the startup volume."; -"ERROR_INSTALL" = "This volume does not meet the requirements for this update."; +"Control_title" = "Control Options"; +"Control_description" = "Settings to control how Chameleon works."; -"Newer_Package_Installed_message" = "A newer version of Chameleon is already installed"; -"Intel_Mac_message" = "This software cannot be installed on this computer."; +// General +"General_title" = "General Options"; +"General_description" = "Choose from a selection of base options."; -// Exclusive boot ptions string +// KernelFlags +"KernelFlags_title" = "Kernel Flags"; +"KernelFlags_description" = "Choose from a selection of kernel flags."; + +// PowerManagement +"PowerManagement_title" = "Power Management"; +"PowerManagement_description" = "A selection of options that deal with power management and speedstep."; + +// Resolution +"Resolution_title" = "Resolution"; +"Resolution_description" = "Set one resolution to use, or select 'None' if you don't want to select a resolution."; + +// Video +"Video_title" = "Video"; +"Video_description" = "A selection of options that deal with video."; + +// KeyLayout +"KeyLayout_title" = "KeyLayout"; +"KeyLayout_description" = "Set one keylayout to use, or select 'None' if you don't want to select a keylayout."; + +// Themes +"Themes_title" = "Themes"; +"Themes_description" = "A collection of sample themes +More themes can be found at http://forum.voodooprojects.org/index.php/board,7.0.html"; + + +// ============================================================================ +// Exclusive boot options string - These are added automatically by buildpkg // Name to be used should be ChooseNone-xxxxxx // Where xxxxx = the name of the BootOptions file (minus the .txt) +// ---------------------------------------------------------------------------- "ChooseNone-Resolution_title" = "None"; "ChooseNone-Resolution_description" = "Don't choose a resolution."; "ChooseNone-keylayout_title" = "None"; "ChooseNone-keylayout_description" = "Don't choose a keylayout."; - - \ No newline at end of file