[mapguide-commits] r6942 - in trunk/Tools/Maestro: Maestro.Editors Maestro.Editors/Common Maestro.Editors/MapDefinition Maestro.Editors/Properties OSGeo.MapGuide.MaestroAPI/Mapping

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Aug 20 07:21:43 PDT 2012


Author: jng
Date: 2012-08-20 07:21:39 -0700 (Mon, 20 Aug 2012)
New Revision: 6942

Modified:
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.resx
   trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
Log:
#2018: Live Map Definition editor improvements:
 - Add a new "Repository View" tab based on the refactoring work in r6941 (#2095), this tab has 3 toolbar buttons:
   - Add To Map: Adds the currently selected layer definition into the current runtime map at the top of the draw order
   - Edit: Opens an editor for the currently selected resource. Not implemented yet
   - Refresh: Refreshes the repository view at the specified folder
 - Re-organize the editor UI layout to become a 3 pane interface (like the AJAX viewer). The Legend/Draw Order tab now fully occupies the left column, the "Properties" tab has been moved to the right column, joining up with the new "Repository View" tab.
 - Iconify the primary tabs

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -114,10 +114,15 @@
             _tree.AfterSelect += new TreeViewEventHandler(OnNodeAfterSelect);
 
             _tree.Nodes.Clear();
+            InitRoot();
+        }
+
+        private void InitRoot()
+        {
             StartUpdate();
-            foreach (RepositoryModelItem folder in GetChildren(null))
+            foreach (RepositoryModelItem item in GetChildren(null))
             {
-                var node = CreateNode(folder);
+                var node = CreateNode(item);
                 _tree.Nodes.Add(node);
             }
             EndUpdate();
@@ -149,16 +154,16 @@
 
         private void UpdateNode(TreeNode nodeToUpdate)
         {
-            RepositoryModelItem folder = (RepositoryModelItem)nodeToUpdate.Tag;
+            RepositoryModelItem item = (RepositoryModelItem)nodeToUpdate.Tag;
             if (IsNodeNotPopulated(nodeToUpdate))
                 nodeToUpdate.Nodes.Clear();
 
-            if (folder.HasChildren && nodeToUpdate.Nodes.Count == 0)
+            if (item.HasChildren && nodeToUpdate.Nodes.Count == 0)
             {
                 StartUpdate();
-                foreach (RepositoryModelItem f in GetChildren(folder))
+                foreach (RepositoryModelItem child in GetChildren(item))
                 {
-                    var node = CreateNode(f);
+                    var node = CreateNode(child);
                     nodeToUpdate.Nodes.Add(node);
                 }
                 EndUpdate();
@@ -171,8 +176,9 @@
             node.Name = item.Name;
             node.Text = item.Name;
             node.Tag = item;
-            node.ImageIndex = node.SelectedImageIndex = item.IsRoot ? RepositoryIcons.RES_ROOT : RepositoryIcons.RES_FOLDER;
-            node.Nodes.Add(new DummyNode());
+            node.ImageIndex = node.SelectedImageIndex = item.ImageIndex;
+            if (item.IsFolder)
+                node.Nodes.Add(new DummyNode());
             return node;
         }
 
@@ -180,17 +186,35 @@
         {
             //Sort them before returning them
             SortedList<string, RepositoryModelItem> folders = new SortedList<string, RepositoryModelItem>();
+            SortedList<string, RepositoryModelItem> docs = new SortedList<string, RepositoryModelItem>();
             foreach (var item in list.Children)
             {
                 if (item.IsFolder)
-                    folders.Add(item.Name, new RepositoryModelItem(item));
+                    folders.Add(item.ResourceId, new RepositoryModelItem(item));
+                else if (!HasFilteredTypes() || (HasFilteredTypes() && IsFilteredType(item.ResourceType)))
+                    docs.Add(item.ResourceId, new RepositoryModelItem(item));
+
             }
             foreach (var folder in folders.Values)
             {
                 yield return folder;
             }
+            foreach (var doc in docs.Values)
+            {
+                yield return doc;
+            }
         }
 
+        private HashSet<ResourceTypes> _filteredTypes = new HashSet<ResourceTypes>();
+
+        public void AddResourceTypeFilter(ResourceTypes rt) { _filteredTypes.Add(rt); }
+
+        public void ClearResourceTypeFilters() { _filteredTypes.Clear(); }
+
+        public bool HasFilteredTypes() { return _filteredTypes.Count > 0; }
+
+        public bool IsFilteredType(ResourceTypes rt) { return _filteredTypes.Contains(rt); }
+
         public System.Collections.IEnumerable GetChildren(RepositoryModelItem item)
         {
             if (item == null)
@@ -249,5 +273,54 @@
                 }
             }
         }
+
+        private TreeNode FindNode(string folderId, TreeNode currentNode)
+        {
+            TreeNodeCollection nodeList = null;
+
+            if (currentNode == null)
+            {
+                nodeList = _tree.Nodes;
+            }
+            else
+            {
+                var item = (RepositoryModelItem)currentNode.Tag;
+                if (folderId.Equals(item.ResourceId))
+                {
+                    return currentNode;
+                }
+                nodeList = currentNode.Nodes;
+            }
+
+            foreach (TreeNode node in nodeList)
+            {
+                var folder = (RepositoryModelItem)node.Tag;
+                if (folderId.StartsWith(folder.ResourceId))
+                {
+                    UpdateNode(node);
+                    node.Expand();
+                    return FindNode(folderId, node);
+                }
+            }
+
+            return null;
+        }
+
+        internal void Refresh(string folderId)
+        {
+            if (string.IsNullOrEmpty(folderId) || folderId == "Library://")
+            {
+                InitRoot();
+            }
+            else
+            {
+                var node = FindNode(folderId, null);
+                if (node != null)
+                {
+                    node.Nodes.Clear();
+                    UpdateNode(node);
+                }
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.Designer.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.Designer.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -29,31 +29,26 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RepositoryView));
             this.trvRepository = new System.Windows.Forms.TreeView();
             this.resImageList = new System.Windows.Forms.ImageList(this.components);
             this.SuspendLayout();
             // 
             // trvRepository
             // 
-            this.trvRepository.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.trvRepository.ImageIndex = 0;
+            resources.ApplyResources(this.trvRepository, "trvRepository");
             this.trvRepository.ImageList = this.resImageList;
-            this.trvRepository.Location = new System.Drawing.Point(0, 0);
             this.trvRepository.Name = "trvRepository";
-            this.trvRepository.SelectedImageIndex = 0;
-            this.trvRepository.Size = new System.Drawing.Size(150, 150);
-            this.trvRepository.TabIndex = 0;
             // 
             // resImageList
             // 
             this.resImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-            this.resImageList.ImageSize = new System.Drawing.Size(16, 16);
+            resources.ApplyResources(this.resImageList, "resImageList");
             this.resImageList.TransparentColor = System.Drawing.Color.Transparent;
             // 
             // RepositoryView
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.Controls.Add(this.trvRepository);
             this.Name = "RepositoryView";
             this.ResumeLayout(false);

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -27,6 +27,8 @@
 using System.Windows.Forms;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace Maestro.Editors.Common
 {
@@ -84,5 +86,35 @@
         }
 
         public event EventHandler ItemSelected;
+
+        public void AddResourceTypeFilter(ResourceTypes rt) { if (_model != null) _model.AddResourceTypeFilter(rt); }
+
+        public void ClearResourceTypeFilters() { if (_model != null) _model.ClearResourceTypeFilters(); }
+
+        public bool HasFilteredTypes() 
+        {
+            if (_model != null)
+                return _model.HasFilteredTypes();
+            else
+                return false;
+        }
+
+        public void RefreshModel(string folderId)
+        {
+            if (_model != null)
+            {
+                if (string.IsNullOrEmpty(folderId))
+                {
+                    _model.Refresh(null);
+                }
+                else
+                {
+                    if (!ResourceIdentifier.IsFolderResource(folderId))
+                        throw new ArgumentException(Properties.Resources.ErrNotAFolder);
+
+                    _model.Refresh(folderId);
+                }
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.resx	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.resx	2012-08-20 14:21:39 UTC (rev 6942)
@@ -117,7 +117,58 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="trvRepository.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="trvRepository.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <metadata name="resImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="resImageList.ImageSize" type="System.Drawing.Size, System.Drawing">
+    <value>16, 16</value>
+  </data>
+  <data name="trvRepository.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="trvRepository.SelectedImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="trvRepository.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 150</value>
+  </data>
+  <data name="trvRepository.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>trvRepository.Name" xml:space="preserve">
+    <value>trvRepository</value>
+  </data>
+  <data name=">>trvRepository.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>trvRepository.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>trvRepository.ZOrder" xml:space="preserve">
+    <value>0</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=">>resImageList.Name" xml:space="preserve">
+    <value>resImageList</value>
+  </data>
+  <data name=">>resImageList.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>$this.Name" xml:space="preserve">
+    <value>RepositoryView</value>
+  </data>
+  <data name=">>$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.UserControl, 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/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2012-08-20 14:21:39 UTC (rev 6942)
@@ -935,6 +935,12 @@
     <Compile Include="MapDefinition\LiveMapEditorLegend.Designer.cs">
       <DependentUpon>LiveMapEditorLegend.cs</DependentUpon>
     </Compile>
+    <Compile Include="MapDefinition\LiveMapEditorRepositoryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MapDefinition\LiveMapEditorRepositoryView.Designer.cs">
+      <DependentUpon>LiveMapEditorRepositoryView.cs</DependentUpon>
+    </Compile>
     <Compile Include="MapDefinition\Live\NewGroupDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1723,6 +1729,9 @@
     <EmbeddedResource Include="MapDefinition\LiveMapEditorLegend.resx">
       <DependentUpon>LiveMapEditorLegend.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MapDefinition\LiveMapEditorRepositoryView.resx">
+      <DependentUpon>LiveMapEditorRepositoryView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MapDefinition\Live\NewGroupDialog.resx">
       <DependentUpon>NewGroupDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -2362,6 +2371,7 @@
     <Content Include="OdbcDriverMap.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\folder-horizontal-open.png" />
     <None Include="Resources\water.png" />
     <None Include="Resources\magnifier-left.png" />
     <None Include="Resources\icon_maptip_disabled.gif" />

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.Designer.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.Designer.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -28,14 +28,20 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LiveMapDefinitionEditorCtrl));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.tabLayersAndGroups = new System.Windows.Forms.TabControl();
             this.TAB_LEGEND = new System.Windows.Forms.TabPage();
             this.legendCtrl = new Maestro.Editors.MapDefinition.LiveMapEditorLegend();
             this.viewer = new Maestro.MapViewer.MapViewer();
             this.TAB_DRAW_ORDER = new System.Windows.Forms.TabPage();
             this.drawOrderCtrl = new Maestro.Editors.MapDefinition.LiveMapEditorDrawOrder();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.tabRepo = new System.Windows.Forms.TabControl();
