[mapguide-commits] r6745 - in trunk/Tools/Maestro: Maestro Maestro.Editors Maestro.Editors/Generic Maestro.Editors/Generic/XmlEditor Maestro.Editors/Properties Maestro.Editors/Resources

Mon Jun 11 02:55:42 PDT 2012

Author: jng
Date: 2012-06-11 02:55:40 -0700 (Mon, 11 Jun 2012)
New Revision: 6745

Added:
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.resx
   trunk/Tools/Maestro/Maestro.Editors/Resources/magnifier-left.png
Modified:
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
   trunk/Tools/Maestro/Maestro/Maestro_All.sln
Log:
More XML editor changes/fixes:
 - Reinstate search and replace functionality
 - Fix the broken formatting logic that was the cause of #2016

Modified: trunk/Tools/Maestro/Maestro/Maestro_All.sln
===================================================================

--- trunk/Tools/Maestro/Maestro/Maestro_All.sln	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro/Maestro_All.sln	2012-06-11 09:55:40 UTC (rev 6745)
@@ -148,495 +148,199 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E0C36475-2B70-4F6D-ACE0-8943167806DC}.Release|x86.ActiveCfg = Release|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|x86.ActiveCfg = Release|Any CPU
 		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.Build.0 = Release|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F1E2F468-5030-4DBA-968C-9620284AFAA1}.Release|x86.ActiveCfg = Release|Any CPU
 		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{59BE5E18-17B6-431D-836E-C0AABA6D69E8}.Release|x86.ActiveCfg = Release|Any CPU
 		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{32BA7DF6-1AFA-441D-9231-5624C5920706}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C7DCF771-5982-4859-A17F-01126E6F9BA6}.Release|x86.ActiveCfg = Release|Any CPU
 		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0FD82B7B-1264-410F-86D1-47E9CCACD68E}.Release|x86.ActiveCfg = Release|Any CPU
 		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|x86.ActiveCfg = Release|Any CPU
 		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0EA33E36-9C33-4D60-B378-B87FADAA0F40}.Release|x86.ActiveCfg = Release|Any CPU
 		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CFD19053-2172-41D3-8460-0FD2123A1E88}.Release|x86.ActiveCfg = Release|Any CPU
 		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{80FA3158-8B5F-48D1-A393-0378AFE48A7E}.Release|x86.ActiveCfg = Release|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|x86.ActiveCfg = Release|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EDDB0F74-6FE7-4969-80B0-817A629722CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AC5068F6-CFBE-4BCD-B68B-062725E424D4}.Release|x86.ActiveCfg = Release|Any CPU
 		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}.Release|x86.ActiveCfg = Release|Any CPU
 		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D525B343-66D6-4D6B-9A55-78A173D94A51}.Release|x86.ActiveCfg = Release|Any CPU
 		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|x86.ActiveCfg = Release|Any CPU
 		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x86.ActiveCfg = Release|Any CPU
 		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|x86.ActiveCfg = Release|Any CPU
 		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{50C12B5C-387C-4007-A1D1-CB181CB474CC}.Release|x86.ActiveCfg = Release|Any CPU
 		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C8DB3E77-3AF4-471D-A214-69DBEB32750E}.Release|x86.ActiveCfg = Release|Any CPU
 		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}.Release|x86.ActiveCfg = Release|Any CPU
 		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B3A2B816-9F41-4857-A111-09D2DF2550D6}.Release|x86.ActiveCfg = Release|Any CPU
 		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3DDF6501-0148-474C-8674-7C7DA49C7F02}.Release|x86.ActiveCfg = Release|Any CPU
 		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2419F940-BFB7-4F3F-B5DA-1052EB4706E5}.Release|x86.ActiveCfg = Release|Any CPU
 		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6EE16FFD-296E-42FF-B994-8902C27AA0F4}.Release|x86.ActiveCfg = Release|Any CPU
 		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D24F724A-1CBF-4EB6-A48B-92C08353C4CC}.Release|x86.ActiveCfg = Release|Any CPU
 		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F4420153-9DF3-4407-AD65-E8ABED2B6E25}.Release|x86.ActiveCfg = Release|Any CPU
 		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BEC17FD3-2ADB-4154-934D-494313C588EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{16E6B250-C805-4C31-9A7D-F56A0051EC93}.Release|x86.ActiveCfg = Release|Any CPU
 		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}.Release|x86.ActiveCfg = Release|Any CPU
 		{222CB020-5336-47D7-9BB9-A22D18953C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{222CB020-5336-47D7-9BB9-A22D18953C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{222CB020-5336-47D7-9BB9-A22D18953C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{222CB020-5336-47D7-9BB9-A22D18953C80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{222CB020-5336-47D7-9BB9-A22D18953C80}.Release|x86.ActiveCfg = Release|Any CPU
 		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}.Release|x86.ActiveCfg = Release|Any CPU
 		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8787FF3F-552F-46BE-B9D7-548B6162B079}.Release|x86.ActiveCfg = Release|Any CPU
 		{E204559D-EE92-4792-96E2-06F45654FAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E204559D-EE92-4792-96E2-06F45654FAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E204559D-EE92-4792-96E2-06F45654FAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E204559D-EE92-4792-96E2-06F45654FAFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E204559D-EE92-4792-96E2-06F45654FAFC}.Release|x86.ActiveCfg = Release|Any CPU
 		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{19A769B5-7CFA-4E9F-90D8-BF4A17F918C4}.Release|x86.ActiveCfg = Release|Any CPU
 		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|x86.ActiveCfg = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Any CPU.Build.0 = Debug|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|x86.ActiveCfg = Debug|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|x86.Build.0 = Debug|x86
+		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|Any CPU.ActiveCfg = Release|x86
 		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|Any CPU.Build.0 = Release|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|Mixed Platforms.Build.0 = Release|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|x86.ActiveCfg = Release|x86
-		{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}.Release|x86.Build.0 = Release|x86
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4F9658DE-D16F-4B40-B830-BB1E0136DBD7}.Release|x86.ActiveCfg = Release|Any CPU
 		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|x86.ActiveCfg = Debug|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|x86.Build.0 = Debug|x86
+		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Debug|Any CPU.Build.0 = Debug|x86
 		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|Any CPU.ActiveCfg = Release|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|x86.ActiveCfg = Release|x86
-		{A1DF0D61-ADBC-4FC9-BE32-54C3C10538E2}.Release|x86.Build.0 = Release|x86
 		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|x86.ActiveCfg = Debug|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|x86.Build.0 = Debug|x86
+		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Debug|Any CPU.Build.0 = Debug|x86
 		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|Any CPU.ActiveCfg = Release|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|Mixed Platforms.Build.0 = Release|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|x86.ActiveCfg = Release|x86
-		{F1EDEB83-D09F-46E0-B655-B43D4D9682DD}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE


Property changes on: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs	2012-06-11 09:55:40 UTC (rev 6745)
@@ -0,0 +1,534 @@
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using ICSharpCode.TextEditor.Document;
+using ICSharpCode.TextEditor;
+using System.Diagnostics;
+using System.IO;
+
+namespace Maestro.Editors.Generic.XmlEditor
+{
+    // Original Source: http://www.codeproject.com/Articles/30936/Using-ICSharpCode-TextEditor
+    //
+    // Adapted for use in the Maestro Generic XML editor component
+
+	internal partial class FindAndReplaceForm : Form
+	{
+		public FindAndReplaceForm()
+		{
+			InitializeComponent();
+			_search = new TextEditorSearcher();
+		}
+
+		TextEditorSearcher _search;
+		TextEditorControl _editor;
+		TextEditorControl Editor { 
+			get { return _editor; } 
+			set { 
+				_editor = value;
+				_search.Document = _editor.Document;
+				UpdateTitleBar();
+			}
+		}
+
+		private void UpdateTitleBar()
+		{
+			string text = ReplaceMode ? Properties.Resources.TextFindAndReplace : Properties.Resources.TextFind;
+			if (_editor != null && _editor.FileName != null)
+				text += " - " + Path.GetFileName(_editor.FileName);
+			if (_search.HasScanRegion)
+				text += " " + Properties.Resources.TextSelectionOnly;
+			this.Text = text;
+		}
+
+		public void ShowFor(TextEditorControl editor, bool replaceMode)
+		{
+			Editor = editor;
+
+			_search.ClearScanRegion();
+			var sm = editor.ActiveTextAreaControl.SelectionManager;
+			if (sm.HasSomethingSelected && sm.SelectionCollection.Count == 1) {
+				var sel = sm.SelectionCollection[0];
+				if (sel.StartPosition.Line == sel.EndPosition.Line)
+					txtLookFor.Text = sm.SelectedText;
+				else
+					_search.SetScanRegion(sel);
+			} else {
+				// Get the current word that the caret is on
+				Caret caret = editor.ActiveTextAreaControl.Caret;
+				int start = TextUtilities.FindWordStart(editor.Document, caret.Offset);
+				int endAt = TextUtilities.FindWordEnd(editor.Document, caret.Offset);
+				txtLookFor.Text = editor.Document.GetText(start, endAt - start);
+			}
+			
+			ReplaceMode = replaceMode;
+
+			this.Owner = (Form)editor.TopLevelControl;
+			this.Show();
+			
+			txtLookFor.SelectAll();
+			txtLookFor.Focus();
+		}
+
+		public bool ReplaceMode
+		{
+			get { return txtReplaceWith.Visible; }
+			set {
+				btnReplace.Visible = btnReplaceAll.Visible = value;
+				lblReplaceWith.Visible = txtReplaceWith.Visible = value;
+				btnHighlightAll.Visible = !value;
+				this.AcceptButton = value ? btnReplace : btnFindNext;
+				UpdateTitleBar();
+			}
+		}
+
+		private void btnFindPrevious_Click(object sender, EventArgs e)
+		{
+            FindNext(txtLookFor.Text, false, true, Properties.Resources.TextNotFound);
+		}
+		private void btnFindNext_Click(object sender, EventArgs e)
+		{
+            FindNext(txtLookFor.Text, false, false, Properties.Resources.TextNotFound);
+		}
+
+		public bool _lastSearchWasBackward = false;
+		public bool _lastSearchLoopedAround;
+
+        public TextRange FindNext(string find, bool viaF3, bool searchBackward, string messageIfNotFound)
+        {
+            return FindNext(find, viaF3, searchBackward, messageIfNotFound, false);
+        }
+
+		public TextRange FindNext(string find, bool viaF3, bool searchBackward, string messageIfNotFound, bool silent)
+		{
+            if (string.IsNullOrEmpty(find))
+			{
+                if (!silent)
+				    MessageBox.Show(Properties.Resources.TextNoStringSpecifiedToLookFor);
+				return null;
+			}
+			_lastSearchWasBackward = searchBackward;
+            _search.LookFor = find; // txtLookFor.Text;
+			_search.MatchCase = chkMatchCase.Checked;
+			_search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
+
+			var caret = _editor.ActiveTextAreaControl.Caret;
+			if (viaF3 && _search.HasScanRegion && !caret.Offset.
+				IsInRange(_search.BeginOffset, _search.EndOffset)) {
+				// user moved outside of the originally selected region
+				_search.ClearScanRegion();
+				UpdateTitleBar();
+			}
+
+			int startFrom = caret.Offset - (searchBackward ? 1 : 0);
+			TextRange range = _search.FindNext(startFrom, searchBackward, out _lastSearchLoopedAround);
+			if (range != null)
+				SelectResult(range);
+			else if (messageIfNotFound != null && !silent)
+				MessageBox.Show(messageIfNotFound);
+			return range;
+		}
+
+		private void SelectResult(TextRange range)
+		{
+			TextLocation p1 = _editor.Document.OffsetToPosition(range.Offset);
+			TextLocation p2 = _editor.Document.OffsetToPosition(range.Offset + range.Length);
+			_editor.ActiveTextAreaControl.SelectionManager.SetSelection(p1, p2);
+			_editor.ActiveTextAreaControl.ScrollTo(p1.Line, p1.Column);
+			// Also move the caret to the end of the selection, because when the user 
+			// presses F3, the caret is where we start searching next time.
+			_editor.ActiveTextAreaControl.Caret.Position = 
+				_editor.Document.OffsetToPosition(range.Offset + range.Length);
+		}
+
+		Dictionary<TextEditorControl, HighlightGroup> _highlightGroups = new Dictionary<TextEditorControl, HighlightGroup>();
+
+		private void btnHighlightAll_Click(object sender, EventArgs e)
+		{
+			if (!_highlightGroups.ContainsKey(_editor))
+				_highlightGroups[_editor] = new HighlightGroup(_editor);
+			HighlightGroup group = _highlightGroups[_editor];
+
+			if (string.IsNullOrEmpty(LookFor))
+				// Clear highlights
+				group.ClearMarkers();
+			else {
+				_search.LookFor = txtLookFor.Text;
+				_search.MatchCase = chkMatchCase.Checked;
+				_search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
+
+				bool looped = false;
+				int offset = 0, count = 0;
+				for(;;) {
+					TextRange range = _search.FindNext(offset, false, out looped);
+					if (range == null || looped)
+						break;
+					offset = range.Offset + range.Length;
+					count++;
+
+					var m = new TextMarker(range.Offset, range.Length, 
+							TextMarkerType.SolidBlock, Color.Yellow, Color.Black);
+					group.AddMarker(m);
+				}
+				if (count == 0)
+					MessageBox.Show(Properties.Resources.TextSearchTextNotFound);
+				else
+					Close();
+			}
+		}
+		
+		private void FindAndReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
+		{	// Prevent dispose, as this form can be re-used
+			if (e.CloseReason != CloseReason.FormOwnerClosing)
+			{
+				if (this.Owner != null)
+					this.Owner.Select(); // prevent another app from being activated instead
+				
+				e.Cancel = true;
+				Hide();
+				
+				// Discard search region
+				_search.ClearScanRegion();
+				_editor.Refresh(); // must repaint manually
+			}
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			Close();
+		}
+
+		private void btnReplace_Click(object sender, EventArgs e)
+		{
+			var sm = _editor.ActiveTextAreaControl.SelectionManager;
+			if (string.Equals(sm.SelectedText, txtLookFor.Text, StringComparison.OrdinalIgnoreCase))
+				InsertText(txtReplaceWith.Text);
+            FindNext(txtLookFor.Text, false, _lastSearchWasBackward, Properties.Resources.TextNotFound);
+		}
+
+        internal int FindAndReplace(string find, string replace)
+        {
+            int count = 0;
+            // BUG FIX: if the replacement string contains the original search string
+            // (e.g. replace "red" with "very red") we must avoid looping around and
+            // replacing forever! To fix, start replacing at beginning of region (by 
+            // moving the caret) and stop as soon as we loop around.
+            _editor.ActiveTextAreaControl.Caret.Position =
+                _editor.Document.OffsetToPosition(_search.BeginOffset);
+
+            _editor.Document.UndoStack.StartUndoGroup();
+            try
+            {
+                while (FindNext(find, false, false, null) != null)
+                {
+                    if (_lastSearchLoopedAround)
+                        break;
+
+                    // Replace
+                    count++;
+                    InsertText(replace);
+                }
+            }
+            finally
+            {
+                _editor.Document.UndoStack.EndUndoGroup();
+            }
+            return count;
+        }
+
+		private void btnReplaceAll_Click(object sender, EventArgs e)
+		{
+            int count = FindAndReplace(txtLookFor.Text, txtReplaceWith.Text);
+			if (count == 0)
+				MessageBox.Show(Properties.Resources.TextNoOccurrencesFound);
+			else {
+				MessageBox.Show(string.Format(Properties.Resources.TextOccurrencesReplaced, count));
+				Close();
+			}
+		}
+
+		private void InsertText(string text)
+		{
+			var textArea = _editor.ActiveTextAreaControl.TextArea;
+			textArea.Document.UndoStack.StartUndoGroup();
+			try {
+				if (textArea.SelectionManager.HasSomethingSelected) {
+					textArea.Caret.Position = textArea.SelectionManager.SelectionCollection[0].StartPosition;
+					textArea.SelectionManager.RemoveSelectedText();
+				}
+				textArea.InsertString(text);
+			} finally {
+				textArea.Document.UndoStack.EndUndoGroup();
+			}
+		}
+
+		public string LookFor { get { return txtLookFor.Text; } }
+	}
+
+    internal static class ExtensionMethods
+    {
+        public static int InRange(this int x, int lo, int hi)
+        {
+            Debug.Assert(lo <= hi);
+            return x < lo ? lo : (x > hi ? hi : x);
+        }
+        public static bool IsInRange(this int x, int lo, int hi)
+        {
+            return x >= lo && x <= hi;
+        }
+        public static Color HalfMix(this Color one, Color two)
+        {
+            return Color.FromArgb(
+                (one.A + two.A) >> 1,
+                (one.R + two.R) >> 1,
+                (one.G + two.G) >> 1,
+                (one.B + two.B) >> 1);
+        }
+    }
+
+	public class TextRange : AbstractSegment
+	{
+		IDocument _document;
+		public TextRange(IDocument document, int offset, int length)
+		{
+			_document = document;
+			this.offset = offset;
+			this.length = length;
+		}
+	}
+
+	/// <summary>This class finds occurrances of a search string in a text 
+	/// editor's IDocument... it's like Find box without a GUI.</summary>
+	public class TextEditorSearcher : IDisposable
+	{
+		IDocument _document;
+		public IDocument Document
+		{
+			get { return _document; } 
+			set { 
+				if (_document != value) {
+					ClearScanRegion();
+					_document = value;
+				}
+			}
+		}
+
+		// I would have used the TextAnchor class to represent the beginning and 
+		// end of the region to scan while automatically adjusting to changes in 
+		// the document--but for some reason it is sealed and its constructor is 
+		// internal. Instead I use a TextMarker, which is perhaps even better as 
+		// it gives me the opportunity to highlight the region. Note that all the 
+		// markers and coloring information is associated with the text document, 
+		// not the editor control, so TextEditorSearcher doesn't need a reference 
+		// to the TextEditorControl. After adding the marker to the document, we
+		// must remember to remove it when it is no longer needed.
+		TextMarker _region = null;
+		/// <summary>Sets the region to search. The region is updated 
+		/// automatically as the document changes.</summary>
+		public void SetScanRegion(ISelection sel)
+		{
+			SetScanRegion(sel.Offset, sel.Length);
+		}
+		/// <summary>Sets the region to search. The region is updated 
+		/// automatically as the document changes.</summary>
+		public void SetScanRegion(int offset, int length)
+		{
+			var bkgColor = _document.HighlightingStrategy.GetColorFor("Default").BackgroundColor;
+			_region = new TextMarker(offset, length, TextMarkerType.SolidBlock, 
+				bkgColor.HalfMix(Color.FromArgb(160,160,160)));
+			_document.MarkerStrategy.AddMarker(_region);
+		}
+		public bool HasScanRegion
+		{
+			get { return _region != null; }
+		}
+		public void ClearScanRegion()
+		{
+			if (_region != null)
+			{
+				_document.MarkerStrategy.RemoveMarker(_region);
+				_region = null;
+			}
+		}
+		public void Dispose() { ClearScanRegion(); GC.SuppressFinalize(this); }
+		~TextEditorSearcher() { Dispose(); }
+		
+		/// <summary>Begins the start offset for searching</summary>
+		public int BeginOffset
+		{
+			get {
+				if (_region != null)
+					return _region.Offset;
+				else
+					return 0;
+			}
+		}
+		/// <summary>Begins the end offset for searching</summary>
+		public int EndOffset
+		{
+			get {
+				if (_region != null)
+					return _region.EndOffset;
+				else
+					return _document.TextLength;
+			}
+		}
+
+		public bool MatchCase;
+
+		public bool MatchWholeWordOnly;
+
+		string _lookFor;
+		string _lookFor2; // uppercase in case-insensitive mode
+		public string LookFor
+		{
+			get { return _lookFor; }
+			set { _lookFor = value; }
+		}
+
+		/// <summary>Finds next instance of LookFor, according to the search rules 
+		/// (MatchCase, MatchWholeWordOnly).</summary>
+		/// <param name="beginAtOffset">Offset in Document at which to begin the search</param>
+		/// <remarks>If there is a match at beginAtOffset precisely, it will be returned.</remarks>
+		/// <returns>Region of document that matches the search string</returns>
+		public TextRange FindNext(int beginAtOffset, bool searchBackward, out bool loopedAround)
+		{
+			Debug.Assert(!string.IsNullOrEmpty(_lookFor));
+			loopedAround = false;
+
+			int startAt = BeginOffset, endAt = EndOffset;
+			int curOffs = beginAtOffset.InRange(startAt, endAt);
+
+			_lookFor2 = MatchCase ? _lookFor : _lookFor.ToUpperInvariant();
+			
+			TextRange result;
+			if (searchBackward) {
+				result = FindNextIn(startAt, curOffs, true);
+				if (result == null) {
+					loopedAround = true;
+					result = FindNextIn(curOffs, endAt, true);
+				}
+			} else {
+				result = FindNextIn(curOffs, endAt, false);
+				if (result == null) {
+					loopedAround = true;
+					result = FindNextIn(startAt, curOffs, false);
+				}
+			}
+			return result;
+		}
+
+		private TextRange FindNextIn(int offset1, int offset2, bool searchBackward)
+		{
+			Debug.Assert(offset2 >= offset1);
+			offset2 -= _lookFor.Length;
+
+			// Make behavior decisions before starting search loop
+			Func<char, char, bool> matchFirstCh;
+			Func<int, bool> matchWord;
+			if (MatchCase)
+				matchFirstCh = (lookFor, c) => (lookFor == c);
+			else
+				matchFirstCh = (lookFor, c) => (lookFor == Char.ToUpperInvariant(c));
+			if (MatchWholeWordOnly)
+				matchWord = IsWholeWordMatch;
+			else
+				matchWord = IsPartWordMatch;
+
+			// Search
+			char lookForCh = _lookFor2[0];
+			if (searchBackward)
+			{
+				for (int offset = offset2; offset >= offset1; offset--) {
+					if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
+						&& matchWord(offset))
+						return new TextRange(_document, offset, _lookFor.Length);
+				}
+			} else {
+				for (int offset = offset1; offset <= offset2; offset++) {
+					if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
+						&& matchWord(offset))
+						return new TextRange(_document, offset, _lookFor.Length);
+				}
+			}
+			return null;
+		}
+		private bool IsWholeWordMatch(int offset)
+		{
+			if (IsWordBoundary(offset) && IsWordBoundary(offset + _lookFor.Length))
+				return IsPartWordMatch(offset);
+			else
+				return false;
+		}
+		private bool IsWordBoundary(int offset)
+		{
+			return offset <= 0 || offset >= _document.TextLength ||
+				!IsAlphaNumeric(offset - 1) || !IsAlphaNumeric(offset);
+		}
+		private bool IsAlphaNumeric(int offset)
+		{
+			char c = _document.GetCharAt(offset);
+			return Char.IsLetterOrDigit(c) || c == '_';
+		}
+		private bool IsPartWordMatch(int offset)
+		{
+			string substr = _document.GetText(offset, _lookFor.Length);
+			if (!MatchCase)
+				substr = substr.ToUpperInvariant();
+			return substr == _lookFor2;
+		}
+	}
+
+	/// <summary>Bundles a group of markers together so that they can be cleared 
+	/// together.</summary>
+	public class HighlightGroup : IDisposable
+	{
+		List<TextMarker> _markers = new List<TextMarker>();
+		TextEditorControl _editor;
+		IDocument _document;
+		public HighlightGroup(TextEditorControl editor)
+		{
+			_editor = editor;
+			_document = editor.Document;
+		}
+		public void AddMarker(TextMarker marker)
+		{
+			_markers.Add(marker);
+			_document.MarkerStrategy.AddMarker(marker);
+		}
+		public void ClearMarkers()
+		{
+			foreach (TextMarker m in _markers)
+				_document.MarkerStrategy.RemoveMarker(m);
+			_markers.Clear();
+			_editor.Refresh();
+		}
+		public void Dispose() { ClearMarkers(); GC.SuppressFinalize(this); }
+		~HighlightGroup() { Dispose(); }
+
+		public IList<TextMarker> Markers { get { return _markers.AsReadOnly(); } }
+	}
+}

Added: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.designer.cs	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.designer.cs	2012-06-11 09:55:40 UTC (rev 6745)
@@ -0,0 +1,165 @@
+namespace Maestro.Editors.Generic.XmlEditor
+{
+	partial class FindAndReplaceForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FindAndReplaceForm));
+            this.label1 = new System.Windows.Forms.Label();
+            this.lblReplaceWith = new System.Windows.Forms.Label();
+            this.txtLookFor = new System.Windows.Forms.TextBox();
+            this.txtReplaceWith = new System.Windows.Forms.TextBox();
+            this.btnFindNext = new System.Windows.Forms.Button();
+            this.btnReplace = new System.Windows.Forms.Button();
+            this.btnReplaceAll = new System.Windows.Forms.Button();
+            this.chkMatchWholeWord = new System.Windows.Forms.CheckBox();
+            this.chkMatchCase = new System.Windows.Forms.CheckBox();
+            this.btnHighlightAll = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnFindPrevious = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // lblReplaceWith
+            // 
+            resources.ApplyResources(this.lblReplaceWith, "lblReplaceWith");
+            this.lblReplaceWith.Name = "lblReplaceWith";
+            // 
+            // txtLookFor
+            // 
+            resources.ApplyResources(this.txtLookFor, "txtLookFor");
+            this.txtLookFor.Name = "txtLookFor";
+            // 
+            // txtReplaceWith
+            // 
+            resources.ApplyResources(this.txtReplaceWith, "txtReplaceWith");
+            this.txtReplaceWith.Name = "txtReplaceWith";
+            // 
+            // btnFindNext
+            // 
+            resources.ApplyResources(this.btnFindNext, "btnFindNext");
+            this.btnFindNext.Name = "btnFindNext";
+            this.btnFindNext.UseVisualStyleBackColor = true;
+            this.btnFindNext.Click += new System.EventHandler(this.btnFindNext_Click);
+            // 
+            // btnReplace
+            // 
+            resources.ApplyResources(this.btnReplace, "btnReplace");
+            this.btnReplace.Name = "btnReplace";
+            this.btnReplace.UseVisualStyleBackColor = true;
+            this.btnReplace.Click += new System.EventHandler(this.btnReplace_Click);
+            // 
+            // btnReplaceAll
+            // 
+            resources.ApplyResources(this.btnReplaceAll, "btnReplaceAll");
+            this.btnReplaceAll.Name = "btnReplaceAll";
+            this.btnReplaceAll.UseVisualStyleBackColor = true;
+            this.btnReplaceAll.Click += new System.EventHandler(this.btnReplaceAll_Click);
+            // 
+            // chkMatchWholeWord
+            // 
+            resources.ApplyResources(this.chkMatchWholeWord, "chkMatchWholeWord");
+            this.chkMatchWholeWord.Name = "chkMatchWholeWord";
+            this.chkMatchWholeWord.UseVisualStyleBackColor = true;
+            // 
+            // chkMatchCase
+            // 
+            resources.ApplyResources(this.chkMatchCase, "chkMatchCase");
+            this.chkMatchCase.Name = "chkMatchCase";
+            this.chkMatchCase.UseVisualStyleBackColor = true;
+            // 
+            // btnHighlightAll
+            // 
+            resources.ApplyResources(this.btnHighlightAll, "btnHighlightAll");
+            this.btnHighlightAll.Name = "btnHighlightAll";
+            this.btnHighlightAll.UseVisualStyleBackColor = true;
+            this.btnHighlightAll.Click += new System.EventHandler(this.btnHighlightAll_Click);
+            // 
+            // btnCancel
+            // 
+            resources.ApplyResources(this.btnCancel, "btnCancel");
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnFindPrevious
+            // 
+            resources.ApplyResources(this.btnFindPrevious, "btnFindPrevious");
+            this.btnFindPrevious.Name = "btnFindPrevious";
+            this.btnFindPrevious.UseVisualStyleBackColor = true;
+            this.btnFindPrevious.Click += new System.EventHandler(this.btnFindPrevious_Click);
+            // 
+            // FindAndReplaceForm
+            // 
+            this.AcceptButton = this.btnReplace;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.CancelButton = this.btnCancel;
+            resources.ApplyResources(this, "$this");
+            this.Controls.Add(this.chkMatchCase);
+            this.Controls.Add(this.chkMatchWholeWord);
+            this.Controls.Add(this.btnReplaceAll);
+            this.Controls.Add(this.btnReplace);
+            this.Controls.Add(this.btnHighlightAll);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnFindPrevious);
+            this.Controls.Add(this.btnFindNext);
+            this.Controls.Add(this.txtReplaceWith);
+            this.Controls.Add(this.txtLookFor);
+            this.Controls.Add(this.lblReplaceWith);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FindAndReplaceForm";
+            this.ShowIcon = false;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FindAndReplaceForm_FormClosing);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label lblReplaceWith;
+		private System.Windows.Forms.TextBox txtLookFor;
+		private System.Windows.Forms.TextBox txtReplaceWith;
+		private System.Windows.Forms.Button btnFindNext;
+		private System.Windows.Forms.Button btnReplace;
+		private System.Windows.Forms.Button btnReplaceAll;
+		private System.Windows.Forms.CheckBox chkMatchWholeWord;
+		private System.Windows.Forms.CheckBox chkMatchCase;
+		private System.Windows.Forms.Button btnHighlightAll;
+		private System.Windows.Forms.Button btnCancel;
+		private System.Windows.Forms.Button btnFindPrevious;
+	}
+}
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.resx	                        (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.resx	2012-06-11 09:55:40 UTC (rev 6745)
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 9</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 13</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Fi&nd what:</value>
+  </data>
+  <data name=">>label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name=">>label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>label1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>label1.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="lblReplaceWith.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblReplaceWith.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 35</value>
+  </data>
+  <data name="lblReplaceWith.Size" type="System.Drawing.Size, System.Drawing">
+    <value>72, 13</value>
+  </data>
+  <data name="lblReplaceWith.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="lblReplaceWith.Text" xml:space="preserve">
+    <value>Re&place with:</value>
+  </data>
+  <data name=">>lblReplaceWith.Name" xml:space="preserve">
+    <value>lblReplaceWith</value>
+  </data>
+  <data name=">>lblReplaceWith.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>lblReplaceWith.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>lblReplaceWith.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="txtLookFor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtLookFor.Location" type="System.Drawing.Point, System.Drawing">
+    <value>90, 6</value>
+  </data>
+  <data name="txtLookFor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 20</value>
+  </data>
+  <data name="txtLookFor.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name=">>txtLookFor.Name" xml:space="preserve">
+    <value>txtLookFor</value>
+  </data>
+  <data name=">>txtLookFor.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>txtLookFor.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>txtLookFor.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="txtReplaceWith.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtReplaceWith.Location" type="System.Drawing.Point, System.Drawing">
+    <value>90, 32</value>
+  </data>
+  <data name="txtReplaceWith.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 20</value>
+  </data>
+  <data name="txtReplaceWith.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name=">>txtReplaceWith.Name" xml:space="preserve">
+    <value>txtReplaceWith</value>
+  </data>
+  <data name=">>txtReplaceWith.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>txtReplaceWith.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>txtReplaceWith.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="btnFindNext.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnFindNext.Location" type="System.Drawing.Point, System.Drawing">
+    <value>247, 81</value>
+  </data>
+  <data name="btnFindNext.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnFindNext.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="btnFindNext.Text" xml:space="preserve">
+    <value>&Find next</value>
+  </data>
+  <data name=">>btnFindNext.Name" xml:space="preserve">
+    <value>btnFindNext</value>
+  </data>
+  <data name=">>btnFindNext.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnFindNext.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnFindNext.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="btnReplace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnReplace.Location" type="System.Drawing.Point, System.Drawing">
+    <value>85, 110</value>
+  </data>
+  <data name="btnReplace.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnReplace.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="btnReplace.Text" xml:space="preserve">
+    <value>&Replace</value>
+  </data>
+  <data name=">>btnReplace.Name" xml:space="preserve">
+    <value>btnReplace</value>
+  </data>
+  <data name=">>btnReplace.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnReplace.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnReplace.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnReplaceAll.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnReplaceAll.Location" type="System.Drawing.Point, System.Drawing">
+    <value>166, 110</value>
+  </data>
+  <data name="btnReplaceAll.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnReplaceAll.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnReplaceAll.Text" xml:space="preserve">
+    <value>Replace &All</value>
+  </data>
+  <data name=">>btnReplaceAll.Name" xml:space="preserve">
+    <value>btnReplaceAll</value>
+  </data>
+  <data name=">>btnReplaceAll.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnReplaceAll.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnReplaceAll.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="chkMatchWholeWord.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkMatchWholeWord.Location" type="System.Drawing.Point, System.Drawing">
+    <value>178, 58</value>
+  </data>
+  <data name="chkMatchWholeWord.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 17</value>
+  </data>
+  <data name="chkMatchWholeWord.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="chkMatchWholeWord.Text" xml:space="preserve">
+    <value>Match &whole word</value>
+  </data>
+  <data name=">>chkMatchWholeWord.Name" xml:space="preserve">
+    <value>chkMatchWholeWord</value>
+  </data>
+  <data name=">>chkMatchWholeWord.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>chkMatchWholeWord.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>chkMatchWholeWord.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="chkMatchCase.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkMatchCase.Location" type="System.Drawing.Point, System.Drawing">
+    <value>90, 58</value>
+  </data>
+  <data name="chkMatchCase.Size" type="System.Drawing.Size, System.Drawing">
+    <value>82, 17</value>
+  </data>
+  <data name="chkMatchCase.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="chkMatchCase.Text" xml:space="preserve">
+    <value>Match &case</value>
+  </data>
+  <data name=">>chkMatchCase.Name" xml:space="preserve">
+    <value>chkMatchCase</value>
+  </data>
+  <data name=">>chkMatchCase.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>chkMatchCase.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>chkMatchCase.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnHighlightAll.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnHighlightAll.Location" type="System.Drawing.Point, System.Drawing">
+    <value>105, 110</value>
+  </data>
+  <data name="btnHighlightAll.Size" type="System.Drawing.Size, System.Drawing">
+    <value>136, 23</value>
+  </data>
+  <data name="btnHighlightAll.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="btnHighlightAll.Text" xml:space="preserve">
+    <value>Find && highlight &all</value>
+  </data>
+  <data name="btnHighlightAll.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name=">>btnHighlightAll.Name" xml:space="preserve">
+    <value>btnHighlightAll</value>
+  </data>
+  <data name=">>btnHighlightAll.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnHighlightAll.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnHighlightAll.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>247, 110</value>
+  </data>
+  <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name=">>btnCancel.Name" xml:space="preserve">
+    <value>btnCancel</value>
+  </data>
+  <data name=">>btnCancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnCancel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnCancel.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="btnFindPrevious.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnFindPrevious.Location" type="System.Drawing.Point, System.Drawing">
+    <value>157, 81</value>
+  </data>
+  <data name="btnFindPrevious.Size" type="System.Drawing.Size, System.Drawing">
+    <value>84, 23</value>
+  </data>
+  <data name="btnFindPrevious.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="btnFindPrevious.Text" xml:space="preserve">
+    <value>Find pre&vious</value>
+  </data>
+  <data name=">>btnFindPrevious.Name" xml:space="preserve">
+    <value>btnFindPrevious</value>
+  </data>
+  <data name=">>btnFindPrevious.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnFindPrevious.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnFindPrevious.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>334, 145</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Find and replace</value>
+  </data>
+  <data name=">>$this.Name" xml:space="preserve">
+    <value>FindAndReplaceForm</value>
+  </data>
+  <data name=">>$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.Designer.cs	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.Designer.cs	2012-06-11 09:55:40 UTC (rev 6745)
@@ -39,14 +39,9 @@
             this.btnFormat = new System.Windows.Forms.ToolStripButton();
             this.btnValidate = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
-            this.txtFind = new System.Windows.Forms.ToolStripTextBox();
-            this.btnFindNext = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
-            this.txtReplace = new System.Windows.Forms.ToolStripTextBox();
-            this.btnReplaceAll = new System.Windows.Forms.ToolStripButton();
             this.lblCursorPos = new System.Windows.Forms.ToolStripLabel();
+            this.btnFind = new System.Windows.Forms.ToolStripButton();
+            this.btnFindAndReplace = new System.Windows.Forms.ToolStripButton();
             this.resDataCtrl = new Maestro.Editors.Generic.ResourceDataPanel();
             this.nodeNumericUpDown1 = new Aga.Controls.Tree.NodeControls.NodeNumericUpDown();
             this.txtXmlContent = new ICSharpCode.TextEditor.TextEditorControl();
@@ -56,23 +51,18 @@
             // toolStrip1
             // 
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-                                    this.btnUndo,
-                                    this.toolStripSeparator1,
-                                    this.btnCopy,
-                                    this.btnCut,
-                                    this.btnPaste,
-                                    this.toolStripSeparator2,
-                                    this.btnFormat,
-                                    this.btnValidate,
-                                    this.toolStripSeparator3,
-                                    this.toolStripLabel1,
-                                    this.txtFind,
-                                    this.btnFindNext,
-                                    this.toolStripSeparator4,
-                                    this.toolStripLabel3,
-                                    this.txtReplace,
-                                    this.btnReplaceAll,
-                                    this.lblCursorPos});
+            this.btnUndo,
+            this.toolStripSeparator1,
+            this.btnCopy,
+            this.btnCut,
+            this.btnPaste,
+            this.toolStripSeparator2,
+            this.btnFormat,
+            this.btnValidate,
+            this.toolStripSeparator3,
+            this.lblCursorPos,
+            this.btnFind,
+            this.btnFindAndReplace});
             resources.ApplyResources(this.toolStrip1, "toolStrip1");
             this.toolStrip1.Name = "toolStrip1";
             // 
@@ -139,49 +129,26 @@
             this.toolStripSeparator3.Name = "toolStripSeparator3";
             resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
             // 
-            // toolStripLabel1
-            // 
-            this.toolStripLabel1.Name = "toolStripLabel1";
-            resources.ApplyResources(this.toolStripLabel1, "toolStripLabel1");
-            // 
-            // txtFind
-            // 
-            this.txtFind.Name = "txtFind";
-            resources.ApplyResources(this.txtFind, "txtFind");
-            // 
-            // btnFindNext
-            // 
-            resources.ApplyResources(this.btnFindNext, "btnFindNext");
-            this.btnFindNext.Name = "btnFindNext";
-            this.btnFindNext.Click += new System.EventHandler(this.btnFindNext_Click);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
-            // 
-            // toolStripLabel3
-            // 
-            this.toolStripLabel3.Name = "toolStripLabel3";
-            resources.ApplyResources(this.toolStripLabel3, "toolStripLabel3");
-            // 
-            // txtReplace
-            // 
-            this.txtReplace.Name = "txtReplace";
-            resources.ApplyResources(this.txtReplace, "txtReplace");
-            // 
-            // btnReplaceAll
-            // 
-            resources.ApplyResources(this.btnReplaceAll, "btnReplaceAll");
-            this.btnReplaceAll.Name = "btnReplaceAll";
-            this.btnReplaceAll.Click += new System.EventHandler(this.btnReplaceAll_Click);
-            // 
             // lblCursorPos
             // 
             this.lblCursorPos.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.lblCursorPos.Name = "lblCursorPos";
             resources.ApplyResources(this.lblCursorPos, "lblCursorPos");
             // 
+            // btnFind
+            // 
+            this.btnFind.Image = global::Maestro.Editors.Properties.Resources.magnifier_left;
+            resources.ApplyResources(this.btnFind, "btnFind");
+            this.btnFind.Name = "btnFind";
+            this.btnFind.Click += new System.EventHandler(this.btnFind_Click);
+            // 
+            // btnFindAndReplace
+            // 
+            this.btnFindAndReplace.Image = global::Maestro.Editors.Properties.Resources.magnifier_left;
+            resources.ApplyResources(this.btnFindAndReplace, "btnFindAndReplace");
+            this.btnFindAndReplace.Name = "btnFindAndReplace";
+            this.btnFindAndReplace.Click += new System.EventHandler(this.btnFindAndReplace_Click);
+            // 
             // resDataCtrl
             // 
             this.resDataCtrl.ContentBackgroundColor = System.Drawing.SystemColors.Control;
@@ -194,22 +161,22 @@
             // nodeNumericUpDown1
             // 
             this.nodeNumericUpDown1.Increment = new decimal(new int[] {
-                                    1,
-                                    0,
-                                    0,
-                                    0});
+            1,
+            0,
+            0,
+            0});
             this.nodeNumericUpDown1.IncrementalSearchEnabled = true;
             this.nodeNumericUpDown1.LeftMargin = 3;
             this.nodeNumericUpDown1.Maximum = new decimal(new int[] {
-                                    100,
-                                    0,
-                                    0,
-                                    0});
+            100,
+            0,
+            0,
+            0});
             this.nodeNumericUpDown1.Minimum = new decimal(new int[] {
-                                    0,
-                                    0,
-                                    0,
-                                    0});
+            0,
+            0,
+            0,
+            0});
             this.nodeNumericUpDown1.ParentColumn = null;
             // 
             // txtXmlContent
@@ -230,6 +197,7 @@
             this.toolStrip1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
+
         }
         private Aga.Controls.Tree.NodeControls.NodeNumericUpDown nodeNumericUpDown1;
 
@@ -246,14 +214,9 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton btnValidate;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
-        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
-        private System.Windows.Forms.ToolStripTextBox txtFind;
-        private System.Windows.Forms.ToolStripButton btnFindNext;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripButton btnReplaceAll;
-        private System.Windows.Forms.ToolStripLabel toolStripLabel3;
-        private System.Windows.Forms.ToolStripTextBox txtReplace;
         private System.Windows.Forms.ToolStripLabel lblCursorPos;
         private System.Windows.Forms.ToolStripButton btnFormat;
+        private System.Windows.Forms.ToolStripButton btnFind;
+        private System.Windows.Forms.ToolStripButton btnFindAndReplace;
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2012-06-11 09:55:40 UTC (rev 6745)
@@ -57,11 +57,12 @@
         public XmlEditorCtrl()
         {
             InitializeComponent();
-            //txtXmlContent.MaxLength = int.MaxValue;
             txtXmlContent.SetHighlighting("XML");
+            txtXmlContent.EnableFolding = true;
             txtXmlContent.ShowInvalidLines = true;
             txtXmlContent.ShowSpaces = true;
             txtXmlContent.ShowTabs = true;
+            txtXmlContent.LineViewerStyle = LineViewerStyle.FullRow;
             txtXmlContent.TextChanged += new EventHandler(OnTextContentChanged);
         }
         
@@ -70,7 +71,10 @@
         private void OnTextContentChanged(object sender, EventArgs e)
         {
             if (!string.IsNullOrEmpty(_origText) && !txtXmlContent.Text.Equals(_origText))
+            {
                 OnResourceChanged();
+                EvaluateCommands();
+            }
                 
             if (string.IsNullOrEmpty(_origText))
                 _origText = txtXmlContent.Text;
@@ -148,7 +152,8 @@
             set 
             {
                 _origText = null;            
-                txtXmlContent.Text = value; //FormatText();
+                txtXmlContent.Text = value;
+                FormatText();
             }
         }
 
@@ -157,90 +162,6 @@
             txtXmlContent.Undo();
         }
 
