Index: branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm (revision 87) +++ branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm (revision 88) @@ -26,21 +26,21 @@ } MenuEntryPane; struct MenuEntry -{ +{ NSString* title; MenuEntryPane pane; } ; static const MenuEntry sMenuList[] = { - {@" Boot From ...", PaneBootFrom}, - {@" Boot Setup", PaneBootSetup}, - {@" Boot Flags", PaneBootFlags}, - {@" Peripherals", PanePeripherals}, - {@" Advanced", PaneAdvanced}, - {@" Efi Inject", PaneEfiInject}, - {@" SMBIOS", PaneSmbios}, - {@" About", PaneAbout} + {(NSLocalizedString(@"Boot_From", nil)), PaneBootFrom}, + {(NSLocalizedString(@"Boot_Setup", nil)), PaneBootSetup}, + {(NSLocalizedString(@"Boot_Flags", nil)), PaneBootFlags}, + {(NSLocalizedString(@"Peripherals", nil)), PanePeripherals}, + {(NSLocalizedString(@"Advanced", nil)), PaneAdvanced}, + {(NSLocalizedString(@"Efi_Inject", nil)), PaneEfiInject}, + {(NSLocalizedString(@"SMBIOS", nil)), PaneSmbios}, + {(NSLocalizedString(@"About", nil)), PaneAbout} }; const int iMenuListSize = sizeof(sMenuList)/ sizeof(MenuEntry); Index: branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 87) +++ branches/diebuche/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 88) @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 010CC625110927A2006EFFE9 /* QuestionMark.png in Resources */ = {isa = PBXBuildFile; fileRef = 010CC624110927A2006EFFE9 /* QuestionMark.png */; }; 01466A931104062500088464 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466A921104062500088464 /* Security.framework */; }; 01466C2A110408CC00088464 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466C29110408CC00088464 /* SecurityInterface.framework */; }; 01466C381104091400088464 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466C371104091400088464 /* SecurityFoundation.framework */; }; @@ -68,13 +67,13 @@ B3981F7D1113376C009E2520 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3981F7C1113376C009E2520 /* QuartzCore.framework */; }; B398220D111349F5009E2520 /* RoundedBox.h in Headers */ = {isa = PBXBuildFile; fileRef = B398220A111349F5009E2520 /* RoundedBox.h */; }; B39822E911134F8B009E2520 /* RoundedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = B398220B111349F5009E2520 /* RoundedBox.m */; }; + B3E370081115D2B000BBF949 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B3E370061115D2B000BBF949 /* Localizable.strings */; }; B3F8855D11146A460022CA5D /* TableViewsController.h in Headers */ = {isa = PBXBuildFile; fileRef = B3F8855B11146A460022CA5D /* TableViewsController.h */; }; B3F8855E11146A460022CA5D /* TableViewsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3F8855C11146A460022CA5D /* TableViewsController.mm */; }; B3F8879611148E790022CA5D /* footer.png in Resources */ = {isa = PBXBuildFile; fileRef = B3F8879511148E790022CA5D /* footer.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 010CC624110927A2006EFFE9 /* QuestionMark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = QuestionMark.png; path = Resources/QuestionMark.png; sourceTree = SOURCE_ROOT; }; 011B2DE81113937D008A540F /* Chameleon.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Chameleon.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; 01466A921104062500088464 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 01466C29110408CC00088464 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; }; @@ -137,6 +136,7 @@ B3981F7C1113376C009E2520 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = ""; }; B398220A111349F5009E2520 /* RoundedBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RoundedBox.h; path = Sources/RoundedBox.h; sourceTree = ""; }; B398220B111349F5009E2520 /* RoundedBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RoundedBox.m; path = Sources/RoundedBox.m; sourceTree = ""; }; + B3E370071115D2B000BBF949 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; B3F8855B11146A460022CA5D /* TableViewsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewsController.h; path = Sources/TableViewsController.h; sourceTree = ""; }; B3F8855C11146A460022CA5D /* TableViewsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TableViewsController.mm; path = Sources/TableViewsController.mm; sourceTree = ""; }; B3F8879511148E790022CA5D /* footer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = footer.png; path = Resources/footer.png; sourceTree = ""; }; @@ -242,11 +242,11 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + B3E370061115D2B000BBF949 /* Localizable.strings */, 01A25D68111109FF0024EA7E /* cdBootCreator.sh */, 01A25D69111109FF0024EA7E /* getDevProp.sh */, 01A25D6A111109FF0024EA7E /* gfxutil */, 01B0E8261108B89100ACF21B /* CREDITS */, - 010CC624110927A2006EFFE9 /* QuestionMark.png */, 01B0E81A1108B87A00ACF21B /* CDROM.png */, 01B0E81B1108B87A00ACF21B /* Chameleon.icns */, 01B0E81C1108B87A00ACF21B /* Chameleon.tiff */, @@ -413,7 +413,6 @@ 01B0E8271108B89100ACF21B /* CREDITS in Resources */, 01B0E8291108B89D00ACF21B /* version in Resources */, 01E0E9511108F9ED004EF6E8 /* TODO in Resources */, - 010CC625110927A2006EFFE9 /* QuestionMark.png in Resources */, 01A25D6B111109FF0024EA7E /* cdBootCreator.sh in Resources */, 01A25D6C111109FF0024EA7E /* getDevProp.sh in Resources */, 01A25D6D111109FF0024EA7E /* gfxutil in Resources */, @@ -421,6 +420,7 @@ B3981E4411132AEC009E2520 /* background.png in Resources */, B3981F48111332FB009E2520 /* name.png in Resources */, B3F8879611148E790022CA5D /* footer.png in Resources */, + B3E370081115D2B000BBF949 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -472,6 +472,14 @@ name = InfoPlist.strings; sourceTree = ""; }; + B3E370061115D2B000BBF949 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + B3E370071115D2B000BBF949 /* English */, + ); + name = Localizable.strings; + sourceTree = ""; + }; F506C042013D9D8C01CA16C8 /* Chameleon.xib */ = { isa = PBXVariantGroup; children = ( Index: branches/diebuche/ChameleonPrefPane/Resources/QuestionMark.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/diebuche/ChameleonPrefPane/English.lproj/Localizable.strings =================================================================== --- branches/diebuche/ChameleonPrefPane/English.lproj/Localizable.strings (revision 0) +++ branches/diebuche/ChameleonPrefPane/English.lproj/Localizable.strings (revision 88) @@ -0,0 +1,24 @@ +/* comment */ +" About" = "About"; + +/* comment */ +" Advanced" = "Advanced"; + +/* comment */ +" Boot_Flags" = "Boot Flags"; + +/* comment */ +" Boot_From ..." = "Boot From ..."; + +/* comment */ +" Boot_Setup" = "Boot Setup"; + +/* comment */ +" Efi_Inject" = " EFI Inject"; + +/* comment */ +" Peripherals" = " Peripherals"; + +/* comment */ +" SMBIOS" = " SMBIOS"; + Index: branches/diebuche/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- branches/diebuche/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 87) +++ branches/diebuche/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 88) @@ -12,7 +12,7 @@ YES - + YES @@ -306,23 +306,23 @@ MC42OTcwODAyOTIAA - + 268 - {{108, 8}, {80, 25}} + {{363, 8}, {158, 25}} 2 YES - + 67239424 134217728 - Shutdown + Restart LucidaGrande 13 1044 - + -2038284033 163 @@ -331,19 +331,19 @@ 25 - + 268 - {{363, 8}, {158, 25}} + {{112, 8}, {90, 25}} 2 YES - + 67239424 134217728 - Restart + Shutdown - + -2038284033 163 @@ -355,7 +355,7 @@ 268 - {{20, 8}, {80, 25}} + {{16, 8}, {90, 25}} 2 YES @@ -981,7 +981,7 @@ 12 - {{16, 80}, {125, 23}} + {{16, 80}, {152, 23}} 2 YES @@ -1032,7 +1032,7 @@ 12 - {{16, 47}, {125, 23}} + {{16, 47}, {152, 23}} 2 YES @@ -1073,7 +1073,7 @@ 12 - {{16, 17}, {136, 23}} + {{16, 17}, {152, 23}} 2 YES @@ -1152,7 +1152,7 @@ 268 - {{16, 94}, {128, 18}} + {{16, 94}, {267, 18}} 2 YES @@ -1175,7 +1175,7 @@ 268 - {{305, 94}, {124, 18}} + {{305, 94}, {188, 18}} 2 YES @@ -1198,7 +1198,7 @@ 268 - {{16, 63}, {161, 18}} + {{16, 63}, {285, 18}} 2 YES @@ -1221,7 +1221,7 @@ 268 - {{16, 30}, {128, 18}} + {{16, 30}, {158, 18}} 2 YES @@ -1407,7 +1407,7 @@ 12 - {{16, 101}, {116, 23}} + {{16, 102}, {116, 23}} 2 YES @@ -1430,7 +1430,7 @@ 12 - {{329, 102}, {170, 23}} + {{329, 102}, {175, 23}} 2 YES @@ -1453,7 +1453,7 @@ 12 - {{329, 70}, {133, 23}} + {{329, 71}, {175, 23}} 2 YES @@ -1476,7 +1476,7 @@ 12 - {{16, 72}, {92, 23}} + {{16, 71}, {144, 23}} 2 YES @@ -1499,7 +1499,7 @@ 12 - {{16, 41}, {100, 23}} + {{16, 42}, {144, 23}} 2 YES @@ -1522,7 +1522,7 @@ 12 - {{164, 43}, {125, 23}} + {{164, 42}, {161, 23}} 2 YES @@ -1545,7 +1545,7 @@ 12 - {{329, 41}, {59, 23}} + {{329, 42}, {170, 23}} 2 YES @@ -1568,7 +1568,7 @@ 268 - {{164, 106}, {109, 18}} + {{164, 107}, {161, 18}} 2 YES @@ -1591,7 +1591,7 @@ 12 - {{329, 12}, {72, 23}} + {{329, 12}, {164, 23}} 2 YES @@ -1703,7 +1703,7 @@ 12 - {{16, 12}, {116, 23}} + {{16, 12}, {144, 23}} 2 YES @@ -1726,7 +1726,7 @@ 268 - {{166, 10}, {134, 26}} + {{166, 9}, {134, 26}} 2 YES @@ -1847,7 +1847,7 @@ 12 - {{16, 12}, {94, 23}} + {{16, 13}, {144, 23}} 2 YES @@ -1870,7 +1870,7 @@ 12 - {{303, 12}, {133, 23}} + {{329, 13}, {174, 23}} 2 YES @@ -1893,7 +1893,7 @@ 12 - {{155, 12}, {125, 23}} + {{164, 13}, {161, 23}} 2 YES @@ -1951,7 +1951,7 @@ Item 4 - + 256 YES @@ -2007,7 +2007,7 @@ 12 - {{147, 17}, {100, 23}} + {{155, 17}, {208, 23}} 2 YES @@ -2030,7 +2030,7 @@ 12 - {{16, 86}, {116, 23}} + {{16, 86}, {135, 23}} 2 YES @@ -2053,7 +2053,7 @@ 268 - {{365, 86}, {134, 23}} + {{361, 86}, {134, 23}} 2 YES @@ -2076,7 +2076,7 @@ 268 - {{365, 51}, {59, 23}} + {{361, 51}, {134, 23}} 2 YES @@ -2099,7 +2099,7 @@ 12 - {{16, 17}, {109, 23}} + {{16, 17}, {141, 23}} 2 YES @@ -2122,7 +2122,7 @@ 268 - {{149, 84}, {181, 26}} + {{157, 83}, {181, 26}} 2 YES @@ -2210,7 +2210,7 @@ 268 - {{16, 53}, {109, 18}} + {{16, 53}, {141, 18}} 2 YES @@ -2233,7 +2233,7 @@ 268 - {{147, 53}, {131, 18}} + {{155, 53}, {202, 18}} 2 YES @@ -2293,7 +2293,7 @@ 268 - {{364, 12}, {101, 23}} + {{361, 12}, {143, 23}} 2 YES @@ -2316,7 +2316,7 @@ 268 - {{16, 13}, {104, 23}} + {{16, 12}, {173, 23}} 2 YES @@ -2339,7 +2339,7 @@ 268 - {{192, 12}, {103, 23}} + {{193, 12}, {169, 23}} 2 YES @@ -2442,28 +2442,10 @@ 25 - - - 12 - {{268, 14}, {25, 22}} - - 2 - YES - - -1536033215 - 272630784 - - - - YES - - - - 268 - {{365, 12}, {93, 23}} + {{361, 12}, {138, 23}} 2 YES @@ -2483,6 +2465,87 @@ 25 + + + 268 + {{269, 9}, {51, 26}} + + 2 + YES + + 343539264 + 272630784 + + + + YES + + + 5 + YES + + YES + 0 + 1 + + + + + 274 + {13, 21} + + + YES + + YES + + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + + + {{1, 1}, {509, 43}} @@ -2512,7 +2575,6 @@ {541, 408} - 2 Peripherals @@ -2539,7 +2601,7 @@ 2 - {{-32, -139}, {605, 568}} + {{-32, -80}, {605, 568}} 2 {0, 0} @@ -2709,7 +2771,7 @@ 268 - {{277, 159}, {63, 23}} + {{277, 159}, {81, 23}} 2 YES @@ -2778,7 +2840,7 @@ 268 - {{277, 125}, {34, 23}} + {{277, 125}, {75, 23}} 2 YES @@ -2820,7 +2882,7 @@ 268 - {{16, 128}, {52, 18}} + {{16, 128}, {80, 18}} 2 YES @@ -2843,7 +2905,7 @@ 268 - {{16, 91}, {74, 23}} + {{16, 91}, {90, 23}} 2 YES @@ -2866,7 +2928,7 @@ 268 - {{16, 56}, {79, 18}} + {{16, 56}, {90, 18}} 2 YES @@ -2889,7 +2951,7 @@ 268 - {{16, 161}, {63, 23}} + {{16, 161}, {90, 23}} 2 YES @@ -2912,7 +2974,7 @@ 268 - {{277, 21}, {157, 18}} + {{277, 21}, {226, 18}} 2 YES @@ -2958,7 +3020,7 @@ 268 - {{16, 21}, {90, 18}} + {{16, 21}, {183, 18}} 2 YES @@ -3429,7 +3491,7 @@ 268 - {{159, 49}, {100, 23}} + {{161, 47}, {205, 23}} 2 YES @@ -3452,7 +3514,7 @@ 268 - {{16, 18}, {98, 23}} + {{16, 19}, {146, 23}} 2 YES @@ -3475,7 +3537,7 @@ 268 - {{161, 20}, {201, 22}} + {{163, 18}, {201, 22}} 2 YES @@ -3493,7 +3555,7 @@ 268 - {{16, 52}, {63, 18}} + {{16, 52}, {146, 18}} 2 YES @@ -3607,7 +3669,7 @@ 268 - {{16, 311}, {132, 18}} + {{16, 311}, {244, 18}} 2 YES @@ -3630,7 +3692,7 @@ 268 - {{341, 309}, {156, 25}} + {{327, 309}, {170, 25}} 2 YES @@ -3814,7 +3876,7 @@ 268 - {{16, 53}, {81, 23}} + {{16, 54}, {105, 23}} 2 YES @@ -3837,7 +3899,7 @@ 268 - {{345, 53}, {126, 22}} + {{345, 55}, {148, 22}} 2 YES @@ -3860,7 +3922,7 @@ 268 - {{121, 55}, {197, 22}} + {{121, 53}, {197, 22}} 2 YES @@ -3896,7 +3958,7 @@ 268 - {{345, 13}, {80, 23}} + {{345, 15}, {161, 23}} 2 YES @@ -3919,7 +3981,7 @@ 268 - {{16, 15}, {92, 23}} + {{16, 15}, {105, 23}} 2 YES @@ -3969,7 +4031,7 @@ 268 - {{373, 13}, {155, 25}} + {{360, 13}, {168, 25}} 2 YES @@ -4015,7 +4077,7 @@ Item 7 - + 256 YES @@ -4061,7 +4123,7 @@ 268 - {{18, 14}, {513, 261}} + {{18, 3}, {513, 261}} 2 YES @@ -4121,7 +4183,7 @@ NeXT TIFF v4.0 pasteboard type - {{222, 244}, {100, 100}} + {{223, 243}, {100, 100}} 2 YES @@ -4174,6 +4236,7 @@ {541, 408} + 2 About @@ -4181,7 +4244,7 @@ - + LucidaGrande 9 @@ -4192,7 +4255,7 @@ YES YES - + @@ -4231,7 +4294,7 @@ 268 - {{1, 1}, {660, 30}} + {{8, 0}, {660, 30}} YES 2 @@ -5042,14 +5105,6 @@ 770 - - onTextFiedChange: - - - - 773 - - mPciRoot @@ -5058,14 +5113,6 @@ 774 - - mPciRootText - - - - 775 - - onCheckButtonChange: @@ -5713,6 +5760,22 @@ 1191 + + + mPciRootText + + + + 1202 + + + + onTextFiedChange: + + + + 1203 + @@ -5923,16 +5986,19 @@ YES - + 1010 + + YES + @@ -5950,20 +6016,6 @@ - 110 - - - YES - - - - - - 111 - - - - 189 @@ -6168,7 +6220,7 @@ - + @@ -6215,31 +6267,17 @@ - 771 - - - YES - - - - - - 772 - - - - 456 YES - + - + @@ -6342,25 +6380,20 @@ YES - + - 1005 - - - - 560 YES + - @@ -6428,7 +6461,6 @@ YES - @@ -6446,6 +6478,7 @@ + @@ -6826,11 +6859,11 @@ YES - + @@ -6921,6 +6954,9 @@ 1003 + + YES + @@ -6938,20 +6974,6 @@ - 832 - - - YES - - - - - - 833 - - - - 905 @@ -7064,9 +7086,9 @@ YES + + - - @@ -7119,16 +7141,16 @@ YES - - + + + + - - @@ -7336,9 +7358,9 @@ - + @@ -7580,6 +7602,53 @@ + + 1005 + + + + + 832 + + + YES + + + + + + 833 + + + + + 1200 + + + YES + + + + + + 1201 + + + + + 110 + + + YES + + + + + + 111 + + + @@ -7668,6 +7737,8 @@ 12.ImportedFromIB2 12.windowTemplate.hasMinSize 12.windowTemplate.minSize + 1200.IBPluginDependency + 1201.IBPluginDependency 128.IBPluginDependency 129.IBPluginDependency 136.IBPluginDependency @@ -7843,9 +7914,6 @@ 768.IBAttributePlaceholdersKey 768.IBPluginDependency 769.IBPluginDependency - 771.IBAttributePlaceholdersKey - 771.IBPluginDependency - 772.IBPluginDependency 776.IBAttributePlaceholdersKey 776.IBPluginDependency 777.IBPluginDependency @@ -8125,10 +8193,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{112, 219}, {668, 439}} + {{137, 208}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin - {{112, 219}, {668, 439}} + {{137, 208}, {668, 439}} {224.664, 10} @@ -8137,6 +8205,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin InitialTabViewItem @@ -8270,11 +8340,6 @@ YES - 239 - 0 - - - 99 1 @@ -8642,15 +8707,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - YES - - - YES - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - ToolTip ToolTip @@ -8787,7 +8843,7 @@ - 1199 + 1203