+            this.TAB_REPO = new System.Windows.Forms.TabPage();
+            this.repoView = new Maestro.Editors.MapDefinition.LiveMapEditorRepositoryView();
             this.tabProperties = new System.Windows.Forms.TabControl();
             this.TAB_PROPERTIES = new System.Windows.Forms.TabPage();
             this.propGrid = new System.Windows.Forms.PropertyGrid();
@@ -45,17 +51,24 @@
             this.lblSelected = new System.Windows.Forms.ToolStripStatusLabel();
             this.lblScale = new System.Windows.Forms.ToolStripStatusLabel();
             this.mapStatusTracker = new Maestro.MapViewer.MapStatusTracker();
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
+            this.tabLayersAndGroups.SuspendLayout();
+            this.TAB_LEGEND.SuspendLayout();
+            this.TAB_DRAW_ORDER.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
             this.splitContainer2.Panel1.SuspendLayout();
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
-            this.tabLayersAndGroups.SuspendLayout();
-            this.TAB_LEGEND.SuspendLayout();
-            this.TAB_DRAW_ORDER.SuspendLayout();
+            this.tabRepo.SuspendLayout();
+            this.TAB_REPO.SuspendLayout();
             this.tabProperties.SuspendLayout();
             this.TAB_PROPERTIES.SuspendLayout();
             this.statusStrip.SuspendLayout();
@@ -63,70 +76,38 @@
             // 
             // splitContainer1
             // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            resources.ApplyResources(this.splitContainer1, "splitContainer1");
             this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 25);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Panel1.Controls.Add(this.tabLayersAndGroups);
             // 
             // splitContainer1.Panel2
             // 
-            this.splitContainer1.Panel2.Controls.Add(this.viewer);
-            this.splitContainer1.Size = new System.Drawing.Size(800, 486);
-            this.splitContainer1.SplitterDistance = 289;
-            this.splitContainer1.TabIndex = 0;
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
             // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.tabLayersAndGroups);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.tabProperties);
-            this.splitContainer2.Size = new System.Drawing.Size(289, 486);
-            this.splitContainer2.SplitterDistance = 167;
-            this.splitContainer2.TabIndex = 0;
-            // 
             // tabLayersAndGroups
             // 
             this.tabLayersAndGroups.Controls.Add(this.TAB_LEGEND);
             this.tabLayersAndGroups.Controls.Add(this.TAB_DRAW_ORDER);
-            this.tabLayersAndGroups.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabLayersAndGroups.Location = new System.Drawing.Point(0, 0);
+            resources.ApplyResources(this.tabLayersAndGroups, "tabLayersAndGroups");
+            this.tabLayersAndGroups.ImageList = this.imageList1;
             this.tabLayersAndGroups.Name = "tabLayersAndGroups";
             this.tabLayersAndGroups.SelectedIndex = 0;
-            this.tabLayersAndGroups.Size = new System.Drawing.Size(289, 167);
-            this.tabLayersAndGroups.TabIndex = 0;
             // 
             // TAB_LEGEND
             // 
             this.TAB_LEGEND.Controls.Add(this.legendCtrl);
-            this.TAB_LEGEND.Location = new System.Drawing.Point(4, 22);
+            resources.ApplyResources(this.TAB_LEGEND, "TAB_LEGEND");
             this.TAB_LEGEND.Name = "TAB_LEGEND";
-            this.TAB_LEGEND.Padding = new System.Windows.Forms.Padding(3);
-            this.TAB_LEGEND.Size = new System.Drawing.Size(281, 141);
-            this.TAB_LEGEND.TabIndex = 0;
-            this.TAB_LEGEND.Text = "Legend";
             this.TAB_LEGEND.UseVisualStyleBackColor = true;
             // 
             // legendCtrl
             // 
-            this.legendCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.legendCtrl.Location = new System.Drawing.Point(3, 3);
+            resources.ApplyResources(this.legendCtrl, "legendCtrl");
             this.legendCtrl.Name = "legendCtrl";
-            this.legendCtrl.Size = new System.Drawing.Size(275, 135);
-            this.legendCtrl.TabIndex = 0;
             this.legendCtrl.Viewer = this.viewer;
             this.legendCtrl.NodeDeleted += new Maestro.MapViewer.NodeEventHandler(this.legendCtrl_NodeDeleted);
             this.legendCtrl.NodeSelected += new Maestro.MapViewer.NodeEventHandler(this.legendCtrl_NodeSelected);
@@ -134,75 +115,105 @@
             // viewer
             // 
             this.viewer.Cursor = System.Windows.Forms.Cursors.Default;
-            this.viewer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.viewer.Location = new System.Drawing.Point(0, 0);
+            resources.ApplyResources(this.viewer, "viewer");
+            this.viewer.MaxScale = 1000000000;
+            this.viewer.MinScale = 10;
+            this.viewer.MouseWheelDelayRenderInterval = 800;
             this.viewer.Name = "viewer";
             this.viewer.PointPixelBuffer = 2;
             this.viewer.SelectionColor = System.Drawing.Color.Blue;
-            this.viewer.Size = new System.Drawing.Size(507, 486);
-            this.viewer.TabIndex = 1;
-            this.viewer.Text = "mapViewer1";
             this.viewer.ZoomInFactor = 0.5D;
             this.viewer.ZoomOutFactor = 2D;
             // 
             // TAB_DRAW_ORDER
             // 
             this.TAB_DRAW_ORDER.Controls.Add(this.drawOrderCtrl);
-            this.TAB_DRAW_ORDER.Location = new System.Drawing.Point(4, 22);
+            resources.ApplyResources(this.TAB_DRAW_ORDER, "TAB_DRAW_ORDER");
             this.TAB_DRAW_ORDER.Name = "TAB_DRAW_ORDER";
-            this.TAB_DRAW_ORDER.Padding = new System.Windows.Forms.Padding(3);
-            this.TAB_DRAW_ORDER.Size = new System.Drawing.Size(281, 141);
-            this.TAB_DRAW_ORDER.TabIndex = 1;
-            this.TAB_DRAW_ORDER.Text = "Draw Order";
             this.TAB_DRAW_ORDER.UseVisualStyleBackColor = true;
             // 
             // drawOrderCtrl
             // 
-            this.drawOrderCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.drawOrderCtrl.Location = new System.Drawing.Point(3, 3);
+            resources.ApplyResources(this.drawOrderCtrl, "drawOrderCtrl");
             this.drawOrderCtrl.Name = "drawOrderCtrl";
-            this.drawOrderCtrl.Size = new System.Drawing.Size(275, 135);
-            this.drawOrderCtrl.TabIndex = 0;
             this.drawOrderCtrl.Viewer = this.viewer;
             this.drawOrderCtrl.LayerChanged += new Maestro.Editors.MapDefinition.LayerEventHandler(this.drawOrderCtrl_LayerChanged);
             this.drawOrderCtrl.LayerDeleted += new Maestro.Editors.MapDefinition.LayerEventHandler(this.drawOrderCtrl_LayerDeleted);
             // 
+            // splitContainer3
+            // 
+            resources.ApplyResources(this.splitContainer3, "splitContainer3");
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Name = "splitContainer3";
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.viewer);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer2
+            // 
+            resources.ApplyResources(this.splitContainer2, "splitContainer2");
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer2.Name = "splitContainer2";
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.tabRepo);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.tabProperties);
+            // 
+            // tabRepo
+            // 
+            this.tabRepo.Controls.Add(this.TAB_REPO);
+            resources.ApplyResources(this.tabRepo, "tabRepo");
+            this.tabRepo.ImageList = this.imageList1;
+            this.tabRepo.Name = "tabRepo";
+            this.tabRepo.SelectedIndex = 0;
+            // 
+            // TAB_REPO
+            // 
+            this.TAB_REPO.Controls.Add(this.repoView);
+            resources.ApplyResources(this.TAB_REPO, "TAB_REPO");
+            this.TAB_REPO.Name = "TAB_REPO";
+            this.TAB_REPO.UseVisualStyleBackColor = true;
+            // 
+            // repoView
+            // 
+            resources.ApplyResources(this.repoView, "repoView");
+            this.repoView.Name = "repoView";
+            this.repoView.RequestAddToMap += new System.EventHandler(this.repoView_RequestAddToMap);
+            this.repoView.RequestEdit += new System.EventHandler(this.repoView_RequestEdit);
+            // 
             // tabProperties
             // 
             this.tabProperties.Controls.Add(this.TAB_PROPERTIES);
-            this.tabProperties.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabProperties.Location = new System.Drawing.Point(0, 0);
+            resources.ApplyResources(this.tabProperties, "tabProperties");
+            this.tabProperties.ImageList = this.imageList1;
             this.tabProperties.Name = "tabProperties";
             this.tabProperties.SelectedIndex = 0;
-            this.tabProperties.Size = new System.Drawing.Size(289, 315);
-            this.tabProperties.TabIndex = 0;
             // 
             // TAB_PROPERTIES
             // 
             this.TAB_PROPERTIES.Controls.Add(this.propGrid);
-            this.TAB_PROPERTIES.Location = new System.Drawing.Point(4, 22);
+            resources.ApplyResources(this.TAB_PROPERTIES, "TAB_PROPERTIES");
             this.TAB_PROPERTIES.Name = "TAB_PROPERTIES";
-            this.TAB_PROPERTIES.Padding = new System.Windows.Forms.Padding(3);
-            this.TAB_PROPERTIES.Size = new System.Drawing.Size(281, 289);
-            this.TAB_PROPERTIES.TabIndex = 1;
-            this.TAB_PROPERTIES.Text = "Properties";
             this.TAB_PROPERTIES.UseVisualStyleBackColor = true;
             // 
             // propGrid
             // 
-            this.propGrid.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.propGrid.Location = new System.Drawing.Point(3, 3);
+            resources.ApplyResources(this.propGrid, "propGrid");
             this.propGrid.Name = "propGrid";
-            this.propGrid.Size = new System.Drawing.Size(275, 283);
-            this.propGrid.TabIndex = 0;
             // 
             // toolbar
             // 
-            this.toolbar.Location = new System.Drawing.Point(0, 0);
+            resources.ApplyResources(this.toolbar, "toolbar");
             this.toolbar.Name = "toolbar";
-            this.toolbar.Size = new System.Drawing.Size(800, 25);
-            this.toolbar.TabIndex = 0;
-            this.toolbar.Text = "defaultToolbar1";
             this.toolbar.Viewer = this.viewer;
             // 
             // statusStrip
@@ -211,28 +222,24 @@
             this.lblCoordinates,
             this.lblSelected,
             this.lblScale});
-            this.statusStrip.Location = new System.Drawing.Point(0, 511);
+            resources.ApplyResources(this.statusStrip, "statusStrip");
             this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 22);
-            this.statusStrip.TabIndex = 2;
-            this.statusStrip.Text = "statusStrip1";
             // 
             // lblCoordinates
             // 
             this.lblCoordinates.Name = "lblCoordinates";
-            this.lblCoordinates.Size = new System.Drawing.Size(0, 17);
+            resources.ApplyResources(this.lblCoordinates, "lblCoordinates");
             // 
             // lblSelected
             // 
             this.lblSelected.Name = "lblSelected";
-            this.lblSelected.Size = new System.Drawing.Size(785, 17);
+            resources.ApplyResources(this.lblSelected, "lblSelected");
             this.lblSelected.Spring = true;
-            this.lblSelected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // lblScale
             // 
             this.lblScale.Name = "lblScale";
-            this.lblScale.Size = new System.Drawing.Size(0, 17);
+            resources.ApplyResources(this.lblScale, "lblScale");
             // 
             // mapStatusTracker
             // 
@@ -241,26 +248,40 @@
             this.mapStatusTracker.SelectedLabel = this.lblSelected;
             this.mapStatusTracker.Viewer = this.viewer;
             // 
+            // imageList1
+            // 
+            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+            this.imageList1.Images.SetKeyName(0, "layer.png");
+            this.imageList1.Images.SetKeyName(1, "layers-stack.png");
+            this.imageList1.Images.SetKeyName(2, "property.png");
+            this.imageList1.Images.SetKeyName(3, "folder-tree.png");
+            // 
             // LiveMapDefinitionEditorCtrl
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.statusStrip);
             this.Controls.Add(this.toolbar);
             this.Name = "LiveMapDefinitionEditorCtrl";
-            this.Size = new System.Drawing.Size(800, 533);
+            resources.ApplyResources(this, "$this");
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
+            this.tabLayersAndGroups.ResumeLayout(false);
+            this.TAB_LEGEND.ResumeLayout(false);
+            this.TAB_DRAW_ORDER.ResumeLayout(false);
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
             this.splitContainer2.Panel1.ResumeLayout(false);
             this.splitContainer2.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
             this.splitContainer2.ResumeLayout(false);
-            this.tabLayersAndGroups.ResumeLayout(false);
-            this.TAB_LEGEND.ResumeLayout(false);
-            this.TAB_DRAW_ORDER.ResumeLayout(false);
+            this.tabRepo.ResumeLayout(false);
+            this.TAB_REPO.ResumeLayout(false);
             this.tabProperties.ResumeLayout(false);
             this.TAB_PROPERTIES.ResumeLayout(false);
             this.statusStrip.ResumeLayout(false);
@@ -289,5 +310,10 @@
         private System.Windows.Forms.TabControl tabProperties;
         private System.Windows.Forms.TabPage TAB_PROPERTIES;
         private System.Windows.Forms.PropertyGrid propGrid;
+        private System.Windows.Forms.SplitContainer splitContainer3;
+        private System.Windows.Forms.TabControl tabRepo;
+        private System.Windows.Forms.TabPage TAB_REPO;
+        private LiveMapEditorRepositoryView repoView;
+        private System.Windows.Forms.ImageList imageList1;
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -28,6 +28,9 @@
 using OSGeo.MapGuide.MaestroAPI.Mapping;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -83,6 +86,9 @@
             _shadowCopy = (IMapDefinition)service.GetEditedResource();
             _mapSvc = (IMappingService)_shadowCopy.CurrentConnection.GetService((int)ServiceType.Mapping);
             _rtMap = _mapSvc.CreateMap(_shadowCopy);
+            repoView.Init(service.ResourceService, new ResourceTypes[] {
+                ResourceTypes.LayerDefinition
+            });
 
             viewer.LoadMap(_rtMap);
         }
@@ -114,5 +120,25 @@
             if (layer != null && layer == propGrid.SelectedObject)
                 propGrid.SelectedObject = null;
         }
