Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 2118)
+++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 2119)
@@ -620,6 +620,7 @@
 	// 06C0 - 06CF
 	{ 0x10DE06C0,	0x10438359,	"Asus GeForce GTX 480" },
 	{ 0x10DE06C0,	0x10DE075F,	"nVidia GeForce GTX 480" },
+	{ 0x10DE06C0,	0x19DA1152,	"Zotac GeForce GTX 480" },
 	{ 0x10DE06C0,	0x38421480,	"EVGA GTX 480" },
 	{ 0x10DE06C0,	0x38421482,	"EVGA GTX 480" },
 
Index: branches/ErmaC/Trunk/i386/boot2/options.c
===================================================================
--- branches/ErmaC/Trunk/i386/boot2/options.c	(revision 2118)
+++ branches/ErmaC/Trunk/i386/boot2/options.c	(revision 2119)
@@ -270,14 +270,14 @@
                 {
                     updateGraphicBootPrompt();
                 }
-            }            
+            }
 			break;
 
         default:
             if ( key >= ' ' && gBootArgsPtr < gBootArgsEnd)
             {
                 *gBootArgsPtr++ = key;
-                
+
                 if( bootArgs->Video.v_display != VGA_TEXT_MODE ) updateGraphicBootPrompt();
                 else if ( key >= ' ' && key < 0x7f) putchar(key);
 			}
@@ -1013,8 +1013,10 @@
 			// New behavior:
 			// Switch between text & graphic interfaces
 			// Only Permitted if started in graphics interface
-			if (useGUI) {
-				if (bootArgs->Video.v_display != VGA_TEXT_MODE) {
+			if (useGUI)
+			{
+				if (bootArgs->Video.v_display != VGA_TEXT_MODE)
+				{
 					setVideoMode(VGA_TEXT_MODE, 0);
 
 					setCursorPosition(0, 0, 0);
@@ -1030,7 +1032,8 @@
 					nextRow = kMenuTopRow;
 					showPrompt = true;
 
-					if (gDeviceCount) {
+					if (gDeviceCount)
+					{
 						printf("Use \30\31 keys to select the startup volume.");
 						showMenu(menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems);
 						nextRow += MIN(gDeviceCount, kMenuMaxItems) + 3;
@@ -1043,7 +1046,7 @@
 					gui.redraw = true;
 					setVideoMode(GRAPHICS_MODE, 0);
 					updateVRAM();
-                    updateGraphicBootPrompt();
+                    			updateGraphicBootPrompt();
 				}
 			}
 			key = 0;
@@ -1122,19 +1125,26 @@
     int cnt;
     bool found = false;
 
-    if (getValueForBootKey(userString, argName, &val, &cnt)) {
-        // Don't copy; these values will be copied at the end of argument processing.
-        found = true;
-    } else if (getValueForBootKey(kernelFlags, argName, &val, &cnt)) {
-        // Don't copy; these values will be copied at the end of argument processing.
-        found = true;
-    } else if (getValueForKey(argName, &val, &cnt, &bootInfo->chameleonConfig)) {
-        copyArgument(argName, val, cnt, argP, cntRemainingP);
-        found = true;
-    }
-    if (found && foundVal)
-        strlcpy(foundVal, val, foundValSize);
-    return found;
+	if (getValueForBootKey(userString, argName, &val, &cnt))
+	{
+		// Don't copy; these values will be copied at the end of argument processing.
+		found = true;
+	}
+	else if (getValueForBootKey(kernelFlags, argName, &val, &cnt))
+	{
+		// Don't copy; these values will be copied at the end of argument processing.
+		found = true;
+	}
+	else if (getValueForKey(argName, &val, &cnt, &bootInfo->chameleonConfig))
+	{
+		copyArgument(argName, val, cnt, argP, cntRemainingP);
+		found = true;
+	}
+	if (found && foundVal)
+	{
+		strlcpy(foundVal, val, foundValSize);
+	}
+	return found;
 }
 
 // Maximum config table value size
Index: branches/ErmaC/Trunk/package/Resources/templates/Localizable.strings
===================================================================
--- branches/ErmaC/Trunk/package/Resources/templates/Localizable.strings	(revision 2118)
+++ branches/ErmaC/Trunk/package/Resources/templates/Localizable.strings	(revision 2119)
@@ -62,14 +62,14 @@
 
 "KernelPatcher_title" = "Kernel Patcher";
 "KernelPatcher_description" = "The KernelPatcher module provides patches for the following:
-Enables the use of the kernelcache with /Extra/Extensions and /Extra/Extensions.mkext
-Removed the CPUID check
-Removes an LAPIC panic
-Removes a panic in commpage_stuff_routine
+*Enables the use of the kernelcache with /Extra/Extensions and /Extra/Extensions.mkext
+*Removed the CPUID check
+*Removes an LAPIC panic
+*Removes a panic in commpage_stuff_routine
 Dependencies: none";
 
 "KextPatcher_title" = "Kext Patcher";
-"KernelPatcher_description" = "The KextPatcher module provides patches for the following:
+"KextPatcher_description" = "The KextPatcher module provides patches for the following:
 Dependencies: none";
 
 // ============================================================================
Index: branches/ErmaC/Trunk/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Trunk/package/buildpkg.sh	(revision 2118)
+++ branches/ErmaC/Trunk/package/buildpkg.sh	(revision 2119)
@@ -23,17 +23,21 @@
 set -u  # Abort with unset variables
 #set -e # Abort with any error can be suppressed locally using EITHER cmd||true OR set -e;cmd;set +e
 
+# ====== LANGUAGE SETUP ======
+export LANG='en_US.UTF-8'
 export LC_COLLATE='C'
 export LC_CTYPE='C'
 
 # ====== CONFIGURATION ======
 CONFIG_MODULES=""
+CONFIG_ACPICODEC_MODULE=""
+CONFIG_KERNELPATCHER_MODULE=""
+CONFIG_KEXTPATCHER_MODULE=""
+CONFIG_KEYLAYOUT_MODULE=""
 CONFIG_KLIBC_MODULE=""
+CONFIG_RESOLUTION_MODULE=""
+CONFIG_SATA_MODULE=""
 CONFIG_UCLIBCXX_MODULE=""
-CONFIG_SATA_MODULE=""
-CONFIG_ACPICODEC_MODULE=""
-CONFIG_RESOLUTION_MODULE=""
-CONFIG_KEYLAYOUT_MODULE=""
 source "${SRCROOT}/auto.conf"
 
 # ====== COLORS ======
@@ -557,7 +561,7 @@
         }
         fi
 # -
-        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KernelPatcher.dylib" ]]; then
+        if [[ "${CONFIG_KERNELPATCHER_MODULE}" == 'y' && -f "${SYMROOT}/i386/modules/KernelPatcher.dylib" ]]; then
         {
             # Start build KernelPatcher package module
             choiceId="KernelPatcher"
@@ -576,7 +580,7 @@
         }
         fi
 # -
-        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KextPatcher.dylib" ]]; then
+        if [[ "${CONFIG_KEXTPATCHER_MODULE}" == 'y' && -f "${SYMROOT}/i386/modules/KextPatcher.dylib" ]]; then
         {
             # Start build KextPatcher package module
             choiceId="KextPatcher"