Index: branches/blackosx/Chameleon.xcodeproj/project.pbxproj
===================================================================
--- branches/blackosx/Chameleon.xcodeproj/project.pbxproj	(revision 1828)
+++ branches/blackosx/Chameleon.xcodeproj/project.pbxproj	(revision 1829)
@@ -1333,6 +1333,11 @@
 		B442B90E14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = nl; path = nl.lproj/Conclusion.rtfd; sourceTree = "<group>"; };
 		B442B90F14BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = nl; path = nl.lproj/Description.html; sourceTree = "<group>"; };
 		B442B91014BE6EC900EEF9D4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B442B91414BE712700EEF9D4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ca; path = ca.lproj/Welcome.rtfd; sourceTree = "<group>"; };
+		B442B91514BE712700EEF9D4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ca; path = ca.lproj/License.rtf; sourceTree = "<group>"; };
+		B442B91614BE712700EEF9D4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B442B91714BE712700EEF9D4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ca; path = ca.lproj/Conclusion.rtfd; sourceTree = "<group>"; };
+		B442B91814BE712700EEF9D4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ca; path = ca.lproj/Description.html; sourceTree = "<group>"; };
 		B45C10A014BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = hr; path = hr.lproj/Description.html; sourceTree = "<group>"; };
 		B45C10A114BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = hr; path = hr.lproj/Conclusion.rtfd; sourceTree = "<group>"; };
 		B45C10A214BE7413006AA075 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = hr; path = hr.lproj/License.rtf; sourceTree = "<group>"; };
@@ -1376,7 +1381,8 @@
 			);
 			name = Icons;
 			sourceTree = "<group>";
-		};		364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = {
+		};
+		364E0DDF14BCFB6600F55E58 /* Scripts.templates */ = {
 			isa = PBXGroup;
 			children = (
 				B4AABE5814C3B8B90055ECD1 /* AddOption */,
@@ -3541,6 +3547,7 @@
 				B442B8FA14BE6E1700EEF9D4 /* el */,
 				B442B8FF14BE6E7D00EEF9D4 /* zh_TW */,
 				B442B90E14BE6EC900EEF9D4 /* nl */,
+				B442B91714BE712700EEF9D4 /* ca */,
 				B45C10A114BE7413006AA075 /* hr */,
 			);
 			name = Conclusion.rtfd;
@@ -3571,6 +3578,7 @@
 				B442B8FB14BE6E1700EEF9D4 /* el */,
 				B442B90014BE6E7D00EEF9D4 /* zh_TW */,
 				B442B90F14BE6EC900EEF9D4 /* nl */,
+				B442B91814BE712700EEF9D4 /* ca */,
 				B45C10A014BE7413006AA075 /* hr */,
 			);
 			name = Description.html;
@@ -3601,6 +3609,7 @@
 				B442B8F814BE6E1700EEF9D4 /* el */,
 				B442B8FD14BE6E7D00EEF9D4 /* zh_TW */,
 				B442B90C14BE6EC900EEF9D4 /* nl */,
+				B442B91514BE712700EEF9D4 /* ca */,
 				B45C10A214BE7413006AA075 /* hr */,
 			);
 			name = License.rtf;
@@ -3631,6 +3640,7 @@
 				B442B8FC14BE6E1700EEF9D4 /* el */,
 				B442B90114BE6E7D00EEF9D4 /* zh_TW */,
 				B442B91014BE6EC900EEF9D4 /* nl */,
+				B442B91614BE712700EEF9D4 /* ca */,
 				B45C10A314BE7413006AA075 /* hr */,
 			);
 			name = Localizable.strings;
@@ -3661,6 +3671,7 @@
 				B442B8F914BE6E1700EEF9D4 /* el */,
 				B442B8FE14BE6E7D00EEF9D4 /* zh_TW */,
 				B442B90D14BE6EC900EEF9D4 /* nl */,
+				B442B91414BE712700EEF9D4 /* ca */,
 				B45C10A414BE7413006AA075 /* hr */,
 			);
 			name = Welcome.rtfd;
Index: branches/blackosx/i386/libsaio/nvidia.c
===================================================================
--- branches/blackosx/i386/libsaio/nvidia.c	(revision 1828)
+++ branches/blackosx/i386/libsaio/nvidia.c	(revision 1829)
@@ -99,9 +99,6 @@
 
 static struct nv_chipsets_t NVKnownChipsets[] = {
 	{ 0x00000000, "Unknown" },
-// temporary placement
-	{ 0x10DE0DF4, "GeForce GT 450M" }, //Azi + issue #99
-	{ 0x10DE1251, "GeForce GTX 560M" }, // Asus G74SX
 //========================================
 	// 0040 - 004F	
 	{ 0x10DE0040, "GeForce 6800 Ultra" },
@@ -400,6 +397,7 @@
 	{ 0x10DE05E2, "GeForce GTX 260" },
 	{ 0x10DE05E3, "GeForce GTX 285" },
 	{ 0x10DE05E6, "GeForce GTX 275" },
+	{ 0x10DE05E7, "Tesla C1060" }, 
 	{ 0x10DE05EA, "GeForce GTX 260" },
 	{ 0x10DE05EB, "GeForce GTX 295" },
 	{ 0x10DE05ED, "Quadroplex 2200 D2" },
@@ -439,8 +437,10 @@
 	{ 0x10DE061B, "Quadro VX 200" },
 	{ 0x10DE061C, "Quadro FX 3600M" },
 	{ 0x10DE061D, "Quadro FX 2800M" },
+	{ 0x10DE061E, "Quadro FX 3700M" }, 
 	{ 0x10DE061F, "Quadro FX 3800M" },
 	// 0620 - 062F	
+	{ 0x10DE0621, "GeForce GT 230" }, 
 	{ 0x10DE0622, "GeForce 9600 GT" },
 	{ 0x10DE0623, "GeForce 9600 GS" },
 	{ 0x10DE0625, "GeForce 9600 GSO 512"},
@@ -448,6 +448,7 @@
 	{ 0x10DE0627, "GeForce GT 140" },
 	{ 0x10DE0628, "GeForce 9800M GTS" },
 	{ 0x10DE062A, "GeForce 9700M GTS" },
+	{ 0x10DE062B, "GeForce 9800M GS" }, 
 	{ 0x10DE062C, "GeForce 9800M GTS" },
 	{ 0x10DE062D, "GeForce 9600 GT" },
 	{ 0x10DE062E, "GeForce 9600 GT" },
@@ -477,6 +478,7 @@
 	{ 0x10DE0652, "GeForce GT 130M" },
 	{ 0x10DE0653, "GeForce GT 120M" },
 	{ 0x10DE0654, "GeForce GT 220M" },
+	{ 0x10DE0655, "GeForce GT 120" }, 
 	{ 0x10DE0656, "GeForce 9650 S" },
 	{ 0x10DE0658, "Quadro FX 380" },
 	{ 0x10DE0659, "Quadro FX 580" },
@@ -507,6 +509,7 @@
 	{ 0x10DE06DD, "Quadro 4000" },
 	{ 0x10DE06DE, "Tesla M2050" },	// TODO: sub-device id: 0x0846
 	{ 0x10DE06DE, "Tesla M2070" },	// TODO: sub-device id: ?	
+	{ 0x10DE06DF, "Tesla M2070-Q" }, 
 	// 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070
 	// 06E0 - 06EF	
 	{ 0x10DE06E0, "GeForce 9300 GE" },
@@ -524,11 +527,13 @@
 	{ 0x10DE06EC, "GeForce G 105M" },
 	{ 0x10DE06EF, "GeForce G 103M" },
 	// 06F0 - 06FF	
+	{ 0x10DE06F1, "GeForce G105M" }, 
 	{ 0x10DE06F8, "Quadro NVS 420" },
 	{ 0x10DE06F9, "Quadro FX 370 LP" },
 	{ 0x10DE06FA, "Quadro NVS 450" },
 	{ 0x10DE06FB, "Quadro FX 370M" },
 	{ 0x10DE06FD, "Quadro NVS 295" },
+	{ 0x10DE06FF, "HICx16 + Graphics" }, 
 	// 0700 - 070F
 	// 0710 - 071F
 	// 0720 - 072F
@@ -555,6 +560,7 @@
 	// 0820 - 082F
 	// 0830 - 083F
 	// 0840 - 084F
+	{ 0x10DE0840, "GeForce 8200M" }, 
 	{ 0x10DE0844, "GeForce 9100M G" },
 	{ 0x10DE0845, "GeForce 8200M G" },
 	{ 0x10DE0846, "GeForce 9200" },
@@ -577,6 +583,7 @@
 	{ 0x10DE0866, "GeForce 9400M G" },
 	{ 0x10DE0867, "GeForce 9400" },
 	{ 0x10DE0868, "nForce 760i SLI" },
+	{ 0x10DE0869, "GeForce 9400" }, 
 	{ 0x10DE086A, "GeForce 9400" },
 	{ 0x10DE086C, "GeForce 9300 / nForce 730i" },
 	{ 0x10DE086D, "GeForce 9200" },
@@ -596,6 +603,8 @@
 	// 0880 - 088F
 	// 0890 - 089F
 	// 08A0 - 08AF
+	{ 0x10DE08A0, "GeForce 320M" }, 
+	{ 0x10DE08A4, "GeForce 320M" }, 
 	// 08B0 - 08BF
 	// 08C0 - 08CF
 	// 08D0 - 08DF	
@@ -623,6 +632,8 @@
 	{ 0x10DE0A20, "GeForce GT220" },
 	{ 0x10DE0A22, "GeForce 315" },
 	{ 0x10DE0A23, "GeForce 210" },
+	{ 0x10DE0A26, "GeForce 405" }, 
+	{ 0x10DE0A27, "GeForce 405" }, 
 	{ 0x10DE0A28, "GeForce GT 230M" },
 	{ 0x10DE0A29, "GeForce GT 330M" },
 	{ 0x10DE0A2A, "GeForce GT 230M" },
@@ -632,6 +643,7 @@
 	// 0A30 - 0A3F	
 	{ 0x10DE0A34, "GeForce GT 240M" },
 	{ 0x10DE0A35, "GeForce GT 325M" },
+	{ 0x10DE0A38, "Quadro 400" }, 
 	{ 0x10DE0A3C, "Quadro FX 880M" },
 	// 0A40 - 0A4F
 	// 0A50 - 0A5F
@@ -656,7 +668,9 @@
 	{ 0x10DE0A73, "GeForce 305M" },
 	{ 0x10DE0A74, "GeForce G210M" },
 	{ 0x10DE0A75, "GeForce G310M" },
+	{ 0x10DE0A76, "ION" }, 
 	{ 0x10DE0A78, "Quadro FX 380 LP" },
+	{ 0x10DE0A7A, "GeForce 315M" }, 
 	{ 0x10DE0A7C, "Quadro FX 380M" },
 	// 0A80 - 0A8F
 	// 0A90 - 0A9F
@@ -697,10 +711,11 @@
 	{ 0x10DE0CA2, "GeForce GT 320" },
 	{ 0x10DE0CA3, "GeForce GT 240" },
 	{ 0x10DE0CA4, "GeForce GT 340" },
+	{ 0x10DE0CA5, "GeForce GT 220" }, 
 	{ 0x10DE0CA7, "GeForce GT 330" },
 	{ 0x10DE0CA8, "GeForce GTS 260M" },
 	{ 0x10DE0CA9, "GeForce GTS 250M" },
-	{ 0x10DE0CAC, "GeForce 315" },
+	{ 0x10DE0CAC, "GeForce GT 220" }, 
 	{ 0x10DE0CAF, "GeForce GT 335M" },
 	// 0CB0 - 0CBF	
 	{ 0x10DE0CB0, "GeForce GTS 350M" },
@@ -730,11 +745,15 @@
 	{ 0x10DE0DC5, "GeForce GTS 450" },
 	{ 0x10DE0DC6, "GeForce GTS 450" },
 	{ 0x10DE0DCA, "GF10x" },
+	{ 0x10DE0DCD, "GeForce GT 555M" }, 
+	{ 0x10DE0DCE, "GeForce GT 555M" }, 
 	// 0DD0 - 0DDF	
 	{ 0x10DE0DD1, "GeForce GTX 460M" },
 	{ 0x10DE0DD2, "GeForce GT 445M" },
 	{ 0x10DE0DD3, "GeForce GT 435M" },
+	{ 0x10DE0DD6, "GeForce GT 550M" }, 
 	{ 0x10DE0DD8, "Quadro 2000" },
+	{ 0x10DE0DDA, "Quadro 2000M" }, 
 	{ 0x10DE0DDE, "GF106-ES" },
 	{ 0x10DE0DDF, "GF106-INT" },
 	// 0DE0 - 0DEF	
@@ -743,13 +762,20 @@
 	{ 0x10DE0DE2, "GeForce GT 420" },
 	{ 0x10DE0DE5, "GeForce GT 530" },
 	{ 0x10DE0DEB, "GeForce GT 555M" },
+	{ 0x10DE0DEC, "GeForce GT 525M" }, 
+	{ 0x10DE0DED, "GeForce GT 520M" }, 
 	{ 0x10DE0DEE, "GeForce GT 415M" },
 	// 0DF0 - 0DFF	
 	{ 0x10DE0DF0, "GeForce GT 425M" },
 	{ 0x10DE0DF1, "GeForce GT 420M" },
 	{ 0x10DE0DF2, "GeForce GT 435M" },
 	{ 0x10DE0DF3, "GeForce GT 420M" },
+	{ 0x10DE0DF4, "GeForce GT 540M" }, 
+	{ 0x10DE0DF5, "GeForce GT 525M" }, 
+	{ 0x10DE0DF6, "GeForce GT 550M" }, 
+	{ 0x10DE0DF7, "GeForce GT 520M" }, 
 	{ 0x10DE0DF8, "Quadro 600" },
+	{ 0x10DE0DFA, "Quadro 1000M" }, 
 	{ 0x10DE0DFE, "GF108 ES" },
 	{ 0x10DE0DFF, "GF108 INT" },
 	// 0E00 - 0E0F
@@ -762,7 +788,10 @@
 	{ 0x10DE0E25, "D12U-50" },
 	// 0E30 - 0E3F	
 	{ 0x10DE0E30, "GeForce GTX 470M" },
+	{ 0x10DE0E31, "GeForce GTX 485M" }, 
 	{ 0x10DE0E38, "GF104GL" },
+	{ 0x10DE0E3A, "Quadro 3000M" }, 
+	{ 0x10DE0E3B, "Quadro 4000M" }, 
 	{ 0x10DE0E3E, "GF104-ES" },
 	{ 0x10DE0E3F, "GF104-INT" },
 	// 0E40 - 0E4F	
@@ -798,28 +827,48 @@
 	// 1020 - 102F
 	// 1030 - 103F
 	// 1040 - 104F
-	{ 0x10DE1040, "GeForce GT 520" },	
+	{ 0x10DE1040, "GeForce GT 520" },
 	// 1050 - 105F
 	{ 0x10DE1050, "GeForce GT 520M" },
+	{ 0x10DE1051, "GeForce GT 520MX" },
+	{ 0x10DE1054, "GeForce GT 410M" }, 
+	{ 0x10DE1056, "NVS 4200M" }, 
+	{ 0x10DE1057, "NVS 4200M" }, 
 	// 1060 - 106F
 	// 1070 - 107F
+	{ 0x10DE107F, "NVIDIA GF119-ES" }, 
 	// 1080 - 108F
 	{ 0x10DE1080, "GeForce GTX 580" },
 	{ 0x10DE1081, "GeForce GTX 570" },
 	{ 0x10DE1082, "GeForce GTX 560 Ti" },
 	{ 0x10DE1083, "D13U" },
+	{ 0x10DE1084, "GeForce GTX 560" }, 
+	{ 0x10DE1086, "GeForce GTX 570" }, 
+	{ 0x10DE1087, "GeForce GTX 560 Ti-448" }, 
 	{ 0x10DE1088, "GeForce GTX 590" },
+	{ 0x10DE1089, "GeForce GTX 580" }, 
+	{ 0x10DE108B, "GeForce GTX 590" }, 
 	// 1090 - 109F	
+	{ 0x10DE1091, "Tesla M2090" }, 
 	{ 0x10DE1098, "D13U" },
-	{ 0x10DE109A, "N12E-Q5" },
+	{ 0x10DE109A, "Quadro 5010M" }, 
+	{ 0x10DE109B, "Quadro 7000" }, 
 	// 10A0 - 10AF
 	// 10B0 - 10BF
 	// 10C0 - 10CF
+	{ 0x10DE10C0, "GeForce 9300 GS" }, 
 	{ 0x10DE10C3, "GeForce 8400 GS" },
+	{ 0x10DE10C5, "GeForce 405" }, 
+	// 10D0 - 10DF
+	{ 0x10DE10D8, "NVS 300" }, 
 	// 1200 - 
 	{ 0x10DE1200, "GeForce GTX 560 Ti" },
+	{ 0x10DE1201, "GeForce GTX 560" }, 
+	{ 0x10DE1241, "GeForce GT 545" }, 
+	{ 0x10DE1243, "GeForce GT 545" }, 
 	{ 0x10DE1244, "GeForce GTX 550 Ti" },
-	{ 0x10DE1245, "GeForce GTS 450" },	
+	{ 0x10DE1245, "GeForce GTS 450" },
+	{ 0x10DE1251, "GeForce GTX 560M" }, 
 };
 
 static uint16_t swap16(uint16_t x)
@@ -830,10 +879,10 @@
 static uint16_t read16(uint8_t *ptr, uint16_t offset)
 {
 	uint8_t ret[2];
-	
+
 	ret[0] = ptr[offset+1];
 	ret[1] = ptr[offset];
-	
+
 	return *((uint16_t*)&ret);
 }
 
@@ -851,12 +900,12 @@
 static uint32_t read32(uint8_t *ptr, uint16_t offset)
 {
 	uint8_t ret[4];
-	
+
 	ret[0] = ptr[offset+3];
 	ret[1] = ptr[offset+2];
 	ret[2] = ptr[offset+1];
 	ret[3] = ptr[offset];
-	
+
 	return *((uint32_t*)&ret);
 }
 #endif
@@ -869,7 +918,7 @@
 	}
 	
 	uint16_t dcbptr = swap16(read16(rom, 0x36));
-	
+
 	if (!dcbptr) {
 		printf("no dcb table found\n");
 		return PATCH_ROM_FAILED;
@@ -892,7 +941,7 @@
 			headerlength = dcbtable[1];
 			numentries	 = dcbtable[2];
 			recordlength = dcbtable[3];
-			
+
 			sig = *(uint32_t *)&dcbtable[6];
 		}
 		else
@@ -942,7 +991,7 @@
 	{
 		uint32_t connection;
 		connection = *(uint32_t *)&dcbtable[headerlength + recordlength * i];
-		
+
 		/* Should we allow discontinuous DCBs? Certainly DCB I2C tables can be discontinuous */
 		if ((connection & 0x0000000f) == 0x0000000f) /* end of records */ 
 			continue;
@@ -1201,12 +1250,15 @@
 		vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
 	}
 	
