Index: branches/ErmaC/Trunk/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1774)
+++ branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1775)
@@ -657,8 +657,10 @@
 
 	{ 0x6741,	0x1646103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6750M",				kNull		},
 
-	{ 0x6741,	0x9080104D, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",				kNull		},
+	{ 0x6741,	0x358D103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M/6650M/6750M",	kNull		}, // ErmaC
 
+    { 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	},
@@ -674,6 +676,7 @@
 
 	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		},
 
+	{ 0x6760,	0x11790003, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		}, // ErmaC
 	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
 	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		}, // ErmaC
 
@@ -687,33 +690,33 @@
 	{ 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		},
+	{ 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	},
+	{ 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		},
+	{ 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	},
+	{ 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	},
 
@@ -721,23 +724,23 @@
 	{ 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		},
+	{ 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		},
+	{ 0x958A,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",		kLamna		},
 
-	{ 0x9598,	0x00000000, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",			kMegalodon	},
+	{ 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		},
+	{ 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		},
+	{ 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		},
@@ -765,6 +768,8 @@
 	{ 0x68D9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		},
 	{ 0x68DA,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		},
 
+	{ 0x68E4,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6370M Series",			kNull		},
+
 	{ 0x68F9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400 Series",			kNull		},
 
 	/* Northen Islands */
Index: branches/ErmaC/Trunk/package/Distribution
===================================================================
--- branches/ErmaC/Trunk/package/Distribution	(revision 1774)
+++ branches/ErmaC/Trunk/package/Distribution	(revision 1775)
@@ -15,6 +15,16 @@
 
     <script>
 
+    var bootPlist = null;
+    if (my.target) {
+        var boot_plist_filenames = new Array( 'org.chameleon.Boot.plist', 'com.apple.Boot.plist' );
+        for ( var i = 0; i &lt; boot_plist_filenames.length; i++ ) {
+            bootPlist = system.files.plistAtPath( my.target.mountpoint + '/Extra/' + boot_plist_filenames[i] );
+            if (bootPlist)
+                break;
+        }
+    }
+
     function installCheckScript() {
         var obj = system.ioregistry.matchingClass("AppleSMC");
         if (obj) {
@@ -40,7 +50,32 @@
     }
 
     function chameleon_boot_plist_exists() {
-        return system.files.fileExistsAtPath(my.target.mountpoint + '/Extra/org.chameleon.Boot.plist');
+        return bootPlist ? true : false;
     }
 
+    function check_chameleon_kernel_option(kernelFlags, value) {
+        var flags = kernelFlags.split(" ");
+        for ( var i = 0; i &lt; flags.length; i++ ) {
+            if (flags[i] == value)
+                  return true;
+        }
+        return false;
+    }
+
+    function check_chameleon_option(key, value) {
+        if ( bootPlist &amp;&amp; bootPlist[ key ] ) {
+            if ( key == "Kernel Flags" )
+                return check_chameleon_kernel_option( bootPlist[ key ], value );
+
+            // Check if value is a boolean
+            var pattern=/^(Y(es)?|No?)$/i;
+            var result = value.match(pattern); // Check if the value is a boolean
+            if ( result &amp;&amp; bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase() )
+                return true;
+            else
+                return bootPlist[ key ] == value; // check if the strings are equal
+        }
+        return false;
+    }
+
     </script>
Index: branches/ErmaC/Trunk/package/Changes.txt
===================================================================
--- branches/ErmaC/Trunk/package/Changes.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/Changes.txt	(revision 1775)
@@ -1,9 +1,13 @@
-- JrCs - Make selection of keymaps a specific menu to avoid polluting chameleon and kernel options menu
-- JrCs - Use configuration to know which modules to add to the generated meta-package
-- JrCs - Declare some variables read-only
-- JrCs - Make the script more robust against errors
-- JrCs - Replace misleading variables
+- JrCs - Look for a com.apple.Boot.plist file for users upgrading from legacy installations
 
+- Only create Chameleon.Backups and write to the install log, if required.
+
+- JrCs - Improved backup of chameleon files
+
+- JrCs - Automaticaly select previous options
+
+- JrCs - Improved buildpkg script - Simplify the construction of options menu - Add a lot of checks to avoid the construction of a bad XML file
+
 - Change Localizable.strings to match the recent changes to the install process.
 
 - Improve messages written to the installation log.
Index: branches/ErmaC/Trunk/package/OptionalSettings/Resolution.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/Resolution.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/Resolution.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Trunk/package/OptionalSettings/Video.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/Video.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/Video.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Trunk/package/OptionalSettings/PowerManagement.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/PowerManagement.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/PowerManagement.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Trunk/package/OptionalSettings/General.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/General.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/General.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
@@ -25,8 +25,8 @@
 # ---------------------------------------------
 # Note: There must be a carriage return at end of last line
 # ---------------------------------------------
-Verbose:KFflag=-v
-Singleusermode:KFflag=-s
-Ignorecaches:KFflag=-f
-Npci:KFflag=npci=0x2000
-Darkwake:KFflag=darkwake=0
+Verbose:Kernel Flags=-v
+Singleusermode:Kernel Flags=-s
+Ignorecaches:Kernel Flags=-f
+Npci:Kernel Flags=npci=0x2000
+Darkwake:Kernel Flags=darkwake=0
Index: branches/ErmaC/Trunk/package/OptionalSettings/Control.txt
===================================================================
--- branches/ErmaC/Trunk/package/OptionalSettings/Control.txt	(revision 1774)
+++ branches/ErmaC/Trunk/package/OptionalSettings/Control.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Trunk/package/Scripts/Main/postinstall
===================================================================
--- branches/ErmaC/Trunk/package/Scripts/Main/postinstall	(revision 1774)
+++ branches/ErmaC/Trunk/package/Scripts/Main/postinstall	(revision 1775)
@@ -1,5 +1,24 @@
 #!/bin/bash
 
+mergeString () {
+    local src="${1}"
+    local new="${2}"
+    local result="$src"
+
+    for newItem in $new ;do
+        local found=0
+        for srcItem in $src ;do
+            if [[ $newItem == $srcItem ]];then
+                found=1
+                break
+            fi
+        done
+        [[ $found -eq 0 ]] && result="$result $newItem"
+    done
+
+    echo "$result"
+}
+
 echo "==============================================="
 echo "Post Post-Install Script"
 echo "*********************************"
@@ -37,6 +56,7 @@
 # set temporary directory
 chamTemp="$dest_vol/usr/local/chamTemp"
 
+
 # ---------------------------------------------
 # Build org.chameleon.Boot.plist
 # ---------------------------------------------
@@ -60,47 +80,34 @@
     cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP"
 
     # Read list of all boot options the user added.
-    arrayCount=0
-    kernelFlagCount=0
-    while read FILE
-    do
-        options[arrayCount]="${FILE##*/}"
+    while IFS= read -r -d '' FILE; do
+        option="${FILE##*/}"
+        key="${option%%=*}"
+        value="${option#*=}"
 
-        # Check keyRead for 'KF' at beginning to
-        # indicate that should be a kernel flag
-        if [ ${options[arrayCount]:0:2} = "KF" ];then
+        # Check for 'Kernel Flags' key indicate that should be a kernel flag
+        if [[ "$key" = "Kernel Flags" ]];then
             # plistbuddy only add's if the key doesn't already exist.
             # So let's store any kernelflags and add them all at the
             # same time once when we reach the end of the options list.
-            kernelflag[kernelFlagCount]="${options[arrayCount]##*flag=}"
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: ${kernelflag[kernelFlagCount]}"
-            (( kernelFlagCount++ ))
+            kernelflag[${#kernelflag[*]}]="$value"
+            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value"
         else
-            keyRead="${options[$arrayCount]%=*}"
-            value="${options[$arrayCount]#*=}"
             # escape any spaces
-            keyToUse=$( echo $keyRead | sed 's/ /\\ /g' )
-            if [ "${keyToUse}" != "DONT" ] && [ "${value}" != "ADD" ]; then
-                sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
-                returnValue=$?
-                if [ ${returnValue} -ne 1 ]; then
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${keyRead}=${value}"
-                else
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${keyRead}=${value} as an option already exists for: ${keyRead}"
-                fi
+            keyToUse=$( echo "$key" | sed 's/ /\\ /g' )
+            sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
+            returnValue=$?
+            if [ ${returnValue} -ne 1 ]; then
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}"
+            else
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}"
             fi
         fi
-        (( arrayCount++ ))
-    done < <(ls "${chamTemp}"/options )
+    done < <( find "${chamTemp}/options" -type f -print0 )
 
-    if [ $kernelFlagCount -gt 0 ]; then
-        # Add any kernel flags together in to one string.
-        for (( i=0 ; i < $kernelFlagCount ; i++ ))
-        do
-            kernelFlagString="${kernelFlagString} ${kernelflag[i]}"
-        done
-        # We add the final string in the next section.
-    fi
+    # Add any kernel flags together in to one string.
+    kernelFlagString="${kernelflag[@]}"
+    # We add the final string in the next section.
 fi
 
 # ---------------------------------------------
@@ -180,7 +187,7 @@
 
         if [[ -n "$currentFlags" ]];then
             # Combine new kernel flags with old ones.
-            kernelFlagString="${kernelFlagString} $currentFlags"
+            kernelFlagString=$( mergeString "$currentFlags" "${kernelFlagString}" )
         fi
 
     elif [ -e "$chamTemp/install_type_new" ]; then
@@ -208,22 +215,15 @@
 
     if [ ! -f "$dest_vol"/.ChameleonEFI ]; then
         # The Standard install option chosen
+        rm -rf "$dest_vol/Extra" # Remove old Extra directory
 
-        # Does an /Extra folder already exist?
-        if [ -e "$dest_vol"/Extra ]; then
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Moving $dest_vol/Extra folder to $dest_vol/Extra-OLD-$( date "+%H-%M-%S" )"
-            mv "$dest_vol/Extra" "$dest_vol/Extra_OLD-"$( date "+%H-%M-%S" )
-        fi
         "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/"
         echo "Copying $chamTemp/Extra TO $dest_vol"
         cp -R "$chamTemp"/Extra "$dest_vol"
     else
         # The EFI system partition install option was chosen
-        # Does a /Volumes/Extra folder already exist?
-        if [ -e "/Volumes/EFI/Extra" ]; then
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Moving /Volumes/EFI/Extra folder to /Volumes/EFI/Extra-OLD-$( date "+%H-%M-%S" )"
-            mv "/Volumes/EFI/Extra" "/Volumes/EFI/Extra_OLD-"$( date "+%H-%M-%S" )
-        fi
+        rm -rf "/Volumes/EFI/Extra" # Remove old Extra directory
+
         "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/"
         cp -R "$chamTemp"/Extra "/Volumes/EFI"
     fi
@@ -242,6 +242,12 @@
 fi
 
 # ---------------------------------------------
+# Update Rights
+# ---------------------------------------------
+chmod 777 ${dest_vol}/Extra         2>/dev/null
+chmod 666 ${dest_vol}/Extra/*.plist 2>/dev/null
+
+# ---------------------------------------------
 # Cleanup
 # ---------------------------------------------
 
Index: branches/ErmaC/Trunk/package/Scripts/Main/preinstall
===================================================================
--- branches/ErmaC/Trunk/package/Scripts/Main/preinstall	(revision 1774)
+++ branches/ErmaC/Trunk/package/Scripts/Main/preinstall	(revision 1775)
@@ -9,7 +9,7 @@
 # Creates text file named 'Chameleon_Installer_Log.txt'
 # at the root of the target volume. This is to help show the
 # user why the installation process failed (even though the
-# package installer ends reading 'Installation Successful'. 
+# package installer ends reading 'Installation Successful'.
 
 
 
@@ -25,31 +25,56 @@
 # / with volume name.
 if [ "$3" == "/" ]
 then
-	targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' )
+    targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' )
 else
     targetVolume="$3"
 fi
 
 logName="Chameleon_Installer_Log.txt"
-logFile="${targetVolume}"/$logName
+logFile="${targetVolume}/$logName"
 
 versionNumber=`cat "${scriptDir}"/Resources/version`
 revisionNumber=`cat "${scriptDir}"/Resources/revision`
 
 
+# ---------------------------------------------
+# Preparing Backing up Chameleon files
+# ---------------------------------------------
+backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" )
+mkdir -p "$backupDir"
 
+if [[ -f "$logFile" ]];then
+    # Backup old log file
+    mv "$logFile" "${backupDir}/${logName}"
+fi
+
+
 # Setup Chameleon_Installer_Log.txt file
 # by writing header and diskutil list
 
 echo "Chameleon installer log - $( date )
 Installer version: ${versionNumber} ${revisionNumber}
 ======================================================" >"${logFile}"
-	
+
 diskutil list >>"${logFile}"
 echo "======================================================" >>"${logFile}"
 
+# ---------------------------------------------
+# Backing up Chameleon files
+# ---------------------------------------------
+# Backup stage2
+if [[ -f "${targetVolume}/boot" ]];then
+    echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}"
+    cp -p "${targetVolume}/boot" "${backupDir}/boot"
+fi
+# Backup /Extra directory
+if [[ -d "${targetVolume}/Extra" ]];then
+    echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}"
+    cp -pR "${targetVolume}/Extra" "${backupDir}/Extra"
+fi
+chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups
+echo "======================================================" >>"${logFile}"
 
-
 echo "==============================================="
 echo "END - Pre-Install Script"
 echo "*********************************"
Index: branches/ErmaC/Trunk/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh kompjutere\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Ne pas installer sur un ordinateur Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traduit par : Tenval\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Traduit par : Tenval\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 versie%CHAMELEONVERSION% revisie%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Installeer niet op een echte Apple Macintosh computer!\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Vertaald door: yeehaw123 & Badeendje\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Vertaald door: yeehaw123 & Badeendje\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unala\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Nie instaluj na komputerze Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : janek202\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : janek202\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : oldnapalm\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : oldnapalm\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076  : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076  : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -58,6 +58,8 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011  
+\fs20 \cf0 Copyright \'a9 2011-2012 
 \f1 \cf3 \'c2\'bd\'c4\'b6
-\f0  : crazybirdy, Ulimate}
+\f0  : crazybirdy, Ulimate
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -36,4 +36,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Jangan dinstall Apple Macintosh ASLI\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Rudolf Tingginehe & Babiloe\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Rudolf Tingginehe & Babiloe\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Hak kopi \'a9 2011}
+\fs20 Hak kopi \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -58,6 +58,8 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011  
+\fs20 \cf0 Copyright \'a9 2011-2012
 \f1 \cf3 \'c2\'bd\uc0\u35793 
-\f0  : crazybirdy, Ulimate}
+\f0  : crazybirdy, Ulimate
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -36,4 +36,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Blackosx\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Blackosx\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset178 GeezaPro;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12500\viewkind0
 \pard\ri0\qc
 
@@ -65,4 +66,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Mohamed Khairy\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Mohamed Khairy\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -60,4 +60,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : artur-pt\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : artur-pt\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 No lo instale en un ordenador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traducido por : juanerson\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Traducido por : juanerson\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 \uc0\u1053 \u1077  \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1080 \u1088 \u1072 \u1112 \u1090 \u1077  \u1085 \u1072  Apple Macintosh \u1082 \u1086 \u1084 \u1087 \u1112 \u1091 \u1090 \u1077 \u1088 \
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080  \u1086 \u1076  \u1089 \u1090 \u1088 \u1072 \u1085 \u1072  \u1085 \u1072  : kn6600\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080  \u1086 \u1076  \u1089 \u1090 \u1088 \u1072 \u1085 \u1072  \u1085 \u1072  : kn6600\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
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/Trunk/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -55,7 +55,9 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 
+\fs20 \cf0 Copyright \'a9 2011-2012 
 \f1 \cf3 \'b9\'f8\'bf\'aa
 \f2\b  
-\f0 by : drew_afx}
+\f0 by : drew_afx
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -33,4 +33,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -45,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Tradotto da : ErmaC e scrax\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Tradotto da : ErmaC e scrax\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unare\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Achtung ! Nicht auf einem Apple Macintosh Computer Installieren\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : !Xabbu, olegischinski & NextMac\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : !Xabbu, olegischinski & NextMac\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Trunk/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Trunk/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Trunk/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Trunk/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Trunk/package/buildpkg.sh	(revision 1774)
+++ branches/ErmaC/Trunk/package/buildpkg.sh	(revision 1775)
@@ -15,7 +15,7 @@
 fi
 
 if [[ ! -d "$SYMROOT" ]];then
-	echo "Directory ${SYMROOT} doesn't exit. Aborting..." >&2 && exit 1
+    echo "Directory ${SYMROOT} doesn't exit. Aborting..." >&2 && exit 1
 fi
 
 # Prevent the script from doing bad things
@@ -61,21 +61,24 @@
 declare -r develop=$(awk "NR==6{print;exit}"  ${PKGROOT}/../CREDITS)
 declare -r credits=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS)
 declare -r pkgdev=$(awk "NR==14{print;exit}"  ${PKGROOT}/../CREDITS)
+declare -r whobuild=$(whoami | awk '{print $1}' | cut -d ":" -f3)
 
-# =================
-
-xmlindent=0
-
-indent[0]="\t"
-indent[1]="\t\t"
-indent[2]="\t\t\t"
-indent[3]="\t\t\t\t"
-
 # ====== GLOBAL VARIABLES ======
 declare -a pkgrefs
-declare -a outline
-declare -a choices
+declare -a choice_key
+declare -a choice_options
+declare -a choice_pkgrefs
+declare -a choice_parent_group_index
+declare -a choice_group_items
+declare -a choice_group_exclusive
 
+# Init Main Group
+choice_key[0]=""
+choice_options[0]=""
+choices_pkgrefs[0]=""
+choice_group_items[0]=""
+choice_group_exclusive[0]=""
+
 # Package name
 declare -r packagename="Chameleon"
 
@@ -86,30 +89,143 @@
 
 # ====== FUNCTIONS ======
 
+trim () {
+    local result="${1#"${1%%[![:space:]]*}"}"   # remove leading whitespace characters
+    echo "${result%"${result##*[![:space:]]}"}" # remove trailing whitespace characters
+}
+
 getPackageRefId () {
     echo ${1//_/.}.${2//_/.} | tr [:upper:] [:lower:]
 }
 
+# Return index of a choice
+getChoiceIndex () {
+    # $1 Choice Id
+    local found=0
+    for (( idx=0 ; idx < ${#choice_key[*]}; idx++ ));do
+        if [[ "${1}" == "${choice_key[$idx]}" ]];then
+            found=1
+            break
+        fi
+    done
+    echo "$idx"
+    return $found
+}
+
+# Add a new choice
 addChoice () {
+    # Optionnal arguments:
+    #    --group=<group> : Group Choice Id
+    #    --start-selected=<javascript code> : Specifies whether this choice is initially selected or unselected
+    #    --start-enabled=<javascript code>  : Specifies the initial enabled state of this choice
+    #    --start-visible=<javascript code>  : Specifies whether this choice is initially visible
+    #    --pkg-refs=<pkgrefs> : List of package reference(s) id (separate by spaces)
+    #
     # $1 Choice Id
-    # $2 Choice Options
-    # $3..$n Package reference id (optional)
+
+    local option
+    local groupChoice=""
+    local choiceOptions=""
+    local pkgrefs=""
+
+    # Check the arguments.
+    for option in "${@}";do
+        case "$option" in
+            --group=*)
+                       shift; groupChoice=${option#*=} ;;
+            --start-selected=*)
+                         shift; choiceOptions="$choiceOptions start_selected=\"${option#*=}\"" ;;
+            --start-enabled=*)
+                         shift; choiceOptions="$choiceOptions start_enabled=\"${option#*=}\"" ;;
+            --start-visible=*)
+                         shift; choiceOptions="$choiceOptions start_visible=\"${option#*=}\"" ;;
+            --pkg-refs=*)
+                          shift; pkgrefs=${option#*=} ;;
+            -*)
+                echo "Unrecognized addChoice option '$option'" >&2
+                exit 1
+                ;;
+            *)  break ;;
+        esac
+    done
+
+    if [[ $# -ne 1 ]];then
+        echo "addChoice invalid number of arguments: ${@}" >&2
+        exit 1
+    fi
+
     local choiceId="${1}"
-    local choiceOptions="${2}"
-    local choiceNode="\t<choice\n\t\tid=\"${choiceId}\"\n\t\ttitle=\"${choiceId}_title\"\n\t\tdescription=\"${choiceId}_description\""
-    [[ -n "${choiceOptions}" ]] && choiceNode="${choiceNode}\n\t\t${choiceOptions}"
-    choiceNode="${choiceNode}>"
-    if [[ $# -ge 3 ]];then
-        for pkgRefId in ${@:3};do
-            choiceNode="${choiceNode}\n\t\t<pkg-ref id=\"${pkgRefId}\"/>"
-        done
+
+    # Add choice in the group
+    idx_group=$(getChoiceIndex "$groupChoice")
+    found_group=$?
+    if [[ $found_group -ne 1 ]];then
+        # No group exist
+        echo "Error can't add choice '$choiceId' to group '$groupChoice': group choice '$groupChoice' doesn't exists." >&2
+        exit 1
+    else
+        set +u; oldItems=${choice_group_items[$idx_group]}; set -u
+        choice_group_items[$idx_group]="$oldItems $choiceId"
     fi
-    choiceNode="${choiceNode}\n\t</choice>\n"
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"${choiceId}\"/>"
-    choices[${#choices[*]}]="$choiceNode"
+    # Check that the choice doesn't already exists
+    idx=$(getChoiceIndex "$choiceId")
+    found=$?
+    if [[ $found -ne 0 ]];then
+        # Choice already exists
+        echo "Error can't add choice '$choiceId': a choice with same name already exists." >&2
+        exit 1
+    fi
+
+    # Record new node
+    choice_key[$idx]="$choiceId"
+    choice_options[$idx]=$(trim "${choiceOptions}") # Removing leading and trailing whitespace(s)
+    choice_parent_group_index[$idx]=$idx_group
+    choice_pkgrefs[$idx]="$pkgrefs"
+
+    return $idx
 }
 
+# Add a group choice
+addGroupChoices() {
+    # Optionnal arguments:
+    #    --parent=<parent> : parent group choice id
+    #    --exclusive_zero_or_one_choice : only zero or one choice can be selected in the group
+    #    --exclusive_one_choice : only one choice can be selected in the group
+    #
+    # $1 Choice Id
+
+    local option
+    local groupChoice=""
+    local exclusive_function=""
+
+    for option in "${@}";do
+        case "$option" in
+            --exclusive_zero_or_one_choice)
+                       shift; exclusive_function="exclusive_zero_or_one_choice" ;;
+            --exclusive_one_choice)
+                       shift; exclusive_function="exclusive_one_choice" ;;
+            --parent=*)
+                       shift; groupChoice=${option#*=} ;;
+            -*)
+                echo "Unrecognized addGroupChoices option '$option'" >&2
+                exit 1
+                ;;
+            *)  break ;;
+        esac
+    done
+
+    if [[ $# -ne 1 ]];then
+        echo "addGroupChoices invalid number of arguments: ${@}" >&2
+        exit 1
+    fi
+
+    addChoice --group="$groupChoice" "${1}"
+    local idx=$? # index of the new created choice
+
+    choice_group_exclusive[$idx]="$exclusive_function"
+}
+
 exclusive_one_choice () {
     # $1 Current choice (ie: test1)
     # $2..$n Others choice(s) (ie: "test2" "test3"). Current can or can't be in the others choices
@@ -146,11 +262,8 @@
     echo -e $COL_CYAN"  ----------------------------------"$COL_RESET
     echo ""
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<choices-outline>"
-
 # build pre install package
     echo "================= Preinstall ================="
-    ((xmlindent++))
     packagesidentity="${chameleon_package_identity}"
     choiceId="Pre"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
@@ -159,10 +272,10 @@
     ditto --noextattr --noqtn ${SRCROOT}/version  ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version
     cp -f ${PKGROOT}/Scripts/Main/preinstall   ${PKG_BUILD_DIR}/${choiceId}/Scripts
     cp -f ${PKGROOT}/Scripts/Sub/InstallLog.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
 # End build pre install package
 
 # build core package
@@ -182,54 +295,43 @@
     ditto --noextattr --noqtn ${SYMROOT}/i386/chain0   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/standalone/i386
     ditto --noextattr --noqtn ${SYMROOT}/i386/fdisk440 ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
     ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"
 # End build core package
 
 # build install type
     echo "================= Chameleon ================="
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"InstallType\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"InstallType\"\n\t\ttitle=\"InstallType_title\"\n\t\tdescription=\"InstallType_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices --exclusive_one_choice "InstallType"
     packagesidentity="${chameleon_package_identity}.type"
-    allChoices="New Upgrade"
 
     # build new install package
     choiceId="New"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"
+    addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build new install package
 
     # build upgrade package
     choiceId="Upgrade"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"
+    addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build upgrade package
 
-   ((xmlindent--))
-   outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
 # End build install type
 
 # build Chameleon package
     echo "================= Chameleon ================="
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Chameleon\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"Chameleon\"\n\t\ttitle=\"Chameleon_title\"\n\t\tdescription=\"Chameleon_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices --exclusive_one_choice "Chameleon"
 
-    allChoices="Standard EFI noboot"
-
     # build standard package
     choiceId="Standard"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
@@ -237,11 +339,10 @@
     cp -f ${PKGROOT}/Scripts/Main/${choiceId}postinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
     cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"true\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build standard package
 
     # build efi package
@@ -251,25 +352,21 @@
     cp -f ${PKGROOT}/Scripts/Main/ESPpostinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
     cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build efi package
 
     # build no bootloader choice package
     choiceId="noboot"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build no bootloader choice package
 
-    ((xmlindent--))
-    outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
 # End build Chameleon package
 
 if [[ "${CONFIG_MODULES}" == 'y' ]];then
@@ -285,9 +382,7 @@
     ###############################
     if [ "$(ls -A "${SYMROOT}/i386/modules")" ]; then
     {
-        outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Module\">"
-        choices[${#choices[*]}]="\t<choice\n\t\tid=\"Module\"\n\t\ttitle=\"Module_title\"\n\t\tdescription=\"Module_description\">\n\t</choice>\n"
-        ((xmlindent++))
+        addGroupChoices "Module"
 
 # -
         if [[ "${CONFIG_KLIBC_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/klibc.dylib" ]]; then
@@ -296,10 +391,10 @@
             choiceId="klibc"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build klibc package module
         }
         fi
@@ -316,11 +411,11 @@
             choiceId="uClibc"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
             # Add the klibc package because the uClibc module is dependent of klibc module
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId" "$klibcPackageRefId"
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"
             # End build uClibc package module
         }
         fi
@@ -332,10 +427,10 @@
             choiceId="AutoReso"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build Resolution package module
         }
         fi
@@ -360,18 +455,16 @@
             ditto --noextattr --noqtn ${SRCROOT}/Keymaps ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps
             # Adding tools
             ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
 
             # Don't add a choice for Keylayout module
-            # addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"
             # End build Keylayout package module
         }
         fi
 
-        ((xmlindent--))
-        outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
     }
     else
     {
@@ -383,11 +476,8 @@
 
 # build Options packages
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Options\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"Options\"\n\t\ttitle=\"Options_title\"\n\t\tdescription=\"Options_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices "Options"
 
-
     # ------------------------------------------------------
     # parse OptionalSettings folder to find files of boot options.
     # ------------------------------------------------------
@@ -397,135 +487,115 @@
     for (( i = 0 ; i < ${#OptionalSettingsFiles[@]} ; i++ ))
     do
 
-		# Take filename and Strip .txt from end and path from front
-		builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} )
-		builtOptionsList=$( echo ${builtOptionsList##*/} )
-		echo "================= $builtOptionsList ================="
-		outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"${builtOptionsList}\">"
-		choices[${#choices[*]}]="\t<choice\n\t\tid=\"${builtOptionsList}\"\n\t\ttitle=\"${builtOptionsList}_title\"\n\t\tdescription=\"${builtOptionsList}_description\">\n\t</choice>\n"
-		((xmlindent++))
-		packagesidentity="${chameleon_package_identity}.options.$builtOptionsList"
+        # Take filename and Strip .txt from end and path from front
+        builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} )
+        builtOptionsList=$( echo ${builtOptionsList##*/} )
 
-		# ------------------------------------------------------
-		# Read boot option file into an array.
-		# ------------------------------------------------------
-		availableOptions=() # array to hold the list of boot options, per 'section'.
-		exclusiveFlag=0 # used to indicate list has exclusive options
-		count=0 # used as index for stepping through array.
-		while read textLine; do
-			# ignore lines in the file beginning with a # and Exclusive=False
-			if [[ ${textLine} != \#* ]] && [[ ${textLine} != "Exclusive=False" ]];then
-				# check for 'Exclusive=True' option in file
-				if [[ ${textLine} == "Exclusive=True" ]];then
-					exclusiveFlag=1
-				else
-					availableOptions[${#availableOptions[@]}]=$textLine
-				fi
-			fi
-		done < ${OptionalSettingsFiles[$i]}
+        echo "================= $builtOptionsList ================="
 
-		# ------------------------------------------------------
-		# Loop through options in array and process each in turn
-		# ------------------------------------------------------
-		allChoices="${availableOptions[@]//:*/}"
-		for (( c = 0 ; c < ${#availableOptions[@]} ; c++ )); do
-			textLine=${availableOptions[c]}
-			# split line - taking all before ':' as option name
-			# and all after ':' as key/value
-			optionName=${textLine%:*}
-			keyValue=${textLine##*:}
+        # ------------------------------------------------------
+        # Read boot option file into an array.
+        # ------------------------------------------------------
+        availableOptions=() # array to hold the list of boot options, per 'section'.
+        exclusiveFlag=""    # used to indicate list has exclusive options
+        while read textLine; do
+            # ignore lines in the file beginning with a # and Exclusive=False
+            if [[ ${textLine} != \#* ]] && [[ ${textLine} != "Exclusive=False" ]];then
+                # check for 'Exclusive=True' option in file
+                if [[ ${textLine} == "Exclusive=True" ]];then
+                    exclusiveFlag="--exclusive_zero_or_one_choice"
+                else
+                    availableOptions[${#availableOptions[@]}]=$textLine
+                fi
+            fi
+        done < ${OptionalSettingsFiles[$i]}
 
-			# create folders required for each boot option
-			mkdir -p "${PKG_BUILD_DIR}/$optionName/Root/"
+        addGroupChoices  --parent="Options" $exclusiveFlag "${builtOptionsList}"
+        packagesidentity="${chameleon_package_identity}.options.$builtOptionsList"
 
-			# create dummy file with name of key/value
-			echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"
+        # ------------------------------------------------------
+        # Loop through options in array and process each in turn
+        # ------------------------------------------------------
+        for (( c = 0 ; c < ${#availableOptions[@]} ; c++ )); do
+            textLine=${availableOptions[c]}
+            # split line - taking all before ':' as option name
+            # and all after ':' as key/value
+            optionName=${textLine%%:*}
+            keyValue=${textLine##*:}
+            key=${keyValue%%=*}
+            value=${keyValue#*=}
 
-			echo -e "\t[BUILD] ${optionName} "
-			packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
-			buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
-			exclusiveSelect=""
-			if [[ ${exclusiveFlag} -eq 1 ]];then
-				exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
-			fi
-			addChoice "${optionName}"  "start_selected=\"false\" ${exclusiveSelect}"  "$packageRefId"
-		done
+            # create folders required for each boot option
+            mkdir -p "${PKG_BUILD_DIR}/$optionName/Root/"
 
-		((xmlindent--))
-		outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
-	done
+            # create dummy file with name of key/value
+            echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"
 
-    ((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
+            packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
+            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"
+            addChoice --group="${builtOptionsList}"  \
+                --start-selected="check_chameleon_option('$key','$value')" \
+                --pkg-refs="$packageRefId" "${optionName}"
+        done
+
+    done
+
 # End build options packages
 
 if [[ -n "${CONFIG_KEYLAYOUT_MODULE}" ]];then
 # build KeyLayout options packages
-	echo "================= Keymaps Options ================="
-	outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"KeyLayout\">"
-	choices[${#choices[*]}]="\t<choice\n\t\tid=\"KeyLayout\"\n\t\ttitle=\"KeyLayout_title\"\n\t\tdescription=\"KeyLayout_description\">\n\t</choice>\n"
-	((xmlindent++))
-	packagesidentity="${chameleon_package_identity}.options.keylayout"
+    echo "================= Keymaps Options ================="
+    addGroupChoices --exclusive_zero_or_one_choice "KeyLayout"
+    packagesidentity="${chameleon_package_identity}.options.keylayout"
     keylayoutPackageRefId=""
     if [[ "${CONFIG_MODULES}" == 'y' && "${CONFIG_KEYLAYOUT_MODULE}" = 'm' ]];then
         keylayoutPackageRefId=$(getPackageRefId "${modules_packages_identity}" "Keylayout")
     fi
 
-	# ------------------------------------------------------
-	# Available Keylayout boot options are discovered by
-	# reading contents of /Keymaps folder after compilation
-	# ------------------------------------------------------
-	availableOptions=($( find "${SRCROOT}/Keymaps" -type f -depth 1 -name '*.lyt' | sed 's|.*/||;s|\.lyt||' ))
-	allChoices="${availableOptions[@]}"
-	# Adjust array contents to match expected format
-	# for boot options which is: name:key=value
-	for (( i = 0 ; i < ${#availableOptions[@]} ; i++ )); do
-		# availableOptions[i]=${availableOptions[i]}":KeyLayout="${availableOptions[i]}
-		# Start build of a keymap package module
-		choiceId="${availableOptions[i]}"
-		mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
+    chameleon_keylayout_key="KeyLayout"
+    # ------------------------------------------------------
+    # Available Keylayout boot options are discovered by
+    # reading contents of /Keymaps folder after compilation
+    # ------------------------------------------------------
+    availableOptions=($( find "${SRCROOT}/Keymaps" -type f -depth 1 -name '*.lyt' | sed 's|.*/||;s|\.lyt||' ))
+    # Adjust array contents to match expected format
+    # for boot options which is: name:key=value
+    for (( i = 0 ; i < ${#availableOptions[@]} ; i++ )); do
+        # Start build of a keymap package module
+        choiceId="${availableOptions[i]}"
+        mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
 
-		# create dummy file with name of key/value
-		echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/KeyLayout=${availableOptions[i]}"
+        # create dummy file with name of key/value
+        echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"
 
-		echo -e "\t[BUILD] ${choiceId} "
-		packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-		buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
-		exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
-		# Add the Keylayout package because the Keylayout module is needed
-		addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  \
-		 "$packageRefId" "$keylayoutPackageRefId"
-		# End build uClibc package module
-	done
+        packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
+        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"
+        # Add the Keylayout package because the Keylayout module is needed
+        addChoice --group="KeyLayout"  \
+            --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \
+            --pkg-refs="$packageRefId $keylayoutPackageRefId" "${choiceId}"
+    done
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
-
 # End build KeyLayout options packages
 fi
 
 # build theme packages
-	echo "================= Themes ================="
-	outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Themes\">"
-	choices[${#choices[*]}]="\t<choice\n\t\tid=\"Themes\"\n\t\ttitle=\"Themes_title\"\n\t\tdescription=\"Themes_description\">\n\t</choice>\n"
-	((xmlindent++))
+    echo "================= Themes ================="
+    addGroupChoices "Themes"
 
-	# Using themes section from Azi's/package branch.
-	packagesidentity="${chameleon_package_identity}.themes"
-	artwork="${SRCROOT}/artwork/themes"
-	themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' ))
-	for (( i = 0 ; i < ${#themes[@]} ; i++ )); do
-		theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
-		mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/"
-		rsync -r --exclude=.svn "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"
-		echo -e "\t[BUILD] ${theme}"
-		packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
-		buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
-		addChoice "${theme}"  "start_selected=\"false\""  "$packageRefId"
-	done
+    # Using themes section from Azi's/package branch.
+    packagesidentity="${chameleon_package_identity}.themes"
+    artwork="${SRCROOT}/artwork/themes"
+    themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' ))
+    for (( i = 0 ; i < ${#themes[@]} ; i++ )); do
+        theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
+        mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/"
+        rsync -r --exclude=.svn "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
+        packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
+        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"
+        addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"
+    done
 # End build theme packages# End build Extras package
 
 # build post install package
@@ -539,84 +609,147 @@
     cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --noextattr --noqtn ${SRCROOT}/revision ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/revision
     ditto --noextattr --noqtn ${SRCROOT}/version ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
 # End build post install package
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</choices-outline>"
-
 }
 
 buildpackage ()
 {
-	#  $1 Package Reference Id (ie: org.chameleon.themes.default)
-	#  $2 Package Name (ie: Default)
-	#  $3 Path to package to build containing Root and/or Scripts
-	#  $4 Target install location
-	#  $5 Size (optional)
-	if [[ -d "${3}/Root" ]]; then
-		local packageRefId="$1"
-		local packageName="$2"
-		local packagePath="$3"
-		local targetPath="$4"
-		set +u # packageSize is optional
+    #  $1 Package Reference Id (ie: org.chameleon.themes.default)
+    #  $2 Package Name (ie: Default)
+    #  $3 Path to package to build containing Root and/or Scripts
+    #  $4 Target install location
+    #  $5 Size (optional)
+    if [[ -d "${3}/Root" ]]; then
+        local packageRefId="$1"
+        local packageName="$2"
+        local packagePath="$3"
+        local targetPath="$4"
+        set +u # packageSize is optional
         local packageSize="$5"
         set -u
 
-		find "${packagePath}" -name '.DS_Store' -delete
-		local filecount=$( find "${packagePath}/Root" | wc -l )
-		if [ "${packageSize}" ]; then
-			local installedsize="${packageSize}"
-		else
-			local installedsize=$( du -hkc "${packagePath}/Root" | tail -n1 | awk {'print $1'} )
-		fi
-		local header="<?xml version=\"1.0\"?>\n<pkg-info format-version=\"2\" "
+        echo -e "\t[BUILD] ${packageName}"
 
-		#[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" "
+        find "${packagePath}" -name '.DS_Store' -delete
+        local filecount=$( find "${packagePath}/Root" | wc -l )
+        if [ "${packageSize}" ]; then
+            local installedsize="${packageSize}"
+        else
+            local installedsize=$( du -hkc "${packagePath}/Root" | tail -n1 | awk {'print $1'} )
+        fi
+        local header="<?xml version=\"1.0\"?>\n<pkg-info format-version=\"2\" "
 
-		header+="identifier=\"${packageRefId}\" "
-		header+="version=\"${version}\" "
+        #[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" "
 
-		[ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" "
+        header+="identifier=\"${packageRefId}\" "
+        header+="version=\"${version}\" "
 
-		header+="auth=\"root\">\n"
-		header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
-		rm -R -f "${packagePath}/Temp"
+        [ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" "
 
-		[ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp"
-		[ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom"
+        header+="auth=\"root\">\n"
+        header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
+        rm -R -f "${packagePath}/Temp"
 
-		if [ -d "${packagePath}/Scripts" ]; then
-			header+="\t<scripts>\n"
-			for script in $( find "${packagePath}/Scripts" -type f \( -name 'pre*' -or -name 'post*' \) ); do
-				header+="\t\t<${script##*/} file=\"./${script##*/}\"/>\n"
-			done
-			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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+        [ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp"
+        [ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom"
+
+        if [ -d "${packagePath}/Scripts" ]; then
+            header+="\t<scripts>\n"
+            for script in $( find "${packagePath}/Scripts" -type f \( -name 'pre*' -or -name 'post*' \) ); do
+                header+="\t\t<${script##*/} file=\"./${script##*/}\"/>\n"
+            done
+            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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
         fi
 
-		header+="</pkg-info>"
-		echo -e "${header}" > "${packagePath}/Temp/PackageInfo"
+        header+="</pkg-info>"
+        echo -e "${header}" > "${packagePath}/Temp/PackageInfo"
 
-		# 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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+        # 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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
 
-		# Create the package
-		(cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .)
+        # Create the package
+        (cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .)
 
-		# Add the package to the list of build packages
-		pkgrefs[${#pkgrefs[*]}]="\t<pkg-ref id=\"${packageRefId}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}'>#${packageName}.pkg</pkg-ref>"
+        # Add the package to the list of build packages
+        pkgrefs[${#pkgrefs[*]}]="\t<pkg-ref id=\"${packageRefId}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}'>#${packageName}.pkg</pkg-ref>"
 
-		rm -rf "${packagePath}"
-	fi
+        rm -rf "${packagePath}"
+    fi
 }
 
+generateOutlineChoices() {
+    # $1 Main Choice
+    # $2 indent level
+    local idx=$(getChoiceIndex "$1")
+    local indentLevel="$2"
+    local indentString=""
+    for ((level=1; level <= $indentLevel ; level++)); do
+        indentString="\t$indentString"
+    done
+    set +u; subChoices="${choice_group_items[$idx]}"; set -u
+    if [[ -n "${subChoices}" ]]; then
+        # Sub choices exists
+        echo -e "$indentString<line choice=\"$1\">"
+        for subChoice in $subChoices;do
+            generateOutlineChoices $subChoice $(($indentLevel+1))
+        done
+        echo -e "$indentString</line>"
+    else
+        echo -e "$indentString<line choice=\"$1\"/>"
+    fi
+}
+
+generateChoices() {
+    for (( idx=1; idx < ${#choice_key[*]} ; idx++)); do
+        local choiceId=${choice_key[$idx]}
+        local choiceOptions=${choice_options[$idx]}
+        local choiceParentGroupIndex=${choice_parent_group_index[$idx]}
+        set +u; local group_exclusive=${choice_group_exclusive[$choiceParentGroupIndex]}; set -u
+
+        # Create the node and standard attributes
+        local choiceNode="\t<choice\n\t\tid=\"${choiceId}\"\n\t\ttitle=\"${choiceId}_title\"\n\t\tdescription=\"${choiceId}_description\""
+
+        # Add options like start_selected, etc...
+        [[ -n "${choiceOptions}" ]] && choiceNode="${choiceNode}\n\t\t${choiceOptions}"
+
+        # Add the selected attribute if options are mutually exclusive
+        if [[ -n "$group_exclusive" ]];then
+            local group_items="${choice_group_items[$choiceParentGroupIndex]}"
+            case $group_exclusive in
+                exclusive_one_choice)
+                    local selected_option=$(exclusive_one_choice "$choiceId" "$group_items") ;;
+                exclusive_zero_or_one_choice)
+                    local selected_option=$(exclusive_zero_or_one_choice "$choiceId" "$group_items") ;;
+                *) echo "Error: unknown function to generate exclusive mode '$group_exclusive' for group '${choice_key[$choiceParentGroupIndex]}'" >&2
+                   exit 1
+                   ;;
+            esac
+            choiceNode="${choiceNode}\n\t\tselected=\"$selected_option\""
+        fi
+
+        choiceNode="${choiceNode}>"
+
+        # Add the package references
+        for pkgRefId in ${choice_pkgrefs[$idx]};do
+            choiceNode="${choiceNode}\n\t\t<pkg-ref id=\"${pkgRefId}\"/>"
+        done
+
+        # Close the node
+        choiceNode="${choiceNode}\n\t</choice>\n"
+
+        echo -e "$choiceNode"
+    done
+}
+
 makedistribution ()
 {
     declare -r distributionDestDir="${SYMROOT}"
@@ -628,7 +761,7 @@
     mkdir -p "${PKG_BUILD_DIR}/${packagename}"
 
     find "${PKG_BUILD_DIR}" -type f -name '*.pkg' -depth 1 | while read component
-	do
+    do
         pkg="${component##*/}" # ie: EFI.pkg
         pkgdir="${PKG_BUILD_DIR}/${packagename}/${pkg}"
         # expand individual packages
@@ -639,13 +772,14 @@
 #   Create the Distribution file
     ditto --noextattr --noqtn "${PKGROOT}/Distribution" "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
-    for (( i=0; i < ${#outline[*]} ; i++)); do
-		echo -e "${outline[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
-	done
+    local start_indent_level=2
+    echo -e "\n\t<choices-outline>" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
+    for main_choice in ${choice_group_items[0]};do
+        generateOutlineChoices $main_choice $start_indent_level >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
+    done
+    echo -e "\t</choices-outline>\n" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
-    for (( i=0; i < ${#choices[*]} ; i++)); do
-		echo -e "${choices[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
-	done
+    generateChoices >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
     for (( i=0; i < ${#pkgrefs[*]} ; i++)); do
         echo -e "${pkgrefs[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
@@ -671,13 +805,17 @@
     perl -i -p -e "s/%CREDITS%/${credits}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
     perl -i -p -e "s/%PKGDEV%/${pkgdev}/g"   $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
 
+#  Adding whoami
+    perl -i -p -e "s/%WHOBUILD%/${whobuild}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
+
 #   Create the final package
     pkgutil --flatten "${PKG_BUILD_DIR}/${packagename}" "${distributionFilePath}"
 
-#   Here is the place for assign a Icon to the pkg
-#   command use to generate the file:
-#   ditto -c -k --sequesterRsrc --keepParent Icon.icns Icon.zip
-# ----
+##################################################################
+#   Here is the place for assign a Icon to the pkg               #
+#   command use to generate the file:                            #
+#   ditto -c -k --sequesterRsrc --keepParent Icon.icns Icon.zip  #
+##################################################################
     ditto -xk "${PKGROOT}/Icons/pkg.zip" "${PKG_BUILD_DIR}/Icons/"
     DeRez -only icns "${PKG_BUILD_DIR}/Icons/Icons/pkg.icns" > "${PKG_BUILD_DIR}/Icons/tempicns.rsrc"
     Rez -append "${PKG_BUILD_DIR}/Icons/tempicns.rsrc" -o "${distributionFilePath}"
@@ -701,6 +839,7 @@
     echo -e $COL_BLUE"  Version:      "$COL_RESET"$version"
     echo -e $COL_BLUE"  Stage:        "$COL_RESET"$stage"
     echo -e $COL_BLUE"  Date/Time:    "$COL_RESET"$builddate"
+    echo -e $COL_BLUE"  Builded by:   "$COL_RESET"$whobuild"
     echo ""
 
 }
Index: branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c
===================================================================
--- branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1774)
+++ branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1775)
@@ -499,7 +499,7 @@
 
 	{ 0x6899,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		, 0 },
 
-	{ 0x6899,	0xE174174B, CHIP_FAMILY_CYPRESS,	"ATI Sapphire Radeon HD 5850",				kUakari		, 0 },
+	{ 0x6899,	0xE174174B, CHIP_FAMILY_CYPRESS,	"ATI Sapphire Radeon HD 5850",			kUakari		, 0 },
 
 	{ 0x6899,	0x200A1787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		, 0 },
 	{ 0x6899,	0x22901787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		, 0 },
@@ -534,7 +534,7 @@
 	{ 0x68B8,	0x200B1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
 	{ 0x68B8,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		, 0 },
 
-	{ 0x68BE,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5750",			kVervet		, 0 }, // ErmaC
+	{ 0x68BE,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5750",				kVervet		, 0 }, // ErmaC
 
 	{ 0x68BF,	0x220E1458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kVervet		, 0 },
 
@@ -592,9 +592,9 @@
 
 	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	, 0 },
 
-	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur		, 0 }, // ErmaC
+	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	, 0 }, // ErmaC
 
-	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ASUS EAH5450",                     kEulemur		, 0 }, // ErmaC
+	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ASUS EAH5450",                     		kEulemur	, 0 }, // ErmaC
 
 	{ 0x68F9,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		, 0 },
 	{ 0x68F9,	0x5490174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		, 0 },
@@ -664,6 +664,8 @@
 
 	{ 0x6741,	0x1646103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6750M",				kNull		, 0 },
 
+	{ 0x6741,	0x358D103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M/6650M/6750M",		kNull		, 0 }, // ErmaC
+
 	{ 0x6741,	0x9080104D, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",				kNull		, 0 },
 
 	{ 0x6758,	0x67581002, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	, 0 },
@@ -681,6 +683,7 @@
 
 	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6490M",				kNull		, 0 },
 
+	{ 0x6760,	0x11790003, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		, 0 }, // ErmaC
 	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		, 0 },
 	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		, 0 }, // ErmaC
 
@@ -760,8 +763,8 @@
 	{ 0x689E,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		, 0 },
 
 	{ 0x68A0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNomascus		, 0 }, // ErmaC
-	{ 0x68A1,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull		, 0 }, // ErmaC
-	{ 0x68B0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull		, 0 }, // ErmaC
+	{ 0x68A1,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull			, 0 }, // ErmaC
+	{ 0x68B0,	0x00000000, CHIP_FAMILY_BROADWAY,	"ATI Mobility Radeon HD 5800 Series",	kNull			, 0 }, // ErmaC
 
 	{ 0x68B8,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		, 0 },
 	{ 0x68B9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5600 Series",			kVervet		, 0 },
@@ -772,6 +775,8 @@
 	{ 0x68D9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		, 0 },
 	{ 0x68DA,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		, 0 },
 
+	{ 0x68E4,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6370M Series",			kNull		, 0 },
+
 	{ 0x68F9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400 Series",			kNull		, 0 },
 
 	/* Northen Islands */
Index: branches/ErmaC/Modules/package/Distribution
===================================================================
--- branches/ErmaC/Modules/package/Distribution	(revision 1774)
+++ branches/ErmaC/Modules/package/Distribution	(revision 1775)
@@ -15,6 +15,16 @@
 
     <script>
 
+    var bootPlist = null;
+    if (my.target) {
+        var boot_plist_filenames = new Array( 'org.chameleon.Boot.plist', 'com.apple.Boot.plist' );
+        for ( var i = 0; i &lt; boot_plist_filenames.length; i++ ) {
+            bootPlist = system.files.plistAtPath( my.target.mountpoint + '/Extra/' + boot_plist_filenames[i] );
+            if (bootPlist)
+                break;
+        }
+    }
+
     function installCheckScript() {
         var obj = system.ioregistry.matchingClass("AppleSMC");
         if (obj) {
@@ -40,7 +50,32 @@
     }
 
     function chameleon_boot_plist_exists() {
-        return system.files.fileExistsAtPath(my.target.mountpoint + '/Extra/org.chameleon.Boot.plist');
+        return bootPlist ? true : false;
     }
 
+    function check_chameleon_kernel_option(kernelFlags, value) {
+        var flags = kernelFlags.split(" ");
+        for ( var i = 0; i &lt; flags.length; i++ ) {
+            if (flags[i] == value)
+                  return true;
+        }
+        return false;
+    }
+
+    function check_chameleon_option(key, value) {
+        if ( bootPlist &amp;&amp; bootPlist[ key ] ) {
+            if ( key == "Kernel Flags" )
+                return check_chameleon_kernel_option( bootPlist[ key ], value );
+
+            // Check if value is a boolean
+            var pattern=/^(Y(es)?|No?)$/i;
+            var result = value.match(pattern); // Check if the value is a boolean
+            if ( result &amp;&amp; bootPlist[ key ].charAt(0).toLowerCase() == value.charAt(0).toLowerCase() )
+                return true;
+            else
+                return bootPlist[ key ] == value; // check if the strings are equal
+        }
+        return false;
+    }
+
     </script>
Index: branches/ErmaC/Modules/package/Changes.txt
===================================================================
--- branches/ErmaC/Modules/package/Changes.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/Changes.txt	(revision 1775)
@@ -1,9 +1,13 @@
-- JrCs - Make selection of keymaps a specific menu to avoid polluting chameleon and kernel options menu
-- JrCs - Use configuration to know which modules to add to the generated meta-package
-- JrCs - Declare some variables read-only
-- JrCs - Make the script more robust against errors
-- JrCs - Replace misleading variables
+- JrCs - Look for a com.apple.Boot.plist file for users upgrading from legacy installations
 
+- Only create Chameleon.Backups and write to the install log, if required.
+
+- JrCs - Improved backup of chameleon files
+
+- JrCs - Automaticaly select previous options
+
+- JrCs - Improved buildpkg script - Simplify the construction of options menu - Add a lot of checks to avoid the construction of a bad XML file
+
 - Change Localizable.strings to match the recent changes to the install process.
 
 - Improve messages written to the installation log.
Index: branches/ErmaC/Modules/package/OptionalSettings/Resolution.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/Resolution.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/Resolution.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Modules/package/OptionalSettings/Video.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/Video.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/Video.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Modules/package/OptionalSettings/PowerManagement.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/PowerManagement.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/PowerManagement.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Modules/package/OptionalSettings/General.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/General.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/General.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
@@ -25,8 +25,8 @@
 # ---------------------------------------------
 # Note: There must be a carriage return at end of last line
 # ---------------------------------------------
-Verbose:KFflag=-v
-Singleusermode:KFflag=-s
-Ignorecaches:KFflag=-f
-Npci:KFflag=npci=0x2000
-Darkwake:KFflag=darkwake=0
+Verbose:Kernel Flags=-v
+Singleusermode:Kernel Flags=-s
+Ignorecaches:Kernel Flags=-f
+Npci:Kernel Flags=npci=0x2000
+Darkwake:Kernel Flags=darkwake=0
Index: branches/ErmaC/Modules/package/OptionalSettings/Control.txt
===================================================================
--- branches/ErmaC/Modules/package/OptionalSettings/Control.txt	(revision 1774)
+++ branches/ErmaC/Modules/package/OptionalSettings/Control.txt	(revision 1775)
@@ -11,9 +11,9 @@
 # example1: InstantMenu:Instant Menu=Yes
 # example2: DropSSDT:DropSSDT=Yes
 # ---------------------------------------------
-# To add kernel flag: Structure is name:KFflag=kernelflag
-# example1: Npci:KFflag=npci=0x2000
-# example2: Verbose:KFflag=-v
+# To add kernel flag: Structure is name:Kernel Flags=kernelflag
+# example1: Npci:Kernel Flags=npci=0x2000
+# example2: Verbose:Kernel Flags=-v
 # ---------------------------------------------
 # The package installer has a setting which controls what
 # the user is allowed to choose.
Index: branches/ErmaC/Modules/package/Scripts/Main/postinstall
===================================================================
--- branches/ErmaC/Modules/package/Scripts/Main/postinstall	(revision 1774)
+++ branches/ErmaC/Modules/package/Scripts/Main/postinstall	(revision 1775)
@@ -1,5 +1,24 @@
 #!/bin/bash
 
+mergeString () {
+    local src="${1}"
+    local new="${2}"
+    local result="$src"
+
+    for newItem in $new ;do
+        local found=0
+        for srcItem in $src ;do
+            if [[ $newItem == $srcItem ]];then
+                found=1
+                break
+            fi
+        done
+        [[ $found -eq 0 ]] && result="$result $newItem"
+    done
+
+    echo "$result"
+}
+
 echo "==============================================="
 echo "Post Post-Install Script"
 echo "*********************************"
@@ -37,6 +56,7 @@
 # set temporary directory
 chamTemp="$dest_vol/usr/local/chamTemp"
 
+
 # ---------------------------------------------
 # Build org.chameleon.Boot.plist
 # ---------------------------------------------
@@ -60,47 +80,34 @@
     cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP"
 
     # Read list of all boot options the user added.
-    arrayCount=0
-    kernelFlagCount=0
-    while read FILE
-    do
-        options[arrayCount]="${FILE##*/}"
+    while IFS= read -r -d '' FILE; do
+        option="${FILE##*/}"
+        key="${option%%=*}"
+        value="${option#*=}"
 
-        # Check keyRead for 'KF' at beginning to
-        # indicate that should be a kernel flag
-        if [ ${options[arrayCount]:0:2} = "KF" ];then
+        # Check for 'Kernel Flags' key indicate that should be a kernel flag
+        if [[ "$key" = "Kernel Flags" ]];then
             # plistbuddy only add's if the key doesn't already exist.
             # So let's store any kernelflags and add them all at the
             # same time once when we reach the end of the options list.
-            kernelflag[kernelFlagCount]="${options[arrayCount]##*flag=}"
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: ${kernelflag[kernelFlagCount]}"
-            (( kernelFlagCount++ ))
+            kernelflag[${#kernelflag[*]}]="$value"
+            "$scriptDir"InstallLog.sh "${dest_vol}" "Added kernel flag: $value"
         else
-            keyRead="${options[$arrayCount]%=*}"
-            value="${options[$arrayCount]#*=}"
             # escape any spaces
-            keyToUse=$( echo $keyRead | sed 's/ /\\ /g' )
-            if [ "${keyToUse}" != "DONT" ] && [ "${value}" != "ADD" ]; then
-                sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
-                returnValue=$?
-                if [ ${returnValue} -ne 1 ]; then
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${keyRead}=${value}"
-                else
-                    "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${keyRead}=${value} as an option already exists for: ${keyRead}"
-                fi
+            keyToUse=$( echo "$key" | sed 's/ /\\ /g' )
+            sudo /usr/libexec/plistbuddy -c "Add :${keyToUse} string ${value}" "$tempOCBP"
+            returnValue=$?
+            if [ ${returnValue} -ne 1 ]; then
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Added boot option: ${key}=${value}"
+            else
+                "$scriptDir"InstallLog.sh "${dest_vol}" "Can't add ${key}=${value} as an option already exists for: ${key}"
             fi
         fi
-        (( arrayCount++ ))
-    done < <(ls "${chamTemp}"/options )
+    done < <( find "${chamTemp}/options" -type f -print0 )
 
-    if [ $kernelFlagCount -gt 0 ]; then
-        # Add any kernel flags together in to one string.
-        for (( i=0 ; i < $kernelFlagCount ; i++ ))
-        do
-            kernelFlagString="${kernelFlagString} ${kernelflag[i]}"
-        done
-        # We add the final string in the next section.
-    fi
+    # Add any kernel flags together in to one string.
+    kernelFlagString="${kernelflag[@]}"
+    # We add the final string in the next section.
 fi
 
 # ---------------------------------------------
@@ -180,7 +187,7 @@
 
         if [[ -n "$currentFlags" ]];then
             # Combine new kernel flags with old ones.
-            kernelFlagString="${kernelFlagString} $currentFlags"
+            kernelFlagString=$( mergeString "$currentFlags" "${kernelFlagString}" )
         fi
 
     elif [ -e "$chamTemp/install_type_new" ]; then
@@ -208,22 +215,15 @@
 
     if [ ! -f "$dest_vol"/.ChameleonEFI ]; then
         # The Standard install option chosen
+        rm -rf "$dest_vol/Extra" # Remove old Extra directory
 
-        # Does an /Extra folder already exist?
-        if [ -e "$dest_vol"/Extra ]; then
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Moving $dest_vol/Extra folder to $dest_vol/Extra-OLD-$( date "+%H-%M-%S" )"
-            mv "$dest_vol/Extra" "$dest_vol/Extra_OLD-"$( date "+%H-%M-%S" )
-        fi
         "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: $dest_vol/"
         echo "Copying $chamTemp/Extra TO $dest_vol"
         cp -R "$chamTemp"/Extra "$dest_vol"
     else
         # The EFI system partition install option was chosen
-        # Does a /Volumes/Extra folder already exist?
-        if [ -e "/Volumes/EFI/Extra" ]; then
-            "$scriptDir"InstallLog.sh "${dest_vol}" "Moving /Volumes/EFI/Extra folder to /Volumes/EFI/Extra-OLD-$( date "+%H-%M-%S" )"
-            mv "/Volumes/EFI/Extra" "/Volumes/EFI/Extra_OLD-"$( date "+%H-%M-%S" )
-        fi
+        rm -rf "/Volumes/EFI/Extra" # Remove old Extra directory
+
         "$scriptDir"InstallLog.sh "${dest_vol}" "Writing new Extra folder to: /Volumes/EFI/"
         cp -R "$chamTemp"/Extra "/Volumes/EFI"
     fi
@@ -242,6 +242,12 @@
 fi
 
 # ---------------------------------------------
+# Update Rights
+# ---------------------------------------------
+chmod 777 ${dest_vol}/Extra         2>/dev/null
+chmod 666 ${dest_vol}/Extra/*.plist 2>/dev/null
+
+# ---------------------------------------------
 # Cleanup
 # ---------------------------------------------
 
Index: branches/ErmaC/Modules/package/Scripts/Main/preinstall
===================================================================
--- branches/ErmaC/Modules/package/Scripts/Main/preinstall	(revision 1774)
+++ branches/ErmaC/Modules/package/Scripts/Main/preinstall	(revision 1775)
@@ -9,7 +9,7 @@
 # Creates text file named 'Chameleon_Installer_Log.txt'
 # at the root of the target volume. This is to help show the
 # user why the installation process failed (even though the
-# package installer ends reading 'Installation Successful'. 
+# package installer ends reading 'Installation Successful'.
 
 
 
@@ -25,31 +25,56 @@
 # / with volume name.
 if [ "$3" == "/" ]
 then
-	targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' )
+    targetVolume="/Volumes/"$( ls -1F /Volumes | sed -n 's:@$::p' )
 else
     targetVolume="$3"
 fi
 
 logName="Chameleon_Installer_Log.txt"
-logFile="${targetVolume}"/$logName
+logFile="${targetVolume}/$logName"
 
 versionNumber=`cat "${scriptDir}"/Resources/version`
 revisionNumber=`cat "${scriptDir}"/Resources/revision`
 
 
+# ---------------------------------------------
+# Preparing Backing up Chameleon files
+# ---------------------------------------------
+backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" )
+mkdir -p "$backupDir"
 
+if [[ -f "$logFile" ]];then
+    # Backup old log file
+    mv "$logFile" "${backupDir}/${logName}"
+fi
+
+
 # Setup Chameleon_Installer_Log.txt file
 # by writing header and diskutil list
 
 echo "Chameleon installer log - $( date )
 Installer version: ${versionNumber} ${revisionNumber}
 ======================================================" >"${logFile}"
-	
+
 diskutil list >>"${logFile}"
 echo "======================================================" >>"${logFile}"
 
+# ---------------------------------------------
+# Backing up Chameleon files
+# ---------------------------------------------
+# Backup stage2
+if [[ -f "${targetVolume}/boot" ]];then
+    echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}"
+    cp -p "${targetVolume}/boot" "${backupDir}/boot"
+fi
+# Backup /Extra directory
+if [[ -d "${targetVolume}/Extra" ]];then
+    echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}"
+    cp -pR "${targetVolume}/Extra" "${backupDir}/Extra"
+fi
+chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups
+echo "======================================================" >>"${logFile}"
 
-
 echo "==============================================="
 echo "END - Pre-Install Script"
 echo "*********************************"
Index: branches/ErmaC/Modules/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ja.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ja.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/he.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/he.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/fi.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/fi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/bs.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh kompjutere\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/bs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/fr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Ne pas installer sur un ordinateur Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traduit par : Tenval\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Traduit par : Tenval\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/fr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/nl.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 versie%CHAMELEONVERSION% revisie%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Installeer niet op een echte Apple Macintosh computer!\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Vertaald door: yeehaw123 & Badeendje\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Vertaald door: yeehaw123 & Badeendje\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/hr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unala\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/hr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pl.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Nie instaluj na komputerze Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : janek202\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : janek202\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pl.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/th.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/th.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/no.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/no.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/hu.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/hu.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/vi.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/vi.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ca.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ca.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : oldnapalm\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : oldnapalm\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/tr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/tr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076  : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076  : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ru.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -58,6 +58,8 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011  
+\fs20 \cf0 Copyright \'a9 2011-2012 
 \f1 \cf3 \'c2\'bd\'c4\'b6
-\f0  : crazybirdy, Ulimate}
+\f0  : crazybirdy, Ulimate
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -36,4 +36,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/id.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Jangan dinstall Apple Macintosh ASLI\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Rudolf Tingginehe & Babiloe\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Rudolf Tingginehe & Babiloe\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/id.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Hak kopi \'a9 2011}
+\fs20 Hak kopi \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/el.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/el.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -58,6 +58,8 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011  
+\fs20 \cf0 Copyright \'a9 2011-2012
 \f1 \cf3 \'c2\'bd\uc0\u35793 
-\f0  : crazybirdy, Ulimate}
+\f0  : crazybirdy, Ulimate
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -36,4 +36,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/en.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Blackosx\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Blackosx\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/en.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ar.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset178 GeezaPro;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12500\viewkind0
 \pard\ri0\qc
 
@@ -65,4 +66,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : Mohamed Khairy\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : Mohamed Khairy\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ar.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -60,4 +60,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 N\'e3o instale num computador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : artur-pt\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : artur-pt\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/cs.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/cs.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/es.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 No lo instale en un ordenador Apple Macintosh\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Traducido por : juanerson\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Traducido por : juanerson\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/es.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 \uc0\u1053 \u1077  \u1080 \u1085 \u1089 \u1090 \u1072 \u1083 \u1080 \u1088 \u1072 \u1112 \u1090 \u1077  \u1085 \u1072  Apple Macintosh \u1082 \u1086 \u1084 \u1087 \u1112 \u1091 \u1090 \u1077 \u1088 \
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080  \u1086 \u1076  \u1089 \u1090 \u1088 \u1072 \u1085 \u1072  \u1085 \u1072  : kn6600\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080  \u1086 \u1076  \u1089 \u1090 \u1088 \u1072 \u1085 \u1072  \u1085 \u1072  : kn6600\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/mk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ko.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ko.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -55,7 +55,9 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 
+\fs20 \cf0 Copyright \'a9 2011-2012 
 \f1 \cf3 \'b9\'f8\'bf\'aa
 \f2\b  
-\f0 by : drew_afx}
+\f0 by : drew_afx
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ko.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -33,4 +33,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/it.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -45,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Tradotto da : ErmaC e scrax\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Tradotto da : ErmaC e scrax\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/it.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ms.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/ms.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/uk.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/uk.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sr.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Instalacija nije prilago\uc0\u273 ena za Apple Macintosh ra\u269 unare\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : mlstudio\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : mlstudio\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sr.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/da.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/da.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sv.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/sv.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/bg.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Do not install to an Apple Macintosh computer\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : ???\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : ???\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/bg.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/de.lproj/Welcome.rtfd/TXT.rtf	(revision 1775)
@@ -1,6 +1,7 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;}
+{\colortbl;\red255\green255\blue255;\red255\green0\blue9;\red0\green0\blue255;\red153\green153\blue153;
+}
 \margl1440\margr1440\vieww11660\viewh12980\viewkind0
 \pard\ri0\qc
 
@@ -12,11 +13,7 @@
 
 \fs26 \cf0 v%CHAMELEONVERSION% r%CHAMELEONREVISION%\
 
-\fs50 \
-\pard\ri0
-
-\fs22 \cf0 \
-\
+\fs50 \cf0 \
 \pard\ri0\qc
 
 \fs28 \cf2 Achtung ! Nicht auf einem Apple Macintosh Computer Installieren\
@@ -49,4 +46,7 @@
 \cf0 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\fs20 \cf0 Copyright \'a9 2011 \b \cf3 Translated by : !Xabbu, olegischinski & NextMac\cf0}
+\fs20 \cf0 Copyright \'a9 2011-2012 
+\b \cf3 Translated by : !Xabbu, olegischinski & NextMac\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+\cf4 %WHOBUILD%}
Index: branches/ErmaC/Modules/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf
===================================================================
--- branches/ErmaC/Modules/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1774)
+++ branches/ErmaC/Modules/package/Resources/de.lproj/Conclusion.rtfd/TXT.rtf	(revision 1775)
@@ -24,4 +24,4 @@
 
 \b0\fs30 \cf0 \
 
-\fs20 Copyright \'a9 2011}
+\fs20 Copyright \'a9 2011-2012}
Index: branches/ErmaC/Modules/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Modules/package/buildpkg.sh	(revision 1774)
+++ branches/ErmaC/Modules/package/buildpkg.sh	(revision 1775)
@@ -15,7 +15,7 @@
 fi
 
 if [[ ! -d "$SYMROOT" ]];then
-	echo "Directory ${SYMROOT} doesn't exit. Aborting..." >&2 && exit 1
+    echo "Directory ${SYMROOT} doesn't exit. Aborting..." >&2 && exit 1
 fi
 
 # Prevent the script from doing bad things
@@ -65,21 +65,24 @@
 declare -r develop=$(awk "NR==6{print;exit}"  ${PKGROOT}/../CREDITS)
 declare -r credits=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS)
 declare -r pkgdev=$(awk "NR==14{print;exit}"  ${PKGROOT}/../CREDITS)
+declare -r whobuild=$(whoami | awk '{print $1}' | cut -d ":" -f3)
 
-# =================
-
-xmlindent=0
-
-indent[0]="\t"
-indent[1]="\t\t"
-indent[2]="\t\t\t"
-indent[3]="\t\t\t\t"
-
 # ====== GLOBAL VARIABLES ======
 declare -a pkgrefs
-declare -a outline
-declare -a choices
+declare -a choice_key
+declare -a choice_options
+declare -a choice_pkgrefs
+declare -a choice_parent_group_index
+declare -a choice_group_items
+declare -a choice_group_exclusive
 
+# Init Main Group
+choice_key[0]=""
+choice_options[0]=""
+choices_pkgrefs[0]=""
+choice_group_items[0]=""
+choice_group_exclusive[0]=""
+
 # Package name
 declare -r packagename="Chameleon"
 
@@ -90,30 +93,143 @@
 
 # ====== FUNCTIONS ======
 
+trim () {
+    local result="${1#"${1%%[![:space:]]*}"}"   # remove leading whitespace characters
+    echo "${result%"${result##*[![:space:]]}"}" # remove trailing whitespace characters
+}
+
 getPackageRefId () {
     echo ${1//_/.}.${2//_/.} | tr [:upper:] [:lower:]
 }
 
+# Return index of a choice
+getChoiceIndex () {
+    # $1 Choice Id
+    local found=0
+    for (( idx=0 ; idx < ${#choice_key[*]}; idx++ ));do
+        if [[ "${1}" == "${choice_key[$idx]}" ]];then
+            found=1
+            break
+        fi
+    done
+    echo "$idx"
+    return $found
+}
+
+# Add a new choice
 addChoice () {
+    # Optionnal arguments:
+    #    --group=<group> : Group Choice Id
+    #    --start-selected=<javascript code> : Specifies whether this choice is initially selected or unselected
+    #    --start-enabled=<javascript code>  : Specifies the initial enabled state of this choice
+    #    --start-visible=<javascript code>  : Specifies whether this choice is initially visible
+    #    --pkg-refs=<pkgrefs> : List of package reference(s) id (separate by spaces)
+    #
     # $1 Choice Id
-    # $2 Choice Options
-    # $3..$n Package reference id (optional)
+
+    local option
+    local groupChoice=""
+    local choiceOptions=""
+    local pkgrefs=""
+
+    # Check the arguments.
+    for option in "${@}";do
+        case "$option" in
+            --group=*)
+                       shift; groupChoice=${option#*=} ;;
+            --start-selected=*)
+                         shift; choiceOptions="$choiceOptions start_selected=\"${option#*=}\"" ;;
+            --start-enabled=*)
+                         shift; choiceOptions="$choiceOptions start_enabled=\"${option#*=}\"" ;;
+            --start-visible=*)
+                         shift; choiceOptions="$choiceOptions start_visible=\"${option#*=}\"" ;;
+            --pkg-refs=*)
+                          shift; pkgrefs=${option#*=} ;;
+            -*)
+                echo "Unrecognized addChoice option '$option'" >&2
+                exit 1
+                ;;
+            *)  break ;;
+        esac
+    done
+
+    if [[ $# -ne 1 ]];then
+        echo "addChoice invalid number of arguments: ${@}" >&2
+        exit 1
+    fi
+
     local choiceId="${1}"
-    local choiceOptions="${2}"
-    local choiceNode="\t<choice\n\t\tid=\"${choiceId}\"\n\t\ttitle=\"${choiceId}_title\"\n\t\tdescription=\"${choiceId}_description\""
-    [[ -n "${choiceOptions}" ]] && choiceNode="${choiceNode}\n\t\t${choiceOptions}"
-    choiceNode="${choiceNode}>"
-    if [[ $# -ge 3 ]];then
-        for pkgRefId in ${@:3};do
-            choiceNode="${choiceNode}\n\t\t<pkg-ref id=\"${pkgRefId}\"/>"
-        done
+
+    # Add choice in the group
+    idx_group=$(getChoiceIndex "$groupChoice")
+    found_group=$?
+    if [[ $found_group -ne 1 ]];then
+        # No group exist
+        echo "Error can't add choice '$choiceId' to group '$groupChoice': group choice '$groupChoice' doesn't exists." >&2
+        exit 1
+    else
+        set +u; oldItems=${choice_group_items[$idx_group]}; set -u
+        choice_group_items[$idx_group]="$oldItems $choiceId"
     fi
-    choiceNode="${choiceNode}\n\t</choice>\n"
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"${choiceId}\"/>"
-    choices[${#choices[*]}]="$choiceNode"
+    # Check that the choice doesn't already exists
+    idx=$(getChoiceIndex "$choiceId")
+    found=$?
+    if [[ $found -ne 0 ]];then
+        # Choice already exists
+        echo "Error can't add choice '$choiceId': a choice with same name already exists." >&2
+        exit 1
+    fi
+
+    # Record new node
+    choice_key[$idx]="$choiceId"
+    choice_options[$idx]=$(trim "${choiceOptions}") # Removing leading and trailing whitespace(s)
+    choice_parent_group_index[$idx]=$idx_group
+    choice_pkgrefs[$idx]="$pkgrefs"
+
+    return $idx
 }
 
+# Add a group choice
+addGroupChoices() {
+    # Optionnal arguments:
+    #    --parent=<parent> : parent group choice id
+    #    --exclusive_zero_or_one_choice : only zero or one choice can be selected in the group
+    #    --exclusive_one_choice : only one choice can be selected in the group
+    #
+    # $1 Choice Id
+
+    local option
+    local groupChoice=""
+    local exclusive_function=""
+
+    for option in "${@}";do
+        case "$option" in
+            --exclusive_zero_or_one_choice)
+                       shift; exclusive_function="exclusive_zero_or_one_choice" ;;
+            --exclusive_one_choice)
+                       shift; exclusive_function="exclusive_one_choice" ;;
+            --parent=*)
+                       shift; groupChoice=${option#*=} ;;
+            -*)
+                echo "Unrecognized addGroupChoices option '$option'" >&2
+                exit 1
+                ;;
+            *)  break ;;
+        esac
+    done
+
+    if [[ $# -ne 1 ]];then
+        echo "addGroupChoices invalid number of arguments: ${@}" >&2
+        exit 1
+    fi
+
+    addChoice --group="$groupChoice" "${1}"
+    local idx=$? # index of the new created choice
+
+    choice_group_exclusive[$idx]="$exclusive_function"
+}
+
 exclusive_one_choice () {
     # $1 Current choice (ie: test1)
     # $2..$n Others choice(s) (ie: "test2" "test3"). Current can or can't be in the others choices
@@ -150,11 +266,8 @@
     echo -e $COL_CYAN"  ----------------------------------"$COL_RESET
     echo ""
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<choices-outline>"
-
 # build pre install package
     echo "================= Preinstall ================="
-    ((xmlindent++))
     packagesidentity="${chameleon_package_identity}"
     choiceId="Pre"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
@@ -163,10 +276,10 @@
     ditto --noextattr --noqtn ${SRCROOT}/version  ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version
     cp -f ${PKGROOT}/Scripts/Main/preinstall   ${PKG_BUILD_DIR}/${choiceId}/Scripts
     cp -f ${PKGROOT}/Scripts/Sub/InstallLog.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
 # End build pre install package
 
 # build core package
@@ -186,54 +299,43 @@
     ditto --noextattr --noqtn ${SYMROOT}/i386/chain0   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/standalone/i386
     ditto --noextattr --noqtn ${SYMROOT}/i386/fdisk440 ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
     ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"
 # End build core package
 
 # build install type
     echo "================= Chameleon ================="
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"InstallType\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"InstallType\"\n\t\ttitle=\"InstallType_title\"\n\t\tdescription=\"InstallType_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices --exclusive_one_choice "InstallType"
     packagesidentity="${chameleon_package_identity}.type"
-    allChoices="New Upgrade"
 
     # build new install package
     choiceId="New"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"!choices['Upgrade'].selected\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"
+    addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build new install package
 
     # build upgrade package
     choiceId="Upgrade"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"chameleon_boot_plist_exists()\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"
+    addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build upgrade package
 
-   ((xmlindent--))
-   outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
 # End build install type
 
 # build Chameleon package
     echo "================= Chameleon ================="
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Chameleon\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"Chameleon\"\n\t\ttitle=\"Chameleon_title\"\n\t\tdescription=\"Chameleon_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices --exclusive_one_choice "Chameleon"
 
-    allChoices="Standard EFI noboot"
-
     # build standard package
     choiceId="Standard"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
@@ -241,11 +343,10 @@
     cp -f ${PKGROOT}/Scripts/Main/${choiceId}postinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
     cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"true\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build standard package
 
     # build efi package
@@ -255,25 +356,21 @@
     cp -f ${PKGROOT}/Scripts/Main/ESPpostinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
     cp -f ${PKGROOT}/Scripts/Sub/* ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build efi package
 
     # build no bootloader choice package
     choiceId="noboot"
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    exclusiveChoice=$(exclusive_one_choice "$choiceId" "$allChoices")
-    addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
     # End build no bootloader choice package
 
-    ((xmlindent--))
-    outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
 # End build Chameleon package
 
 if [[ "${CONFIG_MODULES}" == 'y' ]];then
@@ -293,9 +390,7 @@
     ###############################
     if [ "$(ls -A "${SYMROOT}/i386/modules")" ]; then
     {
-        outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Module\">"
-        choices[${#choices[*]}]="\t<choice\n\t\tid=\"Module\"\n\t\ttitle=\"Module_title\"\n\t\tdescription=\"Module_description\">\n\t</choice>\n"
-        ((xmlindent++))
+        addGroupChoices "Module"
 
 # -
         if [[ "${CONFIG_KLIBC_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/klibc.dylib" ]]; then
@@ -304,10 +399,10 @@
             choiceId="klibc"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build klibc package module
         }
         fi
@@ -324,11 +419,11 @@
             choiceId="uClibc"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
             # Add the klibc package because the uClibc module is dependent of klibc module
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId" "$klibcPackageRefId"
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"
             # End build uClibc package module
         }
         fi
@@ -340,10 +435,10 @@
             choiceId="AutoReso"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build Resolution package module
         }
         fi
@@ -368,12 +463,12 @@
             ditto --noextattr --noqtn ${SRCROOT}/Keymaps ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps
             # Adding tools
             ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" # >/dev/null 2>&1
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1
 
             # Don't add a choice for Keylayout module
-            # addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"
             # End build Keylayout package module
         }
         fi
@@ -386,10 +481,10 @@
             choiceId="AMDGraphicsEnabler"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/AMDGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
-            echo -e "\t[BUILD] ${choiceId} "
+
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build AMDGraphicsEnabler package module
         }
         fi
@@ -404,8 +499,8 @@
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build ATiGraphicsEnabler package module
         }
         fi
@@ -420,8 +515,8 @@
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/IntelGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build IntelGraphicsEnabler package module
         }
         fi
@@ -436,14 +531,12 @@
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/NVIDIAGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"
             echo -e "\t[BUILD] ${choiceId} "
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" # >/dev/null 2>&1
-            addChoice "${choiceId}"  "start_selected=\"false\""  "$packageRefId"
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
             # End build NVIDIAGraphicsEnabler package module
         }
         fi
 
-        ((xmlindent--))
-        outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
     }
     else
     {
@@ -455,11 +548,8 @@
 
 # build Options packages
 
-    outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Options\">"
-    choices[${#choices[*]}]="\t<choice\n\t\tid=\"Options\"\n\t\ttitle=\"Options_title\"\n\t\tdescription=\"Options_description\">\n\t</choice>\n"
-    ((xmlindent++))
+    addGroupChoices "Options"
 
-
     # ------------------------------------------------------
     # parse OptionalSettings folder to find files of boot options.
     # ------------------------------------------------------
@@ -469,135 +559,115 @@
     for (( i = 0 ; i < ${#OptionalSettingsFiles[@]} ; i++ ))
     do
 
-		# Take filename and Strip .txt from end and path from front
-		builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} )
-		builtOptionsList=$( echo ${builtOptionsList##*/} )
-		echo "================= $builtOptionsList ================="
-		outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"${builtOptionsList}\">"
-		choices[${#choices[*]}]="\t<choice\n\t\tid=\"${builtOptionsList}\"\n\t\ttitle=\"${builtOptionsList}_title\"\n\t\tdescription=\"${builtOptionsList}_description\">\n\t</choice>\n"
-		((xmlindent++))
-		packagesidentity="${chameleon_package_identity}.options.$builtOptionsList"
+        # Take filename and Strip .txt from end and path from front
+        builtOptionsList=$( echo ${OptionalSettingsFiles[$i]%.txt} )
+        builtOptionsList=$( echo ${builtOptionsList##*/} )
 
-		# ------------------------------------------------------
-		# Read boot option file into an array.
-		# ------------------------------------------------------
-		availableOptions=() # array to hold the list of boot options, per 'section'.
-		exclusiveFlag=0 # used to indicate list has exclusive options
-		count=0 # used as index for stepping through array.
-		while read textLine; do
-			# ignore lines in the file beginning with a # and Exclusive=False
-			if [[ ${textLine} != \#* ]] && [[ ${textLine} != "Exclusive=False" ]];then
-				# check for 'Exclusive=True' option in file
-				if [[ ${textLine} == "Exclusive=True" ]];then
-					exclusiveFlag=1
-				else
-					availableOptions[${#availableOptions[@]}]=$textLine
-				fi
-			fi
-		done < ${OptionalSettingsFiles[$i]}
+        echo "================= $builtOptionsList ================="
 
-		# ------------------------------------------------------
-		# Loop through options in array and process each in turn
-		# ------------------------------------------------------
-		allChoices="${availableOptions[@]//:*/}"
-		for (( c = 0 ; c < ${#availableOptions[@]} ; c++ )); do
-			textLine=${availableOptions[c]}
-			# split line - taking all before ':' as option name
-			# and all after ':' as key/value
-			optionName=${textLine%:*}
-			keyValue=${textLine##*:}
+        # ------------------------------------------------------
+        # Read boot option file into an array.
+        # ------------------------------------------------------
+        availableOptions=() # array to hold the list of boot options, per 'section'.
+        exclusiveFlag=""    # used to indicate list has exclusive options
+        while read textLine; do
+            # ignore lines in the file beginning with a # and Exclusive=False
+            if [[ ${textLine} != \#* ]] && [[ ${textLine} != "Exclusive=False" ]];then
+                # check for 'Exclusive=True' option in file
+                if [[ ${textLine} == "Exclusive=True" ]];then
+                    exclusiveFlag="--exclusive_zero_or_one_choice"
+                else
+                    availableOptions[${#availableOptions[@]}]=$textLine
+                fi
+            fi
+        done < ${OptionalSettingsFiles[$i]}
 
-			# create folders required for each boot option
-			mkdir -p "${PKG_BUILD_DIR}/$optionName/Root/"
+        addGroupChoices  --parent="Options" $exclusiveFlag "${builtOptionsList}"
+        packagesidentity="${chameleon_package_identity}.options.$builtOptionsList"
 
-			# create dummy file with name of key/value
-			echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"
+        # ------------------------------------------------------
+        # Loop through options in array and process each in turn
+        # ------------------------------------------------------
+        for (( c = 0 ; c < ${#availableOptions[@]} ; c++ )); do
+            textLine=${availableOptions[c]}
+            # split line - taking all before ':' as option name
+            # and all after ':' as key/value
+            optionName=${textLine%%:*}
+            keyValue=${textLine##*:}
+            key=${keyValue%%=*}
+            value=${keyValue#*=}
 
-			echo -e "\t[BUILD] ${optionName} "
-			packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
-			buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" # >/dev/null 2>&1
-			exclusiveSelect=""
-			if [[ ${exclusiveFlag} -eq 1 ]];then
-				exclusiveSelect="selected=\"$(exclusive_zero_or_one_choice "$optionName" "$allChoices")\""
-			fi
-			addChoice "${optionName}"  "start_selected=\"false\" ${exclusiveSelect}"  "$packageRefId"
-		done
+            # create folders required for each boot option
+            mkdir -p "${PKG_BUILD_DIR}/$optionName/Root/"
 
-		((xmlindent--))
-		outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
-	done
+            # create dummy file with name of key/value
+            echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"
 
-    ((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
+            packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")
+            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"
+            addChoice --group="${builtOptionsList}"  \
+                --start-selected="check_chameleon_option('$key','$value')" \
+                --pkg-refs="$packageRefId" "${optionName}"
+        done
+
+    done
+
 # End build options packages
 
 if [[ -n "${CONFIG_KEYLAYOUT_MODULE}" ]];then
 # build KeyLayout options packages
-	echo "================= Keymaps Options ================="
-	outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"KeyLayout\">"
-	choices[${#choices[*]}]="\t<choice\n\t\tid=\"KeyLayout\"\n\t\ttitle=\"KeyLayout_title\"\n\t\tdescription=\"KeyLayout_description\">\n\t</choice>\n"
-	((xmlindent++))
-	packagesidentity="${chameleon_package_identity}.options.keylayout"
+    echo "================= Keymaps Options ================="
+    addGroupChoices --exclusive_zero_or_one_choice "KeyLayout"
+    packagesidentity="${chameleon_package_identity}.options.keylayout"
     keylayoutPackageRefId=""
     if [[ "${CONFIG_MODULES}" == 'y' && "${CONFIG_KEYLAYOUT_MODULE}" = 'm' ]];then
         keylayoutPackageRefId=$(getPackageRefId "${modules_packages_identity}" "Keylayout")
     fi
 
-	# ------------------------------------------------------
-	# Available Keylayout boot options are discovered by
-	# reading contents of /Keymaps folder after compilation
-	# ------------------------------------------------------
-	availableOptions=($( find "${SRCROOT}/Keymaps" -type f -depth 1 -name '*.lyt' | sed 's|.*/||;s|\.lyt||' ))
-	allChoices="${availableOptions[@]}"
-	# Adjust array contents to match expected format
-	# for boot options which is: name:key=value
-	for (( i = 0 ; i < ${#availableOptions[@]} ; i++ )); do
-		# availableOptions[i]=${availableOptions[i]}":KeyLayout="${availableOptions[i]}
-		# Start build of a keymap package module
-		choiceId="${availableOptions[i]}"
-		mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
+    chameleon_keylayout_key="KeyLayout"
+    # ------------------------------------------------------
+    # Available Keylayout boot options are discovered by
+    # reading contents of /Keymaps folder after compilation
+    # ------------------------------------------------------
+    availableOptions=($( find "${SRCROOT}/Keymaps" -type f -depth 1 -name '*.lyt' | sed 's|.*/||;s|\.lyt||' ))
+    # Adjust array contents to match expected format
+    # for boot options which is: name:key=value
+    for (( i = 0 ; i < ${#availableOptions[@]} ; i++ )); do
+        # Start build of a keymap package module
+        choiceId="${availableOptions[i]}"
+        mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root
 
-		# create dummy file with name of key/value
-		echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/KeyLayout=${availableOptions[i]}"
+        # create dummy file with name of key/value
+        echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"
 
-		echo -e "\t[BUILD] ${choiceId} "
-		packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-		buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" # >/dev/null 2>&1
-		exclusiveChoice=$(exclusive_zero_or_one_choice "$choiceId" "$allChoices")
-		# Add the Keylayout package because the Keylayout module is needed
-		addChoice "${choiceId}"  "start_selected=\"false\" selected=\"${exclusiveChoice}\""  \
-		 "$packageRefId" "$keylayoutPackageRefId"
-		# End build uClibc package module
-	done
+        packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
+        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"
+        # Add the Keylayout package because the Keylayout module is needed
+        addChoice --group="KeyLayout"  \
+            --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \
+            --pkg-refs="$packageRefId $keylayoutPackageRefId" "${choiceId}"
+    done
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
-
 # End build KeyLayout options packages
 fi
 
 # build theme packages
-	echo "================= Themes ================="
-	outline[${#outline[*]}]="${indent[$xmlindent]}<line choice=\"Themes\">"
-	choices[${#choices[*]}]="\t<choice\n\t\tid=\"Themes\"\n\t\ttitle=\"Themes_title\"\n\t\tdescription=\"Themes_description\">\n\t</choice>\n"
-	((xmlindent++))
+    echo "================= Themes ================="
+    addGroupChoices "Themes"
 
-	# Using themes section from Azi's/package branch.
-	packagesidentity="${chameleon_package_identity}.themes"
-	artwork="${SRCROOT}/artwork/themes"
-	themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' ))
-	for (( i = 0 ; i < ${#themes[@]} ; i++ )); do
-		theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
-		mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/"
-		rsync -r --exclude=.svn "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"
-		echo -e "\t[BUILD] ${theme}"
-		packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
-		buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" # >/dev/null 2>&1
-		addChoice "${theme}"  "start_selected=\"false\""  "$packageRefId"
-	done
+    # Using themes section from Azi's/package branch.
+    packagesidentity="${chameleon_package_identity}.themes"
+    artwork="${SRCROOT}/artwork/themes"
+    themes=($( find "${artwork}" -type d -depth 1 -not -name '.svn' ))
+    for (( i = 0 ; i < ${#themes[@]} ; i++ )); do
+        theme=$( echo ${themes[$i]##*/} | awk 'BEGIN{OFS=FS=""}{$1=toupper($1);print}' )
+        mkdir -p "${PKG_BUILD_DIR}/${theme}/Root/"
+        rsync -r --exclude=.svn "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</line>"
+        packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")
+        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"
+        addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"
+    done
 # End build theme packages# End build Extras package
 
 # build post install package
@@ -611,84 +681,147 @@
     cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts
     ditto --noextattr --noqtn ${SRCROOT}/revision ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/revision
     ditto --noextattr --noqtn ${SRCROOT}/version ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/version
-    echo -e "\t[BUILD] ${choiceId} "
+
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" # >/dev/null 2>&1
-    addChoice "${choiceId}"  "start_visible=\"false\" start_selected=\"true\""  "$packageRefId"
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+    addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"
 # End build post install package
 
-	((xmlindent--))
-	outline[${#outline[*]}]="${indent[$xmlindent]}</choices-outline>"
-
 }
 
 buildpackage ()
 {
-	#  $1 Package Reference Id (ie: org.chameleon.themes.default)
-	#  $2 Package Name (ie: Default)
-	#  $3 Path to package to build containing Root and/or Scripts
-	#  $4 Target install location
-	#  $5 Size (optional)
-	if [[ -d "${3}/Root" ]]; then
-		local packageRefId="$1"
-		local packageName="$2"
-		local packagePath="$3"
-		local targetPath="$4"
-		set +u # packageSize is optional
+    #  $1 Package Reference Id (ie: org.chameleon.themes.default)
+    #  $2 Package Name (ie: Default)
+    #  $3 Path to package to build containing Root and/or Scripts
+    #  $4 Target install location
+    #  $5 Size (optional)
+    if [[ -d "${3}/Root" ]]; then
+        local packageRefId="$1"
+        local packageName="$2"
+        local packagePath="$3"
+        local targetPath="$4"
+        set +u # packageSize is optional
         local packageSize="$5"
         set -u
 
-		find "${packagePath}" -name '.DS_Store' -delete
-		local filecount=$( find "${packagePath}/Root" | wc -l )
-		if [ "${packageSize}" ]; then
-			local installedsize="${packageSize}"
-		else
-			local installedsize=$( du -hkc "${packagePath}/Root" | tail -n1 | awk {'print $1'} )
-		fi
-		local header="<?xml version=\"1.0\"?>\n<pkg-info format-version=\"2\" "
+        echo -e "\t[BUILD] ${packageName}"
 
-		#[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" "
+        find "${packagePath}" -name '.DS_Store' -delete
+        local filecount=$( find "${packagePath}/Root" | wc -l )
+        if [ "${packageSize}" ]; then
+            local installedsize="${packageSize}"
+        else
+            local installedsize=$( du -hkc "${packagePath}/Root" | tail -n1 | awk {'print $1'} )
+        fi
+        local header="<?xml version=\"1.0\"?>\n<pkg-info format-version=\"2\" "
 
-		header+="identifier=\"${packageRefId}\" "
-		header+="version=\"${version}\" "
+        #[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" "
 
-		[ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" "
+        header+="identifier=\"${packageRefId}\" "
+        header+="version=\"${version}\" "
 
-		header+="auth=\"root\">\n"
-		header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
-		rm -R -f "${packagePath}/Temp"
+        [ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" "
 
-		[ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp"
-		[ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom"
+        header+="auth=\"root\">\n"
+        header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
+        rm -R -f "${packagePath}/Temp"
 
-		if [ -d "${packagePath}/Scripts" ]; then
-			header+="\t<scripts>\n"
-			for script in $( find "${packagePath}/Scripts" -type f \( -name 'pre*' -or -name 'post*' \) ); do
-				header+="\t\t<${script##*/} file=\"./${script##*/}\"/>\n"
-			done
-			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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+        [ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp"
+        [ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom"
+
+        if [ -d "${packagePath}/Scripts" ]; then
+            header+="\t<scripts>\n"
+            for script in $( find "${packagePath}/Scripts" -type f \( -name 'pre*' -or -name 'post*' \) ); do
+                header+="\t\t<${script##*/} file=\"./${script##*/}\"/>\n"
+            done
+            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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
         fi
 
-		header+="</pkg-info>"
-		echo -e "${header}" > "${packagePath}/Temp/PackageInfo"
+        header+="</pkg-info>"
+        echo -e "${header}" > "${packagePath}/Temp/PackageInfo"
 
-		# 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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
+        # 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 -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages
 
-		# Create the package
-		(cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .)
+        # Create the package
+        (cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .)
 
-		# Add the package to the list of build packages
-		pkgrefs[${#pkgrefs[*]}]="\t<pkg-ref id=\"${packageRefId}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}'>#${packageName}.pkg</pkg-ref>"
+        # Add the package to the list of build packages
+        pkgrefs[${#pkgrefs[*]}]="\t<pkg-ref id=\"${packageRefId}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}'>#${packageName}.pkg</pkg-ref>"
 
-		rm -rf "${packagePath}"
-	fi
+        rm -rf "${packagePath}"
+    fi
 }
 
+generateOutlineChoices() {
+    # $1 Main Choice
+    # $2 indent level
+    local idx=$(getChoiceIndex "$1")
+    local indentLevel="$2"
+    local indentString=""
+    for ((level=1; level <= $indentLevel ; level++)); do
+        indentString="\t$indentString"
+    done
+    set +u; subChoices="${choice_group_items[$idx]}"; set -u
+    if [[ -n "${subChoices}" ]]; then
+        # Sub choices exists
+        echo -e "$indentString<line choice=\"$1\">"
+        for subChoice in $subChoices;do
+            generateOutlineChoices $subChoice $(($indentLevel+1))
+        done
+        echo -e "$indentString</line>"
+    else
+        echo -e "$indentString<line choice=\"$1\"/>"
+    fi
+}
+
+generateChoices() {
+    for (( idx=1; idx < ${#choice_key[*]} ; idx++)); do
+        local choiceId=${choice_key[$idx]}
+        local choiceOptions=${choice_options[$idx]}
+        local choiceParentGroupIndex=${choice_parent_group_index[$idx]}
+        set +u; local group_exclusive=${choice_group_exclusive[$choiceParentGroupIndex]}; set -u
+
+        # Create the node and standard attributes
+        local choiceNode="\t<choice\n\t\tid=\"${choiceId}\"\n\t\ttitle=\"${choiceId}_title\"\n\t\tdescription=\"${choiceId}_description\""
+
+        # Add options like start_selected, etc...
+        [[ -n "${choiceOptions}" ]] && choiceNode="${choiceNode}\n\t\t${choiceOptions}"
+
+        # Add the selected attribute if options are mutually exclusive
+        if [[ -n "$group_exclusive" ]];then
+            local group_items="${choice_group_items[$choiceParentGroupIndex]}"
+            case $group_exclusive in
+                exclusive_one_choice)
+                    local selected_option=$(exclusive_one_choice "$choiceId" "$group_items") ;;
+                exclusive_zero_or_one_choice)
+                    local selected_option=$(exclusive_zero_or_one_choice "$choiceId" "$group_items") ;;
+                *) echo "Error: unknown function to generate exclusive mode '$group_exclusive' for group '${choice_key[$choiceParentGroupIndex]}'" >&2
+                   exit 1
+                   ;;
+            esac
+            choiceNode="${choiceNode}\n\t\tselected=\"$selected_option\""
+        fi
+
+        choiceNode="${choiceNode}>"
+
+        # Add the package references
+        for pkgRefId in ${choice_pkgrefs[$idx]};do
+            choiceNode="${choiceNode}\n\t\t<pkg-ref id=\"${pkgRefId}\"/>"
+        done
+
+        # Close the node
+        choiceNode="${choiceNode}\n\t</choice>\n"
+
+        echo -e "$choiceNode"
+    done
+}
+
 makedistribution ()
 {
     declare -r distributionDestDir="${SYMROOT}"
@@ -700,7 +833,7 @@
     mkdir -p "${PKG_BUILD_DIR}/${packagename}"
 
     find "${PKG_BUILD_DIR}" -type f -name '*.pkg' -depth 1 | while read component
-	do
+    do
         pkg="${component##*/}" # ie: EFI.pkg
         pkgdir="${PKG_BUILD_DIR}/${packagename}/${pkg}"
         # expand individual packages
@@ -711,13 +844,14 @@
 #   Create the Distribution file
     ditto --noextattr --noqtn "${PKGROOT}/Distribution" "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
-    for (( i=0; i < ${#outline[*]} ; i++)); do
-		echo -e "${outline[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
-	done
+    local start_indent_level=2
+    echo -e "\n\t<choices-outline>" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
+    for main_choice in ${choice_group_items[0]};do
+        generateOutlineChoices $main_choice $start_indent_level >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
+    done
+    echo -e "\t</choices-outline>\n" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
-    for (( i=0; i < ${#choices[*]} ; i++)); do
-		echo -e "${choices[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
-	done
+    generateChoices >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
     for (( i=0; i < ${#pkgrefs[*]} ; i++)); do
         echo -e "${pkgrefs[$i]}" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
@@ -743,13 +877,17 @@
     perl -i -p -e "s/%CREDITS%/${credits}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
     perl -i -p -e "s/%PKGDEV%/${pkgdev}/g"   $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
 
+#  Adding whoami
+    perl -i -p -e "s/%WHOBUILD%/${whobuild}/g" $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )
+
 #   Create the final package
     pkgutil --flatten "${PKG_BUILD_DIR}/${packagename}" "${distributionFilePath}"
 
-#   Here is the place for assign a Icon to the pkg
-#   command use to generate the file:
-#   ditto -c -k --sequesterRsrc --keepParent Icon.icns Icon.zip
-# ----
+##################################################################
+#   Here is the place for assign a Icon to the pkg               #
+#   command use to generate the file:                            #
+#   ditto -c -k --sequesterRsrc --keepParent Icon.icns Icon.zip  #
+##################################################################
     ditto -xk "${PKGROOT}/Icons/pkg.zip" "${PKG_BUILD_DIR}/Icons/"
     DeRez -only icns "${PKG_BUILD_DIR}/Icons/Icons/pkg.icns" > "${PKG_BUILD_DIR}/Icons/tempicns.rsrc"
     Rez -append "${PKG_BUILD_DIR}/Icons/tempicns.rsrc" -o "${distributionFilePath}"
@@ -773,6 +911,7 @@
     echo -e $COL_BLUE"  Version:      "$COL_RESET"$version"
     echo -e $COL_BLUE"  Stage:        "$COL_RESET"$stage"
     echo -e $COL_BLUE"  Date/Time:    "$COL_RESET"$builddate"
+    echo -e $COL_BLUE"  Builded by:   "$COL_RESET"$whobuild"
     echo ""
 
 }

Property changes on: branches/ErmaC/Modules
___________________________________________________________________
Added: svn:ignore
   + obj
sym
revision
build
.config*
auto.conf
autoconf.h
autoconf.inc
vers.h