Index: branches/ErmaC/Trunk/i386/boot2/gui.c
===================================================================
--- branches/ErmaC/Trunk/i386/boot2/gui.c	(revision 1827)
+++ branches/ErmaC/Trunk/i386/boot2/gui.c	(revision 1828)
@@ -43,8 +43,8 @@
     iDeviceGeneric_o,
     iDeviceHFS,
     iDeviceHFS_o,
-    iDeviceHFS_Mountain,
-    iDeviceHFS_Mountain_o,
+    iDeviceHFS_ML,
+    iDeviceHFS_ML_o,
     iDeviceHFS_Lion,
     iDeviceHFS_Lion_o,
     iDeviceHFS_SL,
@@ -55,8 +55,8 @@
     iDeviceHFS_Tiger_o,
     iDeviceHFSRAID,
     iDeviceHFSRAID_o,
-    iDeviceHFSRAID_Mountain,
-    iDeviceHFSRAID_Mountain_o,
+    iDeviceHFSRAID_ML,
+    iDeviceHFSRAID_ML_o,
     iDeviceHFSRAID_Lion,
     iDeviceHFSRAID_Lion_o,
     iDeviceHFSRAID_SL,
@@ -372,8 +372,8 @@
 	LOADPNG(device_generic_o,               iDeviceGeneric);
 	LOADPNG(device_hfsplus,                 iDeviceGeneric);
 	LOADPNG(device_hfsplus_o,               iDeviceHFS);
-	LOADPNG(device_hfsplus_ml,              iDeviceHFS_Mountain);
-	LOADPNG(device_hfsplus_ml_o,            iDeviceHFS_Mountain_o);
+	LOADPNG(device_hfsplus_ml,              iDeviceHFS_ML);
+	LOADPNG(device_hfsplus_ml_o,            iDeviceHFS_ML_o);
 	LOADPNG(device_hfsplus_lion,            iDeviceHFS_Lion);
 	LOADPNG(device_hfsplus_lion_o,          iDeviceHFS_Lion_o);
 	LOADPNG(device_hfsplus_sl,              iDeviceHFS_SL);
@@ -385,8 +385,8 @@
 
 	LOADPNG(device_hfsraid,                 iDeviceGeneric);
 	LOADPNG(device_hfsraid_o,               iDeviceHFSRAID);
-	LOADPNG(device_hfsraid_ml,              iDeviceHFSRAID_Mountain);
-	LOADPNG(device_hfsraid_ml_o,            iDeviceHFSRAID_Mountain_o);
+	LOADPNG(device_hfsraid_ml,              iDeviceHFSRAID_ML);
+	LOADPNG(device_hfsraid_ml_o,            iDeviceHFSRAID_ML_o);
 	LOADPNG(device_hfsraid_lion,            iDeviceHFSRAID_Lion);
 	LOADPNG(device_hfsraid_lion_o,          iDeviceHFSRAID_Lion_o);
 	LOADPNG(device_hfsraid_sl,              iDeviceHFSRAID_SL);