-	// Workaround for GT 420/430 & 9600M GT
+	// Workaround for 9600M GT, GT 420/430/440 & GT 525M
 	switch (nvda_dev->device_id)
 	{
+		case 0x0649: vram_size = 512*1024*1024; break;	// 9600M GT
+		case 0x0DE0: vram_size = 1024*1024*1024; break; // GT 440
 		case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430
 		case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420
-		case 0x0649: vram_size = 512*1024*1024; break;	// 9600M GT
+		case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M 0DEC
+		case 0x0DF5: vram_size = 1024*1024*1024; break; // GT 525M 0DF5
 		default: break;
 	}
 	
Index: branches/blackosx/i386/libsaio/ati.c
===================================================================
--- branches/blackosx/i386/libsaio/ati.c	(revision 1828)
+++ branches/blackosx/i386/libsaio/ati.c	(revision 1829)
@@ -214,45 +214,47 @@
 	//  
 	{ 0x9400,	0x25521002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",			kNull		},
 	{ 0x9400,	0x30001002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 PRO",			kNull		},
-	
+
+	{ 0x9440,	0x0851174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		}, 
+	{ 0x9440,	0x114A174B, CHIP_FAMILY_RV770,		"Sapphire Radeon HD4870 Vapor-X",		kCardinal	}, 
 	{ 0x9440,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
 	{ 0x9440,	0x24411682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
 	{ 0x9440,	0x24441682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
 	{ 0x9440,	0x24451682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
-	
+
 	{ 0x9441,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",			kMotmot		},
-	
+
 	{ 0x9442,	0x080110B0, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	
+
 	{ 0x9442,	0x24701682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
 	{ 0x9442,	0x24711682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	
+
 	{ 0x9442,	0xE104174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	
-	{ 0x944A,	0x30001043, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x30001458, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x30001462, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x30001545, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x30001682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x3000174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x944A,	0x300017AF, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
+
+	{ 0x944A,	0x30001043, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x30001458, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x30001462, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x30001545, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x30001682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x3000174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x944A,	0x300017AF, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
 	{ 0x944C,	0x24801682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",				kMotmot		},
 	{ 0x944C,	0x24811682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",				kMotmot		},
-	
-	{ 0x944E,	0x3260174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 Series",		kMotmot		},
-	{ 0x944E,	0x3261174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 series",		kMotmot		},
-	
-	{ 0x944E,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4730 Series",		kMotmot		},
-	{ 0x944E,	0x30101787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 Series",		kMotmot		},
+
+	{ 0x944E,	0x3260174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 Series",			kMotmot		},
+	{ 0x944E,	0x3261174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 series",			kMotmot		},
+
+	{ 0x944E,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4730 Series",			kMotmot		},
+	{ 0x944E,	0x30101787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810 Series",			kMotmot		},
 	{ 0x944E,	0x31001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4820",				kMotmot		},
 	
 	{ 0x9480,	0x3628103C, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kGliff		},
@@ -266,7 +268,7 @@
 	
 	{ 0x9490,	0x300017AF, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",				kNull		},
 	
-	{ 0x9498,	0x21CF1458, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",		kNull		},
+	{ 0x9498,	0x21CF1458, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",			kNull		},
 	
 	{ 0x9498,	0x24511682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",				kNull		},
 	{ 0x9498,	0x24521682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",				kNull		},
@@ -296,7 +298,7 @@
 	
 	{ 0x94C3,	0x03421002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
 	
-	{ 0x94C3,	0x30001025, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",		kNull		},
+	{ 0x94C3,	0x30001025, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",			kNull		},
 	
 	{ 0x94C3,	0x03021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
 	{ 0x94C3,	0x04021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
@@ -312,21 +314,21 @@
 	{ 0x94C3,	0x30001462, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",				kNull		},
 	
 	{ 0x94C3,	0x2247148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",			kNull		},
-	{ 0x94C3,	0x3000148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",		kNull		},
+	{ 0x94C3,	0x3000148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",			kNull		},
 	
 	{ 0x94C3,	0x30001642, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",				kNull		},
 	{ 0x94C3,	0x37161642, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
 	
-	{ 0x94C3,	0x3000174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",		kNull		},
+	{ 0x94C3,	0x3000174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",			kNull		},
 	{ 0x94C3,	0xE370174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
 	{ 0x94C3,	0xE400174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
 	
 	{ 0x94C3,	0x203817AF, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",				kNull		},
 	
 	{ 0x94C3,	0x22471787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",			kNull		},
-	{ 0x94C3,	0x30001787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",		kNull		},
+	{ 0x94C3,	0x30001787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350 Series",			kNull		},
 	
-	{ 0x94C3,	0x01011A93, CHIP_FAMILY_RV610,		"Qimonda Radeon HD 2400 PRO",		kNull		},
+	{ 0x94C3,	0x01011A93, CHIP_FAMILY_RV610,		"Qimonda Radeon HD 2400 PRO",			kNull		},
 	
 	{ 0x9501,	0x25421002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3870",				kNull		},
 	{ 0x9501,	0x30001002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",				kNull		},
@@ -358,103 +360,105 @@
 	{ 0x9540,	0x4590174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",				kNull		},
 	
 	{ 0x9540,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",				kNull		},
-	
+
+	{ 0x954F,	0x16131462, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		}, 
+	{ 0x954F,	0x20081787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4350",				kNull		}, 
 	{ 0x954F,	0x29201682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
 	{ 0x954F,	0x29211682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
 	{ 0x954F,	0x30901682, CHIP_FAMILY_RV710,		"XFX Radeon HD 4570",				kNull		},
-	
+
 	{ 0x954F,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
 	{ 0x954F,	0x31001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",				kNull		},
-	
+
 	{ 0x954F,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",				kNull		},
 	{ 0x954F,	0x4450174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
 	{ 0x954F,	0x4570174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4570",			kNull		},
 	{ 0x954F,	0xE990174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4350",			kNull		},
-	
+
 	{ 0x954F,	0x301017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
-	
+
 	{ 0x9552,	0x04341028, CHIP_FAMILY_RV710,		"ATI Mobility Radeon 4330",			kShrike		},
-	
-	{ 0x9552,	0x308B103C, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4300 Series", kShrike	},
-	
-	{ 0x9552,	0x3000148C, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",	kNull		},
-	
-	{ 0x9552,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",	kNull		},
-	
-	{ 0x9552,	0x30001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",	kNull		},
-	
-	{ 0x9552,	0x300017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",	kNull		},
-	
-	{ 0x9553,	0x18751043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",		kShrike		},
-	{ 0x9553,	0x1B321043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",		kShrike		},
-	
-	{ 0x9581,	0x95811002, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",		kNull		},
-	
-	{ 0x9581,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",		kNull		},
-	
-	{ 0x9583,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",		kNull		},
-	
-	{ 0x9588,	0x01021A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 XT",		kNull		},
-	
+
+	{ 0x9552,	0x308B103C, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4300 Series",		kShrike		},
+
+	{ 0x9552,	0x3000148C, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
+
+	{ 0x9552,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
+
+	{ 0x9552,	0x30001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
+
+	{ 0x9552,	0x300017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
+
+	{ 0x9553,	0x18751043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",			kShrike		},
+	{ 0x9553,	0x1B321043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",			kShrike		},
+
+	{ 0x9581,	0x95811002, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
+
+	{ 0x9581,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
+
+	{ 0x9583,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
+
+	{ 0x9588,	0x01021A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 XT",			kNull		},
+
 	{ 0x9589,	0x30001462, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610",				kNull		},
-	
-	{ 0x9589,	0x0E41174B, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",		kNull		},
-	
-	{ 0x9589,	0x30001787, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",		kNull		},
-	
-	{ 0x9589,	0x01001A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 PRO",		kNull		},
-	
-	{ 0x9591,	0x2303148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",		kNull		},
-	
+
+	{ 0x9589,	0x0E41174B, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
+
+	{ 0x9589,	0x30001787, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
+
+	{ 0x9589,	0x01001A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 PRO",			kNull		},
+
+	{ 0x9591,	0x2303148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",			kNull		},
+
 	{ 0x9598,	0xB3831002, CHIP_FAMILY_RV635,		"ATI All-in-Wonder HD",				kNull		},
-	
+
 	{ 0x9598,	0x30001043, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",				kNull		},
 	{ 0x9598,	0x30011043, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
-	
+
 	{ 0x9598,	0x3000148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",				kNull		},
 	{ 0x9598,	0x3001148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
 	{ 0x9598,	0x3031148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
-	
-	{ 0x9598,	0x30001545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 XT",		kNull		},
-	{ 0x9598,	0x30011545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 Pro",		kNull		},
-	
+
+	{ 0x9598,	0x30001545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 XT",			kNull		},
+	{ 0x9598,	0x30011545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 Pro",			kNull		},
+
 	{ 0x9598,	0x3000174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3730",			kNull		},
 	{ 0x9598,	0x3001174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3750",			kNull		},
 	{ 0x9598,	0x4570174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
 	{ 0x9598,	0x4580174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
 	{ 0x9598,	0x4610174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4610",				kNull		},
-	
+
 	{ 0x9598,	0x300117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 3750",				kNull		},
 	{ 0x9598,	0x301017AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
 	{ 0x9598,	0x301117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
-	
+
 	{ 0x9598,	0x30501787, CHIP_FAMILY_RV635,		"ATI Radeon HD 4610",				kNull		},
-	
+
 	{ 0x95C0,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
-	
+
 	{ 0x95C0,	0xE3901745, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
-	
+
 	{ 0x95C0,	0x3000174B, CHIP_FAMILY_RV620,		"Sapphire Radeon HD 3550",			kNull		},
 	{ 0x95C0,	0x3002174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 3570",				kNull		},
 	{ 0x95C0,	0x3020174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	
+
 	{ 0x95C5,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3450",				kNull		},
 	{ 0x95C5,	0x3001148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
 	{ 0x95C5,	0x3002148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
 	{ 0x95C5,	0x3003148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
 	{ 0x95C5,	0x3032148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
 	{ 0x95C5,	0x3033148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
-	
+
 	{ 0x95C5,	0x3010174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
 	{ 0x95C5,	0x4250174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	
+
 	{ 0x95C5,	0x30501787, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	
+
 	{ 0x95C5,	0x301017AF, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
-	
+
 	{ 0x95C5,	0x01041A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",			kNull		},
 	{ 0x95C5,	0x01051A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",			kNull		},
-	
+
 	/* Evergreen */
 	{ 0x6898,	0x0B001002, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kZonalis	},
 
@@ -465,10 +469,11 @@
 	{ 0x6898,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kUakari		},
 
 	{ 0x6898,	0x29611682, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kUakari		},
-	
+
 	{ 0x6899,	0x21E41458, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
-	
+
 	{ 0x6899,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
+	{ 0x6899,	0xE174174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
 	
 	{ 0x6899,	0x200A1787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
 	{ 0x6899,	0x22901787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
@@ -477,37 +482,63 @@
 	{ 0x689C,	0x039E1043, CHIP_FAMILY_HEMLOCK,	"ASUS EAH5870 Series",				kUakari		},
 	
 	{ 0x689C,	0x30201682, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",				kUakari		},
+
+	{ 0x68A0,	0x043A1028, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5870",		kNomascus	},
 	
-	{ 0x68A1,	0x144D103C,	CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",		kNomascus	},
+	{ 0x68A1,	0x144D103C, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",		kNomascus	},
 	{ 0x68A1,	0x1522103C, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",		kHoolock	},
 	
 	{ 0x68A8,	0x050E1025, CHIP_FAMILY_CYPRESS,	"AMD Radeon HD 6850M",				kUakari		},
-	
+
+	{ 0x68BA,	0x174B1482, CHIP_FAMILY_JUNIPER,	"ATI Sapphire Radeon HD 6770",			kVervet		}, 
+
 	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	},
-	
+
+	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
+	{ 0x68B8,	0x21F61458, CHIP_FAMILY_JUNIPER,	"GigaByte HD5770 R577SL-1GD",			kVervet		}, 
+
 	{ 0x68B8,	0x29901682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
 	{ 0x68B8,	0x29911682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	
+
 	{ 0x68B8,	0x1482174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
+	{ 0x68B8,	0xE144174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	}, 
 	{ 0x68B8,	0xE147174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	
-	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	
+
+	{ 0x68B8,	0x200A1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		}, 
 	{ 0x68B8,	0x200B1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
 	{ 0x68B8,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	
+
+	{ 0x68BE,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5750",			kVervet		}, 
+
 	{ 0x68BF,	0x220E1458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kVervet		},
-	
+
 	{ 0x68C0,	0x1594103C, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6570M",				kNull		},
-	
-	{ 0x68C0,	0x392717AA, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5730",		kNull		},
-	
-	{ 0x68C1,	0x033E1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5650",		kNull		},
-	
-	{ 0x68C1,	0x9071104D,	CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5650",		kEulemur	},
-	
-	{ 0x68C8,	0x2306103C, CHIP_FAMILY_REDWOOD,	"ATI FirePro V4800 (FireGL)",		kNull		},
-	
+
+	{ 0x68C0,	0x392717AA, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5730",			kNull		},
+
+	{ 0x68C0,	0x395217AA, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5730",			kNull		}, 
+
+	{ 0x68C1,	0x02051025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x02961025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x030A1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x033D1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x033E1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03471025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03561025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03581025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x035A1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x035C1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03641025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03791025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x037E1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+	{ 0x68C1,	0x03821025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5750",			kNull		}, 
+
+	{ 0x68C1,	0x033E1025, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5650",			kNull		},
+
+	{ 0x68C1,	0x9071104D, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5650",			kEulemur	},
+
+	{ 0x68C8,	0x2306103C, CHIP_FAMILY_REDWOOD,	"ATI FirePro V4800 (FireGL)",			kNull		},
+
 	{ 0x68D8,	0x03561043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
 
 	{ 0x68D8,	0x21D91458, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
@@ -515,203 +546,227 @@
 	{ 0x68D8,	0x5690174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
 	{ 0x68D8,	0x5730174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
 	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
-	
+
 	{ 0x68D8,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
-	
+
 	{ 0x68D8,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
 	{ 0x68D8,	0x301117AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
 
 	{ 0x68D9,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
 
 	{ 0x68DA,	0x5630174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	
+
 	{ 0x68DA,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	
+
 	{ 0x68DA,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	
+
 	{ 0x68E0,	0x04561028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	
+
 	{ 0x68E0,	0x1433103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
 
 	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	
+
+	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur		}, 
+
+	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",     	                kEulemur		}, 
+
 	{ 0x68F9,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x5490174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
 	{ 0x68F9,	0x5530174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
 
 	{ 0x68F9,	0x20091787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
 	{ 0x68F9,	0x22911787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
+	{ 0x68F9,	0x23401462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	}, 
 	{ 0x68F9,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x30011787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
 	{ 0x68F9,	0x30021787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
-	
+
 	{ 0x68F9,	0x301117AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x301217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
 	{ 0x68F9,	0x301317AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
-	
+
+	{ 0x68F9,	0xE145174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	}, 
+	{ 0x68F9,	0xE153174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	}, 
+
 	/* Northen Islands */
 	{ 0x6718,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		},
 	{ 0x6718,	0x67181002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		},
-	
 	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		},
 
-	{ 0x6738,	0x00D01002,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x21FA1002,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		}, 
+	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		}, 
+	{ 0x6719,	0x20101787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		}, 
+
+	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",				kElodea		}, 
+
+	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6738,	0x174B174B, CHIP_FAMILY_BARTS,		"Sapphire Radeon HD6870",			kDuckweed	}, // ?? kBulrushes ??
+	{ 0x6738,	0x21FA1002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
 	{ 0x6738,	0x67381002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
 
-	{ 0x6738,	0x21FA1458,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	
-	{ 0x6738,	0x31031682,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x31041682,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	
-	{ 0x6738,	0xE178174B,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	
-	{ 0x6738,	0x20101787,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x23051787,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	
-	{ 0x6739,	0x67391002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	
-	{ 0x6739,	0x21F81458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
+	{ 0x6738,	0x21FA1458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
 
+	{ 0x6738,	0x31031682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6738,	0x31041682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6738,	0x31071682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	}, 
+	{ 0x6738,	0x31081682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},  // ?? kJuncus ??
+
+	{ 0x6738,	0xE178174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+
+	{ 0x6738,	0x20101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6738,	0x23051787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+
+	{ 0x6739,	0xAA881002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
+	{ 0x6739,	0x03B41043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	}, 
+	{ 0x6739,	0x21F81458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kBulrushes	}, 
 	{ 0x6739,	0x24411462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	
 	{ 0x6739,	0x31101682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},   
-	
-	{ 0x6739,	0xE177174B,	CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-		
+	{ 0x6739,	0x67391002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
+	{ 0x6739,	0xE177174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
+
+	{ 0x6740,	0x1D121043, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6730M",				kNull		}, 
 	{ 0x6740,	0x1657103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		},
 	{ 0x6740,	0x165A103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		},
-	
+
 	{ 0x6741,	0x050E1025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",				kNull		},
 	{ 0x6741,	0x05131025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",				kNull		},
-	
+
 	{ 0x6741,	0x1646103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6750M",				kNull		},
-	
-	{ 0x6741,	0x9080104D,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",				kNull		},
 
-	{ 0x6758,	0x67581002,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	
-	{ 0x6758,	0x22051458,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	
-	{ 0x6758,	0xE194174B,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	
-	{ 0x6758,	0x31811682,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0x31831682,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	
-	{ 0x6758,	0xE1941746,	CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	
+	{ 0x6741,	0x9080104D, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",				kNull		},
+
+	{ 0x6758,	0x67581002, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+
+	{ 0x6758,	0x22051458, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+
+	{ 0x6758,	0xE194174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+
+	{ 0x6758,	0x31811682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+	{ 0x6758,	0x31831682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+
+	{ 0x6758,	0xE1941746, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+
+	{ 0x6759,	0x20121787, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",				kPithecia	}, // ErmaC 
 	{ 0x6759,	0xE193174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",				kNull		},
-	
-	{ 0x6760,	0x04CC1028,	CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		},
-	
+
+	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		},
+
+	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
+	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		}, 
+
 	{ 0x6760,	0x1CB21043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
-	
-	{ 0x6779,	0x64501092,	CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	
-	{ 0x6779,	0xE164174B,	CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},	
-	
+
+	{ 0x6779,	0x64501092, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
+	{ 0x6779,	0xE164174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
+	{ 0x6779,	0xE180174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kPithecia	}, // ErmaC 
+
 	/* standard/default models */
 	{ 0x9400,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",			kNull		},
 	{ 0x9405,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",			kNull		},
-	
-	{ 0x9440,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
+
+	{ 0x9440,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
 	{ 0x9441,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",			kMotmot		},
-	{ 0x9442,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
+	{ 0x9442,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
 	{ 0x9443,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850 X2",			kMotmot		},
-	{ 0x944C,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x944E,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4700 Series",		kMotmot		},
-	
+	{ 0x944C,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x944E,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4700 Series",			kMotmot		},
+
 	{ 0x9450,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9270",				kMotmot		},
 	{ 0x9452,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9250",				kMotmot		},
-	
-	{ 0x9460,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x9462,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	
-	{ 0x9490,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",		kFlicker	},
-	{ 0x9498,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",		kFlicker	},
-	
+
+	{ 0x9460,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x9462,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+
+	{ 0x9490,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",			kFlicker	},
+	{ 0x9498,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",			kFlicker	},
+
 	{ 0x94B3,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
-	{ 0x94B4,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4700 Series",		kFlicker	},
+	{ 0x94B4,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4700 Series",			kFlicker	},
 	{ 0x94B5,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
-	
-	{ 0x94C1,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
-	{ 0x94C3,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
+
+	{ 0x94C1,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",			kIago		},
+	{ 0x94C3,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",			kIago		},
 	{ 0x94C7,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kIago		},
-	{ 0x94CC,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
-	
-	{ 0x9501,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",		kMegalodon	},
-	{ 0x9505,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",		kMegalodon	},
+	{ 0x94CC,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",			kIago		},
+
+	{ 0x9501,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",			kMegalodon	},
+	{ 0x9505,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",			kMegalodon	},
 	{ 0x9507,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3830",				kMegalodon	},
 	{ 0x950F,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3870 X2",			kMegalodon	},
-	
+
 	{ 0x9513,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850 X2",			kMegalodon	},
 	{ 0x9519,	0x00000000, CHIP_FAMILY_RV670,		"AMD FireStream 9170",				kMegalodon	},
-	
+
 	{ 0x9540,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
-	{ 0x954F,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",	kNull		},
-	
-	{ 0x9553,	0x00000000, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4500/5100 Series",	kShrike },
-	
+	{ 0x954F,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
+
+	{ 0x9553,	0x00000000, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4500/5100 Series",	kShrike 	},
+
 	{ 0x9588,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 XT",			kLamna		},
 	{ 0x9589,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 PRO",			kLamna		},
-	{ 0x958A,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",		kLamna		},
-	
-	{ 0x9598,	0x00000000, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",		kMegalodon	},
-	
-	{ 0x95C0,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",		kIago		},
-	{ 0x95C5,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",		kIago		},
-	
+	{ 0x958A,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
+
+	{ 0x9598,	0x00000000, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",			kMegalodon	},
+
+	{ 0x95C0,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",			kIago		},
+	{ 0x95C5,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",			kIago		},
+
 	/* IGP */
-	{ 0x9610,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3200 Graphics",		kNull		},
+	{ 0x9610,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3200 Graphics",			kNull		},
 	{ 0x9611,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon 3100 Graphics",			kNull		},
-	{ 0x9614,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3300 Graphics",		kNull		},
-	{ 0x9616,	0x00000000, CHIP_FAMILY_RS780,		"AMD 760G",							kNull		},
-	
+	{ 0x9614,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3300 Graphics",			kNull		},
+	{ 0x9616,	0x00000000, CHIP_FAMILY_RS780,		"AMD 760G",					kNull		},
+
 	{ 0x9710,	0x00000000, CHIP_FAMILY_RS880,		"ATI Radeon HD 4200",				kNull		},
 	{ 0x9715,	0x00000000, CHIP_FAMILY_RS880,		"ATI Radeon HD 4250",				kNull		},
 	{ 0x9714,	0x00000000, CHIP_FAMILY_RS880,		"ATI Radeon HD 4290",				kNull		},
-	
+
 	/* Evergreen */
 	{ 0x688D,	0x00000000, CHIP_FAMILY_CYPRESS,	"AMD FireStream 9350",				kUakari		},
-	
-	{ 0x6898,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",		kUakari		},
-	{ 0x6899,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",		kUakari		},
-	{ 0x689C,	0x00000000, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5900 Series",		kUakari		},
-	{ 0x689E,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",		kUakari		},
-	
-	{ 0x68B8,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",		kVervet		},
-	{ 0x68B9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5600 Series",		kVervet		},
-	{ 0x68BE,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",		kVervet		},
-	
-	{ 0x68D8,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5600 Series",		kBaboon		},
-	{ 0x68D9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",		kBaboon		},
-	{ 0x68DA,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",		kBaboon		},
-	
-	{ 0x68F9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400 Series",		kNull		},
-	
+
+	{ 0x6898,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		},
+	{ 0x6899,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		},
+	{ 0x689C,	0x00000000, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5900 Series",			kUakari		},
+	{ 0x689E,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		},
+
+	{ 0x68A0,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5800 Series",	kNomascus	}, 
+
+	{ 0x68B8,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		},
+	{ 0x68B9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5600 Series",			kVervet		},
+	{ 0x68BA,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6770 Series",			kVervet		},
+	{ 0x68BE,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		},
+
+	{ 0x68D8,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5600 Series",			kBaboon		},
+	{ 0x68D9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		},
+	{ 0x68DA,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		},
+
+	{ 0x68F9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400 Series",			kNull		},
+
 	/* Northen Islands */
-	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",		kNull		},
-	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",		kNull		},
+	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kNull		},
+	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kGibba		},
+
+	{ 0x6720,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6900M Series",			kNull		},
+
+	{ 0x6738,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870 Series",			kDuckweed	},
+	{ 0x6739,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850 Series",			kDuckweed	},
+	{ 0x673E,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790 Series",			kNull		},
+
+	{ 0x6740,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6700M Series",			kNull		},
+	{ 0x6741,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6600M/6700M Series",		kNull		},
+
+	{ 0x6758,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670 Series",			kBulrushes	},
+	{ 0x6759,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6500 Series",			kNull		},
+
+	{ 0x6760,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6400M Series",			kNull		},
+	{ 0x6761,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6430M Series",			kNull		},
 	
-	{ 0x6720,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6900M Series",		kNull		},
-	
-	{ 0x6738,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870 Series",		kDuckweed	},
-	{ 0x6739,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850 Series",		kDuckweed	},
-	{ 0x673E,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790 Series",		kNull		},
-	
-	{ 0x6740,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6700M Series",		kNull		},
-	{ 0x6741,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6600M/6700M Series",	kNull		},
-	
-	{ 0x6758,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670 Series",		kBulrushes	},
-	{ 0x6759,	0x00000000, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6500 Series",		kNull		},
+	{ 0x6770,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6400 Series",			kNull		},
+	{ 0x6779,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450 Series",			kBulrushes	},
 
-	{ 0x6760,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6400M Series",		kNull		},
-	{ 0x6761,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6430M Series",		kNull		},
-		
-	{ 0x6770,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6400 Series",		kNull		},
-	{ 0x6779,	0x00000000, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450 Series",		kBulrushes	},
-	
-	{ 0x0000,	0x00000000, CHIP_FAMILY_UNKNOW,		NULL,								kNull		}
+	/* Southen Islands */
+
+	{ 0x0000,	0x00000000, CHIP_FAMILY_UNKNOW,		NULL,						kNull		}
 };
 
 typedef struct {
Index: branches/blackosx/i386/util/fdisk/misc.c
===================================================================
--- branches/blackosx/i386/util/fdisk/misc.c	(revision 1828)
+++ branches/blackosx/i386/util/fdisk/misc.c	(revision 1829)
@@ -165,9 +165,9 @@
 }
 
 void
-putshort(p, l)
-	void *p;
-	u_int16_t l;
+putshort(
+	void *p,
+	u_int16_t l)
 {
 	unsigned char *cp = p;
 
Index: branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: ???\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light;
 }
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww14420\viewh12580\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -57,4 +57,4 @@
 \fs18 \cf0 Package built by: %WHOBUILD%, language 
 \f1 \'c2\'bd\'c4\'b6 
 \f0 : crazybirdy, Ulimate\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -34,8 +34,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: ???\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww16700\viewh13340\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: Rudolf Tingginehe & Babiloe\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Hak kopi \'a9 2011-2012\
+\fs20 Hak kopi \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11240\viewh8340\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: ???\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset136 STHeitiTC-Light;\f2\fnil\fcharset134 STHeitiSC-Light;
 }
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -57,4 +57,4 @@
 \fs18 \cf0 Package built by: %WHOBUILD%, language 
 \f1\fs20 \'c2\'bd\uc0\u35793 
 \f0\fs18 : crazybirdy, Ulimate\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -34,8 +34,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -66,4 +66,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: Mohamed Khairy\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -56,8 +56,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: blackosx\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: artur-pt\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww10440\viewh7880\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: mistudio\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww16260\viewh12940\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language \uc0\u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080  \u1086 \u1076  \u1089 \u1090 \u1088 \u1072 \u1085 \u1072  \u1085 \u1072 : kn6600\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww9900\viewh8860\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language traducido por: juanerson\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww14180\viewh11700\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language traduit par: Tenval\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww10860\viewh12200\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language Vertaald door: yeehaw123 & Badeendje\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww13500\viewh13020\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: mistudio\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset129 AppleGothic;\f2\fnil\fcharset129 NanumGothic;
 }
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww15240\viewh12580\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -56,4 +56,4 @@
 \f1\fs20 \'b9\'f8\'bf\'aa
 \f2\b  
 \f0\b0\fs18 by: drew_afx\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -29,8 +29,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww10580\viewh11640\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: janek202\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/it.lproj/Description.html
===================================================================
--- branches/blackosx/package/Resources/it.lproj/Description.html	(revision 1828)
+++ branches/blackosx/package/Resources/it.lproj/Description.html	(revision 1829)
@@ -34,7 +34,7 @@
 <p class="p1">- Generazione automatica dei P-State e C-State.</p>
 <p class="p1">- Log dei messaggi.</p>
 <p class="p3"><br></p>
-<p class="p1">Il codice è rilasciato sotto la versione 2 della licenza GPL (Gnu Public License).</p>
+<p class="p1">Il codice è rilasciato sotto licenza GPL v.2 (Gnu Public License).</p>
 <p class="p4"><span class="s2"><a href="http://forge.voodooprojects.org/p/chameleon/">http://forge.voodooprojects.org/p/chameleon</a></span></p>
 <p class="p2"><br></p>
 <p class="p4"><span class="s3">Per maggiori informazioni, visita (In Inglese): <a href="http://forum.voodooprojects.org/index.php/topic,754.0.html"><span class="s2">http://forum.voodooprojects.org/index.php/topic,754.0.html</span></a></span></p>
Index: branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww13480\viewh11800\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -37,5 +37,5 @@
 \
 \pard\qc
 
-\fs18 \cf0 Package built by: %WHOBUILD%, language tradotto da: ErmaC e scrax\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+\fs18 \cf0 Pacchetto compilato da: %WHOBUILD%, tradotto in Italiano da: ErmaC e scrax\
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,7 +22,7 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
Index: branches/blackosx/package/Resources/ca.lproj/Description.html
===================================================================
--- branches/blackosx/package/Resources/ca.lproj/Description.html	(revision 0)
+++ branches/blackosx/package/Resources/ca.lproj/Description.html	(revision 1829)
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <title></title>
+  <style type="text/css">
+    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'}
+    p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; min-height: 12.0px}
+    p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; color: #0e01ee; min-height: 12.0px}
+    p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 10.0px 'Lucida Grande'; color: #0000ee}
+    span.s1 {text-decoration: underline ; color: #0e01ee}
+    span.s2 {text-decoration: underline}
+    span.s3 {color: #000000}
+  </style>
+</head>
+<body>
+<p class="p1">Chameleon és un gestor d'arrencada basat en una combinació de components desenvolupats a partir de la implementació de la Fake EFI de David Elliott afegida al mètode boot-132 d'Apple</p>
+<p class="p2"><br></p>
+<p class="p1">Chameleon v2 ha estat ampliat amb noves funcions. Per exemple:</p>
+<p class="p2"><br></p>
+<p class="p1">- Interfície gràfica totalment personalizable per donar-li una mica de color al gestor d'arrencada Darwin.</p>
+<p class="p1">- Carrega de RAMdisk per arrencar directament el DVD retail, sense programes addicionals.</p>
+<p class="p1">- Hibernació. Gaudeix de la represa de Mac OS X amb una imatge de mostra.</p>
+<p class="p1">- Override de SMBIOS per modificar els valors SMBIOS per defecte.</p>
+<p class="p1">- Override de DSDT per utilitzar un DSDT editat, que pot resoldre molts problemes.</p>
+<p class="p1">- Injecció de propietats de dispositiu mitjançant EFI Strings.</p>
+<p class="p1">- Sistema híbrid d'arrencada boot0/boot1h per a discos amb taula de particions MBR i GPT.</p>
+<p class="p1">- Detecció automàtica de freqüència FSB fins i tot per les CPUs AMD mes recents.</p>
+<p class="p1">- Suport per RAID software d'Apple.</p>
+<p class="p1">- Enabler per a gràfiques Nvidia i ATI.</p>
+<p class="p1">- Suport de càrrega per mòduls</p>
+<p class="p1">- Detecció automàtic de memòria adaptat de memtest86: <a href="http://www.memtest.org/"><span class="s1">http://www.memtest.org</span></a></p>
+<p class="p1">- Generació automàtica de P-States i C-States per a la gestió d'energia nativa.</p>
+<p class="p1">- Generació d'informe d'accions en txt.</p>
+<p class="p3"><br></p>
+<p class="p1">El codi està alliberat sota la versió 2 de la Llicència Pública GNU.</p>
+<p class="p4"><span class="s2"><a href="http://forge.voodooprojects.org/p/chameleon/">http://forge.voodooprojects.org/p/chameleon</a></span></p>
+<p class="p2"><br></p>
+<p class="p4"><span class="s3">Més informació i Preguntes i respostes habituals: <a href="http://forum.voodooprojects.org/index.php/topic,754.0.html"><span class="s2">http://forum.voodooprojects.org/index.php/topic,754.0.html</span></a></span></p>
+</body>
+</html>
Index: branches/blackosx/package/Resources/ca.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/blackosx/package/Resources/ca.lproj/Localizable.strings
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/blackosx/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 0)
+++ branches/blackosx/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -0,0 +1,41 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
+\pard\qc
+
+\f0\b\fs28 \cf0 \
+
+\fs48 Chameleon
+\fs50 \
+
+\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
+
+\fs28 \
+\cf2 No instal\'b7lar en un ordinador Apple Macintosh\
+
+\fs22 \cf0 \
+\
+Programadors :\
+\pard\qc
+
+\b0 \cf0 %DEVELOP%
+\b \
+\
+Agra\'efments :\
+
+\b0 %CREDITS%
+\b \
+
+\b0 \
+\pard\qc
+
+\b \cf0 Instal\'b7lador :\
+\pard\qc
+
+\b0 \cf0 %PKGDEV%\
+\
+\pard\qc
+
+\fs18 \cf0 Package built by: %WHOBUILD%, Tradu\'eft per : Ed_Saxman\
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 0)
+++ branches/blackosx/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -0,0 +1,29 @@
+{\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;\red153\green153\blue153;}
+\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\pard\ri-20\qc
+
+\f0\b\fs28 \cf0 \
+\
+Els Scripts s'han completat i un arxiu\
+ amb el nom \cf2 @LOG_FILENAME@\cf3  ha estat\
+escrit en l'arrel de la partici\'f3 seleccionada.\
+\
+\cf0 Si us plan,  \cf4 llegeix-ho\cf0  per saber si la instalaci\'f3 ha\
+tingut \'e8xit i mantenir un registre de les accions dutes a terme.\
+\cf4 \
+\
+\
+
+\fs26 \cf0 Chameleon v%CHAMELEONVERSION% r%CHAMELEONREVISION% 
+\fs24 \cf5 \
+
+\b0\fs30 \cf0 \
+
+\fs20 Copyright \'a9 %CPRYEAR%\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/ca.lproj/License.rtf
===================================================================
--- branches/blackosx/package/Resources/ca.lproj/License.rtf	(revision 0)
+++ branches/blackosx/package/Resources/ca.lproj/License.rtf	(revision 1829)
@@ -0,0 +1,350 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
+{\fonttbl\f0\fmodern\fcharset0 Courier-Bold;\f1\fmodern\fcharset0 Courier;}
+{\colortbl;\red255\green255\blue255;}
+\paperw12240\paperh15840\vieww22060\viewh18360\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs40 \cf0 APPLE PUBLIC SOURCE LICENSE \
+
+\fs26 Version 2.0 - August 6, 2003\
+\
+
+\f1\b0 Please read this License carefully before downloading this software. By downloading or using this software, you are agreeing to be bound by the terms of this License. If you do not or cannot agree to the terms of this License, please do not download or use the software.\
+\
+1. General; Definitions. This License applies to any program or other work which Apple Computer, Inc. ("Apple") makes publicly available and which contains a notice placed by Apple identifying such program or work as "Original Code" and stating that it is subject to the terms of this Apple Public Source License version 2.0 ("License"). As used in this License:\
+\
+1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is the grantor of rights, (i) claims of patents that are now or hereafter acquired, owned by or assigned to Apple and (ii) that cover subject matter contained in the Original Code, but only to the extent necessary to use, reproduce and/or distribute the Original Code without infringement; and (b) in the case where You are the grantor of rights, (i) claims of patents that are now or hereafter acquired, owned by or assigned to You and (ii) that cover subject matter in Your Modifications, taken alone or in combination with Original Code.\
+\
+1.2 "Contributor" means any person or entity that creates or contributes to the creation of Modifications.\
+\
+1.3 "Covered Code" means the Original Code, Modifications, the combination of Original Code and any Modifications, and/or any respective portions thereof.\
+\
+1.4 "Externally Deploy" means: (a) to sublicense, distribute or otherwise make Covered Code available, directly or indirectly, to anyone other than You; and/or (b) to use Covered Code, alone or as part of a Larger Work, in any way to provide a service, including but not limited to delivery of content, through electronic communication with a client other than You.\
+\
+1.5 "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.\
+\
+1.6 "Modifications" mean any addition to, deletion from, and/or change\
+to, the substance and/or structure of the Original Code, any previous\
+Modifications, the combination of Original Code and any previous\
+Modifications, and/or any respective portions thereof. When code is\
+released as a series of files, a Modification is: (a) any addition to\
+or deletion from the contents of a file containing Covered Code;\
+and/or (b) any new file or other representation of computer program\
+statements that contains any part of Covered Code.\
+\
+1.7 "Original Code" means (a) the Source Code of a program or other\
+work as originally made available by Apple under this License,\
+including the Source Code of any updates or upgrades to such programs\
+or works made available by Apple under this License, and that has been\
+expressly identified by Apple as such in the header file(s) of such\
+work; and (b) the object code compiled from such Source Code and\
+originally made available by Apple under this License.\
+\
+1.8 "Source Code" means the human readable form of a program or other\
+work that is suitable for making modifications to it, including all\
+modules it contains, plus any associated interface definition files,\
+scripts used to control compilation and installation of an executable\
+(object code).\
+\
+1.9 "You" or "Your" means an individual or a legal entity exercising\
+rights under this License. For legal entities, "You" or "Your"\
+includes any entity which controls, is controlled by, or is under\
+common control with, You, where "control" means (a) the power, direct\
+or indirect, to cause the direction or management of such entity,\
+whether by contract or otherwise, or (b) ownership of fifty percent\
+(50%) or more of the outstanding shares or beneficial ownership of\
+such entity.\
+\
+2. Permitted Uses; Conditions & Restrictions. Subject to the terms\
+and conditions of this License, Apple hereby grants You, effective on\
+the date You accept this License and download the Original Code, a\
+world-wide, royalty-free, non-exclusive license, to the extent of\
+Apple's Applicable Patent Rights and copyrights covering the Original\
+Code, to do the following:\
+\
+2.1 Unmodified Code. You may use, reproduce, display, perform,\
+internally distribute within Your organization, and Externally Deploy\
+verbatim, unmodified copies of the Original Code, for commercial or\
+non-commercial purposes, provided that in each instance:\
+\
+(a) You must retain and reproduce in all copies of Original Code the\
+copyright and other proprietary notices and disclaimers of Apple as\
+they appear in the Original Code, and keep intact all notices in the\
+Original Code that refer to this License; and\
+\
+(b) You must include a copy of this License with every copy of Source\
+Code of Covered Code and documentation You distribute or Externally\
+Deploy, and You may not offer or impose any terms on such Source Code\
+that alter or restrict this License or the recipients' rights\
+hereunder, except as permitted under Section 6.\
+\
+2.2 Modified Code. You may modify Covered Code and use, reproduce,\
+display, perform, internally distribute within Your organization, and\
+Externally Deploy Your Modifications and Covered Code, for commercial\
+or non-commercial purposes, provided that in each instance You also\
+meet all of these conditions:\
+\
+(a) You must satisfy all the conditions of Section 2.1 with respect to\
+the Source Code of the Covered Code;\
+\
+(b) You must duplicate, to the extent it does not already exist, the\
+notice in Exhibit A in each file of the Source Code of all Your\
+Modifications, and cause the modified files to carry prominent notices\
+stating that You changed the files and the date of any change; and\
+\
+(c) If You Externally Deploy Your Modifications, You must make\
+Source Code of all Your Externally Deployed Modifications either\
+available to those to whom You have Externally Deployed Your\
+Modifications, or publicly available. Source Code of Your Externally\
+Deployed Modifications must be released under the terms set forth in\
+this License, including the license grants set forth in Section 3\
+below, for as long as you Externally Deploy the Covered Code or twelve\
+(12) months from the date of initial External Deployment, whichever is\
+longer. You should preferably distribute the Source Code of Your\
+Externally Deployed Modifications electronically (e.g. download from a\
+web site).\
+\
+2.3 Distribution of Executable Versions. In addition, if You\
+Externally Deploy Covered Code (Original Code and/or Modifications) in\
+object code, executable form only, You must include a prominent\
+notice, in the code itself as well as in related documentation,\
+stating that Source Code of the Covered Code is available under the\
+terms of this License with information on how and where to obtain such\
+Source Code.\
+\
+2.4 Third Party Rights. You expressly acknowledge and agree that\
+although Apple and each Contributor grants the licenses to their\
+respective portions of the Covered Code set forth herein, no\
+assurances are provided by Apple or any Contributor that the Covered\
+Code does not infringe the patent or other intellectual property\
+rights of any other entity. Apple and each Contributor disclaim any\
+liability to You for claims brought by any other entity based on\
+infringement of intellectual property rights or otherwise. As a\
+condition to exercising the rights and licenses granted hereunder, You\
+hereby assume sole responsibility to secure any other intellectual\
+property rights needed, if any. For example, if a third party patent\
+license is required to allow You to distribute the Covered Code, it is\
+Your responsibility to acquire that license before distributing the\
+Covered Code.\
+\
+3. Your Grants. In consideration of, and as a condition to, the\
+licenses granted to You under this License, You hereby grant to any\
+person or entity receiving or distributing Covered Code under this\
+License a non-exclusive, royalty-free, perpetual, irrevocable license,\
+under Your Applicable Patent Rights and other intellectual property\
+rights (other than patent) owned or controlled by You, to use,\
+reproduce, display, perform, modify, sublicense, distribute and\
+Externally Deploy Your Modifications of the same scope and extent as\
+Apple's licenses under Sections 2.1 and 2.2 above.\
+\
+4. Larger Works. You may create a Larger Work by combining Covered\
+Code with other code not governed by the terms of this License and\
+distribute the Larger Work as a single product. In each such instance,\
+You must make sure the requirements of this License are fulfilled for\
+the Covered Code or any portion thereof.\
+\
+5. Limitations on Patent License. Except as expressly stated in\
+Section 2, no other patent rights, express or implied, are granted by\
+Apple herein. Modifications and/or Larger Works may require additional\
+patent licenses from Apple which Apple may grant in its sole\
+discretion.\
+\
+6. Additional Terms. You may choose to offer, and to charge a fee for,\
+warranty, support, indemnity or liability obligations and/or other\
+rights consistent with the scope of the license granted herein\
+("Additional Terms") to one or more recipients of Covered Code.\
+However, You may do so only on Your own behalf and as Your sole\
+responsibility, and not on behalf of Apple or any Contributor. You\
+must obtain the recipient's agreement that any such Additional Terms\
+are offered by You alone, and You hereby agree to indemnify, defend\
+and hold Apple and every Contributor harmless for any liability\
+incurred by or claims asserted against Apple or such Contributor by\
+reason of any such Additional Terms.\
+\
+7. Versions of the License. Apple may publish revised and/or new\
+versions of this License from time to time. Each version will be given\
+a distinguishing version number. Once Original Code has been published\
+under a particular version of this License, You may continue to use it\
+under the terms of that version. You may also choose to use such\
+Original Code under the terms of any subsequent version of this\
+License published by Apple. No one other than Apple has the right to\
+modify the terms applicable to Covered Code created under this\
+License.\
+\
+8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in\
+part pre-release, untested, or not fully tested works. The Covered\
+Code may contain errors that could cause failures or loss of data, and\
+may be incomplete or contain inaccuracies. You expressly acknowledge\
+and agree that use of the Covered Code, or any portion thereof, is at\
+Your sole and entire risk. THE COVERED CODE IS PROVIDED "AS IS" AND\
+WITHOUT WARRANTY, UPGRADES OR SUPPORT OF ANY KIND AND APPLE AND\
+APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE\
+PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM\
+ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT\
+NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF\
+MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR\
+PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD\
+PARTY RIGHTS. APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST\
+INTERFERENCE WITH YOUR ENJOYMENT OF THE COVERED CODE, THAT THE\
+FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR REQUIREMENTS,\
+THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR\
+ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO\
+ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE\
+AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.\
+You acknowledge that the Covered Code is not intended for use in the\
+operation of nuclear facilities, aircraft navigation, communication\
+systems, or air traffic control machines in which case the failure of\
+the Covered Code could lead to death, personal injury, or severe\
+physical or environmental damage.\
+\
+9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO\
+EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL,\
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING\
+TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR\
+ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY,\
+TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF\
+APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\
+DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY\
+REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF\
+INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY\
+TO YOU. In no event shall Apple's total liability to You for all\
+damages (other than as may be required by applicable law) under this\
+License exceed the amount of fifty dollars ($50.00).\
+\
+10. Trademarks. This License does not grant any rights to use the\
+trademarks or trade names "Apple", "Apple Computer", "Mac", "Mac OS",\
+"QuickTime", "QuickTime Streaming Server" or any other trademarks,\
+service marks, logos or trade names belonging to Apple (collectively\
+"Apple Marks") or to any trademark, service mark, logo or trade name\
+belonging to any Contributor. You agree not to use any Apple Marks in\
+or as part of the name of products derived from the Original Code or\
+to endorse or promote products derived from the Original Code other\
+than as expressly permitted by and in strict compliance at all times\
+with Apple's third party trademark usage guidelines which are posted\
+at http://www.apple.com/legal/guidelinesfor3rdparties.html.\
+\
+11. Ownership. Subject to the licenses granted under this License,\
+each Contributor retains all rights, title and interest in and to any\
+Modifications made by such Contributor. Apple retains all rights,\
+title and interest in and to the Original Code and any Modifications\
+made by or on behalf of Apple ("Apple Modifications"), and such Apple\
+Modifications will not be automatically subject to this License. Apple\
+may, at its sole discretion, choose to license such Apple\
+Modifications under this License, or on different terms from those\
+contained in this License or may choose not to license them at all.\
+\
+12. Termination.\
+\
+12.1 Termination. This License and the rights granted hereunder will\
+terminate:\
+\
+(a) automatically without notice from Apple if You fail to comply with\
+any term(s) of this License and fail to cure such breach within 30\
+days of becoming aware of such breach;\
+\
+(b) immediately in the event of the circumstances described in Section\
+13.5(b); or\
+\
+(c) automatically without notice from Apple if You, at any time during\
+the term of this License, commence an action for patent infringement\
+against Apple; provided that Apple did not first commence\
+an action for patent infringement against You in that instance.\
+\
+12.2 Effect of Termination. Upon termination, You agree to immediately\
+stop any further use, reproduction, modification, sublicensing and\
+distribution of the Covered Code. All sublicenses to the Covered Code\
+which have been properly granted prior to termination shall survive\
+any termination of this License. Provisions which, by their nature,\
+should remain in effect beyond the termination of this License shall\
+survive, including but not limited to Sections 3, 5, 8, 9, 10, 11,\
+12.2 and 13. No party will be liable to any other for compensation,\
+indemnity or damages of any sort solely as a result of terminating\
+this License in accordance with its terms, and termination of this\
+License will be without prejudice to any other right or remedy of\
+any party.\
+\
+13. Miscellaneous.\
+\
+13.1 Government End Users. The Covered Code is a "commercial item" as\
+defined in FAR 2.101. Government software and technical data rights in\
+the Covered Code include only those rights customarily provided to the\
+public as defined in this License. This customary commercial license\
+in technical data and software is provided in accordance with FAR\
+12.211 (Technical Data) and 12.212 (Computer Software) and, for\
+Department of Defense purchases, DFAR 252.227-7015 (Technical Data --\
+Commercial Items) and 227.7202-3 (Rights in Commercial Computer\
+Software or Computer Software Documentation). Accordingly, all U.S.\
+Government End Users acquire Covered Code with only those rights set\
+forth herein.\
+\
+13.2 Relationship of Parties. This License will not be construed as\
+creating an agency, partnership, joint venture or any other form of\
+legal association between or among You, Apple or any Contributor, and\
+You will not represent to the contrary, whether expressly, by\
+implication, appearance or otherwise.\
+\
+13.3 Independent Development. Nothing in this License will impair\
+Apple's right to acquire, license, develop, have others develop for\
+it, market and/or distribute technology or products that perform the\
+same or similar functions as, or otherwise compete with,\
+Modifications, Larger Works, technology or products that You may\
+develop, produce, market or distribute.\
+\
+13.4 Waiver; Construction. Failure by Apple or any Contributor to\
+enforce any provision of this License will not be deemed a waiver of\
+future enforcement of that or any other provision. Any law or\
+regulation which provides that the language of a contract shall be\
+construed against the drafter will not apply to this License.\
+\
+13.5 Severability. (a) If for any reason a court of competent\
+jurisdiction finds any provision of this License, or portion thereof,\
+to be unenforceable, that provision of the License will be enforced to\
+the maximum extent permissible so as to effect the economic benefits\
+and intent of the parties, and the remainder of this License will\
+continue in full force and effect. (b) Notwithstanding the foregoing,\
+if applicable law prohibits or restricts You from fully and/or\
+specifically complying with Sections 2 and/or 3 or prevents the\
+enforceability of either of those Sections, this License will\
+immediately terminate and You must immediately discontinue any use of\
+the Covered Code and destroy all copies of it that are in your\
+possession or control.\
+\
+13.6 Dispute Resolution. Any litigation or other dispute resolution\
+between You and Apple relating to this License shall take place in the\
+Northern District of California, and You and Apple hereby consent to\
+the personal jurisdiction of, and venue in, the state and federal\
+courts within that District with respect to this License. The\
+application of the United Nations Convention on Contracts for the\
+International Sale of Goods is expressly excluded.\
+\
+13.7 Entire Agreement; Governing Law. This License constitutes the\
+entire agreement between the parties with respect to the subject\
+matter hereof. This License shall be governed by the laws of the\
+United States and the State of California, except that body of\
+California law concerning conflicts of law.\
+\
+Where You are located in the province of Quebec, Canada, the following\
+clause applies: The parties hereby confirm that they have requested\
+that this License and all related documents be drafted in English. Les\
+parties ont exige que le present contrat et tous les documents\
+connexes soient rediges en anglais.\
+\
+EXHIBIT A.\
+\
+"Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights\
+Reserved.\
+\
+This file contains Original Code and/or Modifications of Original Code\
+as defined in and that are subject to the Apple Public Source License\
+Version 2.0 (the 'License'). You may not use this file except in\
+compliance with the License. Please obtain a copy of the License at\
+http://www.opensource.apple.com/apsl/ and read it before using this\
+file.\
+\
+The Original Code and all software distributed under the License are\
+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER\
+EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,\
+INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,\
+FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.\
+Please see the License for the specific language governing rights and\
+limitations under the License." }
\ No newline at end of file
Index: branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww17120\viewh12840\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: oldnapalm\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: mistudio\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11660\viewh12980\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: ???\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww11340\viewh10060\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -38,4 +38,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: iXabbu, olegischinski & NextMac\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1829)
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
-\margl1440\margr1440\vieww8760\viewh7240\viewkind0
+\margl1440\margr1440\vieww10460\viewh7440\viewkind0
 \pard\qc
 
 \f0\b\fs28 \cf0 \
@@ -27,7 +27,7 @@
 \cf0 \uc0\u1041 \u1083 \u1072 \u1075 \u1086 \u1076 \u1072 \u1088 \u1085 \u1086 \u1089 \u1090 \u1080  \u1085 \u1072  :\
 \pard\qc
 
-\b0 \cf0 %CREDITS%
+\b0 %CREDITS%
 \b \
 
 \b0 \
@@ -41,4 +41,4 @@
 \pard\qc
 
 \fs18 \cf0 Package built by: %WHOBUILD%, language translated by: ???\
-Copyright \'a9 2009-2012}
\ No newline at end of file
+Copyright \'a9 %CPRYEAR%}
Index: branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1828)
+++ branches/blackosx/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1829)
@@ -22,8 +22,8 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011-2012\
+\fs20 Copyright \'a9 %CPRYEAR%\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\b \cf6 This package was builded by: %WHOBUILD%}
+\b \cf6 Package built by: %WHOBUILD%}
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh	(revision 1828)
+++ branches/blackosx/package/buildpkg.sh	(revision 1829)
@@ -59,6 +59,7 @@
 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_CPRYEAR=$(awk "NR==18{print;exit}"  ${PKGROOT}/../CREDITS)
 if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "cmorton" ]];then
     declare -r CHAMELEON_WHOBUILD="VoodooLabs BuildBot"
 else
@@ -148,6 +149,7 @@
 s&%DEVELOP%&${CHAMELEON_DEVELOP}&g
 s&%CREDITS%&${CHAMELEON_CREDITS}&g
 s&%PKGDEV%&${CHAMELEON_PKGDEV}&g
+s&%CPRYEAR%&${CHAMELEON_CPRYEAR}&g
 s&%WHOBUILD%&${CHAMELEON_WHOBUILD}&g
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -173,7 +175,7 @@
     #
     # Substition is like: Key=Value
     #
-    # $n : Name of template(s) (templates are in package/Scripts.templates
+    # $n : Name of template(s) - templates are in package/Scripts.templates
 
     local pkgRootDir=""
     declare -a allSubst
@@ -849,7 +851,7 @@
 
         header+="auth=\"root\">\n"
         header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
-        #rm -R -f "${packagePath}/Temp" //blackosx commented out for now
+        rm -R -f "${packagePath}/Temp"
 
         [ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp"
         [ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom"
@@ -862,7 +864,7 @@
             header+="\t</scripts>\n"
             # Create the Script archive file (cpio format)
             (cd "${packagePath}/Scripts" && find . -print | cpio -o -z -R 0:0 --format cpio > "${packagePath}/Temp/Scripts") 2>&1 | \
-                grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+                grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages #blackosx removed -v from -vE
         fi
 
         header+="</pkg-info>"
@@ -870,7 +872,7 @@
 
         # Create the Payload file (cpio format)
         (cd "${packagePath}/Root" && find . -print | cpio -o -z -R 0:0 --format cpio > "${packagePath}/Temp/Payload") 2>&1 | \
-            grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+            grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages #blackosx removed -v from -vE
 
         # Create the package
         (cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .)
@@ -878,7 +880,7 @@
         # Add the package to the list of build packages
         pkgrefs[${#pkgrefs[*]}]="\t<pkg-ref id=\"${packageRefId}\" installKBytes='${installedsize}' version='${CHAMELEON_VERSION}.0.0.${CHAMELEON_TIMESTAMP}'>#${packageName}.pkg</pkg-ref>"
 
-        #rm -rf "${packagePath}" //blackosx commented out for now
+        rm -rf "${packagePath}"
     fi
 }
 
@@ -952,7 +954,7 @@
     declare -r distributionFilename="${packagename// /}-${CHAMELEON_VERSION}-r${CHAMELEON_REVISION}.pkg"
     declare -r distributionFilePath="${distributionDestDir}/${distributionFilename}"
 
-    #rm -f "${distributionDestDir}/${packagename// /}"*.pkg  //blackosx commented out for now
+    rm -f "${distributionDestDir}/${packagename// /}"*.pkg
 
     mkdir -p "${PKG_BUILD_DIR}/${packagename}"
 
@@ -962,7 +964,7 @@
         pkgdir="${PKG_BUILD_DIR}/${packagename}/${pkg}"
         # expand individual packages
         pkgutil --expand "${PKG_BUILD_DIR}/${pkg}" "$pkgdir"
-        #rm -f "${PKG_BUILD_DIR}/${pkg}"  //blackosx commented out for now
+        rm -f "${PKG_BUILD_DIR}/${pkg}"
     done
 
 #   Create the Distribution file
@@ -986,7 +988,7 @@
 #   Create the Resources directory
     ditto --noextattr --noqtn "${PKGROOT}/Resources" "${PKG_BUILD_DIR}/${packagename}/Resources"
 
-#   CleanUp the directory
+#    CleanUp the directory
     # this next line should work but it doesn't - not sure why.
     #find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \;
     
@@ -994,7 +996,7 @@
     find "${PKG_BUILD_DIR}/${packagename}/Resources" -name ".svn" -type d -o -name ".DS_Store" -type f | while read component
     do
 		rm -rf "${component}"
-    done    
+    done
 
     # Make substitutions for version, revision, stage, developers, credits, etc..
     makeSubstitutions $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
@@ -1027,6 +1029,7 @@
     echo -e $COL_CYAN"  Stage:        "$COL_RESET"$CHAMELEON_STAGE"
     echo -e $COL_CYAN"  Date/Time:    "$COL_RESET"$CHAMELEON_BUILDDATE"
     echo -e $COL_CYAN"  Built by:     "$COL_RESET"$CHAMELEON_WHOBUILD"
+    echo -e $COL_CYAN"  Copyright $CHAMELEON_CPRYEAR ""$COL_RESET"
     echo ""
 
 }
Index: branches/blackosx/CREDITS
===================================================================
--- branches/blackosx/CREDITS	(revision 1828)
+++ branches/blackosx/CREDITS	(revision 1829)
@@ -7,8 +7,12 @@
 
 Thanks to:
 --------- 
-bumby, kalyway, Krazubu, XyZ, Galaxy, sckevyn, MasterChief, smith@@, blackosx, DHP, nawcom, scorpius, macman, dmazar
+bumby, kalyway, Krazubu, Eddie11c, JaS, fassl, XyZ, SMF, flama, Galaxy, sckevyn, MasterChief, smith@@, blackosx, DHP, nawcom, scorpius, macman, dmazar
 
 Package:
 --------- 
-kalyway, AzimutZ, blackosx, ErmaC, scrax, JrCs
\ No newline at end of file
+kalyway, AzimutZ, blackosx, ErmaC, scrax, JrCs
+
+Copyright:
+---------
+2008-2012

Property changes on: branches/blackosx
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r1807-1828