- Convert connection encoding menus to be menu tag based to fix localisation errors

 - Add database encoding retrieval support for MySQL 4.1
 - Convert the add table and add database sheets to use encoding menus derived from server supported encodings
 - Re-layout preferences with larger labels to aid localisation
 - Fix preference resizing in non-Favorite tabs

1 files changed, 29 insertions, 4 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 41902baa..5ae45696 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10D573</string>
+		<string key="IBDocument.SystemVersion">10D2094</string>
 		<string key="IBDocument.InterfaceBuilderVersion">762</string>
 		<string key="IBDocument.AppKitVersion">1038.29</string>
 		<string key="IBDocument.HIToolboxVersion">460.00</string>
@@ -13,6 +13,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="956"/>
+			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1250,6 +1251,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">10</int>
 											</object>
 											<object class="NSMenuItem" id="428425210">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1260,6 +1262,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">20</int>
 											</object>
 											<object class="NSMenuItem" id="345290219">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1268,6 +1271,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">30</int>
 											</object>
 											<object class="NSMenuItem" id="649847059">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1279,6 +1283,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="587809847">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1289,6 +1294,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">40</int>
 											</object>
 											<object class="NSMenuItem" id="247892805">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1299,6 +1305,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">50</int>
 											</object>
 											<object class="NSMenuItem" id="1045933524">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1309,6 +1316,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">60</int>
 											</object>
 											<object class="NSMenuItem" id="929144169">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1320,6 +1328,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="1019891968">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1330,6 +1339,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">70</int>
 											</object>
 											<object class="NSMenuItem" id="272867556">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1340,6 +1350,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">80</int>
 											</object>
 											<object class="NSMenuItem" id="831843460">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1351,6 +1362,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="114701997">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1361,6 +1373,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">90</int>
 											</object>
 											<object class="NSMenuItem" id="86485907">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1371,6 +1384,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">100</int>
 											</object>
 											<object class="NSMenuItem" id="243329592">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1381,6 +1395,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">110</int>
 											</object>
 											<object class="NSMenuItem" id="620428396">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1391,6 +1406,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">120</int>
 											</object>
 											<object class="NSMenuItem" id="145813245">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1402,6 +1418,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="290468717">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1412,6 +1429,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">130</int>
 											</object>
 											<object class="NSMenuItem" id="384948978">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1423,6 +1441,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="537895346">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1433,6 +1452,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">140</int>
 											</object>
 											<object class="NSMenuItem" id="239164973">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1444,6 +1464,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">-1</int>
 											</object>
 											<object class="NSMenuItem" id="803749958">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1454,6 +1475,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">150</int>
 											</object>
 											<object class="NSMenuItem" id="691508085">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1464,6 +1486,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">160</int>
 											</object>
 											<object class="NSMenuItem" id="705318648">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1474,6 +1497,7 @@
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
 												<string key="NSAction">_popUpItemAction:</string>
+												<int key="NSTag">170</int>
 											</object>
 											<object class="NSMenuItem" id="302542110">
 												<reference key="NSMenu" ref="487618540"/>
@@ -1482,6 +1506,7 @@
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="625762401"/>
 												<reference key="NSMixedImage" ref="315854375"/>
+												<int key="NSTag">180</int>
 											</object>
 										</object>
 									</object>
@@ -4767,7 +4792,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{449, 1007}, {197, 53}}</string>
-					<string>{{108, 563}, {511, 20}}</string>
+					<string>{{106, 685}, {511, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{506, 836}, {511, 20}}</string>
@@ -4809,7 +4834,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{596, 277}, {255, 253}}</string>
+					<string>{{348, 432}, {255, 253}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{312, 683}, {231, 153}}</string>
@@ -4821,7 +4846,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{815, 44}, {276, 423}}</string>
+					<string>{{603, 82}, {276, 423}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{556, 185}, {279, 383}}</string>