-        private void btnFindNext_Click(object sender, EventArgs e)
-        {
-            String szFind = txtFind.Text;
-            if (String.IsNullOrEmpty(szFind))
-            {
-                MessageBox.Show(this, Properties.Resources.FindEmptyString, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                txtFind.Focus();
-                return;
-            }
-            FindAndReplace(szFind, null);
-        }
-
-        private void btnReplaceAll_Click(object sender, EventArgs e)
-        {
-            if (txtFind.Text.Length == 0)
-                MessageBox.Show(Properties.Resources.FindReplaceNothing);
-
-            FindAndReplace(txtFind.Text, txtReplace.Text);
-        }
-
-        /// <summary>
-        /// Finds and replaces the specified search string with the specified replacement string
-        /// </summary>
-        /// <param name="szFind">The search string.</param>
-        /// <param name="szReplace">The replacement string.</param>
-        public void FindAndReplace(string szFind, string szReplace)
-        {
-            var textEditor = txtXmlContent;
-            
-            var selections = textEditor.ActiveTextAreaControl.TextArea.SelectionManager.SelectionCollection;
-            // find start 
-            int iStartSearching = -1;
-            if (selections.Count > 0)
-                iStartSearching++;
-
-            System.Text.RegularExpressions.Regex regexThis = new System.Text.RegularExpressions.Regex(szFind, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
-            System.Text.RegularExpressions.Match matchThis = regexThis.Match(textEditor.Text, iStartSearching);
-
-            // look by regex, then simple find
-            String szFindInstance = "";
-            if (matchThis.Success)
-            {
-                int iRegExStart = matchThis.Index;
-                int iRegExLength = matchThis.Length;
-
-                // TODO: this is a rubbish hack for single occurrance - there is probably a better RegEx way to find/replace
-                szFindInstance = matchThis.ToString();
-            }
-            else
-            {
-                if (textEditor.Text.IndexOf(szFind, iStartSearching, StringComparison.OrdinalIgnoreCase) < 0)
-                {
-                    MessageBox.Show(this, Properties.Resources.FindNothing, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                    return;
-                }
-                szFindInstance = szFind;
-            }
-
-            String szHighlight;
-            if (String.IsNullOrEmpty(szReplace))
-                szHighlight = szFindInstance;
-            else
-            {
-                textEditor.Text = textEditor.Text.Replace(szFindInstance, szReplace);
-                szHighlight = szReplace;
-            }
-
-            int iFound = textEditor.Text.IndexOf(szHighlight, iStartSearching);
-            if (iFound > -1)
-            {
-                /*
-                //textEditor.Select(iFound, szHighlight.Length);
-                var doc = GetDocument();
-                
-                textEditor.ActiveTextAreaControl.SelectionManager.SelectedText 
-                UpdateTextPosition();
-                //textEditor.ScrollToCaret();
-                */
-
-                //if (!String.IsNullOrEmpty(szReplace) && _ready)
-                //    OnResourceChanged();
-            }
-        }
-        
         private IDocument GetDocument()
         {
             return txtXmlContent.ActiveTextAreaControl.Document;
@@ -328,34 +249,16 @@
 
         private void FormatText()
         {
-            string content = null;
-            if (string.IsNullOrEmpty(txtXmlContent.Text.Trim()))
+            if (string.IsNullOrEmpty(txtXmlContent.Text))
                 return;
-            try
-            {
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(txtXmlContent.Text);
 
-                using (var ms = new MemoryStream())
-                {
-                    using (var sw = new StreamWriter(ms))
-                    {
-                        var writer = XmlWriter.Create(sw, new XmlWriterSettings() { Encoding = Encoding.UTF8, Indent = true });
-                        doc.Save(writer);
-
-                        content = Encoding.UTF8.GetString(ms.GetBuffer());
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(NestedExceptionMessageProcessor.GetFullMessage(ex), Properties.Resources.TitleError, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            if (!string.IsNullOrEmpty(content))
-            {
-                txtXmlContent.Text = content;
-            }
+            System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
+            doc.LoadXml(txtXmlContent.Text);
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            System.Xml.XmlWriter xw = System.Xml.XmlTextWriter.Create(sb, new System.Xml.XmlWriterSettings() { Indent = true });
+            doc.WriteTo(xw);
+            xw.Flush();
+            txtXmlContent.Text = sb.ToString();
         }
 
         /// <summary>
@@ -398,6 +301,27 @@
         {
             txtXmlContent.ActiveTextAreaControl.TextArea.ClipboardHandler.Paste(this, EventArgs.Empty);
         }
+
+        private XmlEditor.FindAndReplaceForm _findForm = new XmlEditor.FindAndReplaceForm();
+
+        private void btnFind_Click(object sender, EventArgs e)
+        {
+            var editor = txtXmlContent;
+            if (editor == null) return;
+            _findForm.ShowFor(editor, false);
+        }
+
+        private void btnFindAndReplace_Click(object sender, EventArgs e)
+        {
+            var editor = txtXmlContent;
+            if (editor == null) return;
+            _findForm.ShowFor(editor, true);
+        }
+
+        public void FindAndReplace(string find, string replace)
+        {
+            _findForm.FindAndReplace(find, replace);
+        }
     }
     
 	/// <summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.resx	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.resx	2012-06-11 09:55:40 UTC (rev 6745)
@@ -184,74 +184,27 @@
   <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
     <value>6, 25</value>
   </data>
-  <data name="toolStripLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 22</value>
+  <data name="lblCursorPos.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 22</value>
   </data>
-  <data name="toolStripLabel1.Text" xml:space="preserve">
-    <value>Find</value>
-  </data>
-  <data name="txtFind.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
-  </data>
-  <data name="btnFindNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGFSURBVDhPY2CgBbCf93Km3dwXZ2AYxCfJHtsZj89MefD/
-        f//tf/8n3///H8QnyQDLaQ/PdF7987/6+I//HVf+/AfxSTLApO/mmcazP/7n7vz0v/709/8gPkkG6Hde
-        OVN9/Ov/tE3v/lcd+/ofxCfJAK2ms2dKD378H774/v/0zU/+g/gkGaBadfRM4tq7/10mnPkfu/LOfxAf
-        rwEyhXtmyhfvO4OMI1bf+2835eL/0JV3/6PLgdSjGCiRsy1GMnvbmZyjH//7bHj+33v9s/+2Sx7+N5h1
-        57/14gf/XVc/+e+y6sn/kK0v/4PUgdRjuEgseV2MSMr6M2GHPv+XW/wSAztvf/8fJA9Sh9M7vHErY3hi
-        lp+xO/DzP9/qr3BsuOvHf5A4SJ5gYHJHLI7hCl90RmP/v/9MG//9V9rz7z+IDxInqBmmgMmmPIY1cM4Z
-        qd3//4NoEJ8YzaxARbJAbATExkxGSSVMvjPOgGgQH4qVgDQHLsOYgRL8QCwJxFI4sCBQnAXZAADCr+rk
-        1StEiAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnFindNext.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="btnFind.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
   </data>
-  <data name="btnFindNext.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 22</value>
+  <data name="btnFind.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 22</value>
   </data>
-  <data name="btnFindNext.Text" xml:space="preserve">
-    <value>Next</value>
+  <data name="btnFind.Text" xml:space="preserve">
+    <value>Find</value>
   </data>
-  <data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>6, 25</value>
-  </data>
-  <data name="toolStripLabel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>48, 22</value>
-  </data>
-  <data name="toolStripLabel3.Text" xml:space="preserve">
-    <value>Replace</value>
-  </data>
-  <data name="txtReplace.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
-  </data>
-  <data name="btnReplaceAll.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGFSURBVDhPY2CgBbCf93Km3dwXZ2AYxCfJHtsZj89MefD/
-        f//tf/8n3///H8QnyQDLaQ/PdF7987/6+I//HVf+/AfxSTLApO/mmcazP/7n7vz0v/709/8gPkkG6Hde
-        OVN9/Ov/tE3v/lcd+/ofxCfJAK2ms2dKD378H774/v/0zU/+g/gkGaBadfRM4tq7/10mnPkfu/LOfxAf
-        rwEyhXtmyhfvO4OMI1bf+2835eL/0JV3/6PLgdSjGCiRsy1GMnvbmZyjH//7bHj+33v9s/+2Sx7+N5h1
-        57/14gf/XVc/+e+y6sn/kK0v/4PUgdRjuEgseV2MSMr6M2GHPv+XW/wSAztvf/8fJA9Sh9M7vHErY3hi
-        lp+xO/DzP9/qr3BsuOvHf5A4SJ5gYHJHLI7hCl90RmP/v/9MG//9V9rz7z+IDxInqBmmgMmmPIY1cM4Z
-        qd3//4NoEJ8YzaxARbJAbATExkxGSSVMvjPOgGgQH4qVgDQHLsOYgRL8QCwJxFI4sCBQnAXZAADCr+rk
-        1StEiAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnReplaceAll.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="btnFindAndReplace.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
     <value>Magenta</value>
   </data>
-  <data name="btnReplaceAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 22</value>
+  <data name="btnFindAndReplace.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 22</value>
   </data>
-  <data name="btnReplaceAll.Text" xml:space="preserve">
-    <value>Replace All</value>
+  <data name="btnFindAndReplace.Text" xml:space="preserve">
+    <value>Find/Replace</value>
   </data>
-  <data name="lblCursorPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 22</value>
-  </data>
   <data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -389,54 +342,24 @@
   <data name=">>toolStripSeparator3.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name=">>toolStripLabel1.Name" xml:space="preserve">
-    <value>toolStripLabel1</value>
+  <data name=">>lblCursorPos.Name" xml:space="preserve">
+    <value>lblCursorPos</value>
   </data>
-  <data name=">>toolStripLabel1.Type" xml:space="preserve">
+  <data name=">>lblCursorPos.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name=">>txtFind.Name" xml:space="preserve">
-    <value>txtFind</value>
+  <data name=">>btnFind.Name" xml:space="preserve">
+    <value>btnFind</value>
   </data>
-  <data name=">>txtFind.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name=">>btnFindNext.Name" xml:space="preserve">
-    <value>btnFindNext</value>
-  </data>
-  <data name=">>btnFindNext.Type" xml:space="preserve">
+  <data name=">>btnFind.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name=">>toolStripSeparator4.Name" xml:space="preserve">
-    <value>toolStripSeparator4</value>
+  <data name=">>btnFindAndReplace.Name" xml:space="preserve">
+    <value>btnFindAndReplace</value>
   </data>
-  <data name=">>toolStripSeparator4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name=">>toolStripLabel3.Name" xml:space="preserve">
-    <value>toolStripLabel3</value>
-  </data>
-  <data name=">>toolStripLabel3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name=">>txtReplace.Name" xml:space="preserve">
-    <value>txtReplace</value>
-  </data>
-  <data name=">>txtReplace.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name=">>btnReplaceAll.Name" xml:space="preserve">
-    <value>btnReplaceAll</value>
-  </data>
-  <data name=">>btnReplaceAll.Type" xml:space="preserve">
+  <data name=">>btnFindAndReplace.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name=">>lblCursorPos.Name" xml:space="preserve">
-    <value>lblCursorPos</value>
-  </data>
-  <data name=">>lblCursorPos.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name=">>nodeNumericUpDown1.Name" xml:space="preserve">
     <value>nodeNumericUpDown1</value>
   </data>

Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-06-11 09:55:40 UTC (rev 6745)
@@ -635,6 +635,12 @@
     <Compile Include="Generic\XmlEditorCtrl.Designer.cs">
       <DependentUpon>XmlEditorCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Generic\XmlEditor\FindAndReplaceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Generic\XmlEditor\FindAndReplaceForm.designer.cs">
+      <DependentUpon>FindAndReplaceForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Generic\XmlValidationResult.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1519,6 +1525,9 @@
       <DependentUpon>XmlEditorCtrl.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Generic\XmlEditor\FindAndReplaceForm.resx">
+      <DependentUpon>FindAndReplaceForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Generic\XmlValidationResult.resx">
       <DependentUpon>XmlValidationResult.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -2301,7 +2310,7 @@
     <Content Include="OdbcDriverMap.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="Resources\layer--minus1.png" />
+    <None Include="Resources\magnifier-left.png" />
     <None Include="Resources\icon_maptip_disabled.gif" />
     <None Include="Resources\icon_maptip.gif" />
     <None Include="Resources\layers-stack.png" />

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-06-11 09:55:40 UTC (rev 6745)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -2236,6 +2236,13 @@
             }
         }
         
+        internal static System.Drawing.Bitmap magnifier_left {
+            get {
+                object obj = ResourceManager.GetObject("magnifier-left", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap map {
             get {
                 object obj = ResourceManager.GetObject("map", resourceCulture);
@@ -3210,6 +3217,78 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Find.
+        /// </summary>
+        internal static string TextFind {
+            get {
+                return ResourceManager.GetString("TextFind", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Find & Replace.
+        /// </summary>
+        internal static string TextFindAndReplace {
+            get {
+                return ResourceManager.GetString("TextFindAndReplace", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No Occurences Found.
+        /// </summary>
+        internal static string TextNoOccurrencesFound {
+            get {
+                return ResourceManager.GetString("TextNoOccurrencesFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No string specified to look for!.
+        /// </summary>
+        internal static string TextNoStringSpecifiedToLookFor {
+            get {
+                return ResourceManager.GetString("TextNoStringSpecifiedToLookFor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Text Not Found.
+        /// </summary>
+        internal static string TextNotFound {
+            get {
+                return ResourceManager.GetString("TextNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Replaced {0} occurrances.
+        /// </summary>
+        internal static string TextOccurrencesReplaced {
+            get {
+                return ResourceManager.GetString("TextOccurrencesReplaced", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search Text Not Found.
+        /// </summary>
+        internal static string TextSearchTextNotFound {
+            get {
+                return ResourceManager.GetString("TextSearchTextNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to (Selection Only).
+        /// </summary>
+        internal static string TextSelectionOnly {
+            get {
+                return ResourceManager.GetString("TextSelectionOnly", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Uploading.
         /// </summary>
         internal static string TextUploading {

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-06-11 05:08:32 UTC (rev 6744)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-06-11 09:55:40 UTC (rev 6745)
@@ -120,8 +120,8 @@
   <data name="OdbcDriverAccess" xml:space="preserve">
     <value>{Microsoft Access Driver (*.mdb)}</value>
   </data>
-  <data name="PackageBuildError" xml:space="preserve">
-    <value>An error occured while building package: {0}</value>
+  <data name="Func_LOOKUP_DefaultValueDescription" xml:space="preserve">
+    <value>Default value returned if expression does not evaluate to any of the keys</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="blueprints" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -140,31 +140,9 @@
         Ab7ReT9BDLTyAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="ParameterOverrideExists" xml:space="preserve">
-    <value>Parameter Override already specified</value>
+  <data name="SelectProperty" xml:space="preserve">
+    <value>Select Property</value>
   </data>
-  <data name="icon_plotdwf_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIecAP7+/rW6x9PW48TD1uHg6ba6x////8HBxMTFyMC/wrK+y/r6+v39/cTD173JyMLG
-        0fT09/P09d3d5qGprPX3+MPFxtXW2dLT1vj4+JOjqcXFxujo6OLk5+Dl58TFyba7x8fIy7a6xuDi4+Li
-        4drb3cHG0Onp6cLP29vb3u7w8ODg6LG2utjc4IeSk+Tx6dTr5dLV4urq6palqp2ho6ezwL69vrTBz8TD
-        1ebu9rvI1Lq+vKSvvdzm89XY3r+/wtLV2PX3+dTX3tHQ3Ymbj+Lk6b/KxOvt8PD1+bS5xvz9/aGvvPX3
-        98LOzLa6yJ+suuvr66CsurzKyM7Q0OHf6NHT1uzu8sTGyb3KyMrKztLX5M3L2b2+wdbY3O3u8sTGyODg
-        6cbIyNrb4Le9v8rLzrq+y5GunKvMuNna3eHi5fDx8qayu7u7vpShq/Py9fX19ZKop8LU2Jmps+nq67TN
-        x5eosPn6++/1+bO/zKCsu/T398XR36Goqp+rutbX2r/AwdHe6tPW5O3v787M2sfL1fz8/K22v/X199ze
-        4t3c5rW6xr/Dz/n5+c7Q0cnKzdze5MTGyoaSiJenndPW4o+ul+Df6MDAxL3BzcHDxcvX1Jyws8XD142g
-        lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACcACwAAAAAEAAQAAAI8QA5CRwoEJODKHcUMElBcOCCQA5c
-        2OFx4k0GDAMNCRkw4MqLIzj+5NgEaQUnQVoGAACwqMMcM3D0KJDRYganBitXMoBQZFKZTDTwsNlz8wkA
-        AwAYAOAQaQgdJTvUiBGoKacBFQR0TIhTyIYTNwNvACBA4EsYDzU08IEih2AASlO4gNjiBwaYNX0GEioR
-        4MClClIESKKQ5wKZgQWojAEkQoCAJUDONDoQADGAQxayAEBBAkGCEAESDQzAAkAVNF6sPEIgIc0GLKN7
-        dEnwIwAjRBGSmBBgaSCRD0Yq+QjQpE4MRUHaNFzwAEkBTiMGOWrIKSAAOw==
-</value>
-  </data>
   <data name="TitleError" xml:space="preserve">
     <value>Error</value>
   </data>
@@ -182,11 +160,6 @@
         /ltycf5WuDgTZ9+86lPm38A/lieNoGpgVUMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="FunctionTooltip" xml:space="preserve">
-    <value>Function: {1}({2})
-Description: {3}
-Returns: {0}</value>
-  </data>
   <data name="Func_URLENCODE_StringValueDescription" xml:space="preserve">
     <value>String to URL encode</value>
   </data>
@@ -267,6 +240,21 @@
         CBiQGI2CFwokMhAwuXLFzZ3RBAQAOw==
 </value>
   </data>
+  <data name="icon_printablepage_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZsAO7y9pKaptzi6LC5xtra4P39/f///6qrsqmqsdbX26+xuN/j6O/v8qurs9HT3ff4
+        +f7+/qmrsr6/xvj4+bi4vaqrs8TFzqyrs7q9wb/CyL2+w+zs7bW2vO3v8dLT3rW2vcHEzLu7wOrs7cPG
+        zfP09crM0/X298/R2sTGyre2vP39/qystNva3sbGycbHy7q9wuLk6fr6+8bJ0eHj6LGxt6mrsejp7Pv7
+        +8/Q0bu9w7i4vry8wtrc4N3g5s/Q0vT198PDy729wtvc4e3t77CxuNzd4vz8/M/R27q9xb6+xvb3+L7A
+        w7S0vuDg5ayut/Lz9NXV1ubn7N7g5czMz+Tl59vc38DBxMXGydTW3M7R27Cvt7i5v/z8+87O0fn5+vLz
+        9fr7+6yttLi5wMHCx8PEzaiqsdXV2Ozs8aqqscTFyNfX29LT1////wAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABsACwAAAAAEAAQAAAI1gDZCBQ4oKDBggMTshlgoGHDAQACKPSxREcQABgBQBQgkQ0OK1OGFDBzJeNG
+        jim6bDBQ4EaBHSYDyAwAhQOEAmC8KKHSIqOAnxI1oIgxwcQXAiEyYuQo8MMEAlAJMBHzwmfHMVATaFVQ
+        BMaWpRIjjACSAIkCBSWSFKhCAwDHBj24SMigAAuDMz86sNDiNsAKB1JUSHjygAeGAzkQpAGK4IiDKCRA
+        1EDgYYYIIjMDlMlygoEMJ00gGCnw4AKFBajZNDgQoQKCMEJsuDhgQY1ChWgOkFmjMCAAOw==
+</value>
+  </data>
   <data name="plus-circle" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -298,6 +286,16 @@
   <data name="AggregateQuery" xml:space="preserve">
     <value>Aggregate Query</value>
   </data>
+  <data name="icon_buffer" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQAAEZCU1KTygpgs6jS54Sv2XuSpTJ6wL/e65jI40mOyObv92Wfz7LX6Iy+3hlquKXM
+        4rjb6leVykqUxY2bqK7V6JzK5Gih0FuazVCSybzd6sTh66TQ5mme0f///wAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBBwAdACwAAAAAEAAQAAAIoQA7KODgwAABBR0SKlxIIAKCBhEEKFRAwIBBhAYaFACw
+        IYHEDgIiNIDIoUNGACgHeBSQYACAAhUcdCBwwWXKAThRAmhgQCBLCjopAEVJ4QIBhQIwDNUJgAIGAQiR
+        MmDAlMHThQkFTNVp9eNCAQEg6IQQwGtCBWAz6MxQFuvMBQd0Hojo1uQDnRro1jXwYAKAvGaxErAA4YGF
+        wFgHFjxYN2FAADs=
+</value>
+  </data>
   <data name="LayerGroupConvertedToBaseLayerGroup" xml:space="preserve">
     <value>Layer Group ({0}) successfully converted to Base Layer Group ({1})</value>
   </data>
@@ -384,6 +382,21 @@
         DQcyVhUrogSACxoKeFDrsOJDARNOAsV4QIAKtQwDIwwIADs=
 </value>
   </data>
+  <data name="icon_zoomout" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZ6AG1LJgE0ZkV2qN7s9bK8xuqvdtfk7LOcjH+AgLrK25i1019fX6OmqdDc41lZWV1d
+        XcnV4XF3fJrU5Xp6emVlZbHE2Y6QkY+Rk7DE2ZGkuLvJ2MjV4VlZWmZmZlpbW8PP3XmTsLHN3rGai5ux
+        yYWFhajN32NobG5vcOz0+a+vr6ewuYGYstzq9LW8weXx993r9WSHraDP4VxcXJ641IeHh3uFj5qzzn6a
+        uF9hY6rK3YepxarA19bk7ouLi5230rnAxdLe56m80ZKYodjm8M3a5nplTnt7e3Jyctfl7/z9/dLg6tPh
+        65m108HP3aurq5vO4mlpabvM3M7b58fHx1xdXoCAgG5ubometKy/zoeNkkZJTGdrb1tcXczZ5cfU4MvL
+        y7GxsXFxcae+12NjZJOluLHJ25yvwcva5lJrhePv9ZKov9He6aHE28PQ3WJjZGRkZKC61WNjY2mGp21+
+        kaS2x3d4eH5/gHyWsaW911dXVwAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AAB6ACwAAAAAEAAQAAAIxgD1CPwyQUYeB1DACFy4kAYFBg0GGPiB4AhDgSTqGBgw4MWQJVIuVGE45Y2B
+        JChYIFFCZMMHOykWGmEwwEUaHmu6eGmSQEWYhQsiChhKVACGIAsWOhhwJoDTpwHEwHmw8AEQLHQgtIkS
+        IgeeGSPiLLTSwkwGDQnKlIjxRIGQHgudICBzRU2FHWwk6LAx5mKHCCtA3PDBRAEaNxZEXDxhYo4cGHdq
+        UNFSpMCBi1lweODAZYseAgAAWL5I+nPo0aUZghad+uLqgAA7
+</value>
+  </data>
   <data name="OperationCompleted" xml:space="preserve">
     <value>Operation Completed</value>
   </data>
@@ -396,6 +409,10 @@
   <data name="UnitsKb" xml:space="preserve">
     <value>KB</value>
   </data>
+  <data name="TooMuchDataWarning" xml:space="preserve">
+    <value>The selected column contains more than {0} different values.
+The calculated averages only accounts for the first {0} distinct values.</value>
+  </data>
   <data name="icon_home" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZZAFJ5osvLxjZHVTdPa6C9zcOlRMjl9pa65GqZz3CLpPb4+f///329mg2RUJy1yE91
@@ -423,33 +440,29 @@
         IAGFBAsYaM4cEAA7
 </value>
   </data>
-  <data name="icon_zoomout" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZ6AG1LJgE0ZkV2qN7s9bK8xuqvdtfk7LOcjH+AgLrK25i1019fX6OmqdDc41lZWV1d
-        XcnV4XF3fJrU5Xp6emVlZbHE2Y6QkY+Rk7DE2ZGkuLvJ2MjV4VlZWmZmZlpbW8PP3XmTsLHN3rGai5ux
-        yYWFhajN32NobG5vcOz0+a+vr6ewuYGYstzq9LW8weXx993r9WSHraDP4VxcXJ641IeHh3uFj5qzzn6a
-        uF9hY6rK3YepxarA19bk7ouLi5230rnAxdLe56m80ZKYodjm8M3a5nplTnt7e3Jyctfl7/z9/dLg6tPh
-        65m108HP3aurq5vO4mlpabvM3M7b58fHx1xdXoCAgG5ubometKy/zoeNkkZJTGdrb1tcXczZ5cfU4MvL
-        y7GxsXFxcae+12NjZJOluLHJ25yvwcva5lJrhePv9ZKov9He6aHE28PQ3WJjZGRkZKC61WNjY2mGp21+
-        kaS2x3d4eH5/gHyWsaW911dXVwAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AAB6ACwAAAAAEAAQAAAIxgD1CPwyQUYeB1DACFy4kAYFBg0GGPiB4AhDgSTqGBgw4MWQJVIuVGE45Y2B
-        JChYIFFCZMMHOykWGmEwwEUaHmu6eGmSQEWYhQsiChhKVACGIAsWOhhwJoDTpwHEwHmw8AEQLHQgtIkS
-        IgeeGSPiLLTSwkwGDQnKlIjxRIGQHgudICBzRU2FHWwk6LAx5mKHCCtA3PDBRAEaNxZEXDxhYo4cGHdq
-        UNFSpMCBi1lweODAZYseAgAAWL5I+nPo0aUZghad+uLqgAA7
-</value>
+  <data name="TitleNewFeatureClass" xml:space="preserve">
+    <value>New Feature Class</value>
   </data>
-  <data name="OperationCancelled" xml:space="preserve">
-    <value>Operation Cancelled</value>
-  </data>
   <data name="NoFolderSelected" xml:space="preserve">
     <value>You have not selected a starting folder, do you want to back up the entire site?</value>
   </data>
-  <data name="ExportNoCommandsSelected" xml:space="preserve">
-    <value>No commands selected. Nothing to export</value>
+  <data name="application_browser" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACiklEQVQ4T6WUXUiTURiAT3rl
+        heBNXQTdCGF2E+1qUIwkiwwsleyHfonUrAhCMTAKE7xINCORgnSslqYNZSmJusrQnH9zttraVkNJdLOt
+        uaWbzrH19H1eBF2aLzycc97D8/KeA+cIQGwEkZ+fnypxSqJwnchOqsjLyzttNBqtLpcLp9OBzWbDYvmI
+        yWRiZGQEaY+hIZlRaT7B8LCF8XE7PT0frLIrcnJyig0GA319fVKyh+7ubrq6utDr9XR0dKDT6WhtbaWl
+        pQWtVotGo0GtVtPY2EhiYmKhfIQi6Q7+K2RX5ObmXo7H48RisX8Ir8YwTC1T1h8kX7/Awbafa6O8lvPL
+        0TiyK7Kzs69Eo1EikchfvnnDFHS6uaB3Uz/qp/XLIp3ORSYXY7z6vsLVXh+FXR5kV2RlZV1bWVkhFAqt
+        YZ8LcPL5VyoMs+jsAUyS1Gz7xRNzAKM3gj0K9lVQfw6yufxdm8jMzLy+tLREIBBg3rfAuSYzd3qmuTfo
+        oc8TkQr8ptkaoF3qYPBHhLFgjLEwGEOQeNfxXqhUqhvBYBCfz4fug5Ps+wOcb/vK5c5pnjpDVL6b5fbb
+        WV44luj3w53XLrRSvmMeEkqNA0KpVJb4/X7cbjeXHvZSrLVwSG3ngMbBUa2DEy9dnG2folg/zRnNJ47U
+        j1JniVIuVUso6BwSCoWizOv1MjMzw76SZ5R2z5PRYGVX3QTKx1b2PLGiarSxt2GSc+1ubg7FuWYIo6oz
+        s+m4ekSkpaXdktv3eDwoCh6hrHjDfvUc26tG2VEzQXqNmZ21ZtKrx1FUm1E9sHOsPcy20l7E4dpxkZyc
+        XJSSklIlIzIqTeti98UmIUWSxBaJretEdpI29JTlb+APrpaoVzbDpskAAAAASUVORK5CYII=
+</value>
   </data>
-  <data name="UnsupportedConnectionType" xml:space="preserve">
-    <value>Invoking MgCooker is not supported for this connection type: {0}</value>
-  </data>
   <data name="icon_back" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIUmABQ1Z7S/z3GFo5TY9aXb8YO37oC06oa78oCz6Ya68Y3B96HF64q+9YW58Im99Xer
@@ -461,8 +474,8 @@
         smYnBgQAOw==
 </value>
   </data>
-  <data name="FileDownloaded" xml:space="preserve">
-    <value>File Downloaded to {0}</value>
+  <data name="FsPostgreSql" xml:space="preserve">
+    <value>PostgreSQL/PostGIS Feature Source</value>
   </data>
   <data name="SpatialContextsFound" xml:space="preserve">
     <value>{0} spatial contexts found</value>
@@ -517,9 +530,24 @@
   <data name="TitleQuestion" xml:space="preserve">
     <value>Question</value>
   </data>
+  <data name="icon_null" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIECANji87HH6f///wAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAACACwAAAAAEAAQ
+        AAAIRAAFCBxIsKDBgwYDKFzIUCHBAAAiSpwY4OHEiwAqDoSIUaJGgRw7ZrQocuTGkiZBovwoIGRHli4x
+        wlz5sKFNhDhzHgwIADs=
+</value>
+  </data>
   <data name="Func_ARGB_GValueDescription" xml:space="preserve">
     <value>Green value</value>
   </data>
+  <data name="icon_measure" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQSAHFCCr2NKldCE9ajLmddJf7nWp3M3BJEd005EQGM5AGK4wGN4QEzZgGK5QE1ZwI0
+        ZQE0awE1Zf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAASACwAAAAAEAAQAAAIWgAlCBxIsKDBgwgTDlSQAIIEAwYeRoQogSGEBgsiSDhw
+        YGNHjhIwRnjAwIFCkiYVqlzJUsIAAS9jwpwpswABmzhv6swZAEGAnz6B/uz5E4DRo0iTAmjJtOnAgAA7
+</value>
+  </data>
   <data name="OutputFileMissing" xml:space="preserve">
     <value>You must enter a full path to the output file</value>
   </data>
@@ -556,6 +584,24 @@
         rkJggg==
 </value>
   </data>
+  <data name="map--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACt0lEQVQ4T52ROU8TUACA32bQ
+        H6BxI+qgJqjEwRgHBhMHxcQoCwNLxSJYiiC0QcALRQIFIodURYW0hoKglSuAnGIVbL2g1gMFpAWRiCKF
+        QkA+34txMg76ki9v+b53iohTp8IlR/6D8EMZGUIcTE/X8h9DdRIhDqSmxizLBaw9adzpO0/PQBHuQSvO
+        wRYs/QNk9noxdvs43uxDV+cjttaH8lUnEWK/wRC7tLzMjfYUWgdN9HrN9HnMTAXaeTXzhspxPxkOH+fc
+        kOaEWLsP5atOIsTepKS4hR8/MDcfp95zgfYPBTQ/NfFp5i6Tcw4efx0h58kQ2W/h9Es4VjeK8lUnEWKP
+        Xq8LLC1RVBfHlZZEKjpTsbuy6HhRwMvXFfS+aaTS4+GsY5iUjhH0TSMoX3USIXbHxcX7FxfJr4mh0nkS
+        +8A5LF0neTRaytCUjS9zbbS527CNf8f0fpnE1mGUrzqJEGFabcL0wgKmW0ewOAxUPU3nWmsy99/n4xor
+        Y2z6Di5PtbzKMGWjCxg7hlC+6iRC7NJoEqfm58m7rqW8Kxlrr5GSBj0Nry/SOXQJ9+cKnANljPqdNE9O
+        cLr7HcpXnUSIHVFRSZOBAAUlseTcjCa3MpriRh2XGxO4ft9I1YOzONwlOPvLaXnRROGj5yhfdRIhtkdG
+        Jk/MzVFUoMNiN1LedoJcWzQ2Vxp2d6b82jxqH57H+62Gz7Pd1LraUb7q4kNChNgaEWEYm52lOEePrSqd
+        ivoULlo0WB4bqH6WIb82C+u+UO5uCaZ+23pqNq2T8zauBgV5bwlhFhvDw1O9fj/F2fEU5sRjKowhu0xD
+        tlWDqVpL4T0d5g1rCERF/UGpEE6xZufOMxPyVT/OzPyV24cPUyR3/U1xaCgnVqwYy1QnCAoOPrpq8+as
+        f0V1YeLXWClZLVn7DyhfdeInSrd8PdhgSYgAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="icon_zoomnext_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZqAK2km+XXyefi3uvv85ScqJWdqPb3+OXn6cHCwq6vsJqirpWdqsPJ0Li9w+fs8cTJ
@@ -571,6 +617,24 @@
         QL4YEAA7
 </value>
   </data>
+  <data name="SelectFolder" xml:space="preserve">
+    <value>Select Folder</value>
+  </data>
+  <data name="icon_zoomrect_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZWAI2aptjb4q2km+vv8+/y9efs8eXXyfX29/b3+PX2+PL199Pa4Nrl6a6vsMHCwujt
+        8ujr7uHk5+Pp76SkpLu7u/T19ufp6qSkpfH09vP09fr7+9fY2aurq8LHzO7x9Ozt7tbX2NPU1sC/v8nK
+        ypubm+Xn6c/Pz9LS0t3g49ri6cLHy/Dy9N3k6/Hz9dXd5czNzcjIyL69vdvg5cPExbO1ttDf4ejq7Nni
+        6paWltrb3Nvf4+js787Q0uXp7ezw9NTT08bJzfP19ujt8bu8vfL09uzu8LGzteLp79PZ38TGx62tre7w
+        8t7l7MLDxK2trODj5be5usXQ2tXb4bCvr9bW1rW2tgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABWACwAAAAAEAAQAAAIqwCtABhIsGDBAAIDKFzIUCEAhA+tSJxIMaFAK1RETInxo6JFKyZyPImAIgSM
+        ihFflFhR4UCLHTqaUHx4YsOBIhoSYPAgBMiIiQ8pWECwJAgRAgMKIFECNICTDAgg9CDgo8CRFCSaVvmQ
+        QAHSAgyYLLhwMAkIrwMeMKhxowOUhlYc2EgrwUUUKUY8SnTAQwaLBSpoNNArcQYHHBOGWGkgwABhjwIa
+        P64Y2bGVgAA7
+</value>
+  </data>
   <data name="icon_pandown" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIeDAJhpZZpqZiJNeNikptelprG+zCBPfSJNdyJOfVJvjMybl9Kgn7ShnSNOeCJPea2f
@@ -592,16 +656,25 @@
         iEmUMn62FGwxJMMJPTzUHKlQgwYShA/kaCFi4E4TCRgsRBzEBQGCOTbcwNk8iA2FHQ4MyAgIADs=
 </value>
   </data>
-  <data name="icon_maptip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_panup" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIU/APT19/Dx89HV3PX292tpdYuKld3g5N3g5by9xdnc4c7S2dXY3snO1sbHzJGQmdXY
-        37K1v+Dj5/P09Nba393h5dTX3czN0PP09dfb4M7S2uLk6Nrd4tHW3ImJlGFgbezu8bi7w93h5NTZ3urr
-        7oWGke3u8eXn6svQ2O/x8+rr7enr7c3S2ZSTnMzQ1+3v8dHW2+Hj6Nnd4t7g5c7T2tPX3eHk6NXZ36al
-        rGpodMvQ19nc4s3S2ubo6+3v8EZDUv///yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA/ACwAAAAAEAAQ
-        AAAIvAB/3MDho6DBgzhuCCQwoOEAFAAifog4gMDACDky7tjIkQGDHBEIZtTIcWOLExkLztixwsPBghAy
-        KFBQUIBNGhUg+CCxkYOAFwIKPrCxYIENED462FhqQ8SDgjES6MAwAYGPAjqyStVRMMQBCgY2WMWqw8AB
-        swVrqK0hY2zWGjBqaChogoddHg18OLh7t+AIvnn33lWRomCPw4ct+GCB2EWPEj5wBAiAuPLhyQESEpBg
-        ufIFCRYFEnyJUGFAADs=
+        R0lGODlhEAAQAIeDAJhpZZpqZiJNeNikptelprG+zCBPfSJNdyJOfVJvjMybl9Kgn7ShnSNOeCJPea2f
+        nq6entWjojVkl6CBgB9NfjVjlB5OftOnqDJejp1xbp9wbM6cnbWEgbaGhKh3eJBkYbeKh9CdnM2jpMeU
+        kcCNirqIi9qoqZ5ybdOfodSmptenpbuKhriHg6uWkyNQeq59fNakpciYljZklaB1dCtXhTFhkC1Zid2m
+        qdilpJlxbah2cyBPe////9ioqLCRjtCdmrKiotuop8OWkaZ0c3+hvdmhpMyZlipZhkFiirWgnd2prcGP
+        jvXm6TNfjcmdmtShoMKPjoKVs9KanbmTkrqIiaiOjVFwjNulpZJnZqNwcpd0dE9wkGF8mNimpdimp7GR
+        kvfk6MeVlKyfqcSSkd6rqDVjk9KeoqGEgbyWk5emu36SscSUkjFfj8WUkDdlltOaoDJeirqurqOPjiBM
+        eax/f9Ghn8aUkyBOf9yorNympKJybtKeoMOTkcuYlShYh6R/fpx6eL6KjL6LigAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACDACwAAAAAEAAQAAAIxAAHCRxIcKCLgggHFhBQQKAdLwGm
+        VEGYQECCQSJ0CLkCgMyMOAUbCJzQI8CIAQCU/IFA8IDAM3QIAFiDAwAeJ18GuhSYg0OeAG0GdLiRwkfC
+        D2G6sPjxZo+JCwwSalABY0MIFEUIoCnoIUadLEukLDDzJEIQMQSTYDGi4EUJQWP68AGTxgpBIIBWQAFB
+        gkogJlHK+NlSsMWQDCf08FBzpEINGkgQPpCjhYiBO00kYLCQUCAXBAjm2HADp7NANhR2ODAgIyAAOw==
 </value>
   </data>
   <data name="SelectFeatureClass" xml:space="preserve">
@@ -623,26 +696,18 @@
         QmCC
 </value>
   </data>
+  <data name="InvalidRecordCountError" xml:space="preserve">
+    <value>Invalid record count in line {0}</value>
+  </data>
   <data name="ConfirmGoogleScaleList" xml:space="preserve">
     <value>Are you sure you want to use a Google-compatible Scale List? This will overwrite your existing scale ranges and will only line up with commercial layers in Fusion if your Map's Coordinate System is WGS84.PseudoMercator</value>
   </data>
-  <data name="printer" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACYklEQVQ4T42SX0hTYRjGX1To
-        omIggdDVLvJi5o0IJjrI5ZgtNuG4KVsodtPZGSNScirHzY2mTIQSDPVK8MKBN6JSyVTUGAkTuqyLBInU
-        iQRZ+OdChz5978nBxJTew+/84/c853zwkbO7mzLUh0J2gXwJdxzBIEldXecgfpmF51c6jdTBATb29/F9
-        b09jJpGAcDyCwgsFkqpSFsrvoyNs7O7i684Ovmxv43MqhdjsLHiEp1hbW/UmRSGmzuMhcjgcVCfLVNvR
-        wXj3j4/xQ3w1u+TN+DgyFFqtAQE9qK/XstrJ6XSSo6mJbG1tvgNR8PPw8EIJ/wkvhx12tcxZQY54sAs8
-        eXl5r/x+P66CHXY5IwpySJKkW6qqhnbEmhVFQSQSQTAYvEAgEEA4HNacra0tdHZ2hjhLNpvNMDg4OLa2
-        tgaXy4X29nbIsozm5mZIUh2qq82orDSirOwerNZHmjM3t4yent4xzlJNTU3V5OTk8urqKsxmswh7YLFY
-        YTRWieD9c5jNDzVnZmYBAwPDy5wlk8nkSiaT60tLSygpKUFDQ6OQ7P/EYqnVHFkcExPv1zlLFRUVz+Lx
-        OGKxGPR6PZzOJ7DbH18KO6Ojo5iamgJnqbS01J9IfMT0dBw+33P09w+jr28I0ehwFiPi/i9ebysWFj5p
-        cJYMBoO6uLiC+fkVuN3u/yJTwFnS6XQt+fn5vUxubm5fSmyY6mgKr9+mMPTuAypfuHG3UYXRO4Jvm5tg
-        J+NzlsTcFNxmCsrLX2qbPmtOTk/BpE9OkBZXdjL+WZY7iK4VFNCN4uKn14uKolfBDruZ+QOvqgI74xfB
-        qAAAAABJRU5ErkJggg==
-</value>
+  <data name="SelectColumnPlaceholder" xml:space="preserve">
+    <value><Select column></value>
   </data>
+  <data name="GenericError" xml:space="preserve">
+    <value>An error occured: {0}</value>
+  </data>
   <data name="LastUpdated" xml:space="preserve">
     <value>Last Updated: </value>
   </data>
@@ -667,13 +732,10 @@
         JEoZP1sKthiS4YQeHmqOVKhBA0nCB3K0EDFwp4kEDBZGDuKCAMEcG27gaB7EhsIOBwZkBAQAOw==
 </value>
   </data>
-  <data name="icon_measure" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQSAHFCCr2NKldCE9ajLmddJf7nWp3M3BJEd005EQGM5AGK4wGN4QEzZgGK5QE1ZwI0
-        ZQE0awE1Zf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAASACwAAAAAEAAQAAAIWgAlCBxIsKDBgwgTDlSQAIIEAwYeRoQogSGEBgsiSDhw
-        YGNHjhIwRnjAwIFCkiYVqlzJUsIAAS9jwpwpswABmzhv6swZAEGAnz6B/uz5E4DRo0iTAmjJtOnAgAA7
-</value>
+  <data name="FunctionTooltip" xml:space="preserve">
+    <value>Function: {1}({2})
+Description: {3}
+Returns: {0}</value>
   </data>
   <data name="OdbcDriverExcel" xml:space="preserve">
     <value>{Microsoft Excel Driver (*.xls)}</value>
@@ -693,22 +755,6 @@
         aIiQYcWFFDModDABk4Dnz6A/DwkIADs=
 </value>
   </data>
-  <data name="icon_refreshmap_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIYAAAAAAP////38/f7+//39/vz8/evr7Nzd4M7P0s3O0bGzuOvs7n6Ej32DjnyCjH6E
-        js3Q1c3P0szO0ers77K4wLG3v6+1vYaasLC3v6+2vq61vK+2vczQ1Ors7unr7fb3+N7f4Kqtrpienqes
-        rKisrKqtramsrN3f38TGxvT19d/g4Kesq6isq6qtrMPGxcTGxdzf3c7Sz7a9t0J2QlqAWneNd3uOe4KU
-        gpSllJmomaOyo6WzpdHi0dHh0cXUxdbk1snWyd3p3dvn26avpqOso97p3tHc0a22rdPd0+Ls4uXu5cTK
-        xMHHwenr6f7+/v39/fz8/O7u7v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABSACwAAAAAEAAQAAAI8AAxZKiwAYPBCgYvSFm4EEOBhyYKEIBSAAMEhQwxPHlSwIQAjhULcMAoxUIE
-        BBFKJEiAAAEGBgweMLRQAAGBFQQeFjjQoYPMhRUiSIgwooAAJwNSDBhgIGPOAiEkDlhio6oMhhkKqECx
-        4gWIADYCiLVBA2gBFwRIEEAxNYcSJTaQ5JCSgQQLEytYtIgypImRJDaMGKGhoQCKAi2guBhwI8gOGzJ2
-        FKmBgcCJFyNcgHByQ4gOJjZ0CKlBocDGERudHAECJGwTIDRKd/AgYsKCDzBw+Aj7A8cMDA4aPAjuQIGB
-        GETC8uhhg6Fz5zOq2pgREAA7
-</value>
-  </data>
   <data name="sort-number" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -723,9 +769,6 @@
         KfgFcqFa2BgtJlQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NoTransformationRequired" xml:space="preserve">
-    <value>No transformation required</value>
-  </data>
   <data name="icon_zoomnext" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZ4AHBJJai7zuqxd9nFs1tgZLjH1xc5Zs/a5CtGdezw9Bg5bypGdWV7khY1bKu0vNjm
@@ -839,12 +882,9 @@
         rkJggg==
 </value>
   </data>
-  <data name="TitleNewFeatureClass" xml:space="preserve">
-    <value>New Feature Class</value>
+  <data name="Func_RANGE_MaxDescription" xml:space="preserve">
+    <value>Exclusive maximum of range that can be matched by the key expression</value>
   </data>
-  <data name="MissingColumnError" xml:space="preserve">
-    <value>Missing column "{0}"</value>
-  </data>
   <data name="icon_selectradius_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQYAM3Lz5+svc3FycTM09bcyM3EyM26v86ssM6wtM26vs23u83KzsvSxs6mqs22us6r
@@ -892,21 +932,6 @@
   <data name="CoordinateTransformationFailed" xml:space="preserve">
     <value>Failed to transform coordinates: {0}</value>
   </data>
-  <data name="minus-circle" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACC0lEQVQ4T6WSP2gTYRjGP5JA
-        EyhNc0M8SotbAxU7pNDsNRA6hLQIpXiVzi0d3RVEaAUXBwexYgT7T9EKcfHfWQlSJJfmUFAhZOgJRocM
-        yh1ZjtfnCXq0pY2DgR+8933v87v3u3xKRNT/0AnfV0o9ABtgU6mBLaWWwBoo/4H1EvfYw15mmD0qyD+O
-        xcxaJuP8mJtzfy0u+j8XFvzvhuHujY873IMgf5Ig/7S/32oahvdtfl4cwzgE177Oznrb8bgFQf7QBEWO
-        Fo2a+zMz3pfpaflUKBzL56kpqRcK3npPj8lMcIS7ON+7dNqxJyfl/cREV/ZyOXk1MuIwEwhuK7X+IZdz
-        zUxG/vI8nZbtVErWBgflXjIpdzStA+tSKuUyEwhu4Wvj7f6LsTFpt9vSaDSkWq2KbdtSr9el2WxKq9Xq
-        UEwk5NHQkM9MILiJByub9Z8ND0utVpNKpXJsmIItCJ7ous9MILiBcd6MjroljLiBhm6UKNA0l5lAsMKL
-        k0zu7+B8r9HwL4qxmMNMILiGv+R6OGzu6Lq3iyl2ITmJl/G4txIKmcwEgqu4lpdxOZYjEausaZ4NiQ3J
-        Ud4ivBwOW+xlJhCgVqfBeWxcgn01GnXKfX3ux0TCJ6y5xj32sJe/g4IInk+BMwNKncsqdeWCUg8v4ksT
-        1lzjHnrOAh1EDgpCWOgFSYC+rvBF7A1R8BuYvt7nXvKiFAAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="document_task" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -944,6 +969,28 @@
   <data name="FolderMissingPrefix" xml:space="preserve">
     <value>The folder must start with \"Library://\", do you want the starting folder to become:\n {0} ?</value>
   </data>
+  <data name="icon_plotdwf_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIecAP7+/rW6x9PW48TD1uHg6ba6x////8HBxMTFyMC/wrK+y/r6+v39/cTD173JyMLG
+        0fT09/P09d3d5qGprPX3+MPFxtXW2dLT1vj4+JOjqcXFxujo6OLk5+Dl58TFyba7x8fIy7a6xuDi4+Li
+        4drb3cHG0Onp6cLP29vb3u7w8ODg6LG2utjc4IeSk+Tx6dTr5dLV4urq6palqp2ho6ezwL69vrTBz8TD
+        1ebu9rvI1Lq+vKSvvdzm89XY3r+/wtLV2PX3+dTX3tHQ3Ymbj+Lk6b/KxOvt8PD1+bS5xvz9/aGvvPX3
+        98LOzLa6yJ+suuvr66CsurzKyM7Q0OHf6NHT1uzu8sTGyb3KyMrKztLX5M3L2b2+wdbY3O3u8sTGyODg
+        6cbIyNrb4Le9v8rLzrq+y5GunKvMuNna3eHi5fDx8qayu7u7vpShq/Py9fX19ZKop8LU2Jmps+nq67TN
+        x5eosPn6++/1+bO/zKCsu/T398XR36Goqp+rutbX2r/AwdHe6tPW5O3v787M2sfL1fz8/K22v/X199ze
+        4t3c5rW6xr/Dz/n5+c7Q0cnKzdze5MTGyoaSiJenndPW4o+ul+Df6MDAxL3BzcHDxcvX1Jyws8XD142g
+        lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACcACwAAAAAEAAQAAAI8QA5CRwoEJODKHcUMElBcOCCQA5c
+        2OFx4k0GDAMNCRkw4MqLIzj+5NgEaQUnQVoGAACwqMMcM3D0KJDRYganBitXMoBQZFKZTDTwsNlz8wkA
+        AwAYAOAQaQgdJTvUiBGoKacBFQR0TIhTyIYTNwNvACBA4EsYDzU08IEih2AASlO4gNjiBwaYNX0GEioR
+        4MClClIESKKQ5wKZgQWojAEkQoCAJUDONDoQADGAQxayAEBBAkGCEAESDQzAAkAVNF6sPEIgIc0GLKN7
+        dEnwIwAjRBGSmBBgaSCRD0Yq+QjQpE4MRUHaNFzwAEkBTiMGOWrIKSAAOw==
+</value>
+  </data>
   <data name="PromptUseOffice2010Drivers" xml:space="preserve">
     <value>Use Office 2010 Drivers? (these are 64-bit compatible)</value>
   </data>
@@ -953,6 +1000,9 @@
   <data name="AllResourceTypes" xml:space="preserve">
     <value>All types</value>
   </data>
+  <data name="FindNothing" xml:space="preserve">
+    <value>Could not find specified string or end of document reached</value>
+  </data>
   <data name="icon_restorecenter_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIUtAKq7y5+svcbS2MPQ1tTc4MvW29DZ3sTR17nH0tDZ3crV2tLa38fT2dHa3snU2tPb
@@ -995,6 +1045,9 @@
   <data name="SQLQuery" xml:space="preserve">
     <value>SQL Query</value>
   </data>
+  <data name="WidgetNameExists" xml:space="preserve">
+    <value>A widget named {0} already exists</value>
+  </data>
   <data name="map--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1029,24 +1082,12 @@
         sODgROSUAGIzM2gx4UoIHSJ/hMHSJMYDHzYmVOGxxIvIgrAHlplNu7bt2QEBADs=
 </value>
   </data>
-  <data name="gear--exclamation" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACv0lEQVQ4T6WQbUhTYRTHn9sm
-        IhbolwWlEqaYTEO2SGcfFiu1ph/UbZ8MxC+9EEUQjQwTkkyioMIFpWIpawVGoUyDTTfTeVfe5e5eTJfT
-        llxfNoiSWIUUp+dsLhT61oUf53DO///n3IcAAPkfYma1Wk2qqqpITU0Nqa2tjVWtVqugnNpAsXmHWvQg
-        WwKqq6tLqfAMrbuxrq+vQzQahc0z1PwzoLKy8pBer78biUSgoaHhChWdXV5eAgR7nOEONajdckFFRQWh
-        nAuFQsBxk7C0JIDZbJ4TBAEQ7IPBYGyHGtRueOK/oFAoiFKpzNBoNM0eDw8874aFhXlYXPwUA3uc4Q41
-        qEVPcXFxPKCkpERJBxeRnp7HQb/fBybTk5mCgoL7CPY4w11Ch56/ATKZTO9ycWC328DpZMHr9UJh4f42
-        kUhEEOw9zuvAWVQwYb0MqEUPJX6BVCptdDgcYLVaAavP9x6KimQtDMMQRC6TtrpHNfA10gsTQ8fAMW4D
-        9FDiAbm5uWU5OTlNSHu74aPb7YeBgWG3XH7wKvLCpPcHPefhV7QP3ljKhZMnJEb0UOIBWVlZJDMzc49M
-        Jr/Nsi4YGRmHQECA1dUfsLLyDdz2OviyfAd0Oh2EF5p/2kwik6OPEVPiARKJBGlhWR76+y0wNuYCg6Ez
-        NDnphwl7B0zZtb/XhCYgVL4yexoGjXuF0WfMEfvTjYD09HRCOa5SlRk5bhby8vLvpaWltbKsD2wvdTA7
-        Vfd9xlcOg+ZL4OUPwzu2dG3YyDyw9NIHwgvwE4vFJCUlRZ2amtqWnJycjZXnzOB8dRRCARXMT8tjF2Cd
-        nz4Ar5/vcA51M6WJADFd7qTQZyVyJCkpqf7aBZGHH82OhufyIfxhH0Q/N8YqEnBmhPsfMl2JgG3UtJ0i
-        oexK0NlKOiiuzXTdIFx3G3n76CZhe28Rwx+y4Aflu5kbswAAAABJRU5ErkJggg==
-</value>
+  <data name="RequiredServiceNotSupported" xml:space="preserve">
+    <value>This connection does not support required service: </value>
   </data>
+  <data name="PromptSelectMap" xml:space="preserve">
+    <value>Select Map</value>
+  </data>
   <data name="FdoConnectionStringComponentNotFound" xml:space="preserve">
     <value>The component "{0}" could not be found in the specified FDO connection string</value>
   </data>
@@ -1122,12 +1163,26 @@
   <data name="FilterShp" xml:space="preserve">
     <value>ESRI Shape File (*.shp)|*.shp</value>
   </data>
-  <data name="Func_LOOKUP_IndexDescription" xml:space="preserve">
-    <value>Lookup index that can be matched by the key expression</value>
+  <data name="InvalidResourceIdFolder" xml:space="preserve">
+    <value>Must be valid resource id. Cannot be a folder</value>
   </data>
-  <data name="WidgetNameExists" xml:space="preserve">
-    <value>A widget named {0} already exists</value>
+  <data name="InvalidFieldCountError" xml:space="preserve">
+    <value>Invalid field count in line {0}</value>
   </data>
+  <data name="document--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAB20lEQVQ4T42SO0hbYRTHz2jo
+        5qBZOgiJgwgl6dAgqCAIBlQqRnBQQTDGoEFuCAbfIkK3Lg5GXLUdOrVD3IVujjo4lYpRkeAj7/fxfy45
+        i4+rH/zg3sv3/3HOuYd8a2skjKyvD4DpN3AMr67S0NISfV1cpMHxTiL5UCeQrVT4rljkm1yOE5kMn6fT
+        /D+VMvl9dMS4FwBOFYjEtNWZSZdKnETw6uGB/yWTfHZ9zaeXl3ySSPBBPM5ycHcGOCVsCgajUSWYgeA2
+        m31Rsr2/z4rT610BJFB/JKLM5splvkf5r0mkEmkHmVnNUZ9hKHN5zCCVz1tKRIDMnOaoNxRSQgUIMoWC
+        pUQGi0xIc9QTDCrzpWqVc5iDlUT+DjLzmqMuv18xyhAUMAcryQ1aRMbQHHVMTirhSq3GRbRhJZE9QSYs
+        OcPlIvoyNqZEqhBIFVaSFFpEJvLdbqefhPN5dFRZqGFRKhA8lfydmuK4y2Vy6Hbzns12gfDxD6JdcnR3
+        0yefT4jKptVQxVPJL4TyExPPiEEiRdBHj4davd5lc1dfkPzx+3kHEiEGFhoaEhsIb0kFODbQ1OzxbKrA
+        lACZiQxWWpJfLHtSxLvclUw9S414aLe1tIQ/tLV9ew9yVzKg8REGvINQesvmrAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="FiniteDisplayScales" xml:space="preserve">
     <value>Finite Display Scales</value>
   </data>
@@ -1162,8 +1217,8 @@
   <data name="FindEmptyString" xml:space="preserve">
     <value>Cannot Find an Empty String</value>
   </data>
-  <data name="ProcessedItem" xml:space="preserve">
-    <value>Processed: {0}</value>
+  <data name="UnsupportedConnectionType" xml:space="preserve">
+    <value>Invoking MgCooker is not supported for this connection type: {0}</value>
   </data>
   <data name="Func_ARGB_Description" xml:space="preserve">
     <value>Color generation function</value>
@@ -1186,6 +1241,14 @@
         uFAwQoSDFVwiuiFToEATKjlsaHaDpMCHDgocBAQAOw==
 </value>
   </data>
+  <data name="icon_selectpolygon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMLAM2qrs8YGBU2aKi0ws2OkfLyl851eMbMjqiToKOuhs6QkwAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIbwAXCFxgIIDBgwcHCixIAIDDhwAC
+        KGQIEaLEhQEaVnRI4CLFjQA6GhCYcaMABBFHkgQp4CQAhQFYHhAwACbLAjNrrjRZACfNnQ8bCujps2bM
+        oBKHJmjZcgFCgwoWCFg6oKpOhQNbXsWK9SfXr2ADAgA7
+</value>
+  </data>
   <data name="edit-indent" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1199,9 +1262,6 @@
         sGBsgDrtCFwAzEVBanC1saTAL88kUjz8yRfZAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
-    <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
-  </data>
   <data name="arrow-circle-135" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1221,20 +1281,25 @@
         SUVORK5CYII=
 </value>
   </data>
-  <data name="Func_ARGB_BValueDescription" xml:space="preserve">
-    <value>Blue value</value>
-  </data>
-  <data name="PromptSelectMap" xml:space="preserve">
-    <value>Select Map</value>
-  </data>
   <data name="AlternateNameMissing" xml:space="preserve">
     <value>You must enter a alternate name, or remove the checkmark</value>
   </data>
   <data name="SelectWidget" xml:space="preserve">
     <value>Select widget</value>
   </data>
-  <data name="GenericError" xml:space="preserve">
-    <value>An error occured: {0}</value>
+  <data name="icon_select" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZdAOvsxmuAjjRRfpOhtpOitjRQeDVQejtTfDZUdzBMejtXf///1/385///74OTl3WE
+        mu7w81Zhdv384KCuwG+EmZWjtPz72/7+3ISQoeLlyFptkPj5vs3Q1ImYsOPl0ktgg3CBnP/95mp9if//
+        4NfZ3P//zYKTjKWviv3919/inpuovOTo59DU27e6weTn4P//7KGyxzVRfjVQezJNdlRqgoCQl7/Gzm6C
+        n9fd15adp+PmzNfe0P//97C6y2d7ltXb45mppoqZra2yt+rs7v///5mjuOLjrdLauuzvqmN5jjVSdf//
+        9NfavlltiGp/nGB1h9nenmBviLq9wrS4vjRQdzNQelhujqGwnOXp7M/V2KWvwfv60+Ln2v///wAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABdACwAAAAAEAAQAAAIjAC7CBxIsCDBBDcMKuyioMeEhQVjQPihAuJAAViIZAlisYuMFUt44BhgsYqL
+        Bgxe7CAA0QCXEBIsjMhQYSEVDxdQbGFyBEgHhQV0LABQgsaBD1EUIgBQ48kGBw+ESFGoJIAVH1eMaBiy
+        cAaIKRgoIDFRZKENEl1YRDgBpQmHjjmSpBDRomMXGE60FAwIADs=
+</value>
   </data>
   <data name="ruler1" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1250,9 +1315,6 @@
         CcSsQAwMPQQQADIloRikWAyIRYBYCIj5gZgHiLmAmB2qmRlIw50HAIdyTYaOb/frAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="Func_RANGE_DefaultValueDescription" xml:space="preserve">
-    <value>Default value returned if expression does not fall into any of the ranges</value>
-  </data>
   <data name="BetweenLabel" xml:space="preserve">
     <value>Between {0} and {1}</value>
   </data>
@@ -1304,14 +1366,33 @@
         laHiZ4UJYWRYwYgszQgLQaItHIaKXxQswuj/gm+HNTFEuMVJpAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="icon_ctxarrow" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhBAAIAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/AP//AAAA//8A/wD/////
+        /wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
+        mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/AAD/MwD/ZgD/mQD/zAD/
+        /zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMzmTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZ
+        MzOZZjOZmTOZzDOZ/zPMADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
+        mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZAGaZM2aZZmaZmWaZzGaZ
+        /2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkz
+        M5kzZpkzmZkzzJkz/5lmAJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
+        mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wzAMwzM8wzZswzmcwzzMwz
+        /8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZmcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/
+        M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
+        mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////AP//M///Zv//mf//zP//
+        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAABAAIAAAIFAABPBgIQOCDggIRKlR40KDBBwEB
+        ADs=
+</value>
+  </data>
   <data name="ColumnValueError" xml:space="preserve">
     <value>An error occured while reading column values: {0}</value>
   </data>
   <data name="UnmanagedBrowserMultiSelectionNotAllowed" xml:space="preserve">
     <value>Multiple selection is not allowed when SelectFoldersOnly is set to true</value>
   </data>
-  <data name="AddWidgetReference" xml:space="preserve">
-    <value>Add Widget Reference</value>
+  <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
+    <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
   </data>
   <data name="PromptName" xml:space="preserve">
     <value>Enter the name</value>
@@ -1340,9 +1421,6 @@
   <data name="DataReadError" xml:space="preserve">
     <value>Unable to read data from the selected column: {0}</value>
   </data>
-  <data name="PromptUpdateMapWidgetReference" xml:space="preserve">
-    <value>Update Map Widget to point to</value>
-  </data>
   <data name="ModeNotAllowed" xml:space="preserve">
     <value>Mode not allowed: {0}</value>
   </data>
@@ -1382,32 +1460,12 @@
   <data name="SymbolGraphicsTextPlaceholder" xml:space="preserve">
     <value><text></value>
   </data>
-  <data name="IncompatibleConnection" xml:space="preserve">
-    <value>This connection is not compatible</value>
+  <data name="Func_RANGE_Description" xml:space="preserve">
+    <value>Range table for style theming</value>
   </data>
-  <data name="InvalidFieldCountError" xml:space="preserve">
-    <value>Invalid field count in line {0}</value>
-  </data>
   <data name="InvokeUrlNoMapDefined" xml:space="preserve">
     <value>Cannot get layers. No map definition specified</value>
   </data>
-  <data name="application_browser" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACiklEQVQ4T6WUXUiTURiAT3rl
-        heBNXQTdCGF2E+1qUIwkiwwsleyHfonUrAhCMTAKE7xINCORgnSslqYNZSmJusrQnH9zttraVkNJdLOt
-        uaWbzrH19H1eBF2aLzycc97D8/KeA+cIQGwEkZ+fnypxSqJwnchOqsjLyzttNBqtLpcLp9OBzWbDYvmI
-        yWRiZGQEaY+hIZlRaT7B8LCF8XE7PT0frLIrcnJyig0GA319fVKyh+7ubrq6utDr9XR0dKDT6WhtbaWl
-        pQWtVotGo0GtVtPY2EhiYmKhfIQi6Q7+K2RX5ObmXo7H48RisX8Ir8YwTC1T1h8kX7/Awbafa6O8lvPL
-        0TiyK7Kzs69Eo1EikchfvnnDFHS6uaB3Uz/qp/XLIp3ORSYXY7z6vsLVXh+FXR5kV2RlZV1bWVkhFAqt
-        YZ8LcPL5VyoMs+jsAUyS1Gz7xRNzAKM3gj0K9lVQfw6yufxdm8jMzLy+tLREIBBg3rfAuSYzd3qmuTfo
-        oc8TkQr8ptkaoF3qYPBHhLFgjLEwGEOQeNfxXqhUqhvBYBCfz4fug5Ps+wOcb/vK5c5pnjpDVL6b5fbb
-        WV44luj3w53XLrRSvmMeEkqNA0KpVJb4/X7cbjeXHvZSrLVwSG3ngMbBUa2DEy9dnG2folg/zRnNJ47U
-        j1JniVIuVUso6BwSCoWizOv1MjMzw76SZ5R2z5PRYGVX3QTKx1b2PLGiarSxt2GSc+1ubg7FuWYIo6oz
-        s+m4ekSkpaXdktv3eDwoCh6hrHjDfvUc26tG2VEzQXqNmZ21ZtKrx1FUm1E9sHOsPcy20l7E4dpxkZyc
-        XJSSklIlIzIqTeti98UmIUWSxBaJretEdpI29JTlb+APrpaoVzbDpskAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="sql-join-right" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1436,15 +1494,9 @@
   <data name="LessThanLabel" xml:space="preserve">
     <value>Less than {0}</value>
   </data>
-  <data name="FieldRequired" xml:space="preserve">
-    <value>This field is required: {0}</value>
-  </data>
   <data name="NewLayerGroup" xml:space="preserve">
     <value>New Layer Group</value>
   </data>
-  <data name="ConfigurationDocumentReset" xml:space="preserve">
-    <value>Configuration Document has been reset</value>
-  </data>
   <data name="icon_refreshmap" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIYAAAAAAP////vz//79//fy//fz/vfz//38//bz//j2//b0/vf2/ff2//T0//T0/vb2
@@ -1464,6 +1516,9 @@
   <data name="QuestionResetFsOverrideList" xml:space="preserve">
     <value>Reset Feature Source override list?</value>
   </data>
+  <data name="AddWidgetReference" xml:space="preserve">
+    <value>Add Widget Reference</value>
+  </data>
   <data name="Infinity" xml:space="preserve">
     <value>Infinity</value>
   </data>
@@ -3183,8 +3238,8 @@
 "5. Products derived from this software may not be called ""ColorBrewer"", nor may ""ColorBrewer"" appear in their name, without prior written permission of Cynthia Brewer.",,,,,,,,,
 </value>
   </data>
-  <data name="Func_LOOKUP_DefaultValueDescription" xml:space="preserve">
-    <value>Default value returned if expression does not evaluate to any of the keys</value>
+  <data name="Func_LOOKUP_IndexDescription" xml:space="preserve">
+    <value>Lookup index that can be matched by the key expression</value>
   </data>
   <data name="icon_search_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -3224,22 +3279,28 @@
   <data name="DeleteConfirmation" xml:space="preserve">
     <value>Do you want to remove the selected item?</value>
   </data>
-  <data name="drive-download" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_popupscrollup_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACTklEQVQ4T42OXWhSYRjHH4KK
-        iBNkX9AHWx9QeaQuDpTsZgu7CsRJGjIcqyAFiY0xhm7RFqxTdLPoqtjCm+jCPsCwUhtL86O0nRo2zZy5
-        tXWR3qztYuUkfHqfsSOOsdWRHzz+n9//4YV6ZwFWQXB+xwYxUW5ge2E1D47d/FTh+K0xqLs7LWO79/XP
-        9Y7AvMgym5yTU92B2s5AhQOOEBy9NgJCf4Z4fCe1kLJ6ZlJsfkQZ7cip7qw4cKg7CoevxoDv+yj1vZ/D
-        M4NfkGbKaLfmgf32N7eZ4FtCsoVmUHV/Atl/Sc7JWfaCvW2vQGZPq9988Eoo1Z4o4SVpAQXfPG5zzWH9
-        8C80RH9jjSOYJKe6UylTuPuyFxQXn5p3tfuT2pEybveWcd2zMqqCZdzR5kvSjpxlB060iECcPH8Djlic
-        sPXCE9hsemDeYnUn66KItcOInMWdpIx25JAr90Cn0y2i1+vBaDTCaZMN9p3rh/WNg+aNLa6xDQyaKaMd
-        OeTKvRUHSCBOnbUA39hZQ9As52sd4AwGQxPD+g+a2Au4ygu0Wi0s0RwOh8cTiQTG4zEMBl+j1/sSPR4P
-        4znDzwigy/VinPnNcg8EQQCNRkO0lkolLBaLODv7E/P5Hzg19Q1zuRxjgjGNkpTGTCaP5FKHuosfz/Og
-        Vqs7CoUCut1uFEURe3t7sKvLgXY70cMQ0cJ+sVgayaWO/G1iw06lUtnNnjuZzWYxnf6Mo6MfmPwOI5EI
-        I8qI49DQWxwYeDhJLnUY1AUFQ8VxnEmhUIj/A7nUoe5fouy03kA6Jw4AAAAASUVORK5CYII=
+        R0lGODlhEAAQAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/AP//AAAA//8A/wD/////
+        /wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
+        mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/AAD/MwD/ZgD/mQD/zAD/
+        /zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMzmTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZ
+        MzOZZjOZmTOZzDOZ/zPMADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
+        mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZAGaZM2aZZmaZmWaZzGaZ
+        /2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkz
+        M5kzZpkzmZkzzJkz/5lmAJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
+        mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wzAMwzM8wzZswzmcwzzMwz
+        /8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZmcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/
+        M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
+        mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////AP//M///Zv//mf//zP//
+        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAILwAfCBxIsKDBgwgTKkSAQOFAhgwd
+        QoSYcOLEgxYtFsyY8SHHjh8/OhxJsqRJkwEBADs=
 </value>
   </data>
+  <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
+    <value>This connection does not support executing this type of Load Procedure</value>
+  </data>
   <data name="OverwriteResource" xml:space="preserve">
     <value>This resource already exists, continue with save?</value>
   </data>
@@ -3261,12 +3322,15 @@
         AEiwtKnDqQGYTmSZ1epEAFq3cggrVmFAADs=
 </value>
   </data>
-  <data name="NewFlyout" xml:space="preserve">
-    <value>New Flyout</value>
+  <data name="Func_IF_FalseValueDescription" xml:space="preserve">
+    <value>Returned if condition is false</value>
   </data>
   <data name="PromptRepairBrokenFeatureSource" xml:space="preserve">
     <value>The resource id {0} could not be found. You will now be prompted to select the correct feature source</value>
   </data>
+  <data name="PackageBuildError" xml:space="preserve">
+    <value>An error occured while building package: {0}</value>
+  </data>
   <data name="UnitsMs" xml:space="preserve">
     <value>ms</value>
   </data>
@@ -3276,26 +3340,8 @@
   <data name="OdbcNoMarkedFile" xml:space="preserve">
     <value>Could not infer ODBC driver. No file specified</value>
   </data>
-  <data name="icon_panleft" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIeDAJhpZZpqZiJNeNikptelprG+zCBPfSJNdyJOfVJvjMybl9Kgn7ShnSNOeCJPea2f
-        nq6entWjojVkl6CBgB9NfjVjlB5OftOnqDJejp1xbp9wbM6cnbWEgbaGhKh3eJBkYbeKh9CdnM2jpMeU
-        kcCNirqIi9qoqZ5ybdOfodSmptenpbuKhriHg6uWkyNQeq59fNakpciYljZklaB1dCtXhTFhkC1Zid2m
-        qdilpJlxbah2cyBPe////9ioqLCRjtCdmrKiotuop8OWkaZ0c3+hvdmhpMyZlipZhkFiirWgnd2prcGP
-        jvXm6TNfjcmdmtShoMKPjoKVs9KanbmTkrqIiaiOjVFwjNulpZJnZqNwcpd0dE9wkGF8mNimpdimp7GR
-        kvfk6MeVlKyfqcSSkd6rqDVjk9KeoqGEgbyWk5emu36SscSUkjFfj8WUkDdlltOaoDJeirqurqOPjiBM
-        eax/f9Ghn8aUkyBOf9yorNympKJybtKeoMOTkcuYlShYh6R/fpx6eL6KjL6LigAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACDACwAAAAAEAAQAAAIwQAHCRxIcFCBBAUTCnQhQECDAwcG
-        2fESYEqVggcHitAh5AoAMjPiKBw0oUeAEQMAKPkDQeEZOgQArMEBAI+TLwpzcMgToM2ADjdS+FD4IUwX
-        Fj/e7DFxgYFCDSpgbAiBoggBNAU9xKiTZYmUBWaeRAgihmASLEYUvCghaEwfPmDSWCEIBNAKKCBIUAnE
-        JEoZP1sKthiS4YQeHmqOVKhBA0nCB3K0EDFwp4kEDBZGDuKCAMEcG27gaB7EhsIOBwZkBAQAOw==
-</value>
+  <data name="Func_FEATURECLASS_Description" xml:space="preserve">
+    <value>Returns the active feature class name</value>
   </data>
   <data name="folder_horizontal" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -3324,21 +3370,6 @@
         7AkAYHHjwA0pW8acubIAzp3ngM5MZk9AADs=
 </value>
   </data>
-  <data name="Func_LOOKUP_ExpressionDescription" xml:space="preserve">
-    <value>Key expression</value>
-  </data>
-  <data name="icon_invokescript" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIU6AEtypf///9bn92+wPq3D3hExZKq+r3ugdmupO1WHSD14K7fH3Jiymb7M37HMxlmP
-        RFeLTVyTSVuQRY/SS6DfUZjYTl6fN1iORJ6xxny6Qn+og4jHR5vbTzJpMpvbUIjGR3Gad4/RS4nISHvB
-        RIrOSXCzP5/eUaDeUJ7dUJPVTYfKSIbLSIDGRnWPsoLHR2WkOT95LD11Pp3cUJPVTIPCRZ6+rIPDRWak
-        OZfYTnGzQAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA6ACwAAAAAEAAQ
-        AAAIuAB1CNSBAYDBgwgxDNRhsEGAhxADNACwEMBEARgzYqQ4EEAAhCA5CvRIoKRJAgUWGjgQAwYEDQ4y
-        ohzIQAKCATJEIIhQA+NMHQYkZBgQYAAFChkixPx5AMEJokVRmECgQcDPBB84QC3qYQMEqyl1KKiAY2vR
-        CgoItAibgEaKrSFm2OhQoMACgQdeTICqgsSEGyAW3BVo4MEAoixcrBjwwMBCgQwuWMgxooSFCwweD1yZ
-        QEGCA441BwQAOw==
-</value>
-  </data>
   <data name="drive-upload" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3370,6 +3401,9 @@
         Q24iOWNAADs=
 </value>
   </data>
+  <data name="FileDownloaded" xml:space="preserve">
+    <value>File Downloaded to {0}</value>
+  </data>
   <data name="ContentFileMissing" xml:space="preserve">
     <value>The content file does not exist</value>
   </data>
@@ -3406,8 +3440,8 @@
         yd/5G8s+qAWdGU8YAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="OdbcCannotInferDriver" xml:space="preserve">
-    <value>Could not infer ODBC driver from file name: {0}</value>
+  <data name="FilterXml" xml:space="preserve">
+    <value>XML Files (.xml)|*.xml</value>
   </data>
   <data name="TestConnectionNoErrors" xml:space="preserve">
     <value>Provider reported no errors</value>
@@ -3451,32 +3485,60 @@
   <data name="UnitsSeconds" xml:space="preserve">
     <value>s</value>
   </data>
-  <data name="SelectColumnPlaceholder" xml:space="preserve">
-    <value><Select column></value>
+  <data name="TooManyIndiviualValuesError" xml:space="preserve">
+    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
   </data>
-  <data name="document--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_maptip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAB20lEQVQ4T42SO0hbYRTHz2jo
-        5qBZOgiJgwgl6dAgqCAIBlQqRnBQQTDGoEFuCAbfIkK3Lg5GXLUdOrVD3IVujjo4lYpRkeAj7/fxfy45
-        i4+rH/zg3sv3/3HOuYd8a2skjKyvD4DpN3AMr67S0NISfV1cpMHxTiL5UCeQrVT4rljkm1yOE5kMn6fT
-        /D+VMvl9dMS4FwBOFYjEtNWZSZdKnETw6uGB/yWTfHZ9zaeXl3ySSPBBPM5ycHcGOCVsCgajUSWYgeA2
-        m31Rsr2/z4rT610BJFB/JKLM5splvkf5r0mkEmkHmVnNUZ9hKHN5zCCVz1tKRIDMnOaoNxRSQgUIMoWC
-        pUQGi0xIc9QTDCrzpWqVc5iDlUT+DjLzmqMuv18xyhAUMAcryQ1aRMbQHHVMTirhSq3GRbRhJZE9QSYs
-        OcPlIvoyNqZEqhBIFVaSFFpEJvLdbqefhPN5dFRZqGFRKhA8lfydmuK4y2Vy6Hbzns12gfDxD6JdcnR3
-        0yefT4jKptVQxVPJL4TyExPPiEEiRdBHj4davd5lc1dfkPzx+3kHEiEGFhoaEhsIb0kFODbQ1OzxbKrA
-        lACZiQxWWpJfLHtSxLvclUw9S414aLe1tIQ/tLV9ew9yVzKg8REGvINQesvmrAAAAABJRU5ErkJggg==
+        R0lGODlhEAAQAIU/APT19/Dx89HV3PX292tpdYuKld3g5N3g5by9xdnc4c7S2dXY3snO1sbHzJGQmdXY
+        37K1v+Dj5/P09Nba393h5dTX3czN0PP09dfb4M7S2uLk6Nrd4tHW3ImJlGFgbezu8bi7w93h5NTZ3urr
+        7oWGke3u8eXn6svQ2O/x8+rr7enr7c3S2ZSTnMzQ1+3v8dHW2+Hj6Nnd4t7g5c7T2tPX3eHk6NXZ36al
+        rGpodMvQ19nc4s3S2ubo6+3v8EZDUv///yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA/ACwAAAAAEAAQ
+        AAAIvAB/3MDho6DBgzhuCCQwoOEAFAAifog4gMDACDky7tjIkQGDHBEIZtTIcWOLExkLztixwsPBghAy
+        KFBQUIBNGhUg+CCxkYOAFwIKPrCxYIENED462FhqQ8SDgjES6MAwAYGPAjqyStVRMMQBCgY2WMWqw8AB
+        swVrqK0hY2zWGjBqaChogoddHg18OLh7t+AIvnn33lWRomCPw4ct+GCB2EWPEj5wBAiAuPLhyQESEpBg
+        ufIFCRYFEnyJUGFAADs=
 </value>
   </data>
   <data name="UnknownResourceTypes" xml:space="preserve">
     <value>Unknown types</value>
   </data>
-  <data name="NoSchemasInFeatureSource" xml:space="preserve">
-    <value>Feature Source has no schemas</value>
+  <data name="printer" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACYklEQVQ4T42SX0hTYRjGX1To
+        omIggdDVLvJi5o0IJjrI5ZgtNuG4KVsodtPZGSNScirHzY2mTIQSDPVK8MKBN6JSyVTUGAkTuqyLBInU
+        iQRZ+OdChz5978nBxJTew+/84/c853zwkbO7mzLUh0J2gXwJdxzBIEldXecgfpmF51c6jdTBATb29/F9
+        b09jJpGAcDyCwgsFkqpSFsrvoyNs7O7i684Ovmxv43MqhdjsLHiEp1hbW/UmRSGmzuMhcjgcVCfLVNvR
+        wXj3j4/xQ3w1u+TN+DgyFFqtAQE9qK/XstrJ6XSSo6mJbG1tvgNR8PPw8EIJ/wkvhx12tcxZQY54sAs8
+        eXl5r/x+P66CHXY5IwpySJKkW6qqhnbEmhVFQSQSQTAYvEAgEEA4HNacra0tdHZ2hjhLNpvNMDg4OLa2
+        tgaXy4X29nbIsozm5mZIUh2qq82orDSirOwerNZHmjM3t4yent4xzlJNTU3V5OTk8urqKsxmswh7YLFY
+        YTRWieD9c5jNDzVnZmYBAwPDy5wlk8nkSiaT60tLSygpKUFDQ6OQ7P/EYqnVHFkcExPv1zlLFRUVz+Lx
+        OGKxGPR6PZzOJ7DbH18KO6Ojo5iamgJnqbS01J9IfMT0dBw+33P09w+jr28I0ehwFiPi/i9ebysWFj5p
+        cJYMBoO6uLiC+fkVuN3u/yJTwFnS6XQt+fn5vUxubm5fSmyY6mgKr9+mMPTuAypfuHG3UYXRO4Jvm5tg
+        J+NzlsTcFNxmCsrLX2qbPmtOTk/BpE9OkBZXdjL+WZY7iK4VFNCN4uKn14uKolfBDruZ+QOvqgI74xfB
+        qAAAAABJRU5ErkJggg==
+</value>
   </data>
   <data name="InvokeScriptCmdDescription" xml:space="preserve">
     <value>Invoke Script Command</value>
   </data>
+  <data name="drive-download" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACTklEQVQ4T42OXWhSYRjHH4KK
+        iBNkX9AHWx9QeaQuDpTsZgu7CsRJGjIcqyAFiY0xhm7RFqxTdLPoqtjCm+jCPsCwUhtL86O0nRo2zZy5
+        tXWR3qztYuUkfHqfsSOOsdWRHzz+n9//4YV6ZwFWQXB+xwYxUW5ge2E1D47d/FTh+K0xqLs7LWO79/XP
+        9Y7AvMgym5yTU92B2s5AhQOOEBy9NgJCf4Z4fCe1kLJ6ZlJsfkQZ7cip7qw4cKg7CoevxoDv+yj1vZ/D
+        M4NfkGbKaLfmgf32N7eZ4FtCsoVmUHV/Atl/Sc7JWfaCvW2vQGZPq9988Eoo1Z4o4SVpAQXfPG5zzWH9
+        8C80RH9jjSOYJKe6UylTuPuyFxQXn5p3tfuT2pEybveWcd2zMqqCZdzR5kvSjpxlB060iECcPH8Djlic
+        sPXCE9hsemDeYnUn66KItcOInMWdpIx25JAr90Cn0y2i1+vBaDTCaZMN9p3rh/WNg+aNLa6xDQyaKaMd
+        OeTKvRUHSCBOnbUA39hZQ9As52sd4AwGQxPD+g+a2Au4ygu0Wi0s0RwOh8cTiQTG4zEMBl+j1/sSPR4P
+        4znDzwigy/VinPnNcg8EQQCNRkO0lkolLBaLODv7E/P5Hzg19Q1zuRxjgjGNkpTGTCaP5FKHuosfz/Og
+        Vqs7CoUCut1uFEURe3t7sKvLgXY70cMQ0cJ+sVgayaWO/G1iw06lUtnNnjuZzWYxnf6Mo6MfmPwOI5EI
+        I8qI49DQWxwYeDhJLnUY1AUFQ8VxnEmhUIj/A7nUoe5fouy03kA6Jw4AAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="CheckGeometryFirst" xml:space="preserve">
     <value>Ensure the Geometry box is checked</value>
   </data>
@@ -3499,9 +3561,6 @@
         coazfwEpq4JeDHDvFwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
-    <value>This connection does not support executing this type of Load Procedure</value>
-  </data>
   <data name="SaveResourceFirst" xml:space="preserve">
     <value>Please save this resource first</value>
   </data>
@@ -3527,6 +3586,29 @@
   <data name="ResourceDoesntExist" xml:space="preserve">
     <value>Resource doesn't exist</value>
   </data>
+  <data name="icon_help" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIfIAOXl5QA5cw4/cnaYt/////Hy8UJyoUl4pjVtoQs8bhRGeDVqn+Xi3hBPjkBwnhJH
+        elF/q/Dx8FWHtVaFtWCPvVd5nxRIePDw8AApYCdWhEdskRFCc16CptHt/0+DtgA5a53K9wU5bFaJuTRq
+        n0p4qUp6qVqItiBZjWeXwkVzorbK3FF+rPPy8Q9CdwAhYCRUiBhVjTZllW+gzzlqlrDV+0luk3Wo3Xyt
+        2TpqmTxrnFOBq26h05WswEBwnE1wl3Om1ZKtxc3p/+P2/zFsqOP4/43B802HvwdDfj5qkjx4sXONqG+W
+        wBBBc7LI3j5tm3KVt5aovPP7/xtMffT//yJUg2eMryRTf4Cs1xFNham7zEBvoGSTwFl+omGRw3ik0WeU
+        wFJ2m09/qej//3Wn2rLE1fPz8hxMfRxMfAAkXB5QhShZixJFdwU9ciVWjSVXh7nM4FiGsypbjISv2VZ7
+        n1iGsQw+b+fv+liNu7fJ3VyApQ1CclSDrwQ8cEF1qXSn1DJik2GNuVGBr8jp/63D1Tx0rHiRrB1Pfe/w
+        7z90qHao2aSzx8rX5SFRgvD9/5+30B9PgeT9/z1lioiy2/P08itflO3r6CFQgqHQ+3CeyQAkXWiZySxd
+        kOXj3lWJuwAuZhtQgrLF2QU5a3ut3oKu2DRkkgAuaYqiu+Pv97PV+c7z/yRfmyRXjMfl/wAza+78/3yf
+        wO/y80l7rkRrkOTr78Xa8Ut5p0d6rythlTxrmwpBduXv+Z2uv6zT+Fx7mQAnYPT08kt6q3em1iRVg5qx
+        yGCNvBBIesPe9jl0rP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAADIACwAAAAAEAAQAAAI/wCRIasEq0CBMr8msSgQ4cIhTgLt
+        2BjjZ4eRJMeGEOqDAMEAZABE3ZAUTISjN01A6RhRK8WRAQASybmyZRYqVh1oRKlyq8eqPAB+jOqkAoQx
+        MkBoFdEV588nDgBkeJlwasoiVQ148BKC5MUDLgA0YaKw5NUeYFiyXHKVIU2uCgC6oPgiIVaJE4qCQDLF
+        hgofMADuEAMEZwWlYYKIQCn1yFArHwA8mKADwQCpRql2uWBkRoGnGgBsBQpzANemQXgsFZOyhgkGDQAQ
+        kTjgYEabOb2EtbAgoA4aWQAWGNCCQ40VAmIK+dqQIJSASABg5HASw80ZAgSUZNIT4oOAj08CiA8fT17A
+        d4EMAKhfz169wIAAOw==
+</value>
+  </data>
   <data name="HeaderFileMissing" xml:space="preserve">
     <value>The header file does not exist</value>
   </data>
@@ -3610,9 +3692,6 @@
 This will cause the package to be restored a the root of the resource tree.
 Are you sure this is what you want?</value>
   </data>
-  <data name="Func_RANGE_Description" xml:space="preserve">
-    <value>Range table for style theming</value>
-  </data>
   <data name="InvalidConnection" xml:space="preserve">
     <value>This is not a valid connection: {0}</value>
   </data>
@@ -3632,21 +3711,23 @@
         QmCC
 </value>
   </data>
-  <data name="icon_invokeurl_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="FieldRequired" xml:space="preserve">
+    <value>This field is required: {0}</value>
+  </data>
+  <data name="ruler" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIU4ANrf46y7zJ6rvLXLss/Z4cXQ2rPD1M3Fo8fR2rjHwK/BtbTJsb3TtcLXt8TOzsDL
-        ycTDpbrQtL7UtrnNs7DCtMHWt6m9rqm9rcHL1LHDtrDDtLPIsb7MxMDVtrLEtbHHsLbMs6u8xK/CtK++
-        q6y/ssDWtrrPtLjPtLrRtLzRtLvStb/VtqS1s7nJw8jSz63AtbzQtMDWt7bMsrvRtcHXt7zStcDMz7zR
-        tQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA4ACwAAAAAEAAQ
-        AAAIuQBx4MAQoKDBgwUxCAxgoKHDhgAMRBSwEKHFABRxBCDAsaNHjhk3AhhJsmSBjCFaZLCQgQOEAzAP
-        ADiJ4wGJBQMq3FjgwYVJihomDAAwoEGDCR5eyjyZYEGDoUQr0FjAgeRJBTBKQCUaI8UImDMFXOiwYivR
-        DhasClBgQsJWBhIivChAl+kGBlBn1GCwgYWAv38daBgwNAIKFQNE2EDAmHFNCh9AnJDxgcIDgZgxO0ig
-        4IKCBA4yYw4IADs=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAB3UlEQVQ4T2PYn8jCsD+JheFA
+        EksGEHdDcQZIbG0EM0gcJw3SywAiQIqAdM/fm8v+/7qy8D+IjU8jzGCwAfsSWTJBGpaFMF98sLnh/9dT
+        0//vTWQ5AxJbE8E8Bx8N0suwPZZlyu9ri/9fnej+/8fFef8/n5gKZ9/fWAcWw0aD9ID0MgBtmf92f8//
+        baUm/+9tqP3/8eik/6dbrP4/29aMF4P0gPQyzAtgap7lx7QRyLn/9fSM/+8P9YMk7oPECGGQXgagIjCe
+        5MY0787aqv8gkzdHM88AiU30ZMSLQWoYloYwM2yIAuPZIOe/2tP5H8QGic30xW8I2IBOeyYYXnhzZdn/
+        FzvbwH4DYlD4MMzAYwjYgJVhzDC8COR8UOABxRYhiTNM98HuErABjZaMMLz0+tKi/0+AaWFZKNNSIGaA
+        YS0xRgZ0oCrMyOCrDhRfHMwEwytfAZ3/CBiVQLGVMHFNUUzNKIaJsTEwVBgxgvDqK4vy/z9YV/1/rj/T
+        eiBm0CCkGWYSyDkTPBn3vAa64NmWxv8gNkiMWCAPVGiUasywsM2Z4TgIA9nzgGLKQCwHxBJALAzEfEDM
+        CcSsQAwMPQQQADIloRikWAyIRYBYCIj5gZgHiLmAmB2qmRlIw50HAIdyTYaOb/frAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="SelectPackageFile" xml:space="preserve">
-    <value>Select the package file to edit</value>
-  </data>
   <data name="QualitativeName" xml:space="preserve">
     <value>Qualitative</value>
   </data>
@@ -3665,12 +3746,8 @@
         sPPAGaBDix4NOiAAOw==
 </value>
   </data>
-  <data name="icon_null" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIECANji87HH6f///wAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAACACwAAAAAEAAQ
-        AAAIRAAFCBxIsKDBgwYDKFzIUCHBAAAiSpwY4OHEiwAqDoSIUaJGgRw7ZrQocuTGkiZBovwoIGRHli4x
-        wlz5sKFNhDhzHgwIADs=
-</value>
+  <data name="NoSchemasInFeatureSource" xml:space="preserve">
+    <value>Feature Source has no schemas</value>
   </data>
   <data name="ConfirmDeleteResourceData" xml:space="preserve">
     <value>Are you sure you want to delete this resource data?</value>
@@ -3706,6 +3783,9 @@
         AbE4EEthwRJAMTEgFgFiAahGkHqQZhYgZqI8M1GSlUF6AcIC84BckOgRAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="ColumnHasNoValidDataError" xml:space="preserve">
+    <value>The selected column had no non-null values and cannot be used.</value>
+  </data>
   <data name="FiletypeMGP" xml:space="preserve">
     <value>MapGuide Packages ({0})</value>
   </data>
@@ -3740,21 +3820,6 @@
         ggMuAmAYkqPDlQRbCoAIwKTLlwgfFsR58KXOmyp/hqT586TRokAN6rTZEsDMggJKGh1A0UBAADs=
 </value>
   </data>
-  <data name="icon_panup_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZuAJumsOTY2MS5uK+2vcW5uJumstrOzsi9vOHV1eHU1ZunsuXZ2dve4d7S0aaxvuTX
-        2ObZ2aaxvePY2NnNzODU0+HT1Ofb2sTJ0c7Jyfjz9J+rttvPztrPzpumsdbS0pqmsdfR0dbS0aSvupum
-        s9zPz9/T08/ExMzFxNbKydfOzdXJyqOuutjMy9zQz8fP1tvPz97R0dLLytfLysG2ttPQ08vEw6Ouucq9
-        vs/Dw6eyvuLW1eXX1+TY1+DW1sa8u+LV1vj09dTQ0NPHx8i/v9fKy+PX1pynsc3BwaSvu+fZ2tTIx+PX
-        18m9vJqlsNLMzMK4t8zAv9zQ0P///9TR0KGsuObY2Mu/v6CrtqSwu6mxu8m/vubZ2pqmst7T0tXKydXJ
-        yc/Jyca9vcbL0si8u7e9xK+3v5+rt8zDw9PHxtjPztrX1+fa28/S2NTMzAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABuACwAAAAAEAAQAAAIxADdCBxIcKCRgggHMgDAQOCLAARSgEE4AMAANz2gcIAgwIIWNQUBCKyxgACJ
-        BwLWnAlCUKSbEyYCCDDAQ8CWLm0GunTjA00VAhseCEkiIUbCGS0CKKFQIcECCSESjgmwpASFHzsCpCl4
-        JAqCGxMqIEigowgEGgRBPGnQAIcKGQZgGMjA5uJAD0NQTPDC4gsRIGIimClT0ImVAweYSLmgIQKWK1kQ
-        TsEQxoWCESIcrOCSUCCZAgWaUMlho7NAJAU+dFDgICAAOw==
-</value>
-  </data>
   <data name="script--arrow" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3802,6 +3867,20 @@
         AAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="application-export" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABzklEQVQ4T6WTO2hiURCGB+0M
+        go0YtrwKaqlphKCVhQ/EB1qE9Ek2CYElsFvErRZ7KytBEAtBsFDBqK2P5MpmIckiaCGIKCqi+MAHyuyZ
+        W66Fhgx85zTzDWd+OICI8BnA5/NxjDPGxYFQL+f1eoEAj8dzXi6X3xuNBtZqNXx7e8WXl9/4/PyEpVIZ
+        i8UKu3msVP4gz//Fx8fiOzkMcgFcLtfXQqGAuVwOs9ksZjIZTKVSmEwmMZFIYDwex1gshtFoFCORCIbD
+        YRSLxRcikQgIWuGSZfChIodBLoDb7b7abre42Wz2wvM85vN5ZE+/cjqdYLFYABwOx/V6vcblcrkXWo3K
+        brff2Gw2nclkArBarbeLxQJns9kO/X4f6/U6C7Ek5EJ59Ho9YQiTvxmNxhMwm8130+kUR6PRDpPJBOfz
+        Oa5WK6Q1/y+dTvcDaNJ4PMbBYLBDs9nEarWK6XRaSD8YDGK73RbmcBz3U6VSGcBgMNwPh0PsdDp7CQQC
+        giyXy38pFIpTNgRAr9d/p11brdZeQqEQ+v1+1Gg0D0qlErRaLYBarX6g53e73YOgXnIY5AJIpdJLmUwW
+        +AjkSCQSIKjoPGZ8ORDqPRJMqs98ZXL/Ad8QklT8D+CBAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="SelectLayer" xml:space="preserve">
     <value>Select Layer</value>
   </data>
@@ -3832,9 +3911,6 @@
   <data name="FilterDwf" xml:space="preserve">
     <value>Autodesk DWF (*.dwf)|*.dwf</value>
   </data>
-  <data name="FsPostgreSql" xml:space="preserve">
-    <value>PostgreSQL/PostGIS Feature Source</value>
-  </data>
   <data name="NewFolder" xml:space="preserve">
     <value>New folder</value>
   </data>
@@ -3883,18 +3959,15 @@
         AgYTKwZIyICycEMDLAkQlKDwxEdHHTyQVLjQEQsQCFMKBgQAOw==
 </value>
   </data>
+  <data name="ExtentsCalculationCompleted" xml:space="preserve">
+    <value>Map extents calculation completed. Click Accept to use the calculated extents.</value>
+  </data>
   <data name="MoreThanLabel" xml:space="preserve">
     <value>More than {0}</value>
   </data>
-  <data name="ColorCountError" xml:space="preserve">
-    <value>Failed to read {0} color(s) in line {1}</value>
-  </data>
   <data name="SymbolGraphicsImagePlaceholder" xml:space="preserve">
     <value><image></value>
   </data>
-  <data name="TextDownloading" xml:space="preserve">
-    <value>Downloading</value>
-  </data>
   <data name="sum" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3908,6 +3981,27 @@
   <data name="FailEnumDataStores" xml:space="preserve">
     <value>Failed to enumerate data stores. Reason: {0}</value>
   </data>
+  <data name="globe--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADV0lEQVQ4T3WPf1DTdRzG327K
+        5WnY4RWnZ51pU0AvuXUlanJNVDDvILs8y5MpWaDmxWkCd96pSQgxmGBGOgc7ajBtuo7MdfxQ+wM1xmAT
+        227MpjOSTVwEDLG1cI/vz+KuP7y+d697Pt/353me7/tLkn0/k6TIStLPfiVp2W9PSVX9q6UVPhVzjmmb
+        UFV0Lu7ZJ/zRHPPvQRQUu+fypWZpbZ+97MofAYMzGDrvDka6R8ZDjZ6HgTUGn13cC9+TBYWWuTMO2Zvy
+        f+jznXUNoSs4jkbnCLS2IVy7H4IrDLj+Bo5aB33CJ2H/fxvkmadKdrXq8ptu+cvb/Wj1h7gggkbHEEzu
+        INoHQugcHkfnGHDtAVDa7vMLv0Tk8sxEk7YY0pP2Nzu3fnsTO8578bX7AYov38WBS3dxuncUPw0CB80e
+        6Hn+3T3g3O//QFbwo1PkJm3Wc8GGE18o62xDGToX1tT3Ikvfi01GD7JNt7GzyYst9TeQedyCqp4w9nPb
+        +6Y72Mx+kWOIKL28eY/5XlhR48CSqm6knHRghdaB1FonXq+xQ2nyoejqI+xuG0NqlQ3JFVa8edIWFjmG
+        CxSHLSmHLkbSdP2QHbEgobIbiZU2JKltSFRZIVfZkFrtwjumMTy/rwVyNZdXdkREjuGCNz5tWaGyhl8s
+        7sBLZV2QcWDhBAmsspIOvFbtwdrGMbyQ34L1JmCDfiAscgwXpB35clFR8/CC8htIqPgFi486kFzlgPyY
+        M0qyugdLj3mwpKQHM7U5iDWuxizdtpDIMVyQoV4Xl62/+Qqb5MzymttYpfEivdaLjLo7WKv1QnHCg1dL
+        7Yg7k4YP/ixAzKnkECk/Xkd7s7gg86up9JamIeFgZ2CVxo/M+gG8Z7iPbcYAtp8NRHV+/Q7M0C5HvEGB
+        jYFc0HHZINXNtFFtnIZo0zdE7zbMm5xtbJWXOQLKM8P4qCmITy6MotA8GtXntCuh8L/9BFTzTBevwE98
+        Ev9KyTzK+b5hTuFVd5a2f3iXaSRccOFhROic6py/pnz+cohKZYOL+1aCKmO7oqhjeQMiKfMsk0hPx6fQ
+        stwPSWnUUW5zG+W1WqIq3sX8wHTXbO8i0OHp12n+ZCmXRL8vYaZNlMxm/X92xugob8p12h2jncjRY8Vf
+        HJIr03vAAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="application-search-result" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3925,6 +4019,25 @@
         mEwmE4KEACz0Y8g4ft7GTSrUgpqQAl1DV5EMXUFSMYhCKOAXo8sWCvVAT3EAAAAASUVORK5CYII=
 </value>
   </data>
+  <data name="color" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAC3klEQVQ4T6XSa0hTYRgH8Cdd
+        yyCCBDWLWRARdsE+VhRllCH0LWEYFSZ2wTJ0kIhm0dzy0rIbCGGOXKkLNU1y3nNU1vCSudlxK0bBlpk5
+        5Ciabu78e/TDTAj60Ic/L+dw/r/zPu85BID+JwvlisdEA8+IPuYTWRIpbOAQKe07g7X2cHmZXb6mzC7b
+        rh2kWGU/HQ8TSEM2qiUztS50lwI3KdZxLdQwWnamf+al0SO9Nfukjle+GUOTZzSppN8RmmMQqCD270AD
+        HXZUK1pmP1eJsD4BjFeBPBWg4jX3MVDajdl7VtGxvqrFRvWHl+zgSQ1FWntWm2Y8jybhLgYsXGxUA3od
+        oHsAaBqAy128fsGM+vukdZXF1ErmyMAIejOlCe4E15xUCkxmAK4iwKYHOqqBmhag/ANQ/BXIFDGX54ew
+        3+0ykiUtABRaqP7TVOEvN7IwjuuYm+PyeDPg7AZ6HUDbGPwGLyZuAN94cx+Sp37pyFIfAM69JrvVXyJ1
+        4RJsKIQLTzEJC/yzbkgj05juA4brAOE28C4d6Dzvl1LptT0AHOokZ7O/QKpEGhoZeMPAIAPD+IkfIjD0
+        nosMNDFgZEB/wi8doU5nAIhqpXbtRIq3iHdwh0cohwHNDHRjDL0MtDFQYQTu8wjaVODCwQnvRmptDwDL
+        Kih711CMmMFABnJRhEro0YNqBmom+AwH+Axr+Aw1QNIpIHrDkBhEddkBgNSkkJvkwlHxpDeFR1DxCGr0
+        QgcPdAxorPwVeYSkQmDfMdErW24SiB4qFoF0Iqok5coXEe4D41d8iahFCvpwkYGLDJxlIPE5sDd33Bei
+        eOEmqlYS3V38lblOFM1JD1bK9NGCoksl7h5t9sb7RqR4j0/a0zHqjcrqEmUxeoHkKi5vXags7oBIxtcR
+        nG20aUUcnd5yizQJZsrPdFJOvpMSNWbalnyLQjbH8TM7OGs5sj+BIL6xihPOWfePzL9o/tmgeeA3KbNy
+        RaQn6HMAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="InvalidColumnNameError" xml:space="preserve">
     <value>Invalid column name</value>
   </data>
@@ -3937,6 +4050,9 @@
         zGQOweCXH55vQ9AfQtD5ofccGoJ+VwR7fmXc/QGbydmsomqW4QAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="ExportNoCommandsSelected" xml:space="preserve">
+    <value>No commands selected. Nothing to export</value>
+  </data>
   <data name="ui_menu" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3948,9 +4064,6 @@
         +XwWigxZkCTpTZblvymRBT4z3gvvVTAys38hdsO4G3bw/gAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="SelectProperty" xml:space="preserve">
-    <value>Select Property</value>
-  </data>
   <data name="FilterSqlite" xml:space="preserve">
     <value>SQLite files|*.sqlite;*.db;*.sdx;*.slt</value>
   </data>
@@ -4141,37 +4254,9 @@
         oBKHJmjZcgFCgwoWCFg6oKpOhQNbXsWK9SfXr2ADAgA7
 </value>
   </data>
-  <data name="function" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABIElEQVQ4T6WTsU4CQRRFdwnE
-        EIkxKBL5BkKjDRQWFljQEwq0pCI2FFT8ABV+gB0dxMrEBAsTowmVxs5f8CvWc/GtWcdZDWGSk3nvvnl3
-        Zmd3gyiKgk0IwjD00UafG4q967Sxr3BMww2cQtXitQx6NM1gL23nWE87wYQFV/81q+4ajBHvHGqJvGum
-        ZdO6vhPUKd6DZj33hc0d03UvU2j6TqCGS1hAyXmEBvmD8X2hvhNcs0i4t95CewK9oVQD7foIA8dA38HS
-        OPvL4ITiC2gONJiHpilW7dwMFH+9hcQYEb9B2bQ+83uiHufSWtKTBnXyZ7j9Yfk7KSCJ1YgNPojFKxzB
-        PhRhF3ZgG/KwBTnIQgbC2KBCcgg6+sHaBpv8yur9BCINtCQt9llRAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="SelectSpatialContext" xml:space="preserve">
     <value>Select Spatial Context</value>
   </data>
-  <data name="FilterXml" xml:space="preserve">
-    <value>XML Files (.xml)|*.xml</value>
-  </data>
-  <data name="icon_select" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZdAOvsxmuAjjRRfpOhtpOitjRQeDVQejtTfDZUdzBMejtXf///1/385///74OTl3WE
-        mu7w81Zhdv384KCuwG+EmZWjtPz72/7+3ISQoeLlyFptkPj5vs3Q1ImYsOPl0ktgg3CBnP/95mp9if//
-        4NfZ3P//zYKTjKWviv3919/inpuovOTo59DU27e6weTn4P//7KGyxzVRfjVQezJNdlRqgoCQl7/Gzm6C
-        n9fd15adp+PmzNfe0P//97C6y2d7ltXb45mppoqZra2yt+rs7v///5mjuOLjrdLauuzvqmN5jjVSdf//
-        9NfavlltiGp/nGB1h9nenmBviLq9wrS4vjRQdzNQelhujqGwnOXp7M/V2KWvwfv60+Ln2v///wAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABdACwAAAAAEAAQAAAIjAC7CBxIsCDBBDcMKuyioMeEhQVjQPihAuJAAViIZAlisYuMFUt44BhgsYqL
-        Bgxe7CAA0QCXEBIsjMhQYSEVDxdQbGFyBEgHhQV0LABQgsaBD1EUIgBQ48kGBw+ESFGoJIAVH1eMaBiy
-        cAaIKRgoIDFRZKENEl1YRDgBpQmHjjmSpBDRomMXGE60FAwIADs=
-</value>
-  </data>
   <data name="NoColumnValuesError" xml:space="preserve">
     <value>No values found in selected column</value>
   </data>
@@ -4193,15 +4278,6 @@
         ZOHTRoMQHTMDABEB5YWDGUmU6KHxQAwGBKj95EkRIw6LFVV6fEig5oJChVHMbOijMCAAOw==
 </value>
   </data>
-  <data name="icon_selectradius" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQZAM2vsxU2aKi0ws2TlvLyl86Ym82Xm85ucM5hY85sbs81Ns9GR82rr8bMjs8cHM5c
-        Xs8xMaOuhqiXpKiAjc5YWs8bG6lYZM6Bg889PgAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAZACwAAAAAEAAQAAAIjAAzCCyAQIEDCBQKCFy48MCCBAMYDEiA4QBDgQceGADA
-        kaOBBxYXFliwsWNHAwsUCkSQwKTLCwgWQhjgEkAACQAGQFjogEHNADcZVFiogKbLAA0CTFCwkOVPAkkt
-        iCR5lADUAAIaajQZwOrVrBgfRhzQNQJQoAwJGlQQwKyAt2AvCgQaVy5DrHbz2g0IADs=
-</value>
-  </data>
   <data name="InvalidValueError" xml:space="preserve">
     <value>Invalid value</value>
   </data>
@@ -4219,9 +4295,6 @@
   <data name="FilterAll" xml:space="preserve">
     <value>All File Types (*.*)|*.*</value>
   </data>
-  <data name="Func_FEATURECLASS_Description" xml:space="preserve">
-    <value>Returns the active feature class name</value>
-  </data>
   <data name="icon_panleft_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZuAJumsOTY2MS5uK+2vcW5uJumstrOzsi9vOHV1eHU1ZunsuXZ2dve4d7S0aaxvuTX
@@ -4237,23 +4310,33 @@
         jBDhYAWXkG7IFCjQhEoOG5jdICnwoYMCBwEBADs=
 </value>
   </data>
+  <data name="gear--exclamation" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACv0lEQVQ4T6WQbUhTYRTHn9sm
+        IhbolwWlEqaYTEO2SGcfFiu1ph/UbZ8MxC+9EEUQjQwTkkyioMIFpWIpawVGoUyDTTfTeVfe5e5eTJfT
+        llxfNoiSWIUUp+dsLhT61oUf53DO///n3IcAAPkfYma1Wk2qqqpITU0Nqa2tjVWtVqugnNpAsXmHWvQg
+        WwKqq6tLqfAMrbuxrq+vQzQahc0z1PwzoLKy8pBer78biUSgoaHhChWdXV5eAgR7nOEONajdckFFRQWh
+        nAuFQsBxk7C0JIDZbJ4TBAEQ7IPBYGyHGtRueOK/oFAoiFKpzNBoNM0eDw8874aFhXlYXPwUA3uc4Q41
+        qEVPcXFxPKCkpERJBxeRnp7HQb/fBybTk5mCgoL7CPY4w11Ch56/ATKZTO9ycWC328DpZMHr9UJh4f42
+        kUhEEOw9zuvAWVQwYb0MqEUPJX6BVCptdDgcYLVaAavP9x6KimQtDMMQRC6TtrpHNfA10gsTQ8fAMW4D
+        9FDiAbm5uWU5OTlNSHu74aPb7YeBgWG3XH7wKvLCpPcHPefhV7QP3ljKhZMnJEb0UOIBWVlZJDMzc49M
+        Jr/Nsi4YGRmHQECA1dUfsLLyDdz2OviyfAd0Oh2EF5p/2kwik6OPEVPiARKJBGlhWR76+y0wNuYCg6Ez
+        NDnphwl7B0zZtb/XhCYgVL4yexoGjXuF0WfMEfvTjYD09HRCOa5SlRk5bhby8vLvpaWltbKsD2wvdTA7
+        Vfd9xlcOg+ZL4OUPwzu2dG3YyDyw9NIHwgvwE4vFJCUlRZ2amtqWnJycjZXnzOB8dRRCARXMT8tjF2Cd
+        nz4Ar5/vcA51M6WJADFd7qTQZyVyJCkpqf7aBZGHH82OhufyIfxhH0Q/N8YqEnBmhPsfMl2JgG3UtJ0i
+        oexK0NlKOiiuzXTdIFx3G3n76CZhe28Rwx+y4Aflu5kbswAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="FsPreview_RasterPropertyNodeTooltip" xml:space="preserve">
     <value>Name: {0}{6}Description: {1}{6}Nullable: {2}{6}Image X Size: {3}{6}Image Y Size: {4}{6}Spatial Context: {5}</value>
   </data>
   <data name="SelectSymbolLibraryFirst" xml:space="preserve">
     <value>Please specify the symbol library first</value>
   </data>
-  <data name="icon_selectpolygon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIMLAM2qrs8YGBU2aKi0ws2OkfLyl851eMbMjqiToKOuhs6QkwAAAAAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAALACwAAAAAEAAQAAAIbwAXCFxgIIDBgwcHCixIAIDDhwAC
-        KGQIEaLEhQEaVnRI4CLFjQA6GhCYcaMABBFHkgQp4CQAhQFYHhAwACbLAjNrrjRZACfNnQ8bCujps2bM
-        oBKHJmjZcgFCgwoWCFg6oKpOhQNbXsWK9SfXr2ADAgA7
-</value>
+  <data name="ProcessedItem" xml:space="preserve">
+    <value>Processed: {0}</value>
   </data>
-  <data name="TooManyIndiviualValuesError" xml:space="preserve">
-    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
-  </data>
   <data name="icon_search" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIcAAAAAAP///4CLnpWeriI3WjRJazVKbDRJajVKazdMbcHGziI8ZC1Ne0hadq+3wyA8
@@ -4355,8 +4438,8 @@
         4sYRGFgFKozSccGGJjZMAC0IoMKBJzh49EhSo+DGAwQMrBybFUDeDCuzOiTrcbDgwwQbKs4aEAA7
 </value>
   </data>
-  <data name="UpdatingConfiguration" xml:space="preserve">
-    <value>Updating Configuration Document</value>
+  <data name="NoTransformationRequired" xml:space="preserve">
+    <value>No transformation required</value>
   </data>
   <data name="PromptDeleteWidgetAndReferences" xml:space="preserve">
     <value>Delete this widget and all references to it?</value>
@@ -4392,22 +4475,16 @@
         L1tJUV/SlAd3xCblH+s4aw2T/BzJAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="map--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_invokeurl_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACt0lEQVQ4T52ROU8TUACA32bQ
-        H6BxI+qgJqjEwRgHBhMHxcQoCwNLxSJYiiC0QcALRQIFIodURYW0hoKglSuAnGIVbL2g1gMFpAWRiCKF
-        QkA+34txMg76ki9v+b53iohTp8IlR/6D8EMZGUIcTE/X8h9DdRIhDqSmxizLBaw9adzpO0/PQBHuQSvO
-        wRYs/QNk9noxdvs43uxDV+cjttaH8lUnEWK/wRC7tLzMjfYUWgdN9HrN9HnMTAXaeTXzhspxPxkOH+fc
-        kOaEWLsP5atOIsTepKS4hR8/MDcfp95zgfYPBTQ/NfFp5i6Tcw4efx0h58kQ2W/h9Es4VjeK8lUnEWKP
-        Xq8LLC1RVBfHlZZEKjpTsbuy6HhRwMvXFfS+aaTS4+GsY5iUjhH0TSMoX3USIXbHxcX7FxfJr4mh0nkS
-        +8A5LF0neTRaytCUjS9zbbS527CNf8f0fpnE1mGUrzqJEGFabcL0wgKmW0ewOAxUPU3nWmsy99/n4xor
-        Y2z6Di5PtbzKMGWjCxg7hlC+6iRC7NJoEqfm58m7rqW8Kxlrr5GSBj0Nry/SOXQJ9+cKnANljPqdNE9O
-        cLr7HcpXnUSIHVFRSZOBAAUlseTcjCa3MpriRh2XGxO4ft9I1YOzONwlOPvLaXnRROGj5yhfdRIhtkdG
-        Jk/MzVFUoMNiN1LedoJcWzQ2Vxp2d6b82jxqH57H+62Gz7Pd1LraUb7q4kNChNgaEWEYm52lOEePrSqd
-        ivoULlo0WB4bqH6WIb82C+u+UO5uCaZ+23pqNq2T8zauBgV5bwlhFhvDw1O9fj/F2fEU5sRjKowhu0xD
-        tlWDqVpL4T0d5g1rCERF/UGpEE6xZufOMxPyVT/OzPyV24cPUyR3/U1xaCgnVqwYy1QnCAoOPrpq8+as
-        f0V1YeLXWClZLVn7DyhfdeInSrd8PdhgSYgAAAAASUVORK5CYII=
+        R0lGODlhEAAQAIU4ANrf46y7zJ6rvLXLss/Z4cXQ2rPD1M3Fo8fR2rjHwK/BtbTJsb3TtcLXt8TOzsDL
+        ycTDpbrQtL7UtrnNs7DCtMHWt6m9rqm9rcHL1LHDtrDDtLPIsb7MxMDVtrLEtbHHsLbMs6u8xK/CtK++
+        q6y/ssDWtrrPtLjPtLrRtLzRtLvStb/VtqS1s7nJw8jSz63AtbzQtMDWt7bMsrvRtcHXt7zStcDMz7zR
+        tQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA4ACwAAAAAEAAQ
+        AAAIuQBx4MAQoKDBgwUxCAxgoKHDhgAMRBSwEKHFABRxBCDAsaNHjhk3AhhJsmSBjCFaZLCQgQOEAzAP
+        ADiJ4wGJBQMq3FjgwYVJihomDAAwoEGDCR5eyjyZYEGDoUQr0FjAgeRJBTBKQCUaI8UImDMFXOiwYivR
+        DhasClBgQsJWBhIivChAl+kGBlBn1GCwgYWAv38daBgwNAIKFQNE2EDAmHFNCh9AnJDxgcIDgZgxO0ig
+        4IKCBA4yYw4IADs=
 </value>
   </data>
   <data name="document" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4443,24 +4520,30 @@
         5ET8AeUdBAROQKmSAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="icon_printablepage_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_selectradius" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIZsAO7y9pKaptzi6LC5xtra4P39/f///6qrsqmqsdbX26+xuN/j6O/v8qurs9HT3ff4
-        +f7+/qmrsr6/xvj4+bi4vaqrs8TFzqyrs7q9wb/CyL2+w+zs7bW2vO3v8dLT3rW2vcHEzLu7wOrs7cPG
-        zfP09crM0/X298/R2sTGyre2vP39/qystNva3sbGycbHy7q9wuLk6fr6+8bJ0eHj6LGxt6mrsejp7Pv7
-        +8/Q0bu9w7i4vry8wtrc4N3g5s/Q0vT198PDy729wtvc4e3t77CxuNzd4vz8/M/R27q9xb6+xvb3+L7A
-        w7S0vuDg5ayut/Lz9NXV1ubn7N7g5czMz+Tl59vc38DBxMXGydTW3M7R27Cvt7i5v/z8+87O0fn5+vLz
-        9fr7+6yttLi5wMHCx8PEzaiqsdXV2Ozs8aqqscTFyNfX29LT1////wAAAAAAAAAAAAAAAAAAAAAAAAAA
+        R0lGODlhEAAQAIQZAM2vsxU2aKi0ws2TlvLyl86Ym82Xm85ucM5hY85sbs81Ns9GR82rr8bMjs8cHM5c
+        Xs8xMaOuhqiXpKiAjc5YWs8bG6lYZM6Bg889PgAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAZACwAAAAAEAAQAAAIjAAzCCyAQIEDCBQKCFy48MCCBAMYDEiA4QBDgQceGADA
+        kaOBBxYXFliwsWNHAwsUCkSQwKTLCwgWQhjgEkAACQAGQFjogEHNADcZVFiogKbLAA0CTFCwkOVPAkkt
+        iCR5lADUAAIaajQZwOrVrBgfRhzQNQJQoAwJGlQQwKyAt2AvCgQaVy5DrHbz2g0IADs=
+</value>
+  </data>
+  <data name="icon_panup_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIZuAJumsOTY2MS5uK+2vcW5uJumstrOzsi9vOHV1eHU1ZunsuXZ2dve4d7S0aaxvuTX
+        2ObZ2aaxvePY2NnNzODU0+HT1Ofb2sTJ0c7Jyfjz9J+rttvPztrPzpumsdbS0pqmsdfR0dbS0aSvupum
+        s9zPz9/T08/ExMzFxNbKydfOzdXJyqOuutjMy9zQz8fP1tvPz97R0dLLytfLysG2ttPQ08vEw6Ouucq9
+        vs/Dw6eyvuLW1eXX1+TY1+DW1sa8u+LV1vj09dTQ0NPHx8i/v9fKy+PX1pynsc3BwaSvu+fZ2tTIx+PX
+        18m9vJqlsNLMzMK4t8zAv9zQ0P///9TR0KGsuObY2Mu/v6CrtqSwu6mxu8m/vubZ2pqmst7T0tXKydXJ
+        yc/Jyca9vcbL0si8u7e9xK+3v5+rt8zDw9PHxtjPztrX1+fa28/S2NTMzAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABsACwAAAAAEAAQAAAI1gDZCBQ4oKDBggMTshlgoGHDAQACKPSxREcQABgBQBQgkQ0OK1OGFDBzJeNG
-        jim6bDBQ4EaBHSYDyAwAhQOEAmC8KKHSIqOAnxI1oIgxwcQXAiEyYuQo8MMEAlAJMBHzwmfHMVATaFVQ
-        BMaWpRIjjACSAIkCBSWSFKhCAwDHBj24SMigAAuDMz86sNDiNsAKB1JUSHjygAeGAzkQpAGK4IiDKCRA
-        1EDgYYYIIjMDlMlygoEMJ00gGCnw4AKFBajZNDgQoQKCMEJsuDhgQY1ChWgOkFmjMCAAOw==
+        AABuACwAAAAAEAAQAAAIxADdCBxIcKCRgggHMgDAQOCLAARSgEE4AMAANz2gcIAgwIIWNQUBCKyxgACJ
+        BwLWnAlCUKSbEyYCCDDAQ8CWLm0GunTjA00VAhseCEkiIUbCGS0CKKFQIcECCSESjgmwpASFHzsCpCl4
+        JAqCGxMqIEigowgEGgRBPGnQAIcKGQZgGMjA5uJAD0NQTPDC4gsRIGIimClT0ImVAweYSLmgIQKWK1kQ
+        TsEQxoWCESIcrOCSUCCZAgWaUMlho7NAJAU+dFDgICAAOw==
 </value>
   </data>
-  <data name="InvalidRecordCountError" xml:space="preserve">
-    <value>Invalid record count in line {0}</value>
-  </data>
   <data name="ExtendedClassTooltip" xml:space="preserve">
     <value>Extended class based on: {0}</value>
   </data>
@@ -4484,8 +4567,8 @@
   <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
     <value>No custom commands selected. Nothing to export</value>
   </data>
-  <data name="FindNothing" xml:space="preserve">
-    <value>Could not find specified string or end of document reached</value>
+  <data name="ColorCountError" xml:space="preserve">
+    <value>Failed to read {0} color(s) in line {1}</value>
   </data>
   <data name="DeleteCommand" xml:space="preserve">
     <value>Delete Command</value>
@@ -4538,8 +4621,8 @@
   <data name="FsMySql" xml:space="preserve">
     <value>MySQL Feature Source</value>
   </data>
-  <data name="ColumnHasNoValidDataError" xml:space="preserve">
-    <value>The selected column had no non-null values and cannot be used.</value>
+  <data name="OperationCancelled" xml:space="preserve">
+    <value>Operation Cancelled</value>
   </data>
   <data name="images_stack" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -4601,12 +4684,12 @@
         cmzwcWHIoBGfFriKNOvTAQywVl2oQOxThWUfcPR6diaEmxDGnh1Y8GDbhAEBADs=
 </value>
   </data>
-  <data name="Func_IF_FalseValueDescription" xml:space="preserve">
-    <value>Returned if condition is false</value>
-  </data>
   <data name="Func_URLENCODE_Description" xml:space="preserve">
     <value>String encoding function</value>
   </data>
+  <data name="UpdatingConfiguration" xml:space="preserve">
+    <value>Updating Configuration Document</value>
+  </data>
   <data name="icon_tasks_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQAAAAAAP////39/vz8/fv7/Pr6+/n5+vj4+fb2936EjuDi5YyTnM7T2bG3vvf4+fb3
@@ -4632,37 +4715,19 @@
         sJgIoscTFB1OcKjBeciIIDQmeoCB+WwJG6iBhFgxY2KB17Bjyw4IADs=
 </value>
   </data>
-  <data name="color" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="function" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAC3klEQVQ4T6XSa0hTYRgH8Cdd
-        yyCCBDWLWRARdsE+VhRllCH0LWEYFSZ2wTJ0kIhm0dzy0rIbCGGOXKkLNU1y3nNU1vCSudlxK0bBlpk5
-        5Ciabu78e/TDTAj60Ic/L+dw/r/zPu85BID+JwvlisdEA8+IPuYTWRIpbOAQKe07g7X2cHmZXb6mzC7b
-        rh2kWGU/HQ8TSEM2qiUztS50lwI3KdZxLdQwWnamf+al0SO9Nfukjle+GUOTZzSppN8RmmMQqCD270AD
-        HXZUK1pmP1eJsD4BjFeBPBWg4jX3MVDajdl7VtGxvqrFRvWHl+zgSQ1FWntWm2Y8jybhLgYsXGxUA3od
-        oHsAaBqAy128fsGM+vukdZXF1ErmyMAIejOlCe4E15xUCkxmAK4iwKYHOqqBmhag/ANQ/BXIFDGX54ew
-        3+0ykiUtABRaqP7TVOEvN7IwjuuYm+PyeDPg7AZ6HUDbGPwGLyZuAN94cx+Sp37pyFIfAM69JrvVXyJ1
-        4RJsKIQLTzEJC/yzbkgj05juA4brAOE28C4d6Dzvl1LptT0AHOokZ7O/QKpEGhoZeMPAIAPD+IkfIjD0
-        nosMNDFgZEB/wi8doU5nAIhqpXbtRIq3iHdwh0cohwHNDHRjDL0MtDFQYQTu8wjaVODCwQnvRmptDwDL
-        Kih711CMmMFABnJRhEro0YNqBmom+AwH+Axr+Aw1QNIpIHrDkBhEddkBgNSkkJvkwlHxpDeFR1DxCGr0
-        QgcPdAxorPwVeYSkQmDfMdErW24SiB4qFoF0Iqok5coXEe4D41d8iahFCvpwkYGLDJxlIPE5sDd33Bei
-        eOEmqlYS3V38lblOFM1JD1bK9NGCoksl7h5t9sb7RqR4j0/a0zHqjcrqEmUxeoHkKi5vXags7oBIxtcR
-        nG20aUUcnd5yizQJZsrPdFJOvpMSNWbalnyLQjbH8TM7OGs5sj+BIL6xihPOWfePzL9o/tmgeeA3KbNy
-        RaQn6HMAAAAASUVORK5CYII=
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABIElEQVQ4T6WTsU4CQRRFdwnE
+        EIkxKBL5BkKjDRQWFljQEwq0pCI2FFT8ABV+gB0dxMrEBAsTowmVxs5f8CvWc/GtWcdZDWGSk3nvvnl3
+        Zmd3gyiKgk0IwjD00UafG4q967Sxr3BMww2cQtXitQx6NM1gL23nWE87wYQFV/81q+4ajBHvHGqJvGum
+        ZdO6vhPUKd6DZj33hc0d03UvU2j6TqCGS1hAyXmEBvmD8X2hvhNcs0i4t95CewK9oVQD7foIA8dA38HS
+        OPvL4ITiC2gONJiHpilW7dwMFH+9hcQYEb9B2bQ+83uiHufSWtKTBnXyZ7j9Yfk7KSCJ1YgNPojFKxzB
+        PhRhF3ZgG/KwBTnIQgbC2KBCcgg6+sHaBpv8yur9BCINtCQt9llRAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="control-stop-square" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABcUlEQVQ4T8XTO0hCYRjG8Q8M
-        6YKE2RC1VRANQVNDQi65RVC0hDQEBS2F4FBQSy2BQxdrUOg6mDWEBJZJUdBSw1cEZYNh2AUywgiHEBSf
-        3ldQ+ChJcGj4cc6B/3nOtxwBQBSjqJf5w5mBjtWoMK29uYgsgIv77KkzN0bXC5PLEWD+Pq2YC6WR5XgA
-        uONeGWhzhAWR9rsUJs8Tec3eJMEd98pAqz0oiJy5SmA0EM8Z8cUwuPuKgZ0nWDwRWI/fwR33ykDztBRE
-        Tl18YXgvhn73I7qctzAvXqJzQeZYPCFwx70yUD9+Joi0nn7A7AzCtHT9q153CNxxrwzUjQUEkT2+KFpW
-        wnmZtp/BHffKQPWQVxDZ7o+jxhPLq8n7Ce64VwZ0li1BZONRClpvMq8qXxLcca8MlPatCyIbTgBDANAf
-        ApV+QEcqDoByUrZPz3TlTmuaUAeEEBqN0bah6XbJPxltm9SXKCfgAaIntQUw/Bj417/xG49phw+gF0Mn
-        AAAAAElFTkSuQmCC
-</value>
+  <data name="Func_ARGB_BValueDescription" xml:space="preserve">
+    <value>Blue value</value>
   </data>
   <data name="icon_zoomin" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -4699,26 +4764,8 @@
   <data name="FindReplaceNothing" xml:space="preserve">
     <value>Nothing to replace</value>
   </data>
-  <data name="icon_panup" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIeDAJhpZZpqZiJNeNikptelprG+zCBPfSJNdyJOfVJvjMybl9Kgn7ShnSNOeCJPea2f
-        nq6entWjojVkl6CBgB9NfjVjlB5OftOnqDJejp1xbp9wbM6cnbWEgbaGhKh3eJBkYbeKh9CdnM2jpMeU
-        kcCNirqIi9qoqZ5ybdOfodSmptenpbuKhriHg6uWkyNQeq59fNakpciYljZklaB1dCtXhTFhkC1Zid2m
-        qdilpJlxbah2cyBPe////9ioqLCRjtCdmrKiotuop8OWkaZ0c3+hvdmhpMyZlipZhkFiirWgnd2prcGP
-        jvXm6TNfjcmdmtShoMKPjoKVs9KanbmTkrqIiaiOjVFwjNulpZJnZqNwcpd0dE9wkGF8mNimpdimp7GR
-        kvfk6MeVlKyfqcSSkd6rqDVjk9KeoqGEgbyWk5emu36SscSUkjFfj8WUkDdlltOaoDJeirqurqOPjiBM
-        eax/f9Ghn8aUkyBOf9yorNympKJybtKeoMOTkcuYlShYh6R/fpx6eL6KjL6LigAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACDACwAAAAAEAAQAAAIxAAHCRxIcKCLgggHFhBQQKAdLwGm
-        VEGYQECCQSJ0CLkCgMyMOAUbCJzQI8CIAQCU/IFA8IDAM3QIAFiDAwAeJ18GuhSYg0OeAG0GdLiRwkfC
-        D2G6sPjxZo+JCwwSalABY0MIFEUIoCnoIUadLEukLDDzJEIQMQSTYDGi4EUJQWP68AGTxgpBIIBWQAFB
-        gkogJlHK+NlSsMWQDCf08FBzpEINGkgQPpCjhYiBO00kYLCQUCAXBAjm2HADp7NANhR2ODAgIyAAOw==
-</value>
+  <data name="SelectPackageFile" xml:space="preserve">
+    <value>Select the package file to edit</value>
   </data>
   <data name="Func_DECAP_StringValueDescription" xml:space="preserve">
     <value>String to format</value>
@@ -4732,64 +4779,28 @@
   <data name="SaveMapBeforeTiling" xml:space="preserve">
     <value>You must save this map first before you can run MgCooker</value>
   </data>
-  <data name="globe--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADSklEQVQ4T4WRbUxTVxzGD+1M
-        JGYuMSFmiyMOQQuaiDUqGwsRGG+aoCRkKpHOlymKi2SZQkKmbAxtKC8FtUoDErRQFalhzhpe3PaBqZRC
-        G7RNKavWKbRAJZQi2lXWZ/9zxU9+8Ca/PPee//M859x7mejYfSYqMjLxL38zsfyfhWLF6FfiCpeCaCO6
-        51UhrPM5+bif57JKvmXCjVBQal9OQ/Wmhqdm+V/PPVqrz3/T7gsOTM/5WxwvPSlal5nPue9tAc++KSg0
-        LP+oxNxe8NtT13XbFPp9c2ixTqPeNIV7E37YAoDtX6DaOOniPu4XckJBnj5UlN/VWND+yF3e40aX208F
-        QbRYpqCz+9Az7kefdw59s8C9F8DpHpeb+4Vcnp6xkN3atJjiDus314Zx6KYTl+wvUPrHCE78PoIrQzP4
-        cxI4qXdAQ+s3xoC2Z68Rdfy2ledCcjRUkHXhjOyiaSq90YaUpiFs0wxhR6sDubrHONzuxO6mB8g8a4By
-        MIBiatune4Ic8vMcwRhLK+/4Xj8WSFRZsFY5gLg6C+LrLUhosOJLlRkynQtFd//Dd92zSFCaEFthxJY6
-        U4DnCCpI/NkQV3InmNw4iqhTBkgqBxBdaUJMlQnRCiOkChMSamzI1s3i02OdkFZReWVvkOcIKtj8U2e8
-        whj4rLQXkfJ+RFFg1TwS0qiyXmyscSC1ZRbhBZ3YqgOyNOMBniOoIPnUudVFHd6V5Q8gqXiINdUWxCot
-        kNZaBWKrBrGp1oG1ZYOIV48hrQ1IVj3y8hxBBelVGUtyNcPrySQlvlA9RpLaibQGJ9IvPkFqvROJFxzY
-        cNqMr29DYNnhG8OrN+ZnZEemUkHm+VC2Xd0sOdnnSVK7kdk0jl3aCexp9WD/dY+g8qRcqMLXoEGynjT6
-        dc2isEltiMikZUzN2I7LjO1sjvggt7VLKrd4ZFe9ONLuww+3ZlConxFUGbkOr2Syd6hjrJ+OQNfSGHqV
-        sgi299fmZYV37dvqR735uunA8Vsvg1yPxO98dTRshf/o4o8nfxQveEifrp9TJpyAMTERRkSzD5fGsc8P
-        HmCy1kZ2sKOb5XUZBOXPfJ3PGaPdWFg45fg/4JeIWDRf8gnp++CbcT/Psf8BxLcXab+EC34AAAAASUVO
-        RK5CYII=
-</value>
+  <data name="IncompatibleConnection" xml:space="preserve">
+    <value>This connection is not compatible</value>
   </data>
-  <data name="globe--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADV0lEQVQ4T3WPf1DTdRzG327K
-        5WnY4RWnZ51pU0AvuXUlanJNVDDvILs8y5MpWaDmxWkCd96pSQgxmGBGOgc7ajBtuo7MdfxQ+wM1xmAT
-        227MpjOSTVwEDLG1cI/vz+KuP7y+d697Pt/353me7/tLkn0/k6TIStLPfiVp2W9PSVX9q6UVPhVzjmmb
-        UFV0Lu7ZJ/zRHPPvQRQUu+fypWZpbZ+97MofAYMzGDrvDka6R8ZDjZ6HgTUGn13cC9+TBYWWuTMO2Zvy
-        f+jznXUNoSs4jkbnCLS2IVy7H4IrDLj+Bo5aB33CJ2H/fxvkmadKdrXq8ptu+cvb/Wj1h7gggkbHEEzu
-        INoHQugcHkfnGHDtAVDa7vMLv0Tk8sxEk7YY0pP2Nzu3fnsTO8578bX7AYov38WBS3dxuncUPw0CB80e
-        6Hn+3T3g3O//QFbwo1PkJm3Wc8GGE18o62xDGToX1tT3Ikvfi01GD7JNt7GzyYst9TeQedyCqp4w9nPb
-        +6Y72Mx+kWOIKL28eY/5XlhR48CSqm6knHRghdaB1FonXq+xQ2nyoejqI+xuG0NqlQ3JFVa8edIWFjmG
-        CxSHLSmHLkbSdP2QHbEgobIbiZU2JKltSFRZIVfZkFrtwjumMTy/rwVyNZdXdkREjuGCNz5tWaGyhl8s
-        7sBLZV2QcWDhBAmsspIOvFbtwdrGMbyQ34L1JmCDfiAscgwXpB35clFR8/CC8htIqPgFi486kFzlgPyY
-        M0qyugdLj3mwpKQHM7U5iDWuxizdtpDIMVyQoV4Xl62/+Qqb5MzymttYpfEivdaLjLo7WKv1QnHCg1dL
-        7Yg7k4YP/ixAzKnkECk/Xkd7s7gg86up9JamIeFgZ2CVxo/M+gG8Z7iPbcYAtp8NRHV+/Q7M0C5HvEGB
-        jYFc0HHZINXNtFFtnIZo0zdE7zbMm5xtbJWXOQLKM8P4qCmITy6MotA8GtXntCuh8L/9BFTzTBevwE98
-        Ev9KyTzK+b5hTuFVd5a2f3iXaSRccOFhROic6py/pnz+cohKZYOL+1aCKmO7oqhjeQMiKfMsk0hPx6fQ
-        stwPSWnUUW5zG+W1WqIq3sX8wHTXbO8i0OHp12n+ZCmXRL8vYaZNlMxm/X92xugob8p12h2jncjRY8Vf
-        HJIr03vAAAAAAElFTkSuQmCC
-</value>
+  <data name="ParameterOverrideExists" xml:space="preserve">
+    <value>Parameter Override already specified</value>
   </data>
-  <data name="TooMuchDataWarning" xml:space="preserve">
-    <value>The selected column contains more than {0} different values.
-The calculated averages only accounts for the first {0} distinct values.</value>
+  <data name="OdbcCannotInferDriver" xml:space="preserve">
+    <value>Could not infer ODBC driver from file name: {0}</value>
   </data>
-  <data name="ruler" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="minus-circle" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAB3UlEQVQ4T2PYn8jCsD+JheFA
-        EksGEHdDcQZIbG0EM0gcJw3SywAiQIqAdM/fm8v+/7qy8D+IjU8jzGCwAfsSWTJBGpaFMF98sLnh/9dT
-        0//vTWQ5AxJbE8E8Bx8N0suwPZZlyu9ri/9fnej+/8fFef8/n5gKZ9/fWAcWw0aD9ID0MgBtmf92f8//
-        baUm/+9tqP3/8eik/6dbrP4/29aMF4P0gPQyzAtgap7lx7QRyLn/9fSM/+8P9YMk7oPECGGQXgagIjCe
-        5MY0787aqv8gkzdHM88AiU30ZMSLQWoYloYwM2yIAuPZIOe/2tP5H8QGic30xW8I2IBOeyYYXnhzZdn/
-        FzvbwH4DYlD4MMzAYwjYgJVhzDC8COR8UOABxRYhiTNM98HuErABjZaMMLz0+tKi/0+AaWFZKNNSIGaA
-        YS0xRgZ0oCrMyOCrDhRfHMwEwytfAZ3/CBiVQLGVMHFNUUzNKIaJsTEwVBgxgvDqK4vy/z9YV/1/rj/T
-        eiBm0CCkGWYSyDkTPBn3vAa64NmWxv8gNkiMWCAPVGiUasywsM2Z4TgIA9nzgGLKQCwHxBJALAzEfEDM
-        CcSsQAwMPQQQADIloRikWAyIRYBYCIj5gZgHiLmAmB2qmRlIw50HAIdyTYaOb/frAAAAAElFTkSuQmCC
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACC0lEQVQ4T6WSP2gTYRjGP5JA
+        EyhNc0M8SotbAxU7pNDsNRA6hLQIpXiVzi0d3RVEaAUXBwexYgT7T9EKcfHfWQlSJJfmUFAhZOgJRocM
+        yh1ZjtfnCXq0pY2DgR+8933v87v3u3xKRNT/0AnfV0o9ABtgU6mBLaWWwBoo/4H1EvfYw15mmD0qyD+O
+        xcxaJuP8mJtzfy0u+j8XFvzvhuHujY873IMgf5Ig/7S/32oahvdtfl4cwzgE177Oznrb8bgFQf7QBEWO
+        Fo2a+zMz3pfpaflUKBzL56kpqRcK3npPj8lMcIS7ON+7dNqxJyfl/cREV/ZyOXk1MuIwEwhuK7X+IZdz
+        zUxG/vI8nZbtVErWBgflXjIpdzStA+tSKuUyEwhu4Wvj7f6LsTFpt9vSaDSkWq2KbdtSr9el2WxKq9Xq
+        UEwk5NHQkM9MILiJByub9Z8ND0utVpNKpXJsmIItCJ7ous9MILiBcd6MjroljLiBhm6UKNA0l5lAsMKL
+        k0zu7+B8r9HwL4qxmMNMILiGv+R6OGzu6Lq3iyl2ITmJl/G4txIKmcwEgqu4lpdxOZYjEausaZ4NiQ3J
+        Ud4ivBwOW+xlJhCgVqfBeWxcgn01GnXKfX3ux0TCJ6y5xj32sJe/g4IInk+BMwNKncsqdeWCUg8v4ksT
+        1lzjHnrOAh1EDgpCWOgFSYC+rvBF7A1R8BuYvt7nXvKiFAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="application--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4829,20 +4840,8 @@
         +fPlBQYEADs=
 </value>
   </data>
-  <data name="icon_zoom" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZsAAE1Z3BJJai7zuqxd9nFs1tgZNnm88fb8MXa78/a5LjH1+fu9dDh8trn9KjR43yP
-        orrT7erv8+Dq9ISAf622v2Rrcmxtb6Sttqq8z2BocJ+fn4aKjcvY5ZqbnYSHi9jm8pGRkpSVl7S3u83U
-        2f///4SFiHV5fq6yt6Cnr77L2K7L54SdtXh3d1xbXcjQ2Ozw9GRgX5yzy7CurcLQ3efs8eLs9UpMTODo
-        8XahzMbb78rc7s7X39ri6uHr9HyQo6/N6uLr9eXq79Dh8dHh8jAvLrvU7X98e5DO1pmirDg3N97m7auo
-        qKamp5u83sjIx6TF54iOlKu0vJy20IWUo67C1aC50unv9Mza6EdKTV5cWr7H0bC/z4OGiKWqsdDg8YBq
-        V+vw9bbBzauvs7e/x1hYWdfb36jG5OTr8W50evT3+Zu20MPT4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABsACwAAAAAEAAQAAAIuQDZCJQxAYaRJQITAkjIRoMILSnCdAHhRGHCDi6U0LBy48oWD2wAiBTJ5EQE
-        EmkWSPigY0oIgQvZsBjxgseZHga8IIjRAqbALEHAcFjTYAgCCGaSMGRjocyCGg0Y5HDwQwqWFSMBQBED
-        xICQAw6OPPGBZumYEjsYHCjSBEeVDFGWskHBBQkVFWoeVCggVyCFDWSI2DBxoUCAAQTkJlCAQUECNgIC
-        HE7cl2HkyZUtSx6QWfOXzpZnsAkIADs=
-</value>
+  <data name="Func_RANGE_DefaultValueDescription" xml:space="preserve">
+    <value>Default value returned if expression does not fall into any of the ranges</value>
   </data>
   <data name="gear--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -4864,6 +4863,27 @@
   <data name="NoWidgetEditorIface" xml:space="preserve">
     <value>The specified editor does not implement the required IWidgetEditor interface</value>
   </data>
+  <data name="icon_panleft" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIeDAJhpZZpqZiJNeNikptelprG+zCBPfSJNdyJOfVJvjMybl9Kgn7ShnSNOeCJPea2f
+        nq6entWjojVkl6CBgB9NfjVjlB5OftOnqDJejp1xbp9wbM6cnbWEgbaGhKh3eJBkYbeKh9CdnM2jpMeU
+        kcCNirqIi9qoqZ5ybdOfodSmptenpbuKhriHg6uWkyNQeq59fNakpciYljZklaB1dCtXhTFhkC1Zid2m
+        qdilpJlxbah2cyBPe////9ioqLCRjtCdmrKiotuop8OWkaZ0c3+hvdmhpMyZlipZhkFiirWgnd2prcGP
+        jvXm6TNfjcmdmtShoMKPjoKVs9KanbmTkrqIiaiOjVFwjNulpZJnZqNwcpd0dE9wkGF8mNimpdimp7GR
+        kvfk6MeVlKyfqcSSkd6rqDVjk9KeoqGEgbyWk5emu36SscSUkjFfj8WUkDdlltOaoDJeirqurqOPjiBM
+        eax/f9Ghn8aUkyBOf9yorNympKJybtKeoMOTkcuYlShYh6R/fpx6eL6KjL6LigAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAACDACwAAAAAEAAQAAAIwQAHCRxIcFCBBAUTCnQhQECDAwcG
+        2fESYEqVggcHitAh5AoAMjPiKBw0oUeAEQMAKPkDQeEZOgQArMEBAI+TLwpzcMgToM2ADjdS+FD4IUwX
+        Fj/e7DFxgYFCDSpgbAiBoggBNAU9xKiTZYmUBWaeRAgihmASLEYUvCghaEwfPmDSWCEIBNAKKCBIUAnE
+        JEoZP1sKthiS4YQeHmqOVKhBA0nCB3K0EDFwp4kEDBZGDuKCAMEcG27gaB7EhsIOBwZkBAQAOw==
+</value>
+  </data>
   <data name="icon_measure_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIMPAKufkcu/pqqomunkwKKdkdXIq5Whrtbh5YyZpZy+1J6Zj42Zp5y/1I2appy+1f//
@@ -4872,9 +4892,43 @@
         owBWKl06MCAAOw==
 </value>
   </data>
+  <data name="globe--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADSklEQVQ4T4WRbUxTVxzGD+1M
+        JGYuMSFmiyMOQQuaiDUqGwsRGG+aoCRkKpHOlymKi2SZQkKmbAxtKC8FtUoDErRQFalhzhpe3PaBqZRC
+        G7RNKavWKbRAJZQi2lXWZ/9zxU9+8Ca/PPee//M859x7mejYfSYqMjLxL38zsfyfhWLF6FfiCpeCaCO6
+        51UhrPM5+bif57JKvmXCjVBQal9OQ/Wmhqdm+V/PPVqrz3/T7gsOTM/5WxwvPSlal5nPue9tAc++KSg0
+        LP+oxNxe8NtT13XbFPp9c2ixTqPeNIV7E37YAoDtX6DaOOniPu4XckJBnj5UlN/VWND+yF3e40aX208F
+        QbRYpqCz+9Az7kefdw59s8C9F8DpHpeb+4Vcnp6xkN3atJjiDus314Zx6KYTl+wvUPrHCE78PoIrQzP4
+        cxI4qXdAQ+s3xoC2Z68Rdfy2ledCcjRUkHXhjOyiaSq90YaUpiFs0wxhR6sDubrHONzuxO6mB8g8a4By
+        MIBiatune4Ic8vMcwRhLK+/4Xj8WSFRZsFY5gLg6C+LrLUhosOJLlRkynQtFd//Dd92zSFCaEFthxJY6
+        U4DnCCpI/NkQV3InmNw4iqhTBkgqBxBdaUJMlQnRCiOkChMSamzI1s3i02OdkFZReWVvkOcIKtj8U2e8
+        whj4rLQXkfJ+RFFg1TwS0qiyXmyscSC1ZRbhBZ3YqgOyNOMBniOoIPnUudVFHd6V5Q8gqXiINdUWxCot
+        kNZaBWKrBrGp1oG1ZYOIV48hrQ1IVj3y8hxBBelVGUtyNcPrySQlvlA9RpLaibQGJ9IvPkFqvROJFxzY
+        cNqMr29DYNnhG8OrN+ZnZEemUkHm+VC2Xd0sOdnnSVK7kdk0jl3aCexp9WD/dY+g8qRcqMLXoEGynjT6
+        dc2isEltiMikZUzN2I7LjO1sjvggt7VLKrd4ZFe9ONLuww+3ZlConxFUGbkOr2Syd6hjrJ+OQNfSGHqV
+        sgi299fmZYV37dvqR735uunA8Vsvg1yPxO98dTRshf/o4o8nfxQveEifrp9TJpyAMTERRkSzD5fGsc8P
+        HmCy1kZ2sKOb5XUZBOXPfJ3PGaPdWFg45fg/4JeIWDRf8gnp++CbcT/Psf8BxLcXab+EC34AAAAASUVO
+        RK5CYII=
+</value>
+  </data>
   <data name="PreviewQueryElapsed" xml:space="preserve">
     <value>Preview Completed in {0}ms</value>
   </data>
+  <data name="control-stop-square" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABcUlEQVQ4T8XTO0hCYRjG8Q8M
+        6YKE2RC1VRANQVNDQi65RVC0hDQEBS2F4FBQSy2BQxdrUOg6mDWEBJZJUdBSw1cEZYNh2AUywgiHEBSf
+        3ldQ+ChJcGj4cc6B/3nOtxwBQBSjqJf5w5mBjtWoMK29uYgsgIv77KkzN0bXC5PLEWD+Pq2YC6WR5XgA
+        uONeGWhzhAWR9rsUJs8Tec3eJMEd98pAqz0oiJy5SmA0EM8Z8cUwuPuKgZ0nWDwRWI/fwR33ykDztBRE
+        Tl18YXgvhn73I7qctzAvXqJzQeZYPCFwx70yUD9+Joi0nn7A7AzCtHT9q153CNxxrwzUjQUEkT2+KFpW
+        wnmZtp/BHffKQPWQVxDZ7o+jxhPLq8n7Ce64VwZ0li1BZONRClpvMq8qXxLcca8MlPatCyIbTgBDANAf
+        ApV+QEcqDoByUrZPz3TlTmuaUAeEEBqN0bah6XbJPxltm9SXKCfgAaIntQUw/Bj417/xG49phw+gF0Mn
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="ColHeaderName" xml:space="preserve">
     <value>Name</value>
   </data>
@@ -4950,23 +5004,19 @@
         IECQOISOAlIeYxkAocGLFTISVxlSoIAAARgGYLHAuQERJwtACCCQYspmhqw7C2gAIfVF3AOCXwwIADs=
 </value>
   </data>
-  <data name="icon_ctxarrow" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_zoom" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhBAAIAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/AP//AAAA//8A/wD/////
-        /wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
-        mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/AAD/MwD/ZgD/mQD/zAD/
-        /zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMzmTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZ
-        MzOZZjOZmTOZzDOZ/zPMADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
-        mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZAGaZM2aZZmaZmWaZzGaZ
-        /2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkz
-        M5kzZpkzmZkzzJkz/5lmAJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
-        mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wzAMwzM8wzZswzmcwzzMwz
-        /8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZmcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/
-        M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
-        mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////AP//M///Zv//mf//zP//
-        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAABAAIAAAIFAABPBgIQOCDggIRKlR40KDBBwEB
-        ADs=
+        R0lGODlhEAAQAIZsAAE1Z3BJJai7zuqxd9nFs1tgZNnm88fb8MXa78/a5LjH1+fu9dDh8trn9KjR43yP
+        orrT7erv8+Dq9ISAf622v2Rrcmxtb6Sttqq8z2BocJ+fn4aKjcvY5ZqbnYSHi9jm8pGRkpSVl7S3u83U
+        2f///4SFiHV5fq6yt6Cnr77L2K7L54SdtXh3d1xbXcjQ2Ozw9GRgX5yzy7CurcLQ3efs8eLs9UpMTODo
+        8XahzMbb78rc7s7X39ri6uHr9HyQo6/N6uLr9eXq79Dh8dHh8jAvLrvU7X98e5DO1pmirDg3N97m7auo
+        qKamp5u83sjIx6TF54iOlKu0vJy20IWUo67C1aC50unv9Mza6EdKTV5cWr7H0bC/z4OGiKWqsdDg8YBq
+        V+vw9bbBzauvs7e/x1hYWdfb36jG5OTr8W50evT3+Zu20MPT4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABsACwAAAAAEAAQAAAIuQDZCJQxAYaRJQITAkjIRoMILSnCdAHhRGHCDi6U0LBy48oWD2wAiBTJ5EQE
+        EmkWSPigY0oIgQvZsBjxgseZHga8IIjRAqbALEHAcFjTYAgCCGaSMGRjocyCGg0Y5HDwQwqWFSMBQBED
+        xICQAw6OPPGBZumYEjsYHCjSBEeVDFGWskHBBQkVFWoeVCggVyCFDWSI2DBxoUCAAQTkJlCAQUECNgIC
+        HE7cl2HkyZUtSx6QWfOXzpZnsAkIADs=
 </value>
   </data>
   <data name="icon_zoomout_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -5020,47 +5070,24 @@
         NtwA4YEACVCjTi05UoHMpVMHPBAZdWSBgRU0FLjQVYHbBQU0Oi2QYcKECwEcxE34dMCAAoATEAwIADs=
 </value>
   </data>
-  <data name="icon_help" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_refreshmap_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIfIAOXl5QA5cw4/cnaYt/////Hy8UJyoUl4pjVtoQs8bhRGeDVqn+Xi3hBPjkBwnhJH
-        elF/q/Dx8FWHtVaFtWCPvVd5nxRIePDw8AApYCdWhEdskRFCc16CptHt/0+DtgA5a53K9wU5bFaJuTRq
-        n0p4qUp6qVqItiBZjWeXwkVzorbK3FF+rPPy8Q9CdwAhYCRUiBhVjTZllW+gzzlqlrDV+0luk3Wo3Xyt
-        2TpqmTxrnFOBq26h05WswEBwnE1wl3Om1ZKtxc3p/+P2/zFsqOP4/43B802HvwdDfj5qkjx4sXONqG+W
-        wBBBc7LI3j5tm3KVt5aovPP7/xtMffT//yJUg2eMryRTf4Cs1xFNham7zEBvoGSTwFl+omGRw3ik0WeU
-        wFJ2m09/qej//3Wn2rLE1fPz8hxMfRxMfAAkXB5QhShZixJFdwU9ciVWjSVXh7nM4FiGsypbjISv2VZ7
-        n1iGsQw+b+fv+liNu7fJ3VyApQ1CclSDrwQ8cEF1qXSn1DJik2GNuVGBr8jp/63D1Tx0rHiRrB1Pfe/w
-        7z90qHao2aSzx8rX5SFRgvD9/5+30B9PgeT9/z1lioiy2/P08itflO3r6CFQgqHQ+3CeyQAkXWiZySxd
-        kOXj3lWJuwAuZhtQgrLF2QU5a3ut3oKu2DRkkgAuaYqiu+Pv97PV+c7z/yRfmyRXjMfl/wAza+78/3yf
-        wO/y80l7rkRrkOTr78Xa8Ut5p0d6rythlTxrmwpBduXv+Z2uv6zT+Fx7mQAnYPT08kt6q3em1iRVg5qx
-        yGCNvBBIesPe9jl0rP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        R0lGODlhEAAQAIYAAAAAAP////38/f7+//39/vz8/evr7Nzd4M7P0s3O0bGzuOvs7n6Ej32DjnyCjH6E
+        js3Q1c3P0szO0ers77K4wLG3v6+1vYaasLC3v6+2vq61vK+2vczQ1Ors7unr7fb3+N7f4Kqtrpienqes
+        rKisrKqtramsrN3f38TGxvT19d/g4Kesq6isq6qtrMPGxcTGxdzf3c7Sz7a9t0J2QlqAWneNd3uOe4KU
+        gpSllJmomaOyo6WzpdHi0dHh0cXUxdbk1snWyd3p3dvn26avpqOso97p3tHc0a22rdPd0+Ls4uXu5cTK
+        xMHHwenr6f7+/v39/fz8/O7u7v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAADIACwAAAAAEAAQAAAI/wCRIasEq0CBMr8msSgQ4cIhTgLt
-        2BjjZ4eRJMeGEOqDAMEAZABE3ZAUTISjN01A6RhRK8WRAQASybmyZRYqVh1oRKlyq8eqPAB+jOqkAoQx
-        MkBoFdEV588nDgBkeJlwasoiVQ148BKC5MUDLgA0YaKw5NUeYFiyXHKVIU2uCgC6oPgiIVaJE4qCQDLF
-        hgofMADuEAMEZwWlYYKIQCn1yFArHwA8mKADwQCpRql2uWBkRoGnGgBsBQpzANemQXgsFZOyhgkGDQAQ
-        kTjgYEabOb2EtbAgoA4aWQAWGNCCQ40VAmIK+dqQIJSASABg5HASw80ZAgSUZNIT4oOAj08CiA8fT17A
-        d4EMAKhfz169wIAAOw==
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABSACwAAAAAEAAQAAAI8AAxZKiwAYPBCgYvSFm4EEOBhyYKEIBSAAMEhQwxPHlSwIQAjhULcMAoxUIE
+        BBFKJEiAAAEGBgweMLRQAAGBFQQeFjjQoYPMhRUiSIgwooAAJwNSDBhgIGPOAiEkDlhio6oMhhkKqECx
+        4gWIADYCiLVBA2gBFwRIEEAxNYcSJTaQ5JCSgQQLEytYtIgypImRJDaMGKGhoQCKAi2guBhwI8gOGzJ2
+        FKmBgcCJFyNcgHByQ4gOJjZ0CKlBocDGERudHAECJGwTIDRKd/AgYsKCDzBw+Aj7A8cMDA4aPAjuQIGB
+        GETC8uhhg6Fz5zOq2pgREAA7
 </value>
   </data>
-  <data name="icon_popupscrollup_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/AP//AAAA//8A/wD/////
-        /wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
-        mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/AAD/MwD/ZgD/mQD/zAD/
-        /zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMzmTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZ
-        MzOZZjOZmTOZzDOZ/zPMADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
-        mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZAGaZM2aZZmaZmWaZzGaZ
-        /2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkz
-        M5kzZpkzmZkzzJkz/5lmAJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
-        mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wzAMwzM8wzZswzmcwzzMwz
-        /8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZmcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/
-        M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
-        mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////AP//M///Zv//mf//zP//
-        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAILwAfCBxIsKDBgwgTKkSAQOFAhgwd
-        QoSYcOLEgxYtFsyY8SHHjh8/OhxJsqRJkwEBADs=
-</value>
+  <data name="MissingColumnError" xml:space="preserve">
+    <value>Missing column "{0}"</value>
   </data>
   <data name="icon_viewoptions_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -5096,8 +5123,8 @@
         SkTwYKJFig4vQiyoESNHiwknLozY8GHDkygbBgQAOw==
 </value>
   </data>
-  <data name="SelectFolder" xml:space="preserve">
-    <value>Select Folder</value>
+  <data name="NewFlyout" xml:space="preserve">
+    <value>New Flyout</value>
   </data>
   <data name="map--arrow" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -5531,9 +5558,6 @@
   <data name="InvalidResourceId" xml:space="preserve">
     <value>Not a valid resource identifier</value>
   </data>
-  <data name="NoRasterClasses" xml:space="preserve">
-    <value>This feature source has no class definitions with raster properties</value>
-  </data>
   <data name="property" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -5551,18 +5575,15 @@
         SUVORK5CYII=
 </value>
   </data>
-  <data name="RequiredServiceNotSupported" xml:space="preserve">
-    <value>This connection does not support required service: </value>
+  <data name="NoRasterClasses" xml:space="preserve">
+    <value>This feature source has no class definitions with raster properties</value>
   </data>
   <data name="EditWatermarkInstance" xml:space="preserve">
     <value>Edit Watermark Instance</value>
   </data>
-  <data name="ExtentsCalculationCompleted" xml:space="preserve">
-    <value>Map extents calculation completed. Click Accept to use the calculated extents.</value>
+  <data name="PromptUpdateMapWidgetReference" xml:space="preserve">
+    <value>Update Map Widget to point to</value>
   </data>
-  <data name="Func_RANGE_MaxDescription" xml:space="preserve">
-    <value>Exclusive maximum of range that can be matched by the key expression</value>
-  </data>
   <data name="Separator" xml:space="preserve">
     <value>Separator</value>
   </data>
@@ -5607,14 +5628,16 @@
   <data name="TransparentName" xml:space="preserve">
     <value>Transparent</value>
   </data>
-  <data name="icon_buffer" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_invokescript" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIQAAEZCU1KTygpgs6jS54Sv2XuSpTJ6wL/e65jI40mOyObv92Wfz7LX6Iy+3hlquKXM
-        4rjb6leVykqUxY2bqK7V6JzK5Gih0FuazVCSybzd6sTh66TQ5mme0f///wAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBBwAdACwAAAAAEAAQAAAIoQA7KODgwAABBR0SKlxIIAKCBhEEKFRAwIBBhAYaFACw
-        IYHEDgIiNIDIoUNGACgHeBSQYACAAhUcdCBwwWXKAThRAmhgQCBLCjopAEVJ4QIBhQIwDNUJgAIGAQiR
-        MmDAlMHThQkFTNVp9eNCAQEg6IQQwGtCBWAz6MxQFuvMBQd0Hojo1uQDnRro1jXwYAKAvGaxErAA4YGF
-        wFgHFjxYN2FAADs=
+        R0lGODlhEAAQAIU6AEtypf///9bn92+wPq3D3hExZKq+r3ugdmupO1WHSD14K7fH3Jiymb7M37HMxlmP
+        RFeLTVyTSVuQRY/SS6DfUZjYTl6fN1iORJ6xxny6Qn+og4jHR5vbTzJpMpvbUIjGR3Gad4/RS4nISHvB
+        RIrOSXCzP5/eUaDeUJ7dUJPVTYfKSIbLSIDGRnWPsoLHR2WkOT95LD11Pp3cUJPVTIPCRZ6+rIPDRWak
+        OZfYTnGzQAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAA6ACwAAAAAEAAQ
+        AAAIuAB1CNSBAYDBgwgxDNRhsEGAhxADNACwEMBEARgzYqQ4EEAAhCA5CvRIoKRJAgUWGjgQAwYEDQ4y
+        ohzIQAKCATJEIIhQA+NMHQYkZBgQYAAFChkixPx5AMEJokVRmECgQcDPBB84QC3qYQMEqyl1KKiAY2vR
+        CgoItAibgEaKrSFm2OhQoMACgQdeTICqgsSEGyAW3BVo4MEAoixcrBjwwMBCgQwuWMgxooSFCwweD1yZ
+        QEGCA441BwQAOw==
 </value>
   </data>
   <data name="cross-script" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -5632,36 +5655,41 @@
         24IinbtF9pUaeCn4QTdWdFAHNsFGMAqr5tprwhbHoJzP+Q95lHpGrVHH8wAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="InvalidResourceIdFolder" xml:space="preserve">
-    <value>Must be valid resource id. Cannot be a folder</value>
+  <data name="ConfigurationDocumentReset" xml:space="preserve">
+    <value>Configuration Document has been reset</value>
   </data>
-  <data name="icon_zoomrect_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIZWAI2aptjb4q2km+vv8+/y9efs8eXXyfX29/b3+PX2+PL199Pa4Nrl6a6vsMHCwujt
-        8ujr7uHk5+Pp76SkpLu7u/T19ufp6qSkpfH09vP09fr7+9fY2aurq8LHzO7x9Ozt7tbX2NPU1sC/v8nK
-        ypubm+Xn6c/Pz9LS0t3g49ri6cLHy/Dy9N3k6/Hz9dXd5czNzcjIyL69vdvg5cPExbO1ttDf4ejq7Nni
-        6paWltrb3Nvf4+js787Q0uXp7ezw9NTT08bJzfP19ujt8bu8vfL09uzu8LGzteLp79PZ38TGx62tre7w
-        8t7l7MLDxK2trODj5be5usXQ2tXb4bCvr9bW1rW2tgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABWACwAAAAAEAAQAAAIqwCtABhIsGDBAAIDKFzIUCEAhA+tSJxIMaFAK1RETInxo6JFKyZyPImAIgSM
-        ihFflFhR4UCLHTqaUHx4YsOBIhoSYPAgBMiIiQ8pWECwJAgRAgMKIFECNICTDAgg9CDgo8CRFCSaVvmQ
-        QAHSAgyYLLhwMAkIrwMeMKhxowOUhlYc2EgrwUUUKUY8SnTAQwaLBSpoNNArcQYHHBOGWGkgwABhjwIa
-        P64Y2bGVgAA7
-</value>
+  <data name="Func_LOOKUP_ExpressionDescription" xml:space="preserve">
+    <value>Key expression</value>
   </data>
-  <data name="application-export" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABzklEQVQ4T6WTO2hiURCGB+0M
-        go0YtrwKaqlphKCVhQ/EB1qE9Ek2CYElsFvErRZ7KytBEAtBsFDBqK2P5MpmIckiaCGIKCqi+MAHyuyZ
-        W66Fhgx85zTzDWd+OICI8BnA5/NxjDPGxYFQL+f1eoEAj8dzXi6X3xuNBtZqNXx7e8WXl9/4/PyEpVIZ
-        i8UKu3msVP4gz//Fx8fiOzkMcgFcLtfXQqGAuVwOs9ksZjIZTKVSmEwmMZFIYDwex1gshtFoFCORCIbD
-        YRSLxRcikQgIWuGSZfChIodBLoDb7b7abre42Wz2wvM85vN5ZE+/cjqdYLFYABwOx/V6vcblcrkXWo3K
-        brff2Gw2nclkArBarbeLxQJns9kO/X4f6/U6C7Ek5EJ59Ho9YQiTvxmNxhMwm8130+kUR6PRDpPJBOfz
-        Oa5WK6Q1/y+dTvcDaNJ4PMbBYLBDs9nEarWK6XRaSD8YDGK73RbmcBz3U6VSGcBgMNwPh0PsdDp7CQQC
-        giyXy38pFIpTNgRAr9d/p11brdZeQqEQ+v1+1Gg0D0qlErRaLYBarX6g53e73YOgXnIY5AJIpdJLmUwW
-        +AjkSCQSIKjoPGZ8ORDqPRJMqs98ZXL/Ad8QklT8D+CBAAAAAElFTkSuQmCC
-</value>
+  <data name="TextDownloading" xml:space="preserve">
+    <value>Downloading</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="magnifier-left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\magnifier-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TextFind" xml:space="preserve">
+    <value>Find</value>
+  </data>
+  <data name="TextFindAndReplace" xml:space="preserve">
+    <value>Find & Replace</value>
+  </data>
+  <data name="TextNoOccurrencesFound" xml:space="preserve">
+    <value>No Occurences Found</value>
+  </data>
+  <data name="TextNoStringSpecifiedToLookFor" xml:space="preserve">
+    <value>No string specified to look for!</value>
+  </data>
+  <data name="TextNotFound" xml:space="preserve">
+    <value>Text Not Found</value>
+  </data>
+  <data name="TextOccurrencesReplaced" xml:space="preserve">
+    <value>Replaced {0} occurrances</value>
+  </data>
+  <data name="TextSearchTextNotFound" xml:space="preserve">
+    <value>Search Text Not Found</value>
+  </data>
+  <data name="TextSelectionOnly" xml:space="preserve">
+    <value>(Selection Only)</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Tools/Maestro/Maestro.Editors/Resources/magnifier-left.png
===================================================================
(Binary files differ)


Property changes on: trunk/Tools/Maestro/Maestro.Editors/Resources/magnifier-left.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