+
+        private void repoView_RequestAddToMap(object sender, EventArgs e)
+        {
+            var item = repoView.SelectedItem;
+            if (item != null && item.ResourceType == ResourceTypes.LayerDefinition)
+            {
+                var layer = _mapSvc.CreateMapLayer(_rtMap, ((ILayerDefinition)this.EditorService.ResourceService.GetResource(item.ResourceId)));
+                layer.Name = LiveMapEditorLegend.GenerateUniqueName(ResourceIdentifier.GetName(item.ResourceId), _rtMap.Layers);
+                layer.LegendLabel = ResourceIdentifier.GetName(item.ResourceId);
+                layer.Visible = true;
+                layer.ShowInLegend = true;
+                _rtMap.Layers.Insert(0, layer);
+                viewer.RefreshMap();
+            }
+        }
+
+        private void repoView_RequestEdit(object sender, EventArgs e)
+        {
+            MessageBox.Show("Not implemented yet");
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.resx	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.resx	2012-08-20 14:21:39 UTC (rev 6942)
@@ -117,13 +117,648 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <data name="legendCtrl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="legendCtrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="legendCtrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>216, 453</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="legendCtrl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="viewer.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="viewer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="viewer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>331, 486</value>
+  </data>
+  <data name="viewer.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="viewer.Text" xml:space="preserve">
+    <value>viewer</value>
+  </data>
+  <data name=">>viewer.Name" xml:space="preserve">
+    <value>viewer</value>
+  </data>
+  <data name=">>viewer.Type" xml:space="preserve">
+    <value>Maestro.MapViewer.MapViewer, Maestro.MapViewer, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>viewer.Parent" xml:space="preserve">
+    <value>splitContainer3.Panel1</value>
+  </data>
+  <data name=">>viewer.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>legendCtrl.Name" xml:space="preserve">
+    <value>legendCtrl</value>
+  </data>
+  <data name=">>legendCtrl.Type" xml:space="preserve">
+    <value>Maestro.Editors.MapDefinition.LiveMapEditorLegend, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>legendCtrl.Parent" xml:space="preserve">
+    <value>TAB_LEGEND</value>
+  </data>
+  <data name=">>legendCtrl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TAB_LEGEND.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="TAB_LEGEND.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 23</value>
+  </data>
+  <data name="TAB_LEGEND.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_LEGEND.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 459</value>
+  </data>
+  <data name="TAB_LEGEND.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="TAB_LEGEND.Text" xml:space="preserve">
+    <value>Legend</value>
+  </data>
+  <data name=">>TAB_LEGEND.Name" xml:space="preserve">
+    <value>TAB_LEGEND</value>
+  </data>
+  <data name=">>TAB_LEGEND.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>TAB_LEGEND.Parent" xml:space="preserve">
+    <value>tabLayersAndGroups</value>
+  </data>
+  <data name=">>TAB_LEGEND.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="drawOrderCtrl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="drawOrderCtrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="drawOrderCtrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>216, 453</value>
+  </data>
+  <data name="drawOrderCtrl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>drawOrderCtrl.Name" xml:space="preserve">
+    <value>drawOrderCtrl</value>
+  </data>
+  <data name=">>drawOrderCtrl.Type" xml:space="preserve">
+    <value>Maestro.Editors.MapDefinition.LiveMapEditorDrawOrder, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>drawOrderCtrl.Parent" xml:space="preserve">
+    <value>TAB_DRAW_ORDER</value>
+  </data>
+  <data name=">>drawOrderCtrl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.ImageIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 23</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 459</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TAB_DRAW_ORDER.Text" xml:space="preserve">
+    <value>Draw Order</value>
+  </data>
+  <data name=">>TAB_DRAW_ORDER.Name" xml:space="preserve">
+    <value>TAB_DRAW_ORDER</value>
+  </data>
+  <data name=">>TAB_DRAW_ORDER.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>TAB_DRAW_ORDER.Parent" xml:space="preserve">
+    <value>tabLayersAndGroups</value>
+  </data>
+  <data name=">>TAB_DRAW_ORDER.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="tabLayersAndGroups.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>366, 17</value>
+  </metadata>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABw
+        CwAAAk1TRnQBSQFMAgEBBAEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8ABQAQ/wH0
+        AfAJvAHzAf8DAAG8DO8BBwH0Af8HAAH/AZkFdAHyAQAB/wHzDLwB8wH/AfEB8AjyAfAB8QH0Af8CAAEH
+        AfMK8gHzAQcC/wcAAf8BmQOaAXQB3AGZAgAB8QHwCvIB8AHxAQAB8AHyAfAICQG1AfAB9AIAAbwB8wry
+        AfMBvAoAAZkDmgF5Af8BmQIAAfAM8gHwAQAB8AHyCAkB3QG7AfAB8QL/AbwB8wHVAfIBBwHvAgcB7wEH
+        AbwB8gHzAbwEAAEHAfQB7AH0AewB9AGZBJoBmQEaAgAB8AzyAfABAAHxAfIJCQG0AQkBtQHwAfQBvAH0
+        CvMB9AG8BAAB9AUAARoBoAKaAaABGgH/AgAB8QzyAfEBAAHxAfIBCQHwBgkB3QG1AfEBuwHwAfEB8AH0
+        AW8B8wgHAfQB8AQAAe8FAAEaAcMCoAHDARoDAAHxAfML8gHxAQAB8QHzAfAB8QYJAd0BuwHxAbsB8gLw
+        DPQB8AQAAfQFAAEbBBoBGwMAAfEB8wvyAfEBAAHyAfMB8AHxAfABGQHdAwkBGQG7AfEBCQHyAvAB/wFP
+        Af8BBwG8AfAB8QX/AfAEAAHvDgAB8QPzCfIB8QEAAfIB8wHwAfIBGQXxARkBuwHyAQkB8gHxAfAH/wGZ
+        AUsBHAK8AfAEAAH0BQABmQV0AfQCAAHyBvMH8gEAAfIB8wHxAfIG8QHzAbsB8gEJAfIC8QL/Ae4BSwHu
+        Af8BmQFLAZkBSwEcAbwB8QQAAQcFAAGZA5oBdAHcAZkCAAHyAfQK8wH0AfIBAAHzAvIB8wEZBfMB8QEJ
+        AfMBCQHzAfEB8AIHAUsBmgFLAW4BSwGaAUsBmgJLAe0B/wMAAfQFAAGZA5oBeQH/AZkCAAHyAfQK8wH0
+        AfIBAAH/AfMCCQG7BgkB3QHzAQkB8wHyAfEB8AHxAZkBdAGaAUsBmgFLAZoBdAGaA3QB8QIAAQcB/wEH
+        Af8BBwH/AZkEmgGZARoCAAHyAfQK8wH0AfIDAAHzAvIH8wHxAQkB8wHyAfQB8gLxAQcBdAGaAXQBmgF0
+        AZoBmQF0AXkBdAGTAgAB/wUAARoBoAKaAaABGgH/AgAB8wHyCvQB8gHzAwAB/wHzCQkB8QHzAfIEAAHz
+        AZkBdAGaAXQCmgJ0AZkBmgGZAgABBwUAARoBwwKgAcMBGgMAAf8B8wryAfMB/wUAAfMB8gjzAfIB8wQA
+        AZkBmgJ0ApoBmQOaAZkB8wIAAf8FAAEbBBoBGxYAAf8B8wjyAfMB/wQAAfMJmQHzAwABvA0AAUIBTQE+
+        BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+EAAEHAgAB/gEBAwABAwIAAf4BAQGAAQEBAAED
+        AQABAwH/AQEBgAEBAwABAwHAAQEBgAEBAwABAwHfAQEBgAEBAwABAwHfAQMBgAEBAwABAwHfAQMBgAEB
+        AwABAwHfAf8BgAEBAwABAwHfAQEBgAEBAwABAwHfAQEBgAEBAwABAQHfAQEBgAEBBAABwAEBAYABAQHA
+        AwAB3wEBAYABAQHAAQAB8AEAAd8BAwGAAQEB8AEAAfABAAHfAQMC/wHwAQAB8AEBAd8B/ws=
+</value>
+  </data>
+  <data name="tabLayersAndGroups.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tabLayersAndGroups.Size" type="System.Drawing.Size, System.Drawing">
+    <value>230, 486</value>
+  </data>
+  <data name="tabLayersAndGroups.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>tabLayersAndGroups.Name" xml:space="preserve">
+    <value>tabLayersAndGroups</value>
+  </data>
+  <data name=">>tabLayersAndGroups.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>tabLayersAndGroups.Parent" xml:space="preserve">
+    <value>splitContainer1.Panel1</value>
+  </data>
+  <data name=">>tabLayersAndGroups.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer1.Panel1.Name" xml:space="preserve">
+    <value>splitContainer1.Panel1</value>
+  </data>
+  <data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
+    <value>splitContainer1</value>
+  </data>
+  <data name=">>splitContainer1.Panel1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="splitContainer3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="splitContainer3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name=">>splitContainer3.Panel1.Name" xml:space="preserve">
+    <value>splitContainer3.Panel1</value>
+  </data>
+  <data name=">>splitContainer3.Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer3.Panel1.Parent" xml:space="preserve">
+    <value>splitContainer3</value>
+  </data>
+  <data name=">>splitContainer3.Panel1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="splitContainer2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="splitContainer2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="splitContainer2.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
+    <value>Horizontal</value>
+  </data>
+  <data name="repoView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="repoView.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="repoView.Size" type="System.Drawing.Size, System.Drawing">
+    <value>217, 134</value>
+  </data>
+  <data name="repoView.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>repoView.Name" xml:space="preserve">
+    <value>repoView</value>
+  </data>
+  <data name=">>repoView.Type" xml:space="preserve">
+    <value>Maestro.Editors.MapDefinition.LiveMapEditorRepositoryView, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>repoView.Parent" xml:space="preserve">
+    <value>TAB_REPO</value>
+  </data>
+  <data name=">>repoView.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TAB_REPO.ImageIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="TAB_REPO.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 23</value>
+  </data>
+  <data name="TAB_REPO.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_REPO.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 140</value>
+  </data>
+  <data name="TAB_REPO.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TAB_REPO.Text" xml:space="preserve">
+    <value>Repository View</value>
+  </data>
+  <data name=">>TAB_REPO.Name" xml:space="preserve">
+    <value>TAB_REPO</value>
+  </data>
+  <data name=">>TAB_REPO.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>TAB_REPO.Parent" xml:space="preserve">
+    <value>tabRepo</value>
+  </data>
+  <data name=">>TAB_REPO.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="tabRepo.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="tabRepo.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tabRepo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>231, 167</value>
+  </data>
+  <data name="tabRepo.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>tabRepo.Name" xml:space="preserve">
+    <value>tabRepo</value>
+  </data>
+  <data name=">>tabRepo.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>tabRepo.Parent" xml:space="preserve">
+    <value>splitContainer2.Panel1</value>
+  </data>
+  <data name=">>tabRepo.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer2.Panel1.Name" xml:space="preserve">
+    <value>splitContainer2.Panel1</value>
+  </data>
+  <data name=">>splitContainer2.Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer2.Panel1.Parent" xml:space="preserve">
+    <value>splitContainer2</value>
+  </data>
+  <data name=">>splitContainer2.Panel1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="propGrid.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="propGrid.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="propGrid.Size" type="System.Drawing.Size, System.Drawing">
+    <value>217, 282</value>
+  </data>
+  <data name="propGrid.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>propGrid.Name" xml:space="preserve">
+    <value>propGrid</value>
+  </data>
+  <data name=">>propGrid.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>propGrid.Parent" xml:space="preserve">
+    <value>TAB_PROPERTIES</value>
+  </data>
+  <data name=">>propGrid.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TAB_PROPERTIES.ImageIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="TAB_PROPERTIES.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 23</value>
+  </data>
+  <data name="TAB_PROPERTIES.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TAB_PROPERTIES.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 288</value>
+  </data>
+  <data name="TAB_PROPERTIES.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TAB_PROPERTIES.Text" xml:space="preserve">
+    <value>Properties</value>
+  </data>
+  <data name=">>TAB_PROPERTIES.Name" xml:space="preserve">
+    <value>TAB_PROPERTIES</value>
+  </data>
+  <data name=">>TAB_PROPERTIES.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>TAB_PROPERTIES.Parent" xml:space="preserve">
+    <value>tabProperties</value>
+  </data>
+  <data name=">>TAB_PROPERTIES.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="tabProperties.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="tabProperties.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tabProperties.Size" type="System.Drawing.Size, System.Drawing">
+    <value>231, 315</value>
+  </data>
+  <data name="tabProperties.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>tabProperties.Name" xml:space="preserve">
+    <value>tabProperties</value>
+  </data>
+  <data name=">>tabProperties.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>tabProperties.Parent" xml:space="preserve">
+    <value>splitContainer2.Panel2</value>
+  </data>
+  <data name=">>tabProperties.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer2.Panel2.Name" xml:space="preserve">
+    <value>splitContainer2.Panel2</value>
+  </data>
+  <data name=">>splitContainer2.Panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer2.Panel2.Parent" xml:space="preserve">
+    <value>splitContainer2</value>
+  </data>
+  <data name=">>splitContainer2.Panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="splitContainer2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>231, 486</value>
+  </data>
+  <data name="splitContainer2.SplitterDistance" type="System.Int32, mscorlib">
+    <value>167</value>
+  </data>
+  <data name="splitContainer2.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer2.Name" xml:space="preserve">
+    <value>splitContainer2</value>
+  </data>
+  <data name=">>splitContainer2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer2.Parent" xml:space="preserve">
+    <value>splitContainer3.Panel2</value>
+  </data>
+  <data name=">>splitContainer2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer3.Panel2.Name" xml:space="preserve">
+    <value>splitContainer3.Panel2</value>
+  </data>
+  <data name=">>splitContainer3.Panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer3.Panel2.Parent" xml:space="preserve">
+    <value>splitContainer3</value>
+  </data>
+  <data name=">>splitContainer3.Panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="splitContainer3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>566, 486</value>
+  </data>
+  <data name="splitContainer3.SplitterDistance" type="System.Int32, mscorlib">
+    <value>331</value>
+  </data>
+  <data name="splitContainer3.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name=">>splitContainer3.Name" xml:space="preserve">
+    <value>splitContainer3</value>
+  </data>
+  <data name=">>splitContainer3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer3.Parent" xml:space="preserve">
+    <value>splitContainer1.Panel2</value>
+  </data>
+  <data name=">>splitContainer3.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer1.Panel2.Name" xml:space="preserve">
+    <value>splitContainer1.Panel2</value>
+  </data>
+  <data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
+    <value>splitContainer1</value>
+  </data>
+  <data name=">>splitContainer1.Panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 486</value>
+  </data>
+  <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
+    <value>230</value>
+  </data>
+  <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>splitContainer1.Name" xml:space="preserve">
+    <value>splitContainer1</value>
+  </data>
+  <data name=">>splitContainer1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>splitContainer1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>splitContainer1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="toolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="toolbar.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="toolbar.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 25</value>
+  </data>
+  <data name="toolbar.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="toolbar.Text" xml:space="preserve">
+    <value>defaultToolbar1</value>
+  </data>
+  <data name=">>toolbar.Name" xml:space="preserve">
+    <value>toolbar</value>
+  </data>
+  <data name=">>toolbar.Type" xml:space="preserve">
+    <value>Maestro.MapViewer.DefaultToolbar, Maestro.MapViewer, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>toolbar.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>toolbar.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>108, 17</value>
   </metadata>
+  <data name="lblCoordinates.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 17</value>
+  </data>
+  <data name="lblSelected.Size" type="System.Drawing.Size, System.Drawing">
+    <value>785, 17</value>
+  </data>
+  <data name="lblSelected.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="lblScale.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 17</value>
+  </data>
+  <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 511</value>
+  </data>
+  <data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 22</value>
+  </data>
+  <data name="statusStrip.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="statusStrip.Text" xml:space="preserve">
+    <value>statusStrip1</value>
+  </data>
+  <data name=">>statusStrip.Name" xml:space="preserve">
+    <value>statusStrip</value>
+  </data>
+  <data name=">>statusStrip.Type" xml:space="preserve">
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>statusStrip.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>statusStrip.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <metadata name="mapStatusTracker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>217, 17</value>
   </metadata>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>800, 533</value>
+  </data>
+  <data name=">>lblCoordinates.Name" xml:space="preserve">
+    <value>lblCoordinates</value>
+  </data>
+  <data name=">>lblCoordinates.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>lblSelected.Name" xml:space="preserve">
+    <value>lblSelected</value>
+  </data>
+  <data name=">>lblSelected.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>lblScale.Name" xml:space="preserve">
+    <value>lblScale</value>
+  </data>
+  <data name=">>lblScale.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>mapStatusTracker.Name" xml:space="preserve">
+    <value>mapStatusTracker</value>
+  </data>
+  <data name=">>mapStatusTracker.Type" xml:space="preserve">
+    <value>Maestro.MapViewer.MapStatusTracker, Maestro.MapViewer, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
+  <data name=">>imageList1.Name" xml:space="preserve">
+    <value>imageList1</value>
+  </data>
+  <data name=">>imageList1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>$this.Name" xml:space="preserve">
+    <value>LiveMapDefinitionEditorCtrl</value>
+  </data>
+  <data name=">>$this.Type" xml:space="preserve">
+    <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.Designer.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.Designer.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -91,7 +91,7 @@
             // 
             // lstDrawOrder
             // 
-            this.lstDrawOrder.DisplayMember = "LegendLabel";
+            this.lstDrawOrder.DisplayMember = "DisplayString";
             this.lstDrawOrder.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lstDrawOrder.FormattingEnabled = true;
             this.lstDrawOrder.Location = new System.Drawing.Point(0, 25);

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -35,6 +35,8 @@
         public LiveMapEditorDrawOrder()
         {
             InitializeComponent();
+            //HACK: http://social.msdn.microsoft.com/Forums/zh/winformsdatacontrols/thread/2db8e07a-6aa8-4865-9b59-c02025eaf317
+            lstDrawOrder.CreateControl();
         }
         
         private RuntimeMap _map;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -79,7 +79,7 @@
             }
         }
 
