Index: branches/blackosx/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1806) +++ branches/blackosx/Chameleon.xcodeproj/project.pbxproj (revision 1807) @@ -15,8 +15,9 @@ 0172D0DC11FB66820030222E /* dram_controllers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dram_controllers.h; sourceTree = ""; }; 0172D0DD11FB66820030222E /* dram_controllers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dram_controllers.c; sourceTree = ""; }; 019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MEMTEST86_LICENSE; sourceTree = ""; }; - 1D145307137073F40050C0CD /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; sourceTree = ""; }; 1D2A1AF513743A2600787720 /* bootargs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootargs.h; sourceTree = ""; }; + 361BC70214BD977700236488 /* Changes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Changes.txt; sourceTree = ""; }; + 361BC70B14BD97C800236488 /* pkg.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = pkg.zip; path = Icons/pkg.zip; sourceTree = ""; }; 369689D014BD0AF10013D77F /* BLOCKERS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BLOCKERS; sourceTree = ""; }; 369689D114BD0AF10013D77F /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; 369689D214BD0B470013D77F /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; @@ -722,19 +723,6 @@ 6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = ""; }; 6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = ""; }; 6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = ""; }; - A34125FD14BA3ED3002C359C /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; - A34125FE14BA3EE8002C359C /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Conclusion.rtfd; sourceTree = ""; }; - A34125FF14BA3F3D002C359C /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260014BA3F3D002C359C /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260114BA3F3D002C359C /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260214BA3F3D002C359C /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260314BA3F3D002C359C /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260414BA3F3D002C359C /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260514BA3F3D002C359C /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260614BA3F3D002C359C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260714BA3F3D002C359C /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260814BA3F3D002C359C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Conclusion.rtfd; sourceTree = ""; }; - A341260914BA3F3D002C359C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Conclusion.rtfd; sourceTree = ""; }; A354B6271495124F00D81AA5 /* ESPpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ESPpostinstall; sourceTree = ""; }; A354B62A1495124F00D81AA5 /* Standardpostinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Standardpostinstall; sourceTree = ""; }; A354B62C149514DE00D81AA5 /* CheckDiskMicrocode.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = CheckDiskMicrocode.sh; sourceTree = ""; }; @@ -997,15 +985,15 @@ A360AA7D14136C1A00084D3F /* Make.rules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Make.rules; sourceTree = ""; }; A37D7D4A141B7C6F0069C38B /* background.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = background.tiff; sourceTree = ""; }; A37D7D4C141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = de; path = de.lproj/Conclusion.rtfd; sourceTree = ""; }; - A37D7D4E141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = de; path = de.lproj/Description.html; sourceTree = ""; }; - A37D7D50141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/License.rtf; sourceTree = ""; }; + A37D7D4E141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = en; path = en.lproj/Description.html; sourceTree = ""; }; + A37D7D50141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/License.rtf; sourceTree = ""; }; A37D7D52141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; - A37D7D54141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = de; path = de.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D54141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = en; path = en.lproj/Welcome.rtfd; sourceTree = ""; }; A37D7D55141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = en; path = en.lproj/Conclusion.rtfd; sourceTree = ""; }; - A37D7D56141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = en; path = en.lproj/Description.html; sourceTree = ""; }; - A37D7D57141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/License.rtf; sourceTree = ""; }; + A37D7D56141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = de; path = de.lproj/Description.html; sourceTree = ""; }; + A37D7D57141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/License.rtf; sourceTree = ""; }; A37D7D58141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - A37D7D59141B7C6F0069C38B /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = en; path = en.lproj/Welcome.rtfd; sourceTree = ""; }; + A37D7D59141B7C6F0069C38B /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = de; path = de.lproj/Welcome.rtfd; sourceTree = ""; }; A37D7D5A141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = es; path = es.lproj/Conclusion.rtfd; sourceTree = ""; }; A37D7D5B141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = es; path = es.lproj/Description.html; sourceTree = ""; }; A37D7D5C141B7C6F0069C38B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = es; path = es.lproj/License.rtf; sourceTree = ""; }; @@ -1016,11 +1004,6 @@ A37D7D61141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/License.rtf; sourceTree = ""; }; A37D7D62141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D63141B7C6F0069C38B /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = fr; path = fr.lproj/Welcome.rtfd; sourceTree = ""; }; - A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; - A37D7D65141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = hr; path = "hr.lproj/Description.html"; sourceTree = ""; }; - A37D7D66141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = hr; path = "hr.lproj/License.rtf"; sourceTree = ""; }; - A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr"; path = "hr-HR.lproj/Localizable.strings"; sourceTree = ""; }; - A37D7D67141B7C6F0069C38B /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; A37D7D69141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = id; path = id.lproj/Conclusion.rtfd; sourceTree = ""; }; A37D7D6A141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = id; path = id.lproj/Description.html; sourceTree = ""; }; A37D7D6B141B7C6F0069C38B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = id; path = id.lproj/License.rtf; sourceTree = ""; }; @@ -1051,25 +1034,10 @@ A37D7D84141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = sr; path = sr.lproj/License.rtf; sourceTree = ""; }; A37D7D85141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Localizable.strings; sourceTree = ""; }; A37D7D86141B7C6F0069C38B /* sr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = sr; path = sr.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA414BCB71F0059212A /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA514BCB71F0059212A /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA614BCB71F0059212A /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA714BCB73D0059212A /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA814BCB73D0059212A /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAA914BCB73D0059212A /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAA14BCB7BE0059212A /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAB14BCB7BE0059212A /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAC14BCB7BE0059212A /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAD14BCB7E10059212A /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAE14BCB7E10059212A /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAAF14BCB7E10059212A /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Welcome.rtfd; sourceTree = ""; }; - A3AECAB014BCB7E10059212A /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Welcome.rtfd; sourceTree = ""; }; A3F1F267141B9B3B00DDA709 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; B0056CE911F3868000754B65 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - B0056CEB11F3868000754B65 /* boot1.asm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm.asm; path = boot1.asm; sourceTree = ""; }; - B0056CEC11F3868000754B65 /* boot1.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot1.s; sourceTree = ""; }; B0056CED11F3868000754B65 /* boot1f32-install.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "boot1f32-install.sh"; sourceTree = ""; }; B0056CEE11F3868000754B65 /* boot1f32.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot1f32.s; sourceTree = ""; }; B0056CEF11F3868000754B65 /* boot1he.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot1he.s; sourceTree = ""; }; @@ -1266,6 +1234,114 @@ B00F494A11F6089500B1D7C5 /* aml_generator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aml_generator.c; sourceTree = ""; }; B0146EFF11FDEF550010765C /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; B0146F0011FDEFB90010765C /* GPL_V2_LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GPL_V2_LICENSE; sourceTree = ""; }; + B41899FB14BFBE2400ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B41899FD14BFBE4500ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B41899FE14BFBE5200ED5B0B /* boot0md.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0md.s; sourceTree = ""; }; + B41899FF14BFBE5D00ED5B0B /* boot0hfs.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0hfs.s; sourceTree = ""; }; + B4189A0014BFBE7D00ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B4189A0114BFBE8900ED5B0B /* boot1h.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot1h.s; sourceTree = ""; }; + B4189A0214BFBE9E00ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B4189A0514BFBF0A00ED5B0B /* BIG.FAT.WARNING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BIG.FAT.WARNING; path = config/lxdialog/BIG.FAT.WARNING; sourceTree = ""; }; + B4189A0614BFBF0A00ED5B0B /* check-lxdialog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "check-lxdialog.sh"; path = "config/lxdialog/check-lxdialog.sh"; sourceTree = ""; }; + B4189A0714BFBF0A00ED5B0B /* checklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = checklist.c; path = config/lxdialog/checklist.c; sourceTree = ""; }; + B4189A0814BFBF0A00ED5B0B /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialog.h; path = config/lxdialog/dialog.h; sourceTree = ""; }; + B4189A0914BFBF0A00ED5B0B /* inputbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inputbox.c; path = config/lxdialog/inputbox.c; sourceTree = ""; }; + B4189A0A14BFBF0A00ED5B0B /* menubox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menubox.c; path = config/lxdialog/menubox.c; sourceTree = ""; }; + B4189A0B14BFBF0A00ED5B0B /* textbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = textbox.c; path = config/lxdialog/textbox.c; sourceTree = ""; }; + B4189A0C14BFBF0A00ED5B0B /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = util.c; path = config/lxdialog/util.c; sourceTree = ""; }; + B4189A0D14BFBF0A00ED5B0B /* yesno.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = yesno.c; path = config/lxdialog/yesno.c; sourceTree = ""; }; + B4189A0E14BFBF1C00ED5B0B /* cconfig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cconfig.c; path = config/cconfig.c; sourceTree = ""; }; + B4189A0F14BFBF1C00ED5B0B /* checklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = checklist.c; path = config/checklist.c; sourceTree = ""; }; + B4189A1014BFBF1C00ED5B0B /* confdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = confdata.c; path = config/confdata.c; sourceTree = ""; }; + B4189A1114BFBF1C00ED5B0B /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialog.h; path = config/dialog.h; sourceTree = ""; }; + B4189A1214BFBF1C00ED5B0B /* expr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = expr.c; path = config/expr.c; sourceTree = ""; }; + B4189A1314BFBF1C00ED5B0B /* expr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = expr.h; path = config/expr.h; sourceTree = ""; }; + B4189A1414BFBF1C00ED5B0B /* inputbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inputbox.c; path = config/inputbox.c; sourceTree = ""; }; + B4189A1514BFBF1C00ED5B0B /* lex.zconf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lex.zconf.c; path = config/lex.zconf.c; sourceTree = ""; }; + B4189A1614BFBF1C00ED5B0B /* lkc_proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lkc_proto.h; path = config/lkc_proto.h; sourceTree = ""; }; + B4189A1714BFBF1C00ED5B0B /* lkc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lkc.h; path = config/lkc.h; sourceTree = ""; }; + B4189A1814BFBF1C00ED5B0B /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = config/Makefile; sourceTree = ""; }; + B4189A1914BFBF1C00ED5B0B /* menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menu.c; path = config/menu.c; sourceTree = ""; }; + B4189A1A14BFBF1C00ED5B0B /* menubox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menubox.c; path = config/menubox.c; sourceTree = ""; }; + B4189A1B14BFBF1C00ED5B0B /* nconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nconf.h; path = config/nconf.h; sourceTree = ""; }; + B4189A1C14BFBF1C00ED5B0B /* symbol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbol.c; path = config/symbol.c; sourceTree = ""; }; + B4189A1D14BFBF1C00ED5B0B /* textbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = textbox.c; path = config/textbox.c; sourceTree = ""; }; + B4189A1E14BFBF1C00ED5B0B /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = util.c; path = config/util.c; sourceTree = ""; }; + B4189A1F14BFBF1C00ED5B0B /* yesno.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = yesno.c; path = config/yesno.c; sourceTree = ""; }; + B4189A2014BFBF1C00ED5B0B /* zconf.hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zconf.hash.c; path = config/zconf.hash.c; sourceTree = ""; }; + B4189A2114BFBF1C00ED5B0B /* zconf.tab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zconf.tab.c; path = config/zconf.tab.c; sourceTree = ""; }; + B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B442B8C514BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ar; path = ar.lproj/License.rtf; sourceTree = ""; }; + B442B8C614BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8C714BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ar; path = ar.lproj/Description.html; sourceTree = ""; }; + B442B8C814BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; + B442B8C914BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8CA14BE6C8D00EEF9D4 /* bs */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = bs; path = bs.lproj/License.rtf; sourceTree = ""; }; + B442B8CB14BE6C8D00EEF9D4 /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8CC14BE6C8D00EEF9D4 /* bs */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = bs; path = bs.lproj/Description.html; sourceTree = ""; }; + B442B8CD14BE6C8D00EEF9D4 /* bs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bs; path = bs.lproj/Localizable.strings; sourceTree = ""; }; + B442B8CE14BE6C8D00EEF9D4 /* bs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bs; path = bs.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8CF14BE6C9900EEF9D4 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = bg; path = bg.lproj/License.rtf; sourceTree = ""; }; + B442B8D014BE6C9900EEF9D4 /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8D114BE6C9900EEF9D4 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = bg; path = bg.lproj/Description.html; sourceTree = ""; }; + B442B8D214BE6C9900EEF9D4 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = ""; }; + B442B8D314BE6C9900EEF9D4 /* bg */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = bg; path = bg.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8D414BE6CB000EEF9D4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ja; path = ja.lproj/License.rtf; sourceTree = ""; }; + B442B8D514BE6CB000EEF9D4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8D614BE6CB000EEF9D4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ja; path = ja.lproj/Description.html; sourceTree = ""; }; + B442B8D714BE6CB000EEF9D4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; + B442B8D814BE6CB000EEF9D4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ja; path = ja.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8DD14BE6D8000EEF9D4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ru; path = ru.lproj/License.rtf; sourceTree = ""; }; + B442B8DE14BE6D8000EEF9D4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8DF14BE6D8000EEF9D4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ru; path = ru.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8E014BE6D8000EEF9D4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ru; path = ru.lproj/Description.html; sourceTree = ""; }; + B442B8E114BE6D8000EEF9D4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; + B442B8E214BE6D8F00EEF9D4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ko; path = ko.lproj/License.rtf; sourceTree = ""; }; + B442B8E314BE6D8F00EEF9D4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8E414BE6D8F00EEF9D4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ko; path = ko.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8E514BE6D8F00EEF9D4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ko; path = ko.lproj/Description.html; sourceTree = ""; }; + B442B8E614BE6D8F00EEF9D4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; + B442B8E714BE6D9B00EEF9D4 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = mk; path = mk.lproj/License.rtf; sourceTree = ""; }; + B442B8E814BE6D9B00EEF9D4 /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8E914BE6D9B00EEF9D4 /* mk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = mk; path = mk.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8EA14BE6D9B00EEF9D4 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = mk; path = mk.lproj/Description.html; sourceTree = ""; }; + B442B8EB14BE6D9B00EEF9D4 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = mk.lproj/Localizable.strings; sourceTree = ""; }; + B442B8EC14BE6DAA00EEF9D4 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = he; path = he.lproj/License.rtf; sourceTree = ""; }; + B442B8ED14BE6DAA00EEF9D4 /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8EE14BE6DAA00EEF9D4 /* he */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = he; path = he.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8EF14BE6DAA00EEF9D4 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = he; path = he.lproj/Description.html; sourceTree = ""; }; + B442B8F014BE6DAA00EEF9D4 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; + B442B8F314BE6DEE00EEF9D4 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = zh_CN; path = zh_CN.lproj/License.rtf; sourceTree = ""; }; + B442B8F414BE6DEE00EEF9D4 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8F514BE6DEE00EEF9D4 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = zh_CN.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8F614BE6DEE00EEF9D4 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = zh_CN; path = zh_CN.lproj/Description.html; sourceTree = ""; }; + B442B8F714BE6DEE00EEF9D4 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = ""; }; + B442B8F814BE6E1700EEF9D4 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = el; path = el.lproj/License.rtf; sourceTree = ""; }; + B442B8F914BE6E1700EEF9D4 /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8FA14BE6E1700EEF9D4 /* el */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = el; path = el.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B8FB14BE6E1700EEF9D4 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = el; path = el.lproj/Description.html; sourceTree = ""; }; + B442B8FC14BE6E1700EEF9D4 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; + B442B8FD14BE6E7D00EEF9D4 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = zh_TW; path = zh_TW.lproj/License.rtf; sourceTree = ""; }; + B442B8FE14BE6E7D00EEF9D4 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B8FF14BE6E7D00EEF9D4 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = zh_TW.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B90014BE6E7D00EEF9D4 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = zh_TW; path = zh_TW.lproj/Description.html; sourceTree = ""; }; + B442B90114BE6E7D00EEF9D4 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = ""; }; + B442B90C14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = nl; path = nl.lproj/License.rtf; sourceTree = ""; }; + B442B90D14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Welcome.rtfd; sourceTree = ""; }; + B442B90E14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Conclusion.rtfd; sourceTree = ""; }; + B442B90F14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = nl; path = nl.lproj/Description.html; sourceTree = ""; }; + B442B91014BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; + B45C10A014BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = hr; path = hr.lproj/Description.html; sourceTree = ""; }; + B45C10A114BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = ""; }; + B45C10A214BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = hr; path = hr.lproj/License.rtf; sourceTree = ""; }; + B45C10A314BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = ""; }; + B45C10A414BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Welcome.rtfd; sourceTree = ""; }; + B4AABE5914C3B8B90055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + B4AABE5B14C3B8C70055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + B4AABE5D14C3B8D70055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; + B4AABE5E14C3B8EF0055ECD1 /* clean_bootplist.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = clean_bootplist.pl; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -1293,10 +1369,20 @@ name = Chameleon; sourceTree = ""; }; - 364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = { + 361BC70414BD979700236488 /* Icons */ = { isa = PBXGroup; children = ( + 361BC70B14BD97C800236488 /* pkg.zip */, + ); + name = Icons; + sourceTree = ""; + }; 364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = { + isa = PBXGroup; + children = ( + B4AABE5814C3B8B90055ECD1 /* AddOption */, 364E0DE114BCFB7A00F55E58 /* InstallerLog */, + B4AABE5A14C3B8C70055ECD1 /* InstallModule */, + B4AABE5C14C3B8D70055ECD1 /* InstallTheme */, 364E0DE314BCFB7A00F55E58 /* Post */, 364E0DE514BCFB7A00F55E58 /* Pre */, ); @@ -1324,6 +1410,7 @@ 364E0DE514BCFB7A00F55E58 /* Pre */ = { isa = PBXGroup; children = ( + B4AABE5E14C3B8EF0055ECD1 /* clean_bootplist.pl */, 36AB75E414BD092D005B8045 /* preinstall */, ); name = Pre; @@ -2837,17 +2924,19 @@ B0056CE511F3868000754B65 /* i386 */ = { isa = PBXGroup; children = ( - 6DBAFD1713B0D4590047ED33 /* include */, B0056CE611F3868000754B65 /* boot0 */, B0056CEA11F3868000754B65 /* boot1 */, B0056CF211F3868000754B65 /* boot2 */, + B41899FB14BFBE2400ED5B0B /* Cconfig */, B0056D0F11F3868000754B65 /* cdboot */, + B4189A0314BFBED900ED5B0B /* config */, B0056D1311F3868000754B65 /* doc */, + 6DBAFD1713B0D4590047ED33 /* include */, B0056D1611F3868000754B65 /* libsa */, B0056D2411F3868000754B65 /* libsaio */, + B0056D7611F3868000754B65 /* Makefile */, A3561CAB1414024C00E9B51E /* modules */, B0056D7911F3868000754B65 /* util */, - B0056D7611F3868000754B65 /* Makefile */, ); path = i386; sourceTree = ""; @@ -2856,6 +2945,9 @@ isa = PBXGroup; children = ( B0056CE711F3868000754B65 /* boot0.s */, + B41899FF14BFBE5D00ED5B0B /* boot0hfs.s */, + B41899FE14BFBE5200ED5B0B /* boot0md.s */, + B41899FD14BFBE4500ED5B0B /* Cconfig */, B0056CE811F3868000754B65 /* chain0.s */, B0056CE911F3868000754B65 /* Makefile */, ); @@ -2865,12 +2957,12 @@ B0056CEA11F3868000754B65 /* boot1 */ = { isa = PBXGroup; children = ( - B0056CEB11F3868000754B65 /* boot1.asm */, - B0056CEC11F3868000754B65 /* boot1.s */, B0056CED11F3868000754B65 /* boot1f32-install.sh */, B0056CEE11F3868000754B65 /* boot1f32.s */, + B4189A0114BFBE8900ED5B0B /* boot1h.s */, B0056CEF11F3868000754B65 /* boot1he.s */, B0056CF011F3868000754B65 /* boot1hp.s */, + B4189A0014BFBE7D00ED5B0B /* Cconfig */, B0056CF111F3868000754B65 /* Makefile */, ); path = boot1; @@ -2885,6 +2977,7 @@ B0056CF611F3868000754B65 /* boot.c */, B0056CF711F3868000754B65 /* boot.h */, B0056CF811F3868000754B65 /* boot2.s */, + B4189A0214BFBE9E00ED5B0B /* Cconfig */, B0056CF911F3868000754B65 /* drivers.c */, B0056CFA11F3868000754B65 /* graphic_utils.c */, B0056CFB11F3868000754B65 /* graphic_utils.h */, @@ -2936,6 +3029,7 @@ B0056D1611F3868000754B65 /* libsa */ = { isa = PBXGroup; children = ( + B4189A2214BFBF5600ED5B0B /* Cconfig */, B0056D1711F3868000754B65 /* efi_tables.c */, B0056D1811F3868000754B65 /* efi_tables.h */, B0056D1911F3868000754B65 /* error.c */, @@ -2968,10 +3062,11 @@ B0056D2C11F3868000754B65 /* bios.h */, B0056D2D11F3868000754B65 /* bios.s */, B0056D2E11F3868000754B65 /* biosfn.c */, - 1D145307137073F40050C0CD /* bootargs.h */, + 1D2A1AF513743A2600787720 /* bootargs.h */, B0056D2F11F3868000754B65 /* bootstruct.c */, B0056D3011F3868000754B65 /* bootstruct.h */, B0056D3111F3868000754B65 /* cache.c */, + B4189A2314BFBF7200ED5B0B /* Cconfig */, B0056D3211F3868000754B65 /* console.c */, B0056D3311F3868000754B65 /* convert.c */, B0056D3411F3868000754B65 /* convert.h */, @@ -3049,12 +3144,13 @@ B0056D7911F3868000754B65 /* util */ = { isa = PBXGroup; children = ( + A3561C8B1413FD7800E9B51E /* bdmesg.c */, + B4189A2414BFBFD100ED5B0B /* Cconfig */, + A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */, A3561C721413FD7800E9B51E /* fdisk */, - A3561C891413FD7800E9B51E /* openUp.c */, - A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */, - A3561C8B1413FD7800E9B51E /* bdmesg.c */, B0056D7A11F3868000754B65 /* machOconv.c */, B0056D7B11F3868000754B65 /* Makefile */, + A3561C891413FD7800E9B51E /* openUp.c */, ); path = util; sourceTree = ""; @@ -3062,14 +3158,15 @@ B0056D8311F3868000754B65 /* package */ = { isa = PBXGroup; children = ( - 364E0DDF14BCFB6600F55E58 /* Scripts.templates */, - 36B43E8114BCE91300D29461 /* OptionalSettings */, - A35D2187141A75DC00969AC0 /* slimpkg.sh */, A35D2188141A75DC00969AC0 /* buildpkg.sh */, - A35D2189141A75DC00969AC0 /* builddmg.sh */, + 361BC70214BD977700236488 /* Changes.txt */, B0056D8511F3868000754B65 /* Distribution */, + 361BC70414BD979700236488 /* Icons */, + 36B43E8114BCE91300D29461 /* OptionalSettings */, A37D7D49141B7C6F0069C38B /* Resources */, A3F1F20D141B9B0D00DDA709 /* Scripts */, + 364E0DDF14BCFB6600F55E58 /* Scripts.templates */, + A35D2187141A75DC00969AC0 /* slimpkg.sh */, B0056DB911F3868000754B65 /* smbios.plist */, ); path = package; @@ -3270,6 +3367,77 @@ path = User_Guide_src; sourceTree = ""; }; + B4189A0314BFBED900ED5B0B /* config */ = { + isa = PBXGroup; + children = ( + B4189A0E14BFBF1C00ED5B0B /* cconfig.c */, + B4189A0F14BFBF1C00ED5B0B /* checklist.c */, + B4189A1014BFBF1C00ED5B0B /* confdata.c */, + B4189A1114BFBF1C00ED5B0B /* dialog.h */, + B4189A1214BFBF1C00ED5B0B /* expr.c */, + B4189A1314BFBF1C00ED5B0B /* expr.h */, + B4189A1414BFBF1C00ED5B0B /* inputbox.c */, + B4189A1514BFBF1C00ED5B0B /* lex.zconf.c */, + B4189A1614BFBF1C00ED5B0B /* lkc_proto.h */, + B4189A1714BFBF1C00ED5B0B /* lkc.h */, + B4189A0414BFBEEF00ED5B0B /* lxdialog */, + B4189A1814BFBF1C00ED5B0B /* Makefile */, + B4189A1914BFBF1C00ED5B0B /* menu.c */, + B4189A1A14BFBF1C00ED5B0B /* menubox.c */, + B4189A1B14BFBF1C00ED5B0B /* nconf.h */, + B4189A1C14BFBF1C00ED5B0B /* symbol.c */, + B4189A1D14BFBF1C00ED5B0B /* textbox.c */, + B4189A1E14BFBF1C00ED5B0B /* util.c */, + B4189A1F14BFBF1C00ED5B0B /* yesno.c */, + B4189A2014BFBF1C00ED5B0B /* zconf.hash.c */, + B4189A2114BFBF1C00ED5B0B /* zconf.tab.c */, + ); + name = config; + sourceTree = ""; + }; + B4189A0414BFBEEF00ED5B0B /* lxdialog */ = { + isa = PBXGroup; + children = ( + B4189A0514BFBF0A00ED5B0B /* BIG.FAT.WARNING */, + B4189A0614BFBF0A00ED5B0B /* check-lxdialog.sh */, + B4189A0714BFBF0A00ED5B0B /* checklist.c */, + B4189A0814BFBF0A00ED5B0B /* dialog.h */, + B4189A0914BFBF0A00ED5B0B /* inputbox.c */, + B4189A0A14BFBF0A00ED5B0B /* menubox.c */, + B4189A0B14BFBF0A00ED5B0B /* textbox.c */, + B4189A0C14BFBF0A00ED5B0B /* util.c */, + B4189A0D14BFBF0A00ED5B0B /* yesno.c */, + ); + name = lxdialog; + sourceTree = ""; + }; + B4AABE5814C3B8B90055ECD1 /* AddOption */ = { + isa = PBXGroup; + children = ( + B4AABE5914C3B8B90055ECD1 /* postinstall */, + ); + name = AddOption; + path = Scripts.templates/AddOption; + sourceTree = ""; + }; + B4AABE5A14C3B8C70055ECD1 /* InstallModule */ = { + isa = PBXGroup; + children = ( + B4AABE5B14C3B8C70055ECD1 /* postinstall */, + ); + name = InstallModule; + path = Scripts.templates/InstallModule; + sourceTree = ""; + }; + B4AABE5C14C3B8D70055ECD1 /* InstallTheme */ = { + isa = PBXGroup; + children = ( + B4AABE5D14C3B8D70055ECD1 /* postinstall */, + ); + name = InstallTheme; + path = Scripts.templates/InstallTheme; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ @@ -3351,29 +3519,29 @@ A37D7D4B141B7C6F0069C38B /* Conclusion.rtfd */ = { isa = PBXVariantGroup; children = ( - A34125FD14BA3ED3002C359C /* ar */, - A34125FE14BA3EE8002C359C /* bg */, - A34125FF14BA3F3D002C359C /* bs */, - A341260014BA3F3D002C359C /* el */, A37D7D55141B7C6F0069C38B /* en */, A37D7D4C141B7C6F0069C38B /* de */, A37D7D5A141B7C6F0069C38B /* es */, A37D7D5F141B7C6F0069C38B /* fr */, - A341260114BA3F3D002C359C /* he */, - A341260214BA3F3D002C359C /* hr */, A37D7D69141B7C6F0069C38B /* id */, A37D7D6E141B7C6F0069C38B /* it */, - A341260314BA3F3D002C359C /* ja */, - A341260414BA3F3D002C359C /* ko */, - A341260514BA3F3D002C359C /* mk */, - A341260614BA3F3D002C359C /* nl */, A37D7D73141B7C6F0069C38B /* pl */, A37D7D78141B7C6F0069C38B /* pt-BR */, A37D7D7D141B7C6F0069C38B /* pt-PT */, - A341260714BA3F3D002C359C /* ru */, A37D7D82141B7C6F0069C38B /* sr */, - A341260814BA3F3D002C359C /* zh_CN */, - A341260914BA3F3D002C359C /* zh_TW */, + B442B8C614BE6C7A00EEF9D4 /* ar */, + B442B8CB14BE6C8D00EEF9D4 /* bs */, + B442B8D014BE6C9900EEF9D4 /* bg */, + B442B8D514BE6CB000EEF9D4 /* ja */, + B442B8DF14BE6D8000EEF9D4 /* ru */, + B442B8E414BE6D8F00EEF9D4 /* ko */, + B442B8E914BE6D9B00EEF9D4 /* mk */, + B442B8EE14BE6DAA00EEF9D4 /* he */, + B442B8F514BE6DEE00EEF9D4 /* zh_CN */, + B442B8FA14BE6E1700EEF9D4 /* el */, + B442B8FF14BE6E7D00EEF9D4 /* zh_TW */, + B442B90E14BE6EC900EEF9D4 /* nl */, + B45C10A114BE7413006AA075 /* hr */, ); name = Conclusion.rtfd; sourceTree = ""; @@ -3381,17 +3549,29 @@ A37D7D4D141B7C6F0069C38B /* Description.html */ = { isa = PBXVariantGroup; children = ( - A37D7D4E141B7C6F0069C38B /* de */, - A37D7D56141B7C6F0069C38B /* en */, + A37D7D4E141B7C6F0069C38B /* en */, + A37D7D56141B7C6F0069C38B /* de */, A37D7D5B141B7C6F0069C38B /* es */, A37D7D60141B7C6F0069C38B /* fr */, - A37D7D65141B7C6F0069C38B /* hr */, A37D7D6A141B7C6F0069C38B /* id */, A37D7D6F141B7C6F0069C38B /* it */, A37D7D74141B7C6F0069C38B /* pl */, A37D7D79141B7C6F0069C38B /* pt-BR */, A37D7D7E141B7C6F0069C38B /* pt-PT */, A37D7D83141B7C6F0069C38B /* sr */, + B442B8C714BE6C7A00EEF9D4 /* ar */, + B442B8CC14BE6C8D00EEF9D4 /* bs */, + B442B8D114BE6C9900EEF9D4 /* bg */, + B442B8D614BE6CB000EEF9D4 /* ja */, + B442B8E014BE6D8000EEF9D4 /* ru */, + B442B8E514BE6D8F00EEF9D4 /* ko */, + B442B8EA14BE6D9B00EEF9D4 /* mk */, + B442B8EF14BE6DAA00EEF9D4 /* he */, + B442B8F614BE6DEE00EEF9D4 /* zh_CN */, + B442B8FB14BE6E1700EEF9D4 /* el */, + B442B90014BE6E7D00EEF9D4 /* zh_TW */, + B442B90F14BE6EC900EEF9D4 /* nl */, + B45C10A014BE7413006AA075 /* hr */, ); name = Description.html; sourceTree = ""; @@ -3399,17 +3579,29 @@ A37D7D4F141B7C6F0069C38B /* License.rtf */ = { isa = PBXVariantGroup; children = ( - A37D7D50141B7C6F0069C38B /* de */, - A37D7D57141B7C6F0069C38B /* en */, + A37D7D50141B7C6F0069C38B /* en */, + A37D7D57141B7C6F0069C38B /* de */, A37D7D5C141B7C6F0069C38B /* es */, A37D7D61141B7C6F0069C38B /* fr */, - A37D7D66141B7C6F0069C38B /* hr */, A37D7D6B141B7C6F0069C38B /* id */, A37D7D70141B7C6F0069C38B /* it */, A37D7D75141B7C6F0069C38B /* pl */, A37D7D7A141B7C6F0069C38B /* pt-BR */, A37D7D7F141B7C6F0069C38B /* pt-PT */, A37D7D84141B7C6F0069C38B /* sr */, + B442B8C514BE6C7A00EEF9D4 /* ar */, + B442B8CA14BE6C8D00EEF9D4 /* bs */, + B442B8CF14BE6C9900EEF9D4 /* bg */, + B442B8D414BE6CB000EEF9D4 /* ja */, + B442B8DD14BE6D8000EEF9D4 /* ru */, + B442B8E214BE6D8F00EEF9D4 /* ko */, + B442B8E714BE6D9B00EEF9D4 /* mk */, + B442B8EC14BE6DAA00EEF9D4 /* he */, + B442B8F314BE6DEE00EEF9D4 /* zh_CN */, + B442B8F814BE6E1700EEF9D4 /* el */, + B442B8FD14BE6E7D00EEF9D4 /* zh_TW */, + B442B90C14BE6EC900EEF9D4 /* nl */, + B45C10A214BE7413006AA075 /* hr */, ); name = License.rtf; sourceTree = ""; @@ -3421,13 +3613,25 @@ A37D7D52141B7C6F0069C38B /* de */, A37D7D5D141B7C6F0069C38B /* es */, A37D7D62141B7C6F0069C38B /* fr */, - A37D7D67141B7C6F0069C38B /* hr */, A37D7D6C141B7C6F0069C38B /* id */, A37D7D71141B7C6F0069C38B /* it */, A37D7D76141B7C6F0069C38B /* pl */, A37D7D7B141B7C6F0069C38B /* pt-BR */, A37D7D80141B7C6F0069C38B /* pt-PT */, A37D7D85141B7C6F0069C38B /* sr */, + B442B8C814BE6C7A00EEF9D4 /* ar */, + B442B8CD14BE6C8D00EEF9D4 /* bs */, + B442B8D214BE6C9900EEF9D4 /* bg */, + B442B8D714BE6CB000EEF9D4 /* ja */, + B442B8E114BE6D8000EEF9D4 /* ru */, + B442B8E614BE6D8F00EEF9D4 /* ko */, + B442B8EB14BE6D9B00EEF9D4 /* mk */, + B442B8F014BE6DAA00EEF9D4 /* he */, + B442B8F714BE6DEE00EEF9D4 /* zh_CN */, + B442B8FC14BE6E1700EEF9D4 /* el */, + B442B90114BE6E7D00EEF9D4 /* zh_TW */, + B442B91014BE6EC900EEF9D4 /* nl */, + B45C10A314BE7413006AA075 /* hr */, ); name = Localizable.strings; sourceTree = ""; @@ -3435,29 +3639,29 @@ A37D7D53141B7C6F0069C38B /* Welcome.rtfd */ = { isa = PBXVariantGroup; children = ( - A3AECAA414BCB71F0059212A /* ar */, - A3AECAA514BCB71F0059212A /* bg */, - A3AECAA614BCB71F0059212A /* bs */, - A37D7D54141B7C6F0069C38B /* de */, - A3AECAA714BCB73D0059212A /* el */, - A37D7D59141B7C6F0069C38B /* en */, + A37D7D54141B7C6F0069C38B /* en */, + A37D7D59141B7C6F0069C38B /* de */, A37D7D5E141B7C6F0069C38B /* es */, A37D7D63141B7C6F0069C38B /* fr */, - A3AECAA814BCB73D0059212A /* he */, - A3AECAA914BCB73D0059212A /* hr */, A37D7D6D141B7C6F0069C38B /* id */, A37D7D72141B7C6F0069C38B /* it */, - A3AECAAA14BCB7BE0059212A /* ja */, - A3AECAAB14BCB7BE0059212A /* ko */, - A3AECAAC14BCB7BE0059212A /* mk */, - A3AECAAD14BCB7E10059212A /* nl */, A37D7D77141B7C6F0069C38B /* pl */, A37D7D7C141B7C6F0069C38B /* pt-BR */, A37D7D81141B7C6F0069C38B /* pt-PT */, - A3AECAAE14BCB7E10059212A /* ru */, A37D7D86141B7C6F0069C38B /* sr */, - A3AECAAF14BCB7E10059212A /* zh_CN */, - A3AECAB014BCB7E10059212A /* zh_TW */, + B442B8C914BE6C7A00EEF9D4 /* ar */, + B442B8CE14BE6C8D00EEF9D4 /* bs */, + B442B8D314BE6C9900EEF9D4 /* bg */, + B442B8D814BE6CB000EEF9D4 /* ja */, + B442B8DE14BE6D8000EEF9D4 /* ru */, + B442B8E314BE6D8F00EEF9D4 /* ko */, + B442B8E814BE6D9B00EEF9D4 /* mk */, + B442B8ED14BE6DAA00EEF9D4 /* he */, + B442B8F414BE6DEE00EEF9D4 /* zh_CN */, + B442B8F914BE6E1700EEF9D4 /* el */, + B442B8FE14BE6E7D00EEF9D4 /* zh_TW */, + B442B90D14BE6EC900EEF9D4 /* nl */, + B45C10A414BE7413006AA075 /* hr */, ); name = Welcome.rtfd; sourceTree = ""; Index: branches/blackosx/package/Distribution =================================================================== --- branches/blackosx/package/Distribution (revision 1806) +++ branches/blackosx/package/Distribution (revision 1807) @@ -53,27 +53,26 @@ return bootPlist ? true : false; } - function check_chameleon_kernel_option(kernelFlags, value) { - var flags = kernelFlags.split(" "); - for ( var i = 0; i < flags.length; i++ ) { - if (flags[i] == value) - return true; - } + function check_chameleon_bool_option(key, value) { + if ( bootPlist && bootPlist[ key ] ) + // check if the first letter (in lowercase) is the same + return bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase(); return false; - } + } - function check_chameleon_option(key, value) { - if ( bootPlist && bootPlist[ key ] ) { - if ( key == "Kernel Flags" ) - return check_chameleon_kernel_option( bootPlist[ key ], value ); + function check_chameleon_text_option(key, value) { + if ( bootPlist && bootPlist[ key ] ) + return bootPlist[ key ] == value; // check if the strings are equal + return false; + } - // Check if value is a boolean - var pattern=/^(Y(es)?|No?)$/i; - var result = value.match(pattern); // Check if the value is a boolean - if ( result && bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase() ) - return true; - else - return bootPlist[ key ] == value; // check if the strings are equal + function check_chameleon_list_option(key, value) { + if ( bootPlist && bootPlist[ key ] ) { + var items = bootPlist[ key ].split(" "); + for ( var i = 0; i < items.length; i++ ) { + if (items[i] == value) + return true; + } } return false; } Index: branches/blackosx/package/Scripts.templates/AddOption/postinstall =================================================================== --- branches/blackosx/package/Scripts.templates/AddOption/postinstall (revision 0) +++ branches/blackosx/package/Scripts.templates/AddOption/postinstall (revision 1807) @@ -0,0 +1,57 @@ +#!/bin/bash + +set -u + +targetVolume="$3" + +key="@optionKey@" +value="@optionValue@" +type="@optionType@" +logName="@LOG_FILENAME@" +logFile="${targetVolume}/$logName" + +# Check if target volume exists +if [[ ! -d "$targetVolume" ]]; then + echo "$targetVolume volume does not exist!" >&2 + exit 1 +fi + +exec >>"${logFile}" 2>&1 + +echo "Added boot option: ${key}=${value}" + +key="${key// /\\ }" # Escape spaces +value="${value// /\\ }" # Escape spaces + +bootPListFile="${targetVolume}/Extra/org.chameleon.Boot.plist" + +case "$type" in + bool|text) + /usr/libexec/plistbuddy -c "Add :${key} string ${value}" "$bootPListFile" + ;; + list) + current_values=$( /usr/libexec/plistbuddy -c "Print :${key}" \ + "$bootPListFile" 2>/dev/null ) + result=$? + current_values="${current_values// /\\ }" # Escape spaces + current_values="${current_values//\"/\\\"}" # Escape double quotes + + if [[ $result -eq 0 ]]; then + # Append our new values + if [[ "$current_values" = "" ]]; then + new_values="${value}" + else + new_values="${current_values}\ ${value}" + fi + /usr/libexec/plistbuddy -c "Set :${key} ${new_values}" \ + "$bootPListFile" + else + # Create a new option + new_values="${value}" + /usr/libexec/plistbuddy -c "Add :${key} string ${new_values}" \ + "$bootPListFile" + fi + ;; +esac + +exit 0 Property changes on: branches/blackosx/package/Scripts.templates/AddOption/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Scripts.templates/Post/postinstall =================================================================== --- branches/blackosx/package/Scripts.templates/Post/postinstall (revision 1806) +++ branches/blackosx/package/Scripts.templates/Post/postinstall (revision 1807) @@ -1,245 +1,40 @@ #!/bin/bash -mergeString () { - local src="${1}" - local new="${2}" - local result="$src" +# $1 = Full path to the installation package the installer app is processing +# $2 = Full path to the installation destination +# $3 = Installation volume (mountpoint) to receive the payload +# $4 = Root directory for the system - for newItem in $new ;do - local found=0 - for srcItem in $src ;do - if [[ $newItem == $srcItem ]];then - found=1 - break - fi - done - [[ $found -eq 0 ]] && result="$result $newItem" - done - - echo "$result" -} - -echo "===============================================" -echo "Post Post-Install Script" -echo "*********************************" - -#echo "DEBUG: $ 1 = Full path to the installation package the installer app is processing: " $1 -#echo "DEBUG: $ 2 = Full path to the installation destination: " $2 -#echo "DEBUG: $ 3 = Installation volume (mountpoint) to receive the payload: " $3 -#echo "DEBUG: $ 4 = Root directory for the system: " $4 - # Check target exists -if [ ! -e "$3" ] -then - echo "$3 volume does not exist!" +if [ ! -d "$3" ]; then + echo "$3 volume does not exist !" >&2 exit 1 fi # If target volume root of current system then replace # / with volume name. -if [ "$3" == "/" ] -then +if [ "$3" == "/" ]; then dest_vol="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' ) else dest_vol="$3" fi +logName="@LOG_FILENAME@" +logFile="${dest_vol}/$logName" + +exec >>"${logFile}" 2>&1 + # Find script location so to find the Install Log script. MYLOCATION="${PWD}/${BASH_ARGV[0]}" export MYLOCATION="${MYLOCATION%/*}" scriptDir=$MYLOCATION # Write some information to the Install Log -"$scriptDir"InstallLog.sh "${dest_vol}" "Running Post postinstall script" -"$scriptDir"InstallLog.sh "${dest_vol}" "Target volume = ${dest_vol}" +echo "======================================================" +echo "Running Post postinstall script" +echo "Target volume = ${dest_vol}" -# set temporary directory -chamTemp="$dest_vol/usr/local/chamTemp" - - # --------------------------------------------- -# Build org.chameleon.Boot.plist -# --------------------------------------------- -# All options selected are now dummy files with -# the filename of the option and value residing -# in /usr/local/chamTemp/options/ -# for example. Boot Banner=Yes - -# Are there any options to build? -if [ "$(ls -A ${chamTemp}/options )" ]; then - - # Check for temporary directory/Extra folder. - if [ ! -d "$chamTemp"/Extra ]; then - mkdir "$chamTemp"/Extra - fi - - # Create template for org.chameleon.Boot.plist" - tempOCBP="$chamTemp"/Extra/org.chameleon.Boot.plist - cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP" - - # Read list of all boot options the user added. - while IFS= read -r -d '' FILE; do - option="${FILE##*/}" - key="${option%%=*}" - value="${option#*=}" - - # Check for 'Kernel Flags' key indicate that should be a kernel flag - if [[ "$key" = "Kernel Flags" ]];then - # plistbuddy only add's if the key doesn't already exist. - # So let's store any kernelflags and add them all at the - # same time once when we reach the end of the options list. - kernelflag[${#kernelflag[*]}]="$value" - "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value" - else - # escape any spaces - keyToUse=$( echo "$key" | sed 's/ /\\ /g' ) - sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP" - returnValue=$? - if [ ${returnValue} -ne 1 ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}" - else - "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}" - fi - fi - done < <( find "${chamTemp}/options" -type f -print0 ) - - # Add any kernel flags together in to one string. - kernelFlagString="${kernelflag[@]}" - # We add the final string in the next section. -fi - -# --------------------------------------------- -# Add any installed modules to the Install Log -# --------------------------------------------- -if [ -e "${chamTemp}"/Extra/modules ]; then - ls "${chamTemp}"/Extra/modules | while read FILE - do - "$scriptDir"InstallLog.sh "${dest_vol}" "Added module: $FILE" - if [ "$FILE" == "Keylayout.dylib" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Also adding required Keymaps." - fi - done -fi - -# --------------------------------------------- -# Add any installed themes to the Install Log -# --------------------------------------------- -if [ -e "${chamTemp}"/Extra/Themes ]; then - ls "${chamTemp}"/Extra/Themes | while read FILE - do - "$scriptDir"InstallLog.sh "${dest_vol}" "Added Theme: $FILE" - done -fi - -# Does a temporary /Extra folder exist? -if [ -d "$chamTemp"/Extra ]; then - - # --------------------------------------------- - # Merge /Extra folders? - # --------------------------------------------- - # Does the user want to upgrade an existing /Extra folder? - # If so, then merge their existing one in to the temp one. - if [ -e "$chamTemp/install_type_upgrade" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to do an upgrade install." - - # first move the new org.chameleon.Boot.plist out of tmp - # Extra folder so we can merge that separately. - mv "$tempOCBP" "$chamTemp/holding.plist" - - # Check for an existing /Extra folder - # and merge existing /Extra with temp one. - if [ -e "$dest_vol"/.ChameleonEFI ]; then - if [ -e "/Volumes/EFI/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing /Volumes/EFI/Extra folder." - ditto --noextattr --noqtn /Volumes/EFI/Extra "$chamTemp"/Extra - fi - else - if [ -e "$dest_vol/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Merging existing ${dest_vol}/Extra folder." - ditto --noextattr --noqtn "${dest_vol}"/Extra "$chamTemp"/Extra - fi - fi - - # Check existing plist name for old naming convention - # and change to new convention. - if [ -e "$chamTemp"/Extra/com.apple.Boot.plist ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "Renaming existing com.apple.Boot.plist to org.chameleon.Boot.plist." - mv "$chamTemp"/Extra/com.apple.Boot.plist "$tempOCBP" - fi - - # Before merging org.chameleon.Boot.plist, copy any - # existing kernel flags, then delete the entry. - currentFlags=$( sudo /usr/libexec/plistbuddy -c "Print :Kernel\ Flags" "$tempOCBP" ) - sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" - - # Merge new org.chameleon.Boot.plist (holding.plist) - # with their currently existing one. - "$scriptDir"InstallLog.sh "${dest_vol}" "------ -Merging new options into org.chameleon.Boot.plist. -NOTE: Please check the new merged org.chameleon.Boot.plist as -NOTE: any existing keys will NOT have been updated. -NOTE: For example: If you already had Wait=No as a boot option -NOTE: and chose Wait=Yes from the list, this will NOT be changed. -------" - sudo /usr/libexec/plistbuddy -c "Merge $chamTemp/holding.plist" "$tempOCBP" - - if [[ -n "$currentFlags" ]];then - # Combine new kernel flags with old ones. - kernelFlagString=$( mergeString "$currentFlags" "${kernelFlagString}" ) - fi - - elif [ -e "$chamTemp/install_type_new" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "User selected to make a new install." - fi - - # Write kernel flags option - kernelFlagString=$(echo ${kernelFlagString}) # Remove leading and trailing spaces - if [[ -n "$kernelFlagString" ]];then - sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" - returnValue=$? - if [ ${returnValue} -ne 0 ]; then # key already exists. - sudo /usr/libexec/plistbuddy -c "Delete :Kernel\ Flags" "$tempOCBP" - sudo /usr/libexec/plistbuddy -c "Add :Kernel\ Flags string $kernelFlagString" "$tempOCBP" - fi - fi - - # --------------------------------------------- - # Copy temp Extra folder to target destination - # --------------------------------------------- - # Check for an existing /Extra folder. If found, back it up - # before copying the temporary Extra folder to destination. - # Extra folder now resides in /usr/local/chamTemp/ - # Copy /usr/local/chamTemp/Extra to correct location. - - if [ ! -f "$dest_vol"/.ChameleonEFI ]; then - # The Standard install option chosen - rm -rf "$dest_vol/Extra" # Remove old Extra directory - - "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/" - echo "Copying $chamTemp/Extra TO $dest_vol" - cp -R "$chamTemp"/Extra "$dest_vol" - else - # The EFI system partition install option was chosen - rm -rf "/Volumes/EFI/Extra" # Remove old Extra directory - - "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/" - cp -R "$chamTemp"/Extra "/Volumes/EFI" - fi -else - if [ ! -f "$dest_vol"/.ChameleonEFI ]; then - if [ -e "$dest_vol"/Extra ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, -so leaving existing $dest_vol/Extra folder untouched." - fi - else - if [ -e "/Volumes/EFI/Extra" ]; then - "$scriptDir"InstallLog.sh "${dest_vol}" "No elements selected for adding to an Extra folder, -so leaving existing /Volumes/EFI/Extra folder untouched." - fi - fi -fi - -# --------------------------------------------- # Update Rights # --------------------------------------------- chmod 777 ${dest_vol}/Extra 2>/dev/null @@ -253,41 +48,10 @@ "$scriptDir"UnMountEFIvolumes.sh "${dest_vol}" "${scriptDir}" # remove any temporary boot sector files if they exist -if [ -d /tmp/newbs ]; then - cleanUp="${cleanUp},1a" - rm /tmp/newbs -fi -if [ -d /tmp/origbs ]; then - cleanUp="${cleanUp},1b" - rm /tmp/origbs -fi -if [ -d /tmp/newBootSector ]; then - cleanUp="${cleanUp},1c" - rm /tmp/newbs -fi -if [ -d /tmp/originalBootSector ]; then - cleanUp="${cleanUp},1d" - rm /tmp/origbs -fi +rm -f /tmp/newbs /tmp/origbs /tmp/originalBootSector /tmp/newBootSector -# delete the temporary Chameleon folder -if [ -e "$chamTemp" ]; then - cleanUp="${cleanUp},2" - rm -rf "$chamTemp" -fi - # Remove /.ChameleonEFI file -if [ -f "$dest_vol"/.ChameleonEFI ]; then - cleanUp="${cleanUp},3" - rm "$dest_vol"/.ChameleonEFI -fi +rm -f "${dest_vol}/.ChameleonEFI" -"$scriptDir"InstallLog.sh "${dest_vol}" "Cleanup: ${cleanUp}" -"$scriptDir"InstallLog.sh "${dest_vol}" "LineBreak" -"$scriptDir"InstallLog.sh "${dest_vol}" "Post script complete" - -echo "===============================================" -echo "END - Post Post-Install Script" -echo "*********************************" -echo "-----------------------------------------------" -echo "" +echo "======================================================" +echo "Post postinstall script complete" Index: branches/blackosx/package/Scripts.templates/Pre/clean_bootplist.pl =================================================================== --- branches/blackosx/package/Scripts.templates/Pre/clean_bootplist.pl (revision 0) +++ branches/blackosx/package/Scripts.templates/Pre/clean_bootplist.pl (revision 1807) @@ -0,0 +1,95 @@ +#!/usr/bin/perl + +use strict; +use YAML::Syck; + +our $target_volume; +our $boot_plist_filepath; + +our $yaml_file="@YAML_FILE@"; + +if ($#ARGV < 0) { + print stderr "A target volume is needed\n"; +} else { + $target_volume=$ARGV[0]; +} + +$boot_plist_filepath = "${target_volume}/Extra/org.chameleon.Boot.plist"; +if ( -f "$boot_plist_filepath" ) { + main("$yaml_file"); +} + +sub _do_cmd { + my ($cmd, $key, $value) = @_; + my $out; + + $key =~ s/([\s])/\\$1/g; # Escape characters in key + $value =~ s/([\s"])/\\$1/g; # Escape characters in value (space & ") + my $plistbuddy_command="$cmd :$key $value"; + + open ( OUTPUT, "-|", '/usr/libexec/plistbuddy', "-c", "$plistbuddy_command", "$boot_plist_filepath" ); + my $exit_code = $?; + chomp($out = ); + close OUTPUT; + return $out; +} + +sub get_boot_plist_option { + my ($option) = @_; + return _do_cmd( "Print", "$option"); +} + +sub delete_boot_plist_option { + my ($option) = @_; + return _do_cmd( "Delete", "$option"); +} + +sub delete_boot_plist_text_option { + my ($option, $values) = @_; + my $current_value = get_boot_plist_option "$option"; + if ( $current_value ne "") { + foreach my $recognized_value (@{$values}) { + if ($recognized_value eq $current_value) { + return _do_cmd( "Delete", "$option"); + } + } + } + return ""; +} + +sub delete_boot_plist_list_option { + my ($option, $values) = @_; + my $current_value = get_boot_plist_option "$option"; + if ( $current_value ne "") { + my %count; + my @new_list; + foreach my $value (@{$values}) { + $count{$value} = 1; + } + foreach my $value (split(/\s+/,$current_value)) { + if ( not exists $count{$value} ) { + push @new_list, $value; + } + } + return _do_cmd( "Set", $option, join(' ',@new_list) ); + } + return ""; +} + +sub main() { + # Remove all options that installer can managed + my ($yaml_file) = @_; + my $hash_ref = LoadFile($yaml_file) or die "Can't open yaml file\n"; + foreach my $option ( keys %{$hash_ref} ) { + my $type = $hash_ref->{$option}->{type}; + if ( $type =~ /^bool$/i ) { + delete_boot_plist_option($option); + } elsif ( $type =~ /^text$/i ) { + delete_boot_plist_text_option( $option, + $hash_ref->{$option}->{values} ); + } elsif ( $type =~ /^list$/i ) { + delete_boot_plist_list_option( $option, + $hash_ref->{$option}->{values} ); + } + } +} Property changes on: branches/blackosx/package/Scripts.templates/Pre/clean_bootplist.pl ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Scripts.templates/Pre/preinstall =================================================================== --- branches/blackosx/package/Scripts.templates/Pre/preinstall (revision 1806) +++ branches/blackosx/package/Scripts.templates/Pre/preinstall (revision 1807) @@ -77,6 +77,19 @@ echo "======================================================" >>"${logFile}" +# Check existing plist name for old naming convention and change to new convention. +if [[ -f "${targetVolume}/Extra/com.apple.Boot.plist" ]]; then + echo "Renaming existing com.apple.Boot.plist to org.chameleon.Boot.plist" >>"${logFile}" + mv "${targetVolume}/Extra/com.apple.Boot.plist" "${targetVolume}/Extra/org.chameleon.Boot.plist" +fi + +# --------------------------------------------- +# Clearing options that Chameleon can managed +# --------------------------------------------- +echo "Clearing options..." >>"${logFile}" +"${PWD}/clean_bootplist.pl" "${targetVolume}" 2>&1 | grep -v 'Does Not Exist' >>"${logFile}" +echo "======================================================" >>"${logFile}" + echo "===============================================" echo "END - Pre-Install Script" echo "*********************************" Index: branches/blackosx/package/Scripts.templates/InstallTheme/postinstall =================================================================== --- branches/blackosx/package/Scripts.templates/InstallTheme/postinstall (revision 0) +++ branches/blackosx/package/Scripts.templates/InstallTheme/postinstall (revision 1807) @@ -0,0 +1,22 @@ +#!/bin/bash + +set -u + +targetVolume="$3" + +themeName="@themeName@" +themeDir="@themeDir@" +logName="@LOG_FILENAME@" +logFile="${targetVolume}/$logName" + +# Check if target volume exists +if [[ ! -d "$targetVolume" ]]; then + echo "$targetVolume volume does not exist!" >&2 + exit 1 +fi + +exec >>"${logFile}" 2>&1 + +[[ -d "${targetVolume}/Extra/Themes/$themeDir" ]] && echo "Theme $themeName installed" + +exit 0 Property changes on: branches/blackosx/package/Scripts.templates/InstallTheme/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/Scripts.templates/InstallModule/postinstall =================================================================== --- branches/blackosx/package/Scripts.templates/InstallModule/postinstall (revision 0) +++ branches/blackosx/package/Scripts.templates/InstallModule/postinstall (revision 1807) @@ -0,0 +1,22 @@ +#!/bin/bash + +set -u + +targetVolume="$3" + +moduleName="@moduleName@" +moduleFile="@moduleFile@" +logName="@LOG_FILENAME@" +logFile="${targetVolume}/$logName" + +# Check if target volume exists +if [[ ! -d "$targetVolume" ]]; then + echo "$targetVolume volume does not exist!" >&2 + exit 1 +fi + +exec >>"${logFile}" 2>&1 + +[[ -f "${targetVolume}/Extra/modules/$moduleFile" ]] && echo "Module $moduleName installed" + +exit 0 Property changes on: branches/blackosx/package/Scripts.templates/InstallModule/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/blackosx/package/OptionalSettings/Resolution.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Resolution.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/Resolution.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -#ÊUse one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,14 +25,14 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -1024x600x32:Graphics Mode=1024x600x32 -1024x768x32:Graphics Mode=1024x768x32 -1280x768x32:Graphics Mode=1280x768x32 -1280x800x32:Graphics Mode=1280x800x32 -1280x960x32:Graphics Mode=1280x960x32 -1280x1024x32:Graphics Mode=1280x1024x32 -1440x900x32:Graphics Mode=1440x900x32 -1600x900x32:Graphics Mode=1600x900x32 -1680x1050x32:Graphics Mode=1680x1050x32 -1920x1080x32:Graphics Mode=1920x1080x32 -1920x1200x32:Graphics Mode=1920x1200x32 +Text@1024x600x32:Graphics Mode=1024x600x32 +Text@1024x768x32:Graphics Mode=1024x768x32 +Text@1280x768x32:Graphics Mode=1280x768x32 +Text@1280x800x32:Graphics Mode=1280x800x32 +Text@1280x960x32:Graphics Mode=1280x960x32 +Text@1280x1024x32:Graphics Mode=1280x1024x32 +Text@1440x900x32:Graphics Mode=1440x900x32 +Text@1600x900x32:Graphics Mode=1600x900x32 +Text@1680x1050x32:Graphics Mode=1680x1050x32 +Text@1920x1080x32:Graphics Mode=1920x1080x32 +Text@1920x1200x32:Graphics Mode=1920x1200x32 Index: branches/blackosx/package/OptionalSettings/Video.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Video.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/Video.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -# Use one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,7 +25,7 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -GraphicsEnabler:GraphicsEnabler=Yes -UseAtiROM:UseAtiROM=Yes -UseNvidiaROM:UseNvidiaROM=Yes -VBIOS:VBIOS=Yes +Bool@GraphicsEnabler:GraphicsEnabler=Yes +Bool@UseAtiROM:UseAtiROM=Yes +Bool@UseNvidiaROM:UseNvidiaROM=Yes +Bool@VBIOS:VBIOS=Yes Index: branches/blackosx/package/OptionalSettings/PowerManagement.txt =================================================================== --- branches/blackosx/package/OptionalSettings/PowerManagement.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/PowerManagement.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -#ÊUse one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,10 +25,10 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -CSTUsingSystemIO:CSTUsingSystemIO=Yes -DropSSDT:DropSSDT=Yes -EnableC2State:EnableC2State=Yes -EnableC3State:EnableC3State=Yes -EnableC4State:EnableC4State=Yes -GenerateCStates:GenerateCStates=Yes -GeneratePStates:GeneratePStates=Yes +Bool@CSTUsingSystemIO:CSTUsingSystemIO=Yes +Bool@DropSSDT:DropSSDT=Yes +Bool@EnableC2State:EnableC2State=Yes +Bool@EnableC3State:EnableC3State=Yes +Bool@EnableC4State:EnableC4State=Yes +Bool@GenerateCStates:GenerateCStates=Yes +Bool@GeneratePStates:GeneratePStates=Yes Index: branches/blackosx/package/OptionalSettings/General.txt =================================================================== --- branches/blackosx/package/OptionalSettings/General.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/General.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -#ÊUse one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,13 +25,13 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -arch:arch=i386 -EHCIacquire:EHCIacquire=Yes -EthernetBuiltIn:EthernetBuiltIn=Yes -ForceHPET:ForceHPET=Yes -ForceWake:ForceWake=Yes -RestartFix:RestartFix=No -UHCIreset:UHCIreset=Yes -UseMemDetect:UseMemDetect=No -UseKernelCache:UseKernelCache=Yes -Wake:Wake=Yes +Text@arch:arch=i386 +Bool@EHCIacquire:EHCIacquire=Yes +Bool@EthernetBuiltIn:EthernetBuiltIn=Yes +Bool@ForceHPET:ForceHPET=Yes +Bool@ForceWake:ForceWake=Yes +Bool@RestartFix:RestartFix=No +Bool@UHCIreset:UHCIreset=Yes +Bool@UseMemDetect:UseMemDetect=No +Bool@UseKernelCache:UseKernelCache=Yes +Bool@Wake:Wake=Yes Index: branches/blackosx/package/OptionalSettings/KernelFlags.txt =================================================================== --- branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/KernelFlags.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -#ÊUse one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,8 +25,8 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -Verbose:Kernel Flags=-v -Singleusermode:Kernel Flags=-s -Ignorecaches:Kernel Flags=-f -Npci:Kernel Flags=npci=0x2000 -Darkwake:Kernel Flags=darkwake=0 +List@Verbose:Kernel Flags=-v +List@Singleusermode:Kernel Flags=-s +List@Ignorecaches:Kernel Flags=-f +List@Npci:Kernel Flags=npci=0x2000 +List@Darkwake:Kernel Flags=darkwake=0 Index: branches/blackosx/package/OptionalSettings/Control.txt =================================================================== --- branches/blackosx/package/OptionalSettings/Control.txt (revision 1806) +++ branches/blackosx/package/OptionalSettings/Control.txt (revision 1807) @@ -4,16 +4,16 @@ # Add boot options or kernel flags to the bottom of this file. # They will appear under the package installer's Settings menu # in a sub menu named with the filename of this file. -#ÊUse one file or many files - it's flexible to make it easy +# Use one file or many files - it's flexible to make it easy # to group different options under separate sub menus. # --------------------------------------------- -# To add boot option: Structure is name:key=value -# example1: InstantMenu:Instant Menu=Yes -# example2: DropSSDT:DropSSDT=Yes +# To add boot option: Structure is: +# type@name:key=value +# example1: Bool@InstantMenu:Instant Menu=Yes +# example2: Text@1024x600x32:Graphics Mode=1024x600x32 +# example3: List@Npci:Kernel Flags=npci=0x2000 # --------------------------------------------- -# To add kernel flag: Structure is name:Kernel Flags=kernelflag -# example1: Npci:Kernel Flags=npci=0x2000 -# example2: Verbose:Kernel Flags=-v +# type can be: Bool, Text or List # --------------------------------------------- # The package installer has a setting which controls what # the user is allowed to choose. @@ -25,10 +25,10 @@ # --------------------------------------------- # Note: There must be a carriage return at end of last line # --------------------------------------------- -BootBanner:Boot Banner=No -GUI:GUI=No -LegacyLogo:Legacy Logo=Yes -InstantMenu:Instant Menu=Yes -QuietBoot:QuietBoot=Yes -ShowInfo:ShowInfo=Yes -Wait:Wait=Yes +Bool@BootBanner:Boot Banner=No +Bool@GUI:GUI=No +Bool@LegacyLogo:Legacy Logo=Yes +Bool@InstantMenu:Instant Menu=Yes +Bool@QuietBoot:QuietBoot=Yes +Bool@ShowInfo:ShowInfo=Yes +Bool@Wait:Wait=Yes Index: branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh =================================================================== --- branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1806) +++ branches/blackosx/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1807) @@ -2,7 +2,6 @@ echo "===============================================" echo "Unmount all volumes named EFI" -echo "*****************************" # loop through and un-mount ALL mounted 'EFI' system partitions - Thanks kizwan @@ -12,10 +11,10 @@ if [ "$#" -eq 2 ]; then targetVolumeChosenByUser="$1" scriptDir="$2" - echo "DEBUG: passed argument for targetVolumeChosenByUser = $targetVolumeChosenByUser" - echo "DEBUG: passed argument for scriptDir = $scriptDir" + # echo "DEBUG: passed argument for targetVolumeChosenByUser = $targetVolumeChosenByUser" + # echo "DEBUG: passed argument for scriptDir = $scriptDir" else - echo "Error - wrong number of values passed" + echo "Error - wrong number of values passed" >&2 exit 9 fi @@ -34,6 +33,3 @@ fi exit 0 - - - Index: branches/blackosx/package/Resources/ja.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developers : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Thanks to : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : ???\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/zh_TW.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -1,24 +1,22 @@ {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light; } -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red128\green128\blue128; +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; } \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ +\pard\ri0\qc -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs28 \cf0 \ \pard\ri0\qc \f1\fs28 \cf2 \'bd\'d0\'a4\'c5\'a6\'77\'b8\'cb\'a8\'ec @@ -28,10 +26,6 @@ \f1 \'b9\'71\'b8\'a3 \f0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0\ql\qnatural \cf0 \ \pard\ri0\ql\qnatural @@ -46,22 +40,25 @@ \f0 : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \f2\b\fs24 \cf0 \'b7\'e2\'d1\'62\'d5\'df \f0 : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \f1 \cf3 \'c2\'bd\'c4\'b6 \f0 : crazybirdy, Ulimate\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg936\cocoartf1038\cocoasubrtf360 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset134 STHeitiSC-Light;} -{\colortbl;\red255\green255\blue255;\red14\green0\blue45;\red0\green0\blue255;\red255\green0\blue0; -\red255\green0\blue9;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -13,7 +13,7 @@ \f1 \'81\'4b\'d4\'da\'df\'78\'93\'f1\'b0\'b2\'d1\'62\'b5\'c4\'b7\'d6\'b8\'ee\'85\'5e\'bd\'a8\'c1\'a2 \f0 \cf2 \ -\cf3 @LOG_FILENAME@ +@LOG_FILENAME@\cf3 \f1 \cf0 \'bc\'6f\'e4\'9b\'ce\'c4\'bc\'fe\'a1\'a3 \f0 \cf2 \ \ @@ -28,12 +28,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/he.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developers : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Thanks to : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : ???\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/id.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/id.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/id.lproj/Localizable.strings (revision 1807) @@ -237,7 +237,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Mac Keyboard Jerman"; @@ -322,9 +322,9 @@ "Video_title" = "Video"; "Video_description" = "Opsi seleksi untuk video."; -// KeyLayout -"KeyLayout_title" = "Layout keyboard"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "Layout keyboard"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Tema"; Index: branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Jangan dinstall Apple Macintosh ASLI\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Jangan dinstall Apple Macintosh ASLI\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Tim pengembang : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Berterima kasih kepada : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Pakete : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : Rudolf Tingginehe & Babiloe\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Hak kopi \'a9 2011-2012} +\fs20 Hak kopi \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/el.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developers : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Thanks to : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : ???\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/zh_CN.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -1,39 +1,33 @@ {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light; } -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red128\green128\blue128; +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; } \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ +\pard\ri0\qc -\fs50 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs28 \cf0 \ \pard\ri0\qc -\f1\fs28 \cf2 \uc0\u35831 \'a4\'c5\'a6\'77\u35013 \'a8\'ec +\f1 \cf2 \uc0\u35831 \'a4\'c5\'a6\'77\u35013 \'a8\'ec \f0 Apple \f1 \'aa\'ba \f0 Macintosh \f1 \uc0\u30005 \u33041 \f0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \f2\fs24 \cf0 \'bf\'aa\'b7\'a2\'d5\'df \f0 : @@ -46,22 +40,25 @@ \f0 : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \f2\b\fs24 \cf0 \'b7\'e2\'d7\'b0\'d5\'df \f0 : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \f1 \cf3 \'c2\'bd\uc0\u35793 \f0 : crazybirdy, Ulimate\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg936\cocoartf1038\cocoasubrtf360 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset134 STHeitiSC-Light;} -{\colortbl;\red255\green255\blue255;\red14\green0\blue45;\red0\green0\blue255;\red255\green0\blue0; -\red255\green0\blue9;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -13,7 +13,7 @@ \f1 \'b2\'a2\'d4\'da\'d1\'a1\'d4\'f1\'b0\'b2\'d7\'b0\'b5\'c4\'b7\'d6\'c7\'f8\'bd\'a8\'c1\'a2 \f0 \cf2 \ -\cf3 @LOG_FILENAME@ +@LOG_FILENAME@\cf3 \f1 \cf0 \'bc\'cd\'c2\'bc\'ce\'c4\'bc\'fe\'a1\'a3 \f0 \cf2 \ \ @@ -28,12 +28,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ar.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -1,22 +1,24 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset178 GeezaPro;} {\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; } -\margl1440\margr1440\vieww11660\viewh12500\viewkind0 -\pard\ri0\qc +\margl1440\margr1440\vieww11660\viewh12980\viewkind0 +\pard\ri0\qr \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon -\fs50 \ +\fs48 \cf0 Chameleon +\fs28 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ +\pard\ri0\qc -\fs50 \cf0 \ +\fs28 \cf0 \ \pard\ri0\qc -\f1\fs28 \cf2 \'e1\'c7 +\f1 \cf2 \'e1\'c7 \f0 \f1 \'ca\'cb\'c8\'ca\'e5 \f0 @@ -29,10 +31,6 @@ \f1 \'c7\'e1\'c7\'d5\'e1\'ed\'c9 \f0 \uc0\u8235 .\uc0\u8236 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 \cf0 \ \pard\qr @@ -52,7 +50,7 @@ \f1 \'e1 \f0 \uc0\u8235 : \fs24 \uc0\u8236 \ -\pard\pardirnatural\qr +\pard\qr\pardirnatural \b0\fs18 \cf0 \ \pard\qr @@ -62,12 +60,15 @@ \f1 \'c7\'e1\'cd\'d2\'e3\'c9 \f0 \uc0\u8235 :\uc0\u8236 \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qr +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr\pardirnatural \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : Mohamed Khairy\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,13 +1,12 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset178 GeezaPro;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red164\green8\blue0; -\red255\green0\blue0;\red255\green0\blue9;} -\margl1440\margr1440\vieww11660\viewh12500\viewkind0 +{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; +\red255\green0\blue9;\red153\green153\blue153;} +\margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc \f0\b\fs28 \cf0 \ \ - \f1 \'c7\'e1\'e3\'ce\'d8\'e6\'d8\'c7\'ca \'ca\'e3\'ca \f0 \uc0\u8235 , \f1 \uc0\u8236 \'e6 \'e3\'e1\'dd @@ -21,7 +20,6 @@ \f1 \'df\'f1\'ca\'c8 \'e1\'cc\'d0\'d1 \'c7\'e1\'c8\'c7\'d1\'ca\'d4\'e4 \'c7\'e1\'e3\'ce\'ca\'c7\'d1\uc0\u8235 . \f0 \uc0\u8236 \ \ - \f1 \cf0 \'e3\'e4 \f0 \f1 \'dd\'d6\'e1\'df @@ -52,12 +50,14 @@ \cf5 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% -\fs24 \cf6 \ +\fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1807) @@ -235,7 +235,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -320,9 +320,9 @@ "Video_title" = "Video"; "Video_description" = "A selection of options that deal with video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Themes"; Index: branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developers : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Thanks to : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : Blackosx\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1807) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Teclado Mac Alemão"; @@ -317,15 +317,15 @@ // Resolution "Resolution_title" = "Resolução"; -"Resolution_description" = "Set one resolution to use."; +"Resolution_description" = "Configura a resolução do écran"; // Video "Video_title" = "Video"; "Video_description" = "Preferências de Video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Temas"; Index: branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 N\'e3o instale num computador Apple Macintosh\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 N\'e3o instale num computador Apple Macintosh\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Desenvolvedores : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Agradecimentos : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Cr\'e9ditos pelos pacotes : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : artur-pt\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/bs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh kompjutere\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh kompjutere\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Programeri : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Hvala : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Paket : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\fs20 \cf0 Copyright \'a9 2011 +\fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : mlstudio\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/es.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/es.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/es.lproj/Localizable.strings (revision 1807) @@ -478,7 +478,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- @@ -636,7 +636,7 @@ "Resolution_title" = "Resolución"; -"Resolution_description" = "Set one resolution to use."; +"Resolution_description" = "Permite fijar la resolución de pantalla para nuestro monitor"; @@ -648,11 +648,11 @@ -// KeyLayout +// Keymaps -"KeyLayout_title" = "KeyLayout"; +"Keymaps_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; Index: branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/fr.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/fr.lproj/Localizable.strings (revision 1807) @@ -147,7 +147,7 @@ // ---------------------------------------------------------------------------- -"CSTUsingSystemIO_title" = "Generate C-States=Yes"; +"CSTUsingSystemIO_title" = "CST Using SystemIO=Yes"; "CSTUsingSystemIO_description" = "Nouvelle méthode de génétation des C-State _CST en utilisant les registres SystemIO au lieu de FixedHW."; "DropSSDT_title" = "DropSSDT=Yes"; @@ -323,9 +323,9 @@ "Video_title" = "Vidéo"; "Video_description" = "Options concernant la partie vidéo du système."; -// KeyLayout -"KeyLayout_title" = "Mappage de clavier"; -"KeyLayout_description" = "Sélectionnez un mappage de clavier à utiliser. +// Keymaps +"Keymaps_title" = "Mappage de clavier"; +"Keymaps_description" = "Sélectionnez un mappage de clavier à utiliser. Cela installera aussi le module Keylayout ainsi que les différentes configurations de clavier."; // Themes Index: branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Ne pas installer sur un ordinateur Apple Macintosh\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Ne pas installer sur un ordinateur Apple Macintosh\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 D\'e9veloppeurs : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Merci \'e0\'a0 : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package d'installation : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Traduit par : Tenval\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/mk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 \uc0\u1053 \u1077 \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1080 \u1088 \u1072 \u1112 \u1090 \u1077 \u1085 \u1072 Apple Macintosh \u1082 \u1086 \u1084 \u1087 \u1112 \u1091 \u1090 \u1077 \u1088 \ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 \uc0\u1053 \u1077 \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1080 \u1088 \u1072 \u1112 \u1090 \u1077 \u1085 \u1072 Apple Macintosh \u1082 \u1086 \u1084 \u1087 \u1112 \u1091 \u1090 \u1077 \u1088 \ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 \uc0\u1044 \u1077 \u1074 \u1077 \u1083 \u1086 \u1087 \u1077 \u1088 \u1080 : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 \uc0\u1041 \u1083 \u1072 \u1075 \u1086 \u1076 \u1072 \u1088 \u1085 \u1086 \u1089 \u1090 \u1076 \u1086 : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 \uc0\u1055 \u1072 \u1082 \u1077 \u1090 : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1086 \u1076 \u1089 \u1090 \u1088 \u1072 \u1085 \u1072 \u1085 \u1072 : kn6600\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/nl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 versie%CHAMELEONVERSION% revisie%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Installeer niet op een echte Apple Macintosh computer!\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Installeer niet op een echte Apple Macintosh computer!\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Ontwikkelaars : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Dank gaat uit naar : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Vertaald door: yeehaw123 & Badeendje\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/hr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unala\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unala\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Programeri : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Hvala : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Paket : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : mlstudio\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ko.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -1,11 +1,12 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 -{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset129 AppleGothic;\f2\fnil\fcharset129 NanumGothic; +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset129 AppleGothic;\f2\fnil\fcharset129 NanumGothic;} +{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153; } -{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc \f1\b0\fs48 \'c4\'ab\'b8\'e1\'b7\'b9\'bf\'c2 \f0\b\fs50 \ @@ -14,22 +15,14 @@ \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ \pard\ri0\qc -\fs50 \cf0 \ -\pard\ri0 - -\fs22 \cf0 \ -\ +\fs28 \cf0 \ \pard\ri0\qc \f1\b0\fs28 \cf2 \'be\'d6\'c7\'c3 \'b8\'c5\'c5\'b2\'c5\'e4\'bd\'c3 \'c4\'c4\'c7\'bb\'c5\'cd\'bf\'a1 \'bc\'b3\'c4\'a1\'c7\'cf\'c1\'f6 \'b8\'b6\'bd\'c3\'bf\'c0. \f0\b \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \f1\b0\fs24 \cf0 \'b0\'b3\'b9\'df\'c0\'da\'b5\'e9 \f0\b : @@ -45,20 +38,23 @@ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \f1\fs24 \cf0 \'c6\'d0\'c5\'b0\'c1\'f6 \'b0\'b3\'b9\'df \f0\b : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \f1 \cf3 \'b9\'f8\'bf\'aa \f2\b -\f0 by : drew_afx -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\f0 by : drew_afx\ +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,14 +1,12 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 -{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset129 AppleGothic;\f2\fnil\fcharset129 NanumGothic; -} +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset129 AppleGothic;\f2\fnil\fcharset129 NanumGothic;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc \f0\b\fs28 \cf0 \ \ - \f1\b0 \'bd\'ba\'c5\'a9\'b8\'b3\'c6\'ae(\'bc\'b3\'c4\'a1)\'b0\'a1 \'bf\'cf\'b7\'e1\'b5\'c7\'be\'fa\'bd\'c0\'b4\'cf\'b4\'d9. \ \'bc\'b1\'c5\'c3\'b5\'c8 \'c6\'c4\'c6\'bc\'bc\'c7\'c0\'c7 \'b7\'e7\'c6\'ae \'b5\'f0\'b7\'ba\'c5\'e4\'b8\'ae\'bf\'a1 \f2\b \ @@ -24,8 +22,6 @@ \f0\b \cf4 \ \ \ -\ -\ \f1\b0\fs26 \cf0 \'c4\'ab\'b8\'e1\'b7\'b9\'bf\'c2 \f0\b v%CHAMELEONVERSION% r%CHAMELEONREVISION% @@ -33,4 +29,8 @@ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/pl.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/pl.lproj/Localizable.strings (revision 1807) @@ -239,7 +239,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -324,9 +324,9 @@ "Video_title" = "Grafika"; "Video_description" = "Wybierz ustawienia zwizane z obsBug grafiki."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Tematy"; Index: branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Nie instaluj na komputerze Apple Macintosh\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Nie instaluj na komputerze Apple Macintosh\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developerzy: \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Podzi\uc0\u281 kowania dla: \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Pakiet: \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : janek202\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/it.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/it.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/it.lproj/Localizable.strings (revision 1807) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Mappatura tastiera Tedesca Mac"; @@ -323,9 +323,9 @@ "Video_title" = "Video"; "Video_description" = "Selezione di opzioni per il video."; -// KeyLayout -"KeyLayout_title" = "Mappatura tastiera"; -"KeyLayout_description" = "Seleziona la mappatura da utilizzare, Verrá anche installato il modulo Keylayout e le mappature tastiera."; +// Keymaps +"Keymaps_title" = "Mappatura tastiera"; +"Keymaps_description" = "Seleziona la mappatura da utilizzare, Verrá anche installato il modulo Keylayout e le mappature tastiera."; // Themes "Themes_title" = "Temi"; Index: branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,23 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ +\pard\ri0\qc -\fs50 \cf0 \ +\fs28 \cf0 \ \pard\ri0\qc \fs28 \cf2 Non installare su computer Apple Macintosh\ \pard\ri0\qc -\fs26 \cf0 \ -\ -\pard\ri0 -\cf0 \ -\pard\ri0 +\fs50 \cf0 \ +\pard\ri0\ql\qnatural \fs24 \cf0 Sviluppatori : \fs20 %DEVELOP% @@ -34,20 +33,23 @@ \fs24 Grazie a : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Pacchetto realizzato da : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Tradotto da : ErmaC e scrax\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 Questo pkg \'e8 stato compilato da: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 Questo pkg \'e8 stato compilato da: %WHOBUILD%} Index: branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 Questo pkg \'e8 stato compilato da: %WHOBUILD%} Index: branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings (revision 1807) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Teclado Mac Alemão"; @@ -323,9 +323,9 @@ "Video_title" = "Video"; "Video_description" = "Preferências de Video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Temas"; Index: branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 N\'e3o instale num computador Apple Macintosh\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 N\'e3o instale num computador Apple Macintosh\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Desenvolvedores : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Agradecimentos : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Cr\'e9ditos pelos pacotes : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : oldnapalm\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/sr.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/sr.lproj/Localizable.strings (revision 1807) @@ -288,7 +288,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -374,9 +374,9 @@ "Video_title" = "Video"; "Video_description" = "Izbor opcija koje se bave videom."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Themes"; Index: branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unare\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unare\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Programeri : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Hvala : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Paket : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : mlstudio\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ru.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Developers : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Thanks to : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 -\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 : ???\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\b \cf3 Translated by : ???\ +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/de.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/de.lproj/Localizable.strings (revision 1806) +++ branches/blackosx/package/Resources/de.lproj/Localizable.strings (revision 1807) @@ -239,7 +239,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -318,15 +318,15 @@ // Resolution "Resolution_title" = "Bildschirmauflösung"; -"Resolution_description" = "Set one resolution to use."; +"Resolution_description" = "Setzt die Bildschirmauflösung für den Bootprozess."; // Video "Video_title" = "Video"; "Video_description" = "Optionen zur Grafik."; -// KeyLayout -"KeyLayout_title" = "Tastaturbelegung"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "Tastaturbelegung"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Erscheinungsbild"; Index: branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Achtung ! Nicht auf einem Apple Macintosh Computer Installieren\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Achtung ! Nicht auf einem Apple Macintosh Computer Installieren\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0 Entwickler : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 Dank : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : !Xabbu, olegischinski & NextMac\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ um nachzuschauen was getan wurde.\cf5 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/bg.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf (revision 1807) @@ -6,24 +6,21 @@ \pard\ri0\qc \f0\b\fs28 \cf0 \ +\pard\ri0\qc -\fs48 Chameleon +\fs48 \cf0 Chameleon \fs50 \ \pard\ri0\qc \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\ - -\fs50 \cf0 \ \pard\ri0\qc -\fs28 \cf2 Do not install to an Apple Macintosh computer\ +\fs28 \cf0 \ \pard\ri0\qc - -\fs26 \cf0 \ -\ -\pard\ri0 +\cf2 Do not install to an Apple Macintosh computer\ +\pard\ri0\qc \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \fs24 \cf0\u1056 \u1072 \u1079 \u1088 \u1072 \u1073 \u1086 \u1090 \u1077 \u1085 \u1086 \u1090 : \fs20 %DEVELOP% @@ -34,20 +31,23 @@ \fs24 \uc0\u1041 \u1083 \u1072 \u1075 \u1086 \u1076 \u1072 \u1088 \u1085 \u1086 \u1089 \u1090 \u1080 \u1085 \u1072 : \fs20 %CREDITS% \fs24 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ -\pard\ri0 +\pard\ri0\ql\qnatural \b\fs24 \cf0 Package : \fs20 %PKGDEV% \b0\fs30 \ -\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \cf0 \ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 \b \cf3 Translated by : ???\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr -\cf4 This package was builded by: %WHOBUILD%\ -} +\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural + +\b0\fs18 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b\fs20 \cf4 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf (revision 1806) +++ branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf (revision 1807) @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red14\green0\blue45;\red255\green0\blue0; -\red255\green0\blue9;} +\red255\green0\blue9;\red153\green153\blue153;} \margl1440\margr1440\vieww11660\viewh12980\viewkind0 \pard\ri-20\qc @@ -16,12 +16,14 @@ \cf4 \ \ \ -\ -\ \fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% \fs24 \cf5 \ \b0\fs30 \cf0 \ -\fs20 Copyright \'a9 2011-2012} +\fs20 Copyright \'a9 2011-2012\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\b \cf6 This package was builded by: %WHOBUILD%} Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1806) +++ branches/blackosx/package/buildpkg.sh (revision 1807) @@ -62,11 +62,19 @@ declare -r CHAMELEON_DEVELOP=$(awk "NR==6{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_CREDITS=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_PKGDEV=$(awk "NR==14{print;exit}" ${PKGROOT}/../CREDITS) -declare -r CHAMELEON_WHOBUILD=$(whoami | awk '{print $1}' | cut -d ":" -f3) +if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "cmorton" ]];then + declare -r CHAMELEON_WHOBUILD="VoodooLabs BuildBot" +else + declare -r CHAMELEON_WHOBUILD=$(whoami | awk '{print $1}' | cut -d ":" -f3) +fi # ====== GLOBAL VARIABLES ====== declare -r LOG_FILENAME="Chameleon_Installer_Log.txt" +declare -a chameleonOptionType +declare -a chameleonOptionKey +declare -a chameleonOptionValues + declare -a pkgrefs declare -a choice_key declare -a choice_options @@ -88,7 +96,6 @@ # Package identifiers declare -r chameleon_package_identity="org.chameleon" declare -r modules_packages_identity="${chameleon_package_identity}.modules" -declare -r chamTemp="usr/local/chamTemp" # ====== FUNCTIONS ====== @@ -97,21 +104,11 @@ echo "${result%"${result##*[![:space:]]}"}" # remove trailing whitespace characters } -argument () { - local opt="$1" - - if [[ $# -eq 0 ]];then - echo "$0: option requires an argument -- '$opt'" >&2; exit 1 - fi - echo "$opt" -} - function makeSubstitutions () { # Substition is like: Key=Value # # Optionnal arguments: # --subst= : add a new substitution - # --subst : add a new substitution # # Last argument(s) is/are file(s) where substitutions must be made @@ -134,7 +131,6 @@ while [[ $# -gt 0 ]];do local option="$1" case "$option" in - --subst) shift; addSubst "$(argument $@)"; shift ;; --subst=*) shift; addSubst "${option#*=}" ;; -*) echo "Unrecognized makeSubstitutions option '$option'" >&2 @@ -178,7 +174,6 @@ # # Optionnal arguments: # --subst= : add a new substitution - # --subst : add a new substitution # # Substition is like: Key=Value # @@ -192,7 +187,6 @@ local option="$1" case "$option" in --pkg-rootdir=*) shift; pkgRootDir="${option#*=}" ;; - --subst) shift; allSubst[${#allSubst[*]}]="$option"; allSubst[${#allSubst[*]}]="$1" ; shift ;; --subst=*) shift; allSubst[${#allSubst[*]}]="${option}" ;; -*) echo "Unrecognized addTemplateScripts option '$option'" >&2 @@ -381,6 +375,53 @@ echo "(my.choice.selected && $(exclusive_one_choice ${@}))" } +recordChameleonOption () { + local type="$1" + local key="$2" + local value="$3" + + # Search for an existing key + local found=0 + for (( idx=0 ; idx < ${#chameleonOptionKey[@]}; idx++ ));do + if [[ "$key" == "${chameleonOptionKey[$idx]}" ]];then + found=1 + break + fi + done + + # idx contain the index of a new key or an existing one + if [[ $found -eq 0 ]]; then + # Create a new one + chameleonOptionKey[$idx]="$key" + chameleonOptionType[$idx]="$type" + chameleonOptionValues[$idx]="" + fi + + case "$type" in + bool) ;; + text|list) chameleonOptionValues[$idx]="${chameleonOptionValues[$idx]} $value" ;; + *) echo "Error unknown type '$type' for '$key'" >&2 + exit 1 + ;; + esac +} + +generate_options_yaml_file () { + local yamlFile="$1" + echo "---" > $yamlFile + for (( idx=0; idx < ${#chameleonOptionKey[@]}; idx++ ));do + printf "%s:\n type: %s\n" "${chameleonOptionKey[$idx]}" "${chameleonOptionType[$idx]}" >> $yamlFile + case ${chameleonOptionType[$idx]} in + text|list) + printf " values:\n" >> $yamlFile + for value in ${chameleonOptionValues[$idx]};do + printf " - %s\n" "$value" >> $yamlFile + done + ;; + esac + done +} + main () { @@ -393,18 +434,17 @@ echo -e $COL_CYAN" ----------------------------------"$COL_RESET echo "" -# build pre install package +# Add pre install choice echo "================= Preinstall =================" packagesidentity="${chameleon_package_identity}" choiceId="Pre" - mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" -# End build pre install package + # Package will be build at the end +# End pre install choice + # build core package echo "================= Core =================" packagesidentity="${chameleon_package_identity}" @@ -428,33 +468,6 @@ addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" # End build core package -# build install type - echo "================= Chameleon =================" - addGroupChoices --exclusive_one_choice "InstallType" - packagesidentity="${chameleon_package_identity}.type" - - # build new install package - choiceId="New" - mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new" - - packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" - addChoice --group="InstallType" --start-selected="!choices['Upgrade'].selected" --pkg-refs="$packageRefId" "${choiceId}" - # End build new install package - - # build upgrade package - choiceId="Upgrade" - mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade" - - packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" - addChoice --group="InstallType" --start-selected="chameleon_boot_plist_exists()" --pkg-refs="$packageRefId" "${choiceId}" - # End build upgrade package - -# End build install type - # build Chameleon package echo "================= Chameleon =================" addGroupChoices --exclusive_one_choice "Chameleon" @@ -474,6 +487,10 @@ # End build standard package # build efi package +if [[ 1 -eq 0 ]];then + # Only standard installation is currently supported + # We need to update the script to be able to install + # Chameleon on EFI partition choiceId="EFI" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources @@ -486,7 +503,7 @@ buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --group="Chameleon" --start-visible="systemHasGPT()" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build efi package - +fi # build no bootloader choice package choiceId="noboot" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root @@ -518,11 +535,16 @@ { # Start build Resolution package module choiceId="AutoReso" + moduleFile="Resolution.dylib" mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root" - ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" + ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="moduleName=$choiceId" \ + --subst="moduleFile=$moduleFile" \ + InstallModule packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build Resolution package module } @@ -533,11 +555,16 @@ { # Start build klibc package module choiceId="klibc" + moduleFile="${choiceId}.dylib" mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root" - ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root + ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" ${PKG_BUILD_DIR}/${choiceId}/Root + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="moduleName=$choiceId" \ + --subst="moduleFile=$moduleFile" \ + InstallModule packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules" addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId" "${choiceId}" # End build klibc package module } @@ -553,11 +580,16 @@ fi # Start build uClibc package module choiceId="uClibc" + moduleFile="uClibcxx.dylib" mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root" - ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root" + ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="moduleName=$choiceId" \ + --subst="moduleFile=$moduleFile" \ + InstallModule packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules" # Add the klibc package because the uClibc module is dependent of klibc module addChoice --group="Module" --start-selected="false" --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}" # End build uClibc package module @@ -570,6 +602,7 @@ { # Start build Keylayout package module choiceId="Keylayout" + moduleFile="${choiceId}.dylib" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/{modules,Keymaps} mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin layout_src_dir="${SRCROOT}/i386/modules/Keylayout/layouts/layouts-src" @@ -579,14 +612,19 @@ tar czf "${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps/layouts-src.tar.gz" README *.slt) fi # Adding module - ditto --noextattr --noqtn ${SYMROOT}/i386/modules/${choiceId}.dylib ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/modules + ditto --noextattr --noqtn ${SYMROOT}/i386/modules/$moduleFile ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/modules # Adding Keymaps ditto --noextattr --noqtn ${SRCROOT}/Keymaps ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps # Adding tools ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin + # Adding scripts + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="moduleName=$choiceId" \ + --subst="moduleFile=$moduleFile" \ + InstallModule packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # Don't add a choice for Keylayout module # addChoice "${choiceId}" "Module" --start-selected="false" "$packageRefId" @@ -611,14 +649,13 @@ # parse OptionalSettings folder to find files of boot options. # ------------------------------------------------------ OptionalSettingsFolder="${PKGROOT}/OptionalSettings" - OptionalSettingsFiles=($( find "${OptionalSettingsFolder}" -depth 1 ! -name '.svn' ! -name '.DS_Store' )) - for (( i = 0 ; i < ${#OptionalSettingsFiles[@]} ; i++ )) - do + while IFS= read -r -d '' OptionsFile; do # Take filename and Strip .txt from end and path from front - builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} ) - builtOptionsList=$( echo ${builtOptionsList##*/} ) + builtOptionsList=${OptionsFile%.txt} + builtOptionsList=${builtOptionsList##*/} + packagesidentity="${chameleon_package_identity}.options.$builtOptionsList" echo "================= $builtOptionsList =================" @@ -628,54 +665,68 @@ availableOptions=() # array to hold the list of boot options, per 'section'. exclusiveFlag="" # used to indicate list has exclusive options while read textLine; do - # ignore lines in the file beginning with a # and Exclusive=False - if [[ ${textLine} != \#* ]] && [[ ${textLine} != "Exclusive=False" ]];then - # check for 'Exclusive=True' option in file - if [[ ${textLine} == "Exclusive=True" ]];then - exclusiveFlag="--exclusive_zero_or_one_choice" - else - availableOptions[${#availableOptions[@]}]=$textLine - fi - fi - done < ${OptionalSettingsFiles[$i]} + # ignore lines in the file beginning with a # + [[ $textLine = \#* ]] && continue + local optionName="" key="" value="" + case "$textLine" in + Exclusive=[Tt][Rr][Uu][Ee]) exclusiveFlag="--exclusive_zero_or_one_choice" ;; + Exclusive=*) continue ;; + *@*:*=*) + availableOptions[${#availableOptions[*]}]="$textLine" ;; + *) echo "Error: invalid line '$textLine' in file '$OptionsFile'" >&2 + exit 1 + ;; + esac + done < "$OptionsFile" addGroupChoices --parent="Options" $exclusiveFlag "${builtOptionsList}" - packagesidentity="${chameleon_package_identity}.options.$builtOptionsList" # ------------------------------------------------------ # Loop through options in array and process each in turn # ------------------------------------------------------ - for (( c = 0 ; c < ${#availableOptions[@]} ; c++ )); do - textLine=${availableOptions[c]} + for textLine in "${availableOptions[@]}"; do # split line - taking all before ':' as option name # and all after ':' as key/value - optionName=${textLine%%:*} - keyValue=${textLine##*:} + type=$( echo "${textLine%%@*}" | tr '[:upper:]' '[:lower:]' ) + tmp=${textLine#*@} + optionName=${tmp%%:*} + keyValue=${tmp##*:} key=${keyValue%%=*} value=${keyValue#*=} # create folders required for each boot option mkdir -p "${PKG_BUILD_DIR}/$optionName/Root/" - # create dummy file with name of key/value - echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}" - + case "$type" in + bool) startSelected="check_chameleon_bool_option('$key','$value')" ;; + text) startSelected="check_chameleon_text_option('$key','$value')" ;; + list) startSelected="check_chameleon_list_option('$key','$value')" ;; + *) echo "Error: invalid type '$type' in line '$textLine' in '$OptionsFile'" >&2 + exit 1 + ;; + esac + recordChameleonOption "$type" "$key" "$value" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/$optionName" \ + --subst="optionType=$type" \ + --subst="optionKey=$key" \ + --subst="optionValue=$value" \ + AddOption packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}") - buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" + buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/" addChoice --group="${builtOptionsList}" \ - --start-selected="check_chameleon_option('$key','$value')" \ + --start-selected="$startSelected" \ --pkg-refs="$packageRefId" "${optionName}" done - done + done < <( find "${OptionalSettingsFolder}" -depth 1 -type f -name '*.txt' -print0 ) # End build options packages if [[ -n "${CONFIG_KEYLAYOUT_MODULE}" ]];then -# build KeyLayout options packages +# build Keymaps options packages echo "================= Keymaps Options =================" - addGroupChoices --exclusive_zero_or_one_choice "KeyLayout" - packagesidentity="${chameleon_package_identity}.options.keylayout" + addGroupChoices --exclusive_zero_or_one_choice "Keymaps" + packagesidentity="${chameleon_package_identity}.options.keymaps" keylayoutPackageRefId="" if [[ "${CONFIG_MODULES}" == 'y' && "${CONFIG_KEYLAYOUT_MODULE}" = 'm' ]];then keylayoutPackageRefId=$(getPackageRefId "${modules_packages_identity}" "Keylayout") @@ -694,18 +745,21 @@ choiceId="${availableOptions[i]}" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - # create dummy file with name of key/value - echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}" - + recordChameleonOption "text" "$chameleon_keylayout_key" "$choiceId" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="optionType=text" \ + --subst="optionKey=$chameleon_keylayout_key" \ + --subst="optionValue=$choiceId" \ + AddOption packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") - buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # Add the Keylayout package because the Keylayout module is needed - addChoice --group="KeyLayout" \ - --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \ + addChoice --group="Keymaps" \ + --start-selected="check_chameleon_text_option('${chameleon_keylayout_key}','${choiceId}')" \ --pkg-refs="$packageRefId $keylayoutPackageRefId" "${choiceId}" done -# End build KeyLayout options packages +# End build Keymaps options packages fi # build theme packages @@ -717,22 +771,42 @@ artwork="${SRCROOT}/artwork/themes" themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' )) for (( i = 0 ; i < ${#themes[@]} ; i++ )); do - theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' ) - mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/" - rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}" + themeName=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' ) + themeDir="$themeName" + mkdir -p "${PKG_BUILD_DIR}/${themeName}/Root/" + rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${themeName}/Root/${themeName}" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${themeName}" \ + --subst="themeName=$themeName" \ + --subst="themeDir=$themeDir" \ + InstallTheme - packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}") - buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" - addChoice --group="Themes" --start-selected="false" --pkg-refs="$packageRefId" "${theme}" + packageRefId=$(getPackageRefId "${packagesidentity}" "${themeName}") + buildpackage "$packageRefId" "${themeName}" "${PKG_BUILD_DIR}/${themeName}" "/Extra/Themes" + addChoice --group="Themes" --start-selected="false" --pkg-refs="$packageRefId" "${themeName}" done # End build theme packages# End build Extras package +# build pre install package + echo "================= Pre =================" + packagesidentity="${chameleon_package_identity}" + choiceId="Pre" + + packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") + mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root + mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources + local yamlFile="Resources/chameleon_options.yaml" + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \ + --subst="YAML_FILE=${yamlFile}" ${choiceId} + generate_options_yaml_file "${PKG_BUILD_DIR}/${choiceId}/Scripts/$yamlFile" + buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" +# End build pre install package + # build post install package echo "================= Post =================" packagesidentity="${chameleon_package_identity}" choiceId="Post" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root - addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} InstallerLog + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") Property changes on: branches/blackosx ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r1792-1806