@@ -906,7 +906,7 @@
                     
 					switch (device->OSVersion[3]) {
 						case '8':
-							devicetype = is_image_loaded(iDeviceHFSRAID_Mountain) ? iDeviceHFSRAID_Mountain : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
+							devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
 							break;
 						case '7':
 							devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
@@ -931,7 +931,7 @@
 					
 					switch (device->OSVersion[3]) {
 						case '8':
-							devicetype = is_image_loaded(iDeviceHFS_Mountain) ? iDeviceHFS_Mountain : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
+							devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
 							break;
 						case '7':
 							devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
Index: branches/ErmaC/Trunk/i386/util/fdisk/misc.c
===================================================================
--- branches/ErmaC/Trunk/i386/util/fdisk/misc.c	(revision 1827)
+++ branches/ErmaC/Trunk/i386/util/fdisk/misc.c	(revision 1828)
@@ -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/ErmaC/Trunk/package/Resources/ko.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/i386/boot2/gui.c
===================================================================
--- branches/ErmaC/Modules/i386/boot2/gui.c	(revision 1827)
+++ branches/ErmaC/Modules/i386/boot2/gui.c	(revision 1828)
@@ -43,8 +43,8 @@
     iDeviceGeneric_o,
     iDeviceHFS,
     iDeviceHFS_o,
-    iDeviceHFS_Mountain,
-    iDeviceHFS_Mountain_o,
+    iDeviceHFS_ML,
+    iDeviceHFS_ML_o,
     iDeviceHFS_Lion,
     iDeviceHFS_Lion_o,
     iDeviceHFS_SL,
@@ -55,8 +55,8 @@
     iDeviceHFS_Tiger_o,
     iDeviceHFSRAID,
     iDeviceHFSRAID_o,
-    iDeviceHFSRAID_Mountain,
-    iDeviceHFSRAID_Mountain_o,
+    iDeviceHFSRAID_ML,
+    iDeviceHFSRAID_ML_o,
     iDeviceHFSRAID_Lion,
     iDeviceHFSRAID_Lion_o,
     iDeviceHFSRAID_SL,
@@ -372,8 +372,8 @@
 	LOADPNG(device_generic_o,               iDeviceGeneric);
 	LOADPNG(device_hfsplus,                 iDeviceGeneric);
 	LOADPNG(device_hfsplus_o,               iDeviceHFS);
-	LOADPNG(device_hfsplus_ml,              iDeviceHFS_Mountain);
-	LOADPNG(device_hfsplus_ml_o,            iDeviceHFS_Mountain_o);
+	LOADPNG(device_hfsplus_ml,              iDeviceHFS_ML);
+	LOADPNG(device_hfsplus_ml_o,            iDeviceHFS_ML_o);
 	LOADPNG(device_hfsplus_lion,            iDeviceHFS_Lion);
 	LOADPNG(device_hfsplus_lion_o,          iDeviceHFS_Lion_o);
 	LOADPNG(device_hfsplus_sl,              iDeviceHFS_SL);
@@ -385,8 +385,8 @@
 
 	LOADPNG(device_hfsraid,                 iDeviceGeneric);
 	LOADPNG(device_hfsraid_o,               iDeviceHFSRAID);
-	LOADPNG(device_hfsraid_ml,              iDeviceHFSRAID_Mountain);
-	LOADPNG(device_hfsraid_ml_o,            iDeviceHFSRAID_Mountain_o);
+	LOADPNG(device_hfsraid_ml,              iDeviceHFSRAID_ML);
+	LOADPNG(device_hfsraid_ml_o,            iDeviceHFSRAID_ML_o);
 	LOADPNG(device_hfsraid_lion,            iDeviceHFSRAID_Lion);
 	LOADPNG(device_hfsraid_lion_o,          iDeviceHFSRAID_Lion_o);
 	LOADPNG(device_hfsraid_sl,              iDeviceHFSRAID_SL);
@@ -906,7 +906,7 @@
                     
 					switch (device->OSVersion[3]) {
 						case '8':
-							devicetype = is_image_loaded(iDeviceHFSRAID_Mountain) ? iDeviceHFSRAID_Mountain : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
+							devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
 							break;
 						case '7':
 							devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID  : iDeviceGeneric;
@@ -931,7 +931,7 @@
 					
 					switch (device->OSVersion[3]) {
 						case '8':
-							devicetype = is_image_loaded(iDeviceHFS_Mountain) ? iDeviceHFS_Mountain : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
+							devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
 							break;
 						case '7':
 							devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric;
Index: branches/ErmaC/Modules/i386/util/fdisk/misc.c
===================================================================
--- branches/ErmaC/Modules/i386/util/fdisk/misc.c	(revision 1827)
+++ branches/ErmaC/Modules/i386/util/fdisk/misc.c	(revision 1828)
@@ -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/ErmaC/Modules/package/Resources/ko.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream