Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h	(revision 374)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h	(revision 375)
@@ -46,6 +46,7 @@
 
 +(NSMutableArray*)	extractInfoWithBSDNames: (NSArray*) bsdNames;
 +(NSMutableArray*)	extractInfoWithBSDNames: (NSArray*) bsdNames withArray:(NSMutableArray*) arr;
++(NSUInteger*) ResetHdRedirTable;
 
 -(bool)	isValid;
 
Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 374)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 375)
@@ -47,6 +47,12 @@
 	return sHdRedirTable;
 }
 
+/// redirection table for disk swapping
++(NSUInteger*) ResetHdRedirTable
+{
+	for (int i=0; i< MAX_HD; i++) sHdRedirTable[i]=i;
+}
+
 /// extract disk number from bsdname spec
 -(int) diskNumber
 {
@@ -189,6 +195,8 @@
 	
 	if (partArr!=nil && [partArr count]>0)
 	{
+			[PartitionInfoElement	ResetHdRedirTable];
+
 			DASessionRef session = DASessionCreate(NULL);
 			for (NSString* part in partArr)
 			{
Index: trunk/ChameleonPrefPane/French.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/French.lproj/Chameleon.xib	(revision 374)
+++ trunk/ChameleonPrefPane/French.lproj/Chameleon.xib	(revision 375)
@@ -349,14 +349,14 @@
 																							<object class="NSTableView" id="830282976">
 																								<reference key="NSNextResponder" ref="729666351"/>
 																								<int key="NSvFlags">8448</int>
-																								<string key="NSFrameSize">{494, 257}</string>
+																								<string key="NSFrameSize">{499, 257}</string>
 																								<reference key="NSSuperview" ref="729666351"/>
 																								<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																								<bool key="NSEnabled">YES</bool>
 																								<object class="NSTableHeaderView" key="NSHeaderView" id="4756718">
 																									<reference key="NSNextResponder" ref="216647119"/>
 																									<int key="NSvFlags">256</int>
-																									<string key="NSFrameSize">{494, 17}</string>
+																									<string key="NSFrameSize">{499, 17}</string>
 																									<reference key="NSSuperview" ref="216647119"/>
 																									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																									<reference key="NSTableView" ref="830282976"/>
@@ -723,7 +723,7 @@
 																										<reference key="NSTableView" ref="830282976"/>
 																									</object>
 																									<object class="NSTableColumn" id="861957185">
-																										<double key="NSWidth">42.11328125</double>
+																										<double key="NSWidth">46.90234375</double>
 																										<double key="NSMinWidth">10</double>
 																										<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																										<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -821,7 +821,7 @@
 																									</object>
 																								</object>
 																								<double key="NSRowHeight">32</double>
-																								<int key="NSTvFlags">-692060160</int>
+																								<int key="NSTvFlags">-689963008</int>
 																								<reference key="NSDelegate"/>
 																								<reference key="NSDataSource"/>
 																								<int key="NSColumnAutoresizingStyle">4</int>
@@ -851,14 +851,14 @@
 																					</object>
 																					<object class="NSScroller" id="94292441">
 																						<reference key="NSNextResponder" ref="303493593"/>
-																						<int key="NSvFlags">-2147483392</int>
+																						<int key="NSvFlags">256</int>
 																						<string key="NSFrame">{{1, 259}, {494, 15}}</string>
 																						<reference key="NSSuperview" ref="303493593"/>
+																						<bool key="NSEnabled">YES</bool>
 																						<int key="NSsFlags">1</int>
 																						<reference key="NSTarget" ref="303493593"/>
 																						<string key="NSAction">_doScroller:</string>
-																						<double key="NSCurValue">1</double>
-																						<double key="NSPercent">0.99596774193548387</double>
+																						<double key="NSPercent">0.98997995991983967</double>
 																					</object>
 																					<object class="NSClipView" id="216647119">
 																						<reference key="NSNextResponder" ref="303493593"/>
@@ -880,7 +880,7 @@
 																				<reference key="NSSuperview" ref="727875353"/>
 																				<reference key="NSNextKeyView" ref="729666351"/>
 																				<int key="NSViewLayerContentsRedrawPolicy">2</int>
-																				<int key="NSsFlags">133682</int>
+																				<int key="NSsFlags">133810</int>
 																				<reference key="NSVScroller" ref="681132672"/>
 																				<reference key="NSHScroller" ref="94292441"/>
 																				<reference key="NSContentView" ref="729666351"/>
Index: trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib	(revision 374)
+++ trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib	(revision 375)
@@ -349,14 +349,14 @@
 																							<object class="NSTableView" id="830282976">
 																								<reference key="NSNextResponder" ref="729666351"/>
 																								<int key="NSvFlags">8448</int>
-																								<string key="NSFrameSize">{494, 257}</string>
+																								<string key="NSFrameSize">{499, 257}</string>
 																								<reference key="NSSuperview" ref="729666351"/>
 																								<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																								<bool key="NSEnabled">YES</bool>
 																								<object class="NSTableHeaderView" key="NSHeaderView" id="4756718">
 																									<reference key="NSNextResponder" ref="216647119"/>
 																									<int key="NSvFlags">256</int>
-																									<string key="NSFrameSize">{494, 17}</string>
+																									<string key="NSFrameSize">{499, 17}</string>
 																									<reference key="NSSuperview" ref="216647119"/>
 																									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																									<reference key="NSTableView" ref="830282976"/>
@@ -723,7 +723,7 @@
 																										<reference key="NSTableView" ref="830282976"/>
 																									</object>
 																									<object class="NSTableColumn" id="861957185">
-																										<double key="NSWidth">42.11328125</double>
+																										<double key="NSWidth">46.90234375</double>
 																										<double key="NSMinWidth">10</double>
 																										<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																										<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -821,7 +821,7 @@
 																									</object>
 																								</object>
 																								<double key="NSRowHeight">32</double>
-																								<int key="NSTvFlags">-692060160</int>
+																								<int key="NSTvFlags">-689963008</int>
 																								<reference key="NSDelegate"/>
 																								<reference key="NSDataSource"/>
 																								<int key="NSColumnAutoresizingStyle">4</int>
@@ -851,14 +851,14 @@
 																					</object>
 																					<object class="NSScroller" id="94292441">
 																						<reference key="NSNextResponder" ref="303493593"/>
-																						<int key="NSvFlags">-2147483392</int>
+																						<int key="NSvFlags">256</int>
 																						<string key="NSFrame">{{1, 259}, {494, 15}}</string>
 																						<reference key="NSSuperview" ref="303493593"/>
+																						<bool key="NSEnabled">YES</bool>
 																						<int key="NSsFlags">1</int>
 																						<reference key="NSTarget" ref="303493593"/>
 																						<string key="NSAction">_doScroller:</string>
-																						<double key="NSCurValue">1</double>
-																						<double key="NSPercent">0.99596774193548387</double>
+																						<double key="NSPercent">0.98997995991983967</double>
 																					</object>
 																					<object class="NSClipView" id="216647119">
 																						<reference key="NSNextResponder" ref="303493593"/>
@@ -880,7 +880,7 @@
 																				<reference key="NSSuperview" ref="727875353"/>
 																				<reference key="NSNextKeyView" ref="729666351"/>
 																				<int key="NSViewLayerContentsRedrawPolicy">2</int>
-																				<int key="NSsFlags">133682</int>
+																				<int key="NSsFlags">133810</int>
 																				<reference key="NSVScroller" ref="681132672"/>
 																				<reference key="NSHScroller" ref="94292441"/>
 																				<reference key="NSContentView" ref="729666351"/>
Index: trunk/ChameleonPrefPane/German.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/German.lproj/Chameleon.xib	(revision 374)
+++ trunk/ChameleonPrefPane/German.lproj/Chameleon.xib	(revision 375)
@@ -349,14 +349,14 @@
 																							<object class="NSTableView" id="830282976">
 																								<reference key="NSNextResponder" ref="729666351"/>
 																								<int key="NSvFlags">8448</int>
-																								<string key="NSFrameSize">{494, 257}</string>
+																								<string key="NSFrameSize">{499, 257}</string>
 																								<reference key="NSSuperview" ref="729666351"/>
 																								<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																								<bool key="NSEnabled">YES</bool>
 																								<object class="NSTableHeaderView" key="NSHeaderView" id="4756718">
 																									<reference key="NSNextResponder" ref="216647119"/>
 																									<int key="NSvFlags">256</int>
-																									<string key="NSFrameSize">{494, 17}</string>
+																									<string key="NSFrameSize">{499, 17}</string>
 																									<reference key="NSSuperview" ref="216647119"/>
 																									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																									<reference key="NSTableView" ref="830282976"/>
@@ -723,7 +723,7 @@
 																										<reference key="NSTableView" ref="830282976"/>
 																									</object>
 																									<object class="NSTableColumn" id="861957185">
-																										<double key="NSWidth">42.11328125</double>
+																										<double key="NSWidth">46.90234375</double>
 																										<double key="NSMinWidth">10</double>
 																										<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																										<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -821,7 +821,7 @@
 																									</object>
 																								</object>
 																								<double key="NSRowHeight">32</double>
-																								<int key="NSTvFlags">-692060160</int>
+																								<int key="NSTvFlags">-689963008</int>
 																								<reference key="NSDelegate"/>
 																								<reference key="NSDataSource"/>
 																								<int key="NSColumnAutoresizingStyle">4</int>
@@ -851,14 +851,14 @@
 																					</object>
 																					<object class="NSScroller" id="94292441">
 																						<reference key="NSNextResponder" ref="303493593"/>
-																						<int key="NSvFlags">-2147483392</int>
+																						<int key="NSvFlags">256</int>
 																						<string key="NSFrame">{{1, 259}, {494, 15}}</string>
 																						<reference key="NSSuperview" ref="303493593"/>
+																						<bool key="NSEnabled">YES</bool>
 																						<int key="NSsFlags">1</int>
 																						<reference key="NSTarget" ref="303493593"/>
 																						<string key="NSAction">_doScroller:</string>
-																						<double key="NSCurValue">1</double>
-																						<double key="NSPercent">0.99596774193548387</double>
+																						<double key="NSPercent">0.98997995991983967</double>
 																					</object>
 																					<object class="NSClipView" id="216647119">
 																						<reference key="NSNextResponder" ref="303493593"/>
@@ -880,7 +880,7 @@
 																				<reference key="NSSuperview" ref="727875353"/>
 																				<reference key="NSNextKeyView" ref="729666351"/>
 																				<int key="NSViewLayerContentsRedrawPolicy">2</int>
-																				<int key="NSsFlags">133682</int>
+																				<int key="NSsFlags">133810</int>
 																				<reference key="NSVScroller" ref="681132672"/>
 																				<reference key="NSHScroller" ref="94292441"/>
 																				<reference key="NSContentView" ref="729666351"/>
Index: trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib	(revision 374)
+++ trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib	(revision 375)
@@ -349,14 +349,14 @@
 																							<object class="NSTableView" id="830282976">
 																								<reference key="NSNextResponder" ref="729666351"/>
 																								<int key="NSvFlags">8448</int>
-																								<string key="NSFrameSize">{494, 257}</string>
+																								<string key="NSFrameSize">{499, 257}</string>
 																								<reference key="NSSuperview" ref="729666351"/>
 																								<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																								<bool key="NSEnabled">YES</bool>
 																								<object class="NSTableHeaderView" key="NSHeaderView" id="4756718">
 																									<reference key="NSNextResponder" ref="216647119"/>
 																									<int key="NSvFlags">256</int>
-																									<string key="NSFrameSize">{494, 17}</string>
+																									<string key="NSFrameSize">{499, 17}</string>
 																									<reference key="NSSuperview" ref="216647119"/>
 																									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																									<reference key="NSTableView" ref="830282976"/>
@@ -723,7 +723,7 @@
 																										<reference key="NSTableView" ref="830282976"/>
 																									</object>
 																									<object class="NSTableColumn" id="861957185">
-																										<double key="NSWidth">42.11328125</double>
+																										<double key="NSWidth">46.90234375</double>
 																										<double key="NSMinWidth">10</double>
 																										<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																										<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -821,7 +821,7 @@
 																									</object>
 																								</object>
 																								<double key="NSRowHeight">32</double>
-																								<int key="NSTvFlags">-692060160</int>
+																								<int key="NSTvFlags">-689963008</int>
 																								<reference key="NSDelegate"/>
 																								<reference key="NSDataSource"/>
 																								<int key="NSColumnAutoresizingStyle">4</int>
@@ -851,14 +851,14 @@
 																					</object>
 																					<object class="NSScroller" id="94292441">
 																						<reference key="NSNextResponder" ref="303493593"/>
-																						<int key="NSvFlags">-2147483392</int>
+																						<int key="NSvFlags">256</int>
 																						<string key="NSFrame">{{1, 259}, {494, 15}}</string>
 																						<reference key="NSSuperview" ref="303493593"/>
+																						<bool key="NSEnabled">YES</bool>
 																						<int key="NSsFlags">1</int>
 																						<reference key="NSTarget" ref="303493593"/>
 																						<string key="NSAction">_doScroller:</string>
-																						<double key="NSCurValue">1</double>
-																						<double key="NSPercent">0.99596774193548387</double>
+																						<double key="NSPercent">0.98997995991983967</double>
 																					</object>
 																					<object class="NSClipView" id="216647119">
 																						<reference key="NSNextResponder" ref="303493593"/>
@@ -880,7 +880,7 @@
 																				<reference key="NSSuperview" ref="727875353"/>
 																				<reference key="NSNextKeyView" ref="729666351"/>
 																				<int key="NSViewLayerContentsRedrawPolicy">2</int>
-																				<int key="NSsFlags">133682</int>
+																				<int key="NSsFlags">133810</int>
 																				<reference key="NSVScroller" ref="681132672"/>
 																				<reference key="NSHScroller" ref="94292441"/>
 																				<reference key="NSContentView" ref="729666351"/>
Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 374)
+++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 375)
@@ -12,7 +12,7 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="172"/>
+      <integer value="103"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -330,14 +330,14 @@
                                               <object class="NSTableView" id="830282976">
                                                 <reference key="NSNextResponder" ref="729666351"/>
                                                 <int key="NSvFlags">8448</int>
-                                                <string key="NSFrameSize">{494, 257}</string>
+                                                <string key="NSFrameSize">{499, 257}</string>
                                                 <reference key="NSSuperview" ref="729666351"/>
                                                 <int key="NSViewLayerContentsRedrawPolicy">2</int>
                                                 <bool key="NSEnabled">YES</bool>
                                                 <object class="NSTableHeaderView" key="NSHeaderView" id="4756718">
                                                   <reference key="NSNextResponder" ref="216647119"/>
                                                   <int key="NSvFlags">256</int>
-                                                  <string key="NSFrameSize">{494, 17}</string>
+                                                  <string key="NSFrameSize">{499, 17}</string>
                                                   <reference key="NSSuperview" ref="216647119"/>
                                                   <int key="NSViewLayerContentsRedrawPolicy">2</int>
                                                   <reference key="NSTableView" ref="830282976"/>
@@ -704,7 +704,7 @@
                                                     <reference key="NSTableView" ref="830282976"/>
                                                   </object>
                                                   <object class="NSTableColumn" id="861957185">
-                                                    <double key="NSWidth">42.11328125</double>
+                                                    <double key="NSWidth">46.90234375</double>
                                                     <double key="NSMinWidth">10</double>
                                                     <double key="NSMaxWidth">3.4028229999999999e+38</double>
                                                     <object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -802,7 +802,7 @@
                                                   </object>
                                                 </object>
                                                 <double key="NSRowHeight">32</double>
-                                                <int key="NSTvFlags">-692060160</int>
+                                                <int key="NSTvFlags">-689963008</int>
                                                 <reference key="NSDelegate"/>
                                                 <reference key="NSDataSource"/>
                                                 <int key="NSColumnAutoresizingStyle">4</int>
@@ -832,14 +832,14 @@
                                           </object>
                                           <object class="NSScroller" id="94292441">
                                             <reference key="NSNextResponder" ref="303493593"/>
-                                            <int key="NSvFlags">-2147483392</int>
+                                            <int key="NSvFlags">256</int>
                                             <string key="NSFrame">{{1, 259}, {494, 15}}</string>
                                             <reference key="NSSuperview" ref="303493593"/>
+                                            <bool key="NSEnabled">YES</bool>
                                             <int key="NSsFlags">1</int>
                                             <reference key="NSTarget" ref="303493593"/>
                                             <string key="NSAction">_doScroller:</string>
-                                            <double key="NSCurValue">1</double>
-                                            <double key="NSPercent">0.99596774193548387</double>
+                                            <double key="NSPercent">0.98997995991983967</double>
                                           </object>
                                           <object class="NSClipView" id="216647119">
                                             <reference key="NSNextResponder" ref="303493593"/>
@@ -861,7 +861,7 @@
                                         <reference key="NSSuperview" ref="727875353"/>
                                         <reference key="NSNextKeyView" ref="729666351"/>
                                         <int key="NSViewLayerContentsRedrawPolicy">2</int>
-                                        <int key="NSsFlags">133682</int>
+                                        <int key="NSsFlags">133810</int>
                                         <reference key="NSVScroller" ref="681132672"/>
                                         <reference key="NSHScroller" ref="94292441"/>
                                         <reference key="NSContentView" ref="729666351"/>