Chameleon

Chameleon Commit Details

Date:2012-02-23 18:09:44 (12 years 2 months ago)
Author:ErmaC
Commit:1828
Parents: 1827
Message:- sync with trunk - Update Korean Localizable.strings files - Fix correct graphics Icons detection for gui.c
Changes:
M/branches/ErmaC/Modules/package/Resources/ko.lproj/Localizable.strings
M/branches/ErmaC/Trunk/i386/util/fdisk/misc.c
M/branches/ErmaC/Trunk/i386/boot2/gui.c
M/branches/ErmaC/Modules/i386/util/fdisk/misc.c
M/branches/ErmaC/Modules/i386/boot2/gui.c
M/branches/ErmaC/Trunk/package/Resources/ko.lproj/Localizable.strings

File differences

branches/ErmaC/Trunk/i386/boot2/gui.c
4343
4444
4545
46
47
46
47
4848
4949
5050
......
5555
5656
5757
58
59
58
59
6060
6161
6262
......
372372
373373
374374
375
376
375
376
377377
378378
379379
......
385385
386386
387387
388
389
388
389
390390
391391
392392
......
906906
907907
908908
909
909
910910
911911
912912
......
931931
932932
933933
934
934
935935
936936
937937
iDeviceGeneric_o,␊
iDeviceHFS,␊
iDeviceHFS_o,␊
iDeviceHFS_Mountain,␊
iDeviceHFS_Mountain_o,␊
iDeviceHFS_ML,␊
iDeviceHFS_ML_o,␊
iDeviceHFS_Lion,␊
iDeviceHFS_Lion_o,␊
iDeviceHFS_SL,␊
iDeviceHFS_Tiger_o,␊
iDeviceHFSRAID,␊
iDeviceHFSRAID_o,␊
iDeviceHFSRAID_Mountain,␊
iDeviceHFSRAID_Mountain_o,␊
iDeviceHFSRAID_ML,␊
iDeviceHFSRAID_ML_o,␊
iDeviceHFSRAID_Lion,␊
iDeviceHFSRAID_Lion_o,␊
iDeviceHFSRAID_SL,␊
␉LOADPNG(device_generic_o, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus_o, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_ml, iDeviceHFS_Mountain);␊
␉LOADPNG(device_hfsplus_ml_o, iDeviceHFS_Mountain_o);␊
␉LOADPNG(device_hfsplus_ml, iDeviceHFS_ML);␊
␉LOADPNG(device_hfsplus_ml_o, iDeviceHFS_ML_o);␊
␉LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion);␊
␉LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o);␊
␉LOADPNG(device_hfsplus_sl, iDeviceHFS_SL);␊
␊
␉LOADPNG(device_hfsraid, iDeviceGeneric);␊
␉LOADPNG(device_hfsraid_o, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_Mountain);␊
␉LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_Mountain_o);␊
␉LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_ML);␊
␉LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_ML_o);␊
␉LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion);␊
␉LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o);␊
␉LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL);␊
␊
␉␉␉␉␉switch (device->OSVersion[3]) {␊
␉␉␉␉␉␉case '8':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_Mountain) ? iDeviceHFSRAID_Mountain : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉case '7':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␊
␉␉␉␉␉switch (device->OSVersion[3]) {␊
␉␉␉␉␉␉case '8':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_Mountain) ? iDeviceHFS_Mountain : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉case '7':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
branches/ErmaC/Trunk/i386/util/fdisk/misc.c
165165
166166
167167
168
169
170
168
169
170
171171
172172
173173
}␊
␊
void␊
putshort(p, l)␊
␉void *p;␊
␉u_int16_t l;␊
putshort(␊
␉void *p,␊
␉u_int16_t l)␊
{␊
␉unsigned char *cp = p;␊
␊
branches/ErmaC/Modules/i386/boot2/gui.c
4343
4444
4545
46
47
46
47
4848
4949
5050
......
5555
5656
5757
58
59
58
59
6060
6161
6262
......
372372
373373
374374
375
376
375
376
377377
378378
379379
......
385385
386386
387387
388
389
388
389
390390
391391
392392
......
906906
907907
908908
909
909
910910
911911
912912
......
931931
932932
933933
934
934
935935
936936
937937
iDeviceGeneric_o,␊
iDeviceHFS,␊
iDeviceHFS_o,␊
iDeviceHFS_Mountain,␊
iDeviceHFS_Mountain_o,␊
iDeviceHFS_ML,␊
iDeviceHFS_ML_o,␊
iDeviceHFS_Lion,␊
iDeviceHFS_Lion_o,␊
iDeviceHFS_SL,␊
iDeviceHFS_Tiger_o,␊
iDeviceHFSRAID,␊
iDeviceHFSRAID_o,␊
iDeviceHFSRAID_Mountain,␊
iDeviceHFSRAID_Mountain_o,␊
iDeviceHFSRAID_ML,␊
iDeviceHFSRAID_ML_o,␊
iDeviceHFSRAID_Lion,␊
iDeviceHFSRAID_Lion_o,␊
iDeviceHFSRAID_SL,␊
␉LOADPNG(device_generic_o, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus_o, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_ml, iDeviceHFS_Mountain);␊
␉LOADPNG(device_hfsplus_ml_o, iDeviceHFS_Mountain_o);␊
␉LOADPNG(device_hfsplus_ml, iDeviceHFS_ML);␊
␉LOADPNG(device_hfsplus_ml_o, iDeviceHFS_ML_o);␊
␉LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion);␊
␉LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o);␊
␉LOADPNG(device_hfsplus_sl, iDeviceHFS_SL);␊
␊
␉LOADPNG(device_hfsraid, iDeviceGeneric);␊
␉LOADPNG(device_hfsraid_o, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_Mountain);␊
␉LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_Mountain_o);␊
␉LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_ML);␊
␉LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_ML_o);␊
␉LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion);␊
␉LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o);␊
␉LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL);␊
␊
␉␉␉␉␉switch (device->OSVersion[3]) {␊
␉␉␉␉␉␉case '8':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_Mountain) ? iDeviceHFSRAID_Mountain : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉case '7':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric;␊
␉␉␉␉␉␊
␉␉␉␉␉switch (device->OSVersion[3]) {␊
␉␉␉␉␉␉case '8':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_Mountain) ? iDeviceHFS_Mountain : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉case '7':␊
␉␉␉␉␉␉␉devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;␊
branches/ErmaC/Modules/i386/util/fdisk/misc.c
165165
166166
167167
168
169
170
168
169
170
171171
172172
173173
}␊
␊
void␊
putshort(p, l)␊
␉void *p;␊
␉u_int16_t l;␊
putshort(␊
␉void *p,␊
␉u_int16_t l)␊
{␊
␉unsigned char *cp = p;␊
␊

Archive Download the corresponding diff file

Revision: 1828