-        private static string GenerateUniqueName(string prefix, RuntimeMapLayerCollection layers)
+        internal static string GenerateUniqueName(string prefix, RuntimeMapLayerCollection layers)
         {
             int counter = 0;
             string name = prefix;

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -631,6 +631,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Not a folder.
+        /// </summary>
+        internal static string ErrNotAFolder {
+            get {
+                return ResourceManager.GetString("ErrNotAFolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Error loading WMS configuration document: {0}. A default document will be created.
         /// </summary>
         internal static string ErrorLoadingWmsConfig {
@@ -919,6 +928,13 @@
             }
         }
         
+        internal static System.Drawing.Bitmap folder_horizontal_open {
+            get {
+                object obj = ResourceManager.GetObject("folder-horizontal-open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The folder must start with \"Library://\", do you want the starting folder to become:\n {0} ?.
         /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-08-20 14:21:39 UTC (rev 6942)
@@ -117,13 +117,20 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="icon_print_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIIAAJmZmdra2rS2uLe5u7W1vbq6uv///wAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        BwAGACwAAAAAEAAQAAAIYgANCBQAoKBBAAUEKhQIIIDDhwEKJFxooCFEhwUiUrR4MaNGhRcfShwpcMDB
+        ggMuAmAYkqPDlQRbCoAIwKTLlwgfFsR58KXOmyp/hqT586TRokAN6rTZEsDMggJKGh1A0UBAADs=
+</value>
+  </data>
   <data name="OdbcDriverAccess" xml:space="preserve">
     <value>{Microsoft Access Driver (*.mdb)}</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>
-  <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">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -140,6 +147,12 @@
         Ab7ReT9BDLTyAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="ParameterOverrideExists" xml:space="preserve">
+    <value>Parameter Override already specified</value>
+  </data>
+  <data name="NewFlyout" xml:space="preserve">
+    <value>New Flyout</value>
+  </data>
   <data name="SelectProperty" xml:space="preserve">
     <value>Select Property</value>
   </data>
@@ -240,21 +253,6 @@
         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
@@ -286,16 +284,6 @@
   <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>
@@ -409,10 +397,6 @@
   <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
@@ -443,25 +427,14 @@
   <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="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 name="Func_DECAP_Description" xml:space="preserve">
+    <value>String formatting function</value>
   </data>
   <data name="icon_back" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -474,12 +447,18 @@
         smYnBgQAOw==
 </value>
   </data>
+  <data name="TextSelectDataStore" xml:space="preserve">
+    <value>Select Data Store</value>
+  </data>
   <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>
   </data>
+  <data name="TextFindAndReplace" xml:space="preserve">
+    <value>Find & Replace</value>
+  </data>
   <data name="exclamation" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -527,16 +506,13 @@
   <data name="PromptDeleteCommand" xml:space="preserve">
     <value>This command is referenced in the following menus: {0}. Do you want to delete this command and all menu items referencing it?</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="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>
@@ -584,24 +560,6 @@
         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
@@ -617,24 +575,6 @@
         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
@@ -656,25 +596,16 @@
         iEmUMn62FGwxJMMJPTzUHKlQgwYShA/kaCFi4E4TCRgsRBzEBQGCOTbcwNk8iA2FHQ4MyAgIADs=
 </value>
   </data>
-  <data name="icon_panup" 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>
-        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==
+        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="SelectFeatureClass" xml:space="preserve">
@@ -696,9 +627,6 @@
         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>
@@ -755,6 +683,22 @@
         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
@@ -820,19 +764,6 @@
         yCdHlitbs8yUycn6b/wLvnCph/venGUAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="layer-shape-curve" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABlklEQVQ4T6WS2y/CYRjHH4uN
-        ZbRSU8sqM1FSsdEF5sKFzYXIoTJuwozKMcw9rurSDS64YWbOZ/+C/ynf5+33tn5lDvPbPr/v8x6e7/u8
-        B+rceu8CcUUJmscZTZPW6qHiTx9Mk2HykLLZLFHH5lsCwQcr4Hae9rUnalt5IPfyvcAxtk/G7gipDPyp
-        1wBIKkpQgUwuNGATV/KOmhYuyTx9kquAJ/s2XsJABzhWJX9l0Jq4JUYYeNefmUHg4lU9q4+iXE6UyC3I
-        ClQGnARsYALJWjn51wa8IoOEPjAKAyvQIO4BKdZvKygY1CD2gTCIgW2+HValzf0+HKJGtYVCd7lHPmlM
-        6gU7rGiXQxvAOOhvid8QIw7RFIiK+5VGnKwYiEm8WkG72rl0PQUczYtXOQP58YtjM34oDCdKA3toT8Sc
-        BLwgWGJQ8l6LOqosbvGAgAHMNc5fqCv4yYDHa/0hssXOBuyz57uscgtlGNOAClAJtKAG6IAe1AETqAdm
-        y8xphm9HUbHunwwMI5nhuvDRgTFyPCQq4N9/+ATdd0wu3kGkzgAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="FiletypeZip" xml:space="preserve">
     <value>Zip files ({0})</value>
   </data>
@@ -885,6 +816,9 @@
   <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
@@ -932,6 +866,21 @@
   <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
@@ -1000,9 +949,6 @@
   <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
@@ -1045,9 +991,6 @@
   <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
@@ -1082,9 +1025,6 @@
         sODgROSUAGIzM2gx4UoIHSJ/hMHSJMYDHzYmVOGxxIvIgrAHlplNu7bt2QEBADs=
 </value>
   </data>
-  <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>
@@ -1163,25 +1103,14 @@
   <data name="FilterShp" xml:space="preserve">
     <value>ESRI Shape File (*.shp)|*.shp</value>
   </data>
-  <data name="InvalidResourceIdFolder" xml:space="preserve">
-    <value>Must be valid resource id. Cannot be a folder</value>
+  <data name="TextNoOccurrencesFound" xml:space="preserve">
+    <value>No Occurences Found</value>
   </data>
   <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 name="WidgetNameExists" xml:space="preserve">
+    <value>A widget named {0} already exists</value>
   </data>
   <data name="FiniteDisplayScales" xml:space="preserve">
     <value>Finite Display Scales</value>
@@ -1287,6 +1216,9 @@
   <data name="SelectWidget" xml:space="preserve">
     <value>Select widget</value>
   </data>
+  <data name="TextOccurrencesReplaced" xml:space="preserve">
+    <value>Replaced {0} occurrances</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
@@ -1315,6 +1247,9 @@
         CcSsQAwMPQQQADIloRikWAyIRYBYCIj5gZgHiLmAmB2qmRlIw50HAIdyTYaOb/frAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="TextPreparingConfigurationDocument" xml:space="preserve">
+    <value>Preparing Configuration Document</value>
+  </data>
   <data name="BetweenLabel" xml:space="preserve">
     <value>Between {0} and {1}</value>
   </data>
@@ -1366,25 +1301,6 @@
         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>
@@ -1421,6 +1337,9 @@
   <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>
@@ -1497,6 +1416,9 @@
   <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
@@ -3279,25 +3201,6 @@
   <data name="DeleteConfirmation" xml:space="preserve">
     <value>Do you want to remove the selected item?</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>
   <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
     <value>This connection does not support executing this type of Load Procedure</value>
   </data>
@@ -3307,6 +3210,9 @@
   <data name="Func_MAPNAME_Description" xml:space="preserve">
     <value>Returns the active map name</value>
   </data>
+  <data name="TextNotFound" xml:space="preserve">
+    <value>Text Not Found</value>
+  </data>
   <data name="XmlDocIsValid" xml:space="preserve">
     <value>Document is valid</value>
   </data>
@@ -3340,8 +3246,8 @@
   <data name="OdbcNoMarkedFile" xml:space="preserve">
     <value>Could not infer ODBC driver. No file specified</value>
   </data>
-  <data name="Func_FEATURECLASS_Description" xml:space="preserve">
-    <value>Returns the active feature class name</value>
+  <data name="RdbmsFeatureSource" xml:space="preserve">
+    <value>RDBMS Feature Source</value>
   </data>
   <data name="folder_horizontal" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -3370,6 +3276,21 @@
         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
@@ -3418,8 +3339,18 @@
         sgoDAgA7
 </value>
   </data>
-  <data name="RdbmsFeatureSource" xml:space="preserve">
-    <value>RDBMS Feature Source</value>
+  <data name="layer-shape-curve" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABlklEQVQ4T6WS2y/CYRjHH4uN
+        ZbRSU8sqM1FSsdEF5sKFzYXIoTJuwozKMcw9rurSDS64YWbOZ/+C/ynf5+33tn5lDvPbPr/v8x6e7/u8
+        B+rceu8CcUUJmscZTZPW6qHiTx9Mk2HykLLZLFHH5lsCwQcr4Hae9rUnalt5IPfyvcAxtk/G7gipDPyp
+        1wBIKkpQgUwuNGATV/KOmhYuyTx9kquAJ/s2XsJABzhWJX9l0Jq4JUYYeNefmUHg4lU9q4+iXE6UyC3I
+        ClQGnARsYALJWjn51wa8IoOEPjAKAyvQIO4BKdZvKygY1CD2gTCIgW2+HValzf0+HKJGtYVCd7lHPmlM
+        6gU7rGiXQxvAOOhvid8QIw7RFIiK+5VGnKwYiEm8WkG72rl0PQUczYtXOQP58YtjM34oDCdKA3toT8Sc
+        BLwgWGJQ8l6LOqosbvGAgAHMNc5fqCv4yYDHa/0hssXOBuyz57uscgtlGNOAClAJtKAG6IAe1AETqAdm
+        y8xphm9HUbHunwwMI5nhuvDRgTFyPCQq4N9/+ATdd0wu3kGkzgAAAABJRU5ErkJggg==
+</value>
   </data>
   <data name="InvalidColorComponent" xml:space="preserve">
     <value>Invalid {0} color component {1} in line {2}</value>
@@ -3449,6 +3380,391 @@
   <data name="Func_IF_ConditionDescription" xml:space="preserve">
     <value>Boolean expression (filter) encapsulated in a string</value>
   </data>
+  <data name="CommandTypesDataset" xml:space="preserve">
+    <value><?xml version="1.0" encoding="utf-8" ?>
+
+<!-- 
+  Note to translators:
+    You can only translate <Label>, <ToolTip> and <Description>
+    If you translate any of the others, the editor won't work!
+-->
+
+<CommandTypesDataset>
+	<Command>
+		<Command>About</Command>
+		<Label>About</Label>
+		<ToolTip>About</ToolTip>
+		<Action>About</Action>
+		<Description>Display information about this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon></EnabledIcon>		
+		<DisabledIcon></DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Buffer</Command>
+		<Label>Buffer</Label>
+		<ToolTip>Buffer</ToolTip>
+		<Action>Buffer</Action>
+		<Description>Create buffers around the selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Clear Selection</Command>
+		<Label>Clear Selection</Label>
+		<ToolTip>Clear selection</ToolTip>
+		<Action>Clear Selection</Action>
+		<Description>Clear the current selections</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Copy Map</Command>
+		<Label>Copy</Label>
+		<ToolTip>Copy</ToolTip>
+		<Action>Copy Map</Action>
+		<Description>Copy current view of map to clipboard</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Help</Command>
+		<Label>Help</Label>
+		<ToolTip>Help</ToolTip>
+		<Action>Help</Action>
+		<Description>Launch help for this application</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Center and Scale</Command>
+		<Label>Initial Center and Scale</Label>
+		<ToolTip>Initial center and scale</ToolTip>
+		<Action>Restore View</Action>
+		<Description>Zoom to the initial center and scale of the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Initial Map View</Command>
+		<Label>Initial Map View</Label>
+		<ToolTip>Initial map view</ToolTip>
+		<Action>Fit To Window</Action>
+		<Description>Fit the initial view of the map to the window</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke Script</Command>
+		<Label>Invoke Script</Label>
+		<ToolTip>Invoke script</ToolTip>
+		<Action>Invoke Script</Action>
+		<Description>Invoke a script command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Invoke URL</Command>
+		<Label>Invoke URL</Label>
+		<ToolTip>Invoke a command by accessing a URL</ToolTip>
+		<Action>Invoke URL</Action>
+		<Description>Invoke a URL command</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Measure</Command>
+		<Label>Measure</Label>
+		<ToolTip>Measure</ToolTip>
+		<Action>Measure</Action>
+		<Description>Measure distances on the map</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Next View</Command>
+		<Label>Next View</Label>
+		<ToolTip>Next View</ToolTip>
+		<Action>Next View</Action>
+		<Description>Buffer</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan</Command>
+		<Label>Pan</Label>
+		<ToolTip>Pan mode</ToolTip>
+		<Action>Pan</Action>
+		<Description>Drag the map to view areas out of range</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Down</Command>
+		<Label>Pan Down</Label>
+		<ToolTip>Pan down</ToolTip>
+		<Action>Pan Down</Action>
+		<Description>Pan down by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Left</Command>
+		<Label>Pan Left</Label>
+		<ToolTip>Pan left</ToolTip>
+		<Action>Pan Left</Action>
+		<Description>Pan left by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Right</Command>
+		<Label>Pan Right</Label>
+		<ToolTip>Pan right</ToolTip>
+		<Action>Pan Right</Action>
+		<Description>Pan right by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Pan Up</Command>
+		<Label>Pan Up</Label>
+		<ToolTip>Pan up</ToolTip>
+		<Action>Pan Up</Action>
+		<Description>Pan up by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Previous View</Command>
+		<Label>Previous View</Label>
+		<ToolTip>Previous view</ToolTip>
+		<Action>Previous View</Action>
+		<Description>Go to previous view</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Print</Command>
+		<Label>Print</Label>
+		<ToolTip>Print</ToolTip>
+		<Action>Print</Action>
+		<Description>Print with optional layout</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Refresh Map</Command>
+		<Label>Refresh Map</Label>
+		<ToolTip>Refresh map</ToolTip>
+		<Action>Refresh</Action>
+		<Description>Refresh map and reload all layers keeping current center and scale</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Search</Command>
+		<Label>Search</Label>
+		<ToolTip>Search</ToolTip>
+		<Action>Search</Action>
+		<Description>Perform a search</Description>
+		<Viewers>All</Viewers>
+		<Type>Custom</Type>
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select</Command>
+		<Label>Select</Label>
+		<ToolTip>Select mode</ToolTip>
+		<Action>Select</Action>
+		<Description>Select features by clicking and dragging</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Polygon</Command>
+		<Label>Select Polygon</Label>
+		<ToolTip>Select polygon</ToolTip>
+		<Action>Select Polygon</Action>
+		<Description>Create a polygon to select all features that fall within</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Radius</Command>
+		<Label>Select Radius</Label>
+		<ToolTip>Select radius</ToolTip>
+		<Action>Select Radius</Action>
+		<Description>Click and drag to select all features inside the circle</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Select Within</Command>
+		<Label>Select Within</Label>
+		<ToolTip>Select within</ToolTip>
+		<Action>Select Within</Action>
+		<Description>Select features that fall within currently selected areas</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>View Options</Command>
+		<Label>View Options</Label>
+		<ToolTip>View options</ToolTip>
+		<Action>View Options</Action>
+		<Description>View Options</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom</Command>
+		<Label>Zoom Dynamic</Label>
+		<ToolTip>Zoom dynamic</ToolTip>
+		<Action>Zoom</Action>
+		<Description>Zoom dynamically by clicking and dragging</Description>
+		<Viewers>DWF</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom In</Command>
+		<Label>Zoom In</Label>
+		<ToolTip>Zoom in</ToolTip>
+		<Action>Zoom In</Action>
+		<Description>Zoom in by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Out</Command>
+		<Label>Zoom Out</Label>
+		<ToolTip>Zoom out</ToolTip>
+		<Action>Zoom Out</Action>
+		<Description>Zoom out by a preset increment</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Rectangle</Command>
+		<Label>Zoom Rectangle</Label>
+		<ToolTip>Zoom to rectangle</ToolTip>
+		<Action>Zoom Rectangle</Action>
+		<Description>Zoom in on an area</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Zoom Selection</Command>
+		<Label>Zoom Selection</Label>
+		<ToolTip>Zoom to selection</ToolTip>
+		<Action>Zoom To Selection</Action>
+		<Description>Zoom to extents of selected features</Description>
+		<Viewers>All</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
+	</Command>
+
+	<Command>
+		<Command>Get Printable Page</Command>
+		<Label>Printable Page</Label>
+		<ToolTip>Get printable page</ToolTip>
+		<Action>Get Printable Page</Action>
+		<Description>Get printer-friendly page</Description>
+		<Viewers>AJAX</Viewers>
+		<Type>Built-In</Type>
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
+	</Command>
+
+</CommandTypesDataset>
+</value>
+  </data>
   <data name="icon_zoomselect" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZvAISChAEBAXBJJai7zsfb8Nrn9M/a5Nnm81tgZNDh8sXa77jH16jR4+fu9dDh8brT
@@ -3488,37 +3804,25 @@
   <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_maptip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="document--minus" 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=
+        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="UnknownResourceTypes" xml:space="preserve">
     <value>Unknown types</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="NoSchemasInFeatureSource" xml:space="preserve">
+    <value>Feature Source has no schemas</value>
   </data>
   <data name="InvokeScriptCmdDescription" xml:space="preserve">
     <value>Invoke Script Command</value>
@@ -3586,29 +3890,6 @@
   <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>
@@ -3714,25 +3995,17 @@
   <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>
-        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 name="water" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\water.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
-  <data name="Func_DECAP_Description" xml:space="preserve">
-    <value>String formatting function</value>
+  <data name="TextDownloading" xml:space="preserve">
+    <value>Downloading</value>
   </data>
   <data name="icon_fitwindow_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -3746,9 +4019,16 @@
         sPPAGaBDix4NOiAAOw==
 </value>
   </data>
-  <data name="NoSchemasInFeatureSource" xml:space="preserve">
-    <value>Feature Source has no schemas</value>
+  <data name="TextSearchTextNotFound" xml:space="preserve">
+    <value>Search Text Not Found</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="ConfirmDeleteResourceData" xml:space="preserve">
     <value>Are you sure you want to delete this resource data?</value>
   </data>
@@ -3768,6 +4048,9 @@
         gJgPiLmBmBOI2aB6mIE0IwDSnmBluZcHuwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="OdbcCannotInferDriver" xml:space="preserve">
+    <value>Could not infer ODBC driver from file name: {0}</value>
+  </data>
   <data name="arrow-curve" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3783,9 +4066,6 @@
         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>
@@ -3813,11 +4093,22 @@
   <data name="OverwriteDisplayScales" xml:space="preserve">
     <value>Overwrite the current display scales?</value>
   </data>
-  <data name="icon_print_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="RequiredServiceNotSupported" xml:space="preserve">
+    <value>This connection does not support required service: </value>
+  </data>
+  <data name="icon_panup_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhEAAQAIIAAJmZmdra2rS2uLe5u7W1vbq6uv///wAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        BwAGACwAAAAAEAAQAAAIYgANCBQAoKBBAAUEKhQIIIDDhwEKJFxooCFEhwUiUrR4MaNGhRcfShwpcMDB
-        ggMuAmAYkqPDlQRbCoAIwKTLlwgfFsR58KXOmyp/hqT586TRokAN6rTZEsDMggJKGh1A0UBAADs=
+        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">
@@ -3867,20 +4158,6 @@
         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>
@@ -3959,12 +4236,12 @@
         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>
@@ -3981,27 +4258,6 @@
   <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
@@ -4019,24 +4275,8 @@
         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 name="TextNoItemSelected" xml:space="preserve">
+    <value>No Items Selected</value>
   </data>
   <data name="InvalidColumnNameError" xml:space="preserve">
     <value>Invalid column name</value>
@@ -4254,6 +4494,17 @@
         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>
@@ -4278,6 +4529,15 @@
         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>
@@ -4295,6 +4555,9 @@
   <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
@@ -4386,22 +4649,21 @@
 This will result in the entire repository being deleted and replaced with this package.
 Are you absolutely sure that is what you want?</value>
   </data>
-  <data name="map" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="application_browser" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACnklEQVQ4T52RSU9TUQBGu1V/
-        gMYdS8PGhQtDXLgwcWEwMYYNCzYNFMFSBqENswwCgUIjg6KCgMVQELAyyVQGsVBskakWFASEgoWIYssU
-        huO7L/4A8SVf8hbnnLx3ryIoLS1QWth/LBBQKG6npKiklxM/fz2F4lZiYvixpNcOJdM8ms3QdAnOuVrs
-        c10Yp6bJsq2gG3QT0+lG3eImosmN4IUnf8FNrTbi8PiY55YEuuf02FbKGXWVs7lr4ZN3lro1H6lWN5lO
-        SLZDhNmN4IUnB27ExUXuHx1R3hlDq+sBlq8GOsf0fPe+ZmPHysjPJfI/LJD3GdIn4W7LMoIXnhy4rtGo
-        dw8PKWmJ5ElXLDX9iZgdOfRNGJicqcE2206dy0WGdZGEviU0HUsIXnhy4FpkZJTv4ICixnDq7EmYpzMx
-        DiQxvPyYhU0TP3Z66XX2Ylr7jX7+mNjuRQQvPDlwVaWK3trfR/8yDKNVS/1YCs+64+mZL8KxWsHqVjMO
-        V4P0K4tULO+j61tA8MKTA1eUytjNvT0KK1VUD8RTa9NR1qahbSaX/oWHONdrsE9XsOyz07nhIX3wC4IX
-        nhy4HBISt7G7i6EsgvyqUArqQiltV/OoPZrKHh317zKwOsuwT1XTNdFB8fA4gheeHLgUHBzv2dmhxKDG
-        aNZR3XuPAlMoJkcyZmeWdLWFNL3PZuVXI+vbgzQ5LAheeHLgYlCQdnV7m9J8Dab6FGpaE8g1KjGOaGn4
-        mCpdbQ4vLMlMearweFsYHH+F4IUnBy4EBiau+HyU5kVRnB+FvjicvAolebVK9A0qit+oefpWOpu+NLps
-        ekbGKxG88OTAuYCA+x7pVL95vf88wQtPDpzy87tzxt8/56QTnhyQntPSzko7f4IJ/rQI/AE63awC7yrB
-        bwAAAABJRU5ErkJggg==
+        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="gear--minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4475,16 +4737,22 @@
         L1tJUV/SlAd3xCblH+s4aw2T/BzJAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="icon_invokeurl_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="map--minus" 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
+        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="document" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4520,30 +4788,24 @@
         5ET8AeUdBAROQKmSAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="icon_selectradius" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_printablepage_disabled" 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="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
+        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
-        AABuACwAAAAAEAAQAAAIxADdCBxIcKCRgggHMgDAQOCLAARSgEE4AMAANz2gcIAgwIIWNQUBCKyxgACJ
-        BwLWnAlCUKSbEyYCCDDAQ8CWLm0GunTjA00VAhseCEkiIUbCGS0CKKFQIcECCSESjgmwpASFHzsCpCl4
-        JAqCGxMqIEigowgEGgRBPGnQAIcKGQZgGMjA5uJAD0NQTPDC4gsRIGIimClT0ImVAweYSLmgIQKWK1kQ
-        TsEQxoWCESIcrOCSUCCZAgWaUMlho7NAJAU+dFDgICAAOw==
+        AABsACwAAAAAEAAQAAAI1gDZCBQ4oKDBggMTshlgoGHDAQACKPSxREcQABgBQBQgkQ0OK1OGFDBzJeNG
+        jim6bDBQ4EaBHSYDyAwAhQOEAmC8KKHSIqOAnxI1oIgxwcQXAiEyYuQo8MMEAlAJMBHzwmfHMVATaFVQ
+        BMaWpRIjjACSAIkCBSWSFKhCAwDHBj24SMigAAuDMz86sNDiNsAKB1JUSHjygAeGAzkQpAGK4IiDKCRA
+        1EDgYYYIIjMDlMlygoEMJ00gGCnw4AKFBajZNDgQoQKCMEJsuDhgQY1ChWgOkFmjMCAAOw==
 </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>
@@ -4567,8 +4829,8 @@
   <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
     <value>No custom commands selected. Nothing to export</value>
   </data>
-  <data name="ColorCountError" xml:space="preserve">
-    <value>Failed to read {0} color(s) in line {1}</value>
+  <data name="FindNothing" xml:space="preserve">
+    <value>Could not find specified string or end of document reached</value>
   </data>
   <data name="DeleteCommand" xml:space="preserve">
     <value>Delete Command</value>
@@ -4621,8 +4883,8 @@
   <data name="FsMySql" xml:space="preserve">
     <value>MySQL Feature Source</value>
   </data>
-  <data name="OperationCancelled" xml:space="preserve">
-    <value>Operation Cancelled</value>
+  <data name="ColumnHasNoValidDataError" xml:space="preserve">
+    <value>The selected column had no non-null values and cannot be used.</value>
   </data>
   <data name="images_stack" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -4700,6 +4962,23 @@
         CTATKF7MePGHgAA7
 </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>
   <data name="icon_viewoptions" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIYAAAAAAP////7+//39/vv8/gkiTxAwYzhfl4KSqYGRqHuNpnyOp32Pp3+QqICRqLfC
@@ -4715,15 +4994,23 @@
         sJgIoscTFB1OcKjBeciIIDQmeoCB+WwJG6iBhFgxY2KB17Bjyw4IADs=
 </value>
   </data>
-  <data name="function" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="color" 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
+        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="Func_ARGB_BValueDescription" xml:space="preserve">
@@ -4764,8 +5051,26 @@
   <data name="FindReplaceNothing" xml:space="preserve">
     <value>Nothing to replace</value>
   </data>
-  <data name="SelectPackageFile" xml:space="preserve">
-    <value>Select the package file to edit</value>
+  <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>
   <data name="Func_DECAP_StringValueDescription" xml:space="preserve">
     <value>String to format</value>
@@ -4782,27 +5087,63 @@
   <data name="IncompatibleConnection" xml:space="preserve">
     <value>This connection is not compatible</value>
   </data>
-  <data name="ParameterOverrideExists" xml:space="preserve">
-    <value>Parameter Override already specified</value>
+  <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="OdbcCannotInferDriver" xml:space="preserve">
-    <value>Could not infer ODBC driver from file name: {0}</value>
+  <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="minus-circle" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="map" 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==
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACnklEQVQ4T52RSU9TUQBGu1V/
+        gMYdS8PGhQtDXLgwcWEwMYYNCzYNFMFSBqENswwCgUIjg6KCgMVQELAyyVQGsVBskakWFASEgoWIYssU
+        huO7L/4A8SVf8hbnnLx3ryIoLS1QWth/LBBQKG6npKiklxM/fz2F4lZiYvixpNcOJdM8ms3QdAnOuVrs
+        c10Yp6bJsq2gG3QT0+lG3eImosmN4IUnf8FNrTbi8PiY55YEuuf02FbKGXWVs7lr4ZN3lro1H6lWN5lO
+        SLZDhNmN4IUnB27ExUXuHx1R3hlDq+sBlq8GOsf0fPe+ZmPHysjPJfI/LJD3GdIn4W7LMoIXnhy4rtGo
+        dw8PKWmJ5ElXLDX9iZgdOfRNGJicqcE2206dy0WGdZGEviU0HUsIXnhy4FpkZJTv4ICixnDq7EmYpzMx
+        DiQxvPyYhU0TP3Z66XX2Ylr7jX7+mNjuRQQvPDlwVaWK3trfR/8yDKNVS/1YCs+64+mZL8KxWsHqVjMO
+        V4P0K4tULO+j61tA8MKTA1eUytjNvT0KK1VUD8RTa9NR1qahbSaX/oWHONdrsE9XsOyz07nhIX3wC4IX
+        nhy4HBISt7G7i6EsgvyqUArqQiltV/OoPZrKHh317zKwOsuwT1XTNdFB8fA4gheeHLgUHBzv2dmhxKDG
+        aNZR3XuPAlMoJkcyZmeWdLWFNL3PZuVXI+vbgzQ5LAheeHLgYlCQdnV7m9J8Dab6FGpaE8g1KjGOaGn4
+        mCpdbQ4vLMlMearweFsYHH+F4IUnBy4EBiau+HyU5kVRnB+FvjicvAolebVK9A0qit+oefpWOpu+NLps
+        ekbGKxG88OTAuYCA+x7pVL95vf88wQtPDpzy87tzxt8/56QTnhyQntPSzko7f4IJ/rQI/AE63awC7yrB
+        bwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="ruler" 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
+</value>
+  </data>
   <data name="application--plus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -5004,19 +5345,23 @@
         IECQOISOAlIeYxkAocGLFTISVxlSoIAAARgGYLHAuQERJwtACCCQYspmhqw7C2gAIfVF3AOCXwwIADs=
 </value>
   </data>
-  <data name="icon_zoom" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_ctxarrow" 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=
+        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="icon_zoomout_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -5070,24 +5415,47 @@
         NtwA4YEACVCjTi05UoHMpVMHPBAZdWSBgRU0FLjQVYHbBQU0Oi2QYcKECwEcxE34dMCAAoATEAwIADs=
 </value>
   </data>
-  <data name="icon_refreshmap_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_help" 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
+        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
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
-        AABSACwAAAAAEAAQAAAI8AAxZKiwAYPBCgYvSFm4EEOBhyYKEIBSAAMEhQwxPHlSwIQAjhULcMAoxUIE
-        BBFKJEiAAAEGBgweMLRQAAGBFQQeFjjQoYPMhRUiSIgwooAAJwNSDBhgIGPOAiEkDlhio6oMhhkKqECx
-        4gWIADYCiLVBA2gBFwRIEEAxNYcSJTaQ5JCSgQQLEytYtIgypImRJDaMGKGhoQCKAi2guBhwI8gOGzJ2
-        FKmBgcCJFyNcgHByQ4gOJjZ0CKlBocDGERudHAECJGwTIDRKd/AgYsKCDzBw+Aj7A8cMDA4aPAjuQIGB
-        GETC8uhhg6Fz5zOq2pgREAA7
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAADIACwAAAAAEAAQAAAI/wCRIasEq0CBMr8msSgQ4cIhTgLt
+        2BjjZ4eRJMeGEOqDAMEAZABE3ZAUTISjN01A6RhRK8WRAQASybmyZRYqVh1oRKlyq8eqPAB+jOqkAoQx
+        MkBoFdEV588nDgBkeJlwasoiVQ148BKC5MUDLgA0YaKw5NUeYFiyXHKVIU2uCgC6oPgiIVaJE4qCQDLF
+        hgofMADuEAMEZwWlYYKIQCn1yFArHwA8mKADwQCpRql2uWBkRoGnGgBsBQpzANemQXgsFZOyhgkGDQAQ
+        kTjgYEabOb2EtbAgoA4aWQAWGNCCQ40VAmIK+dqQIJSASABg5HASw80ZAgSUZNIT4oOAj08CiA8fT17A
+        d4EMAKhfz169wIAAOw==
 </value>
   </data>
-  <data name="MissingColumnError" xml:space="preserve">
-    <value>Missing column "{0}"</value>
+  <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>
   <data name="icon_viewoptions_disabled" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -5123,8 +5491,8 @@
         SkTwYKJFig4vQiyoESNHiwknLozY8GHDkygbBgQAOw==
 </value>
   </data>
-  <data name="NewFlyout" xml:space="preserve">
-    <value>New Flyout</value>
+  <data name="SelectFolder" xml:space="preserve">
+    <value>Select Folder</value>
   </data>
   <data name="map--arrow" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -5145,391 +5513,24 @@
         O/EfeeONT9E6bWgAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="CommandTypesDataset" xml:space="preserve">
-    <value><?xml version="1.0" encoding="utf-8" ?>
-
-<!-- 
-  Note to translators:
-    You can only translate <Label>, <ToolTip> and <Description>
-    If you translate any of the others, the editor won't work!
--->
-
-<CommandTypesDataset>
-	<Command>
-		<Command>About</Command>
-		<Label>About</Label>
-		<ToolTip>About</ToolTip>
-		<Action>About</Action>
-		<Description>Display information about this application</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon></EnabledIcon>		
-		<DisabledIcon></DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Buffer</Command>
-		<Label>Buffer</Label>
-		<ToolTip>Buffer</ToolTip>
-		<Action>Buffer</Action>
-		<Description>Create buffers around the selected features</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Clear Selection</Command>
-		<Label>Clear Selection</Label>
-		<ToolTip>Clear selection</ToolTip>
-		<Action>Clear Selection</Action>
-		<Description>Clear the current selections</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Copy Map</Command>
-		<Label>Copy</Label>
-		<ToolTip>Copy</ToolTip>
-		<Action>Copy Map</Action>
-		<Description>Copy current view of map to clipboard</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Help</Command>
-		<Label>Help</Label>
-		<ToolTip>Help</ToolTip>
-		<Action>Help</Action>
-		<Description>Launch help for this application</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Initial Center and Scale</Command>
-		<Label>Initial Center and Scale</Label>
-		<ToolTip>Initial center and scale</ToolTip>
-		<Action>Restore View</Action>
-		<Description>Zoom to the initial center and scale of the map</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Initial Map View</Command>
-		<Label>Initial Map View</Label>
-		<ToolTip>Initial map view</ToolTip>
-		<Action>Fit To Window</Action>
-		<Description>Fit the initial view of the map to the window</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Invoke Script</Command>
-		<Label>Invoke Script</Label>
-		<ToolTip>Invoke script</ToolTip>
-		<Action>Invoke Script</Action>
-		<Description>Invoke a script command</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Invoke URL</Command>
-		<Label>Invoke URL</Label>
-		<ToolTip>Invoke a command by accessing a URL</ToolTip>
-		<Action>Invoke URL</Action>
-		<Description>Invoke a URL command</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Measure</Command>
-		<Label>Measure</Label>
-		<ToolTip>Measure</ToolTip>
-		<Action>Measure</Action>
-		<Description>Measure distances on the map</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Next View</Command>
-		<Label>Next View</Label>
-		<ToolTip>Next View</ToolTip>
-		<Action>Next View</Action>
-		<Description>Buffer</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan</Command>
-		<Label>Pan</Label>
-		<ToolTip>Pan mode</ToolTip>
-		<Action>Pan</Action>
-		<Description>Drag the map to view areas out of range</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Down</Command>
-		<Label>Pan Down</Label>
-		<ToolTip>Pan down</ToolTip>
-		<Action>Pan Down</Action>
-		<Description>Pan down by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Left</Command>
-		<Label>Pan Left</Label>
-		<ToolTip>Pan left</ToolTip>
-		<Action>Pan Left</Action>
-		<Description>Pan left by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Right</Command>
-		<Label>Pan Right</Label>
-		<ToolTip>Pan right</ToolTip>
-		<Action>Pan Right</Action>
-		<Description>Pan right by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Pan Up</Command>
-		<Label>Pan Up</Label>
-		<ToolTip>Pan up</ToolTip>
-		<Action>Pan Up</Action>
-		<Description>Pan up by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Previous View</Command>
-		<Label>Previous View</Label>
-		<ToolTip>Previous view</ToolTip>
-		<Action>Previous View</Action>
-		<Description>Go to previous view</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Print</Command>
-		<Label>Print</Label>
-		<ToolTip>Print</ToolTip>
-		<Action>Print</Action>
-		<Description>Print with optional layout</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Refresh Map</Command>
-		<Label>Refresh Map</Label>
-		<ToolTip>Refresh map</ToolTip>
-		<Action>Refresh</Action>
-		<Description>Refresh map and reload all layers keeping current center and scale</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Search</Command>
-		<Label>Search</Label>
-		<ToolTip>Search</ToolTip>
-		<Action>Search</Action>
-		<Description>Perform a search</Description>
-		<Viewers>All</Viewers>
-		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select</Command>
-		<Label>Select</Label>
-		<ToolTip>Select mode</ToolTip>
-		<Action>Select</Action>
-		<Description>Select features by clicking and dragging</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Polygon</Command>
-		<Label>Select Polygon</Label>
-		<ToolTip>Select polygon</ToolTip>
-		<Action>Select Polygon</Action>
-		<Description>Create a polygon to select all features that fall within</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Radius</Command>
-		<Label>Select Radius</Label>
-		<ToolTip>Select radius</ToolTip>
-		<Action>Select Radius</Action>
-		<Description>Click and drag to select all features inside the circle</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Select Within</Command>
-		<Label>Select Within</Label>
-		<ToolTip>Select within</ToolTip>
-		<Action>Select Within</Action>
-		<Description>Select features that fall within currently selected areas</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>View Options</Command>
-		<Label>View Options</Label>
-		<ToolTip>View options</ToolTip>
-		<Action>View Options</Action>
-		<Description>View Options</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom</Command>
-		<Label>Zoom Dynamic</Label>
-		<ToolTip>Zoom dynamic</ToolTip>
-		<Action>Zoom</Action>
-		<Description>Zoom dynamically by clicking and dragging</Description>
-		<Viewers>DWF</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom In</Command>
-		<Label>Zoom In</Label>
-		<ToolTip>Zoom in</ToolTip>
-		<Action>Zoom In</Action>
-		<Description>Zoom in by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Out</Command>
-		<Label>Zoom Out</Label>
-		<ToolTip>Zoom out</ToolTip>
-		<Action>Zoom Out</Action>
-		<Description>Zoom out by a preset increment</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Rectangle</Command>
-		<Label>Zoom Rectangle</Label>
-		<ToolTip>Zoom to rectangle</ToolTip>
-		<Action>Zoom Rectangle</Action>
-		<Description>Zoom in on an area</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Zoom Selection</Command>
-		<Label>Zoom Selection</Label>
-		<ToolTip>Zoom to selection</ToolTip>
-		<Action>Zoom To Selection</Action>
-		<Description>Zoom to extents of selected features</Description>
-		<Viewers>All</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
-	</Command>
-
-	<Command>
-		<Command>Get Printable Page</Command>
-		<Label>Printable Page</Label>
-		<ToolTip>Get printable page</ToolTip>
-		<Action>Get Printable Page</Action>
-		<Description>Get printer-friendly page</Description>
-		<Viewers>AJAX</Viewers>
-		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
-		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
-	</Command>
-
-</CommandTypesDataset>
+  <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>
+  <data name="TextNoStringSpecifiedToLookFor" xml:space="preserve">
+    <value>No string specified to look for!</value>
+  </data>
   <data name="SearchCmdDescription" xml:space="preserve">
     <value>Search Command</value>
   </data>
@@ -5558,6 +5559,9 @@
   <data name="InvalidResourceId" xml:space="preserve">
     <value>Not a valid resource identifier</value>
   </data>
+  <data name="TextLoading" xml:space="preserve">
+    <value>Loading</value>
+  </data>
   <data name="property" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -5581,9 +5585,12 @@
   <data name="EditWatermarkInstance" xml:space="preserve">
     <value>Edit Watermark Instance</value>
   </data>
-  <data name="PromptUpdateMapWidgetReference" xml:space="preserve">
-    <value>Update Map Widget to point to</value>
+  <data name="ExtentsCalculationCompleted" xml:space="preserve">
+    <value>Map extents calculation completed. Click Accept to use the calculated extents.</value>
   </data>
+  <data name="TextSelectionOnly" xml:space="preserve">
+    <value>(Selection Only)</value>
+  </data>
   <data name="Separator" xml:space="preserve">
     <value>Separator</value>
   </data>
@@ -5628,16 +5635,14 @@
   <data name="TransparentName" xml:space="preserve">
     <value>Transparent</value>
   </data>
-  <data name="icon_invokescript" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="icon_buffer" 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==
+        R0lGODlhEAAQAIQAAEZCU1KTygpgs6jS54Sv2XuSpTJ6wL/e65jI40mOyObv92Wfz7LX6Iy+3hlquKXM
+        4rjb6leVykqUxY2bqK7V6JzK5Gih0FuazVCSybzd6sTh66TQ5mme0f///wAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBBwAdACwAAAAAEAAQAAAIoQA7KODgwAABBR0SKlxIIAKCBhEEKFRAwIBBhAYaFACw
+        IYHEDgIiNIDIoUNGACgHeBSQYACAAhUcdCBwwWXKAThRAmhgQCBLCjopAEVJ4QIBhQIwDNUJgAIGAQiR
+        MmDAlMHThQkFTNVp9eNCAQEg6IQQwGtCBWAz6MxQFuvMBQd0Hojo1uQDnRro1jXwYAKAvGaxErAA4YGF
+        wFgHFjxYN2FAADs=
 </value>
   </data>
   <data name="cross-script" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -5655,56 +5660,57 @@
         24IinbtF9pUaeCn4QTdWdFAHNsFGMAqr5tprwhbHoJzP+Q95lHpGrVHH8wAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="ConfigurationDocumentReset" xml:space="preserve">
-    <value>Configuration Document has been reset</value>
+  <data name="InvalidResourceIdFolder" xml:space="preserve">
+    <value>Must be valid resource id. Cannot be a folder</value>
   </data>
-  <data name="Func_LOOKUP_ExpressionDescription" xml:space="preserve">
-    <value>Key expression</value>
+  <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="TextDownloading" xml:space="preserve">
-    <value>Downloading</value>
+  <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>
-  <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 name="icon_invokeurl_disabled" 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=
+</value>
   </data>
-  <data name="TextNoOccurrencesFound" xml:space="preserve">
-    <value>No Occurences Found</value>
+  <data name="folder-horizontal-open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder-horizontal-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TextNoStringSpecifiedToLookFor" xml:space="preserve">
-    <value>No string specified to look for!</value>
+  <data name="ErrNotAFolder" xml:space="preserve">
+    <value>Not a folder</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>
-  <data name="TextNoItemSelected" xml:space="preserve">
-    <value>No Items Selected</value>
-  </data>
-  <data name="TextPreparingConfigurationDocument" xml:space="preserve">
-    <value>Preparing Configuration Document</value>
-  </data>
-  <data name="TextLoading" xml:space="preserve">
-    <value>Loading</value>
-  </data>
-  <data name="water" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\water.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="TextSelectDataStore" xml:space="preserve">
-    <value>Select Data Store</value>
-  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2012-08-20 12:57:10 UTC (rev 6941)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2012-08-20 14:21:39 UTC (rev 6942)
@@ -941,5 +941,10 @@
             var tokens = this.QualifiedClassName.Split(':');
             return this.Parent.FeatureService.GetClassDefinition(tokens[0], tokens[1]);
         }
+
+        /// <summary>
+        /// Gets a display string for this layer for presentation purposes
+        /// </summary>
+        public string DisplayString { get { return this.LegendLabel + " (" + this.Name + ")"; } }
     }
 }



More information about the mapguide-commits mailing list