Thu Dec 24 07:13:35 EST 2009

Author: ksgeograf
Date: 2009-12-24 07:13:35 -0500 (Thu, 24 Dec 2009)
New Revision: 4475

Modified:
   trunk/Tools/Maestro/Installer/UpgradeData.wxi
   trunk/Tools/Maestro/Installer/incBinFiles.wxs
   trunk/Tools/Maestro/Installer/incLocFiles.da-DK.wxs
   trunk/Tools/Maestro/Installer/incLocFiles.es-ES.wxs
   trunk/Tools/Maestro/Installer/incLocFiles.fr-FR.wxs
   trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Localization/es-ES/MgCooker/Strings/Progress.es-ES.resx
   trunk/Tools/Maestro/Localization/fr-FR/MgCooker/Strings/Progress.fr-FR.resx
   trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
Log:
Maestro:
Build for r4475

Modified: trunk/Tools/Maestro/Installer/UpgradeData.wxi
===================================================================

--- trunk/Tools/Maestro/Installer/UpgradeData.wxi	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Installer/UpgradeData.wxi	2009-12-24 12:13:35 UTC (rev 4475)
@@ -3,7 +3,7 @@
   <?define UpgradeCode="A7C2ECB3-1991-47B9-A22E-8844BB95CAE2" ?>
 
   <!-- Remember to change product version on each install -->
-  <?define ProductVersion="1.1.0.4437" ?>
+  <?define ProductVersion="1.1.0.4475" ?>
 
   <?define Manufacturer="HexaD" ?>
 

Modified: trunk/Tools/Maestro/Installer/incBinFiles.wxs
===================================================================
--- trunk/Tools/Maestro/Installer/incBinFiles.wxs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Installer/incBinFiles.wxs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -3,7 +3,7 @@
   <!--<CommandLineOptions>
   <Producer>Autogenerated by Paraffin - Wintellect - John Robbins - john at wintellect.com</Producer>
   <WARNING>Manual changes to this file may cause incorrect behavior.</WARNING>
-  <CreatedOn>14-12-2009 23:27</CreatedOn>
+  <CreatedOn>24-12-2009 13:04</CreatedOn>
   <Directory>C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\</Directory>
   <Custom>MAESTROBIN</Custom>
   <DirAlias>C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\</DirAlias>
@@ -34,7 +34,7 @@
     </ComponentGroup>
     <DirectoryRef Id="INSTALLLOCATION">
       <Directory Id="dir_MapGuideMaestro_0" Name="MapGuideMaestro">
-        <Component Id="comp_MAESTROBIN_0" DiskId="1" KeyPath="yes" Guid="4A93FC9C-5165-43F7-B5C3-4DB6100DE412">
+        <Component Id="comp_MAESTROBIN_0" DiskId="1" KeyPath="yes" Guid="335B7DC1-D9AB-421D-9570-3E08EAC1ACA3">
           <File Id="file_MAESTROBIN_0" Name="ColorBrewer.csv" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\ColorBrewer.csv" />
           <File Id="file_MAESTROBIN_1" Name="EditorMap.xml" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\EditorMap.xml" />
           <File Id="file_MAESTROBIN_2" Name="ICSharpCode.SharpZipLib.dll" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\ICSharpCode.SharpZipLib.dll" />
@@ -58,7 +58,7 @@
           <File Id="file_MAESTROBIN_20" Name="Topology.IO.MapGuide.dll" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Topology.IO.MapGuide.dll" />
         </Component>
         <Directory Id="dir_MapGuideMaestro_Schemas_1" Name="Schemas">
-          <Component Id="comp_MAESTROBIN_21" DiskId="1" KeyPath="yes" Guid="4C467D40-0237-476F-99F2-2EDBAD6B4E8C">
+          <Component Id="comp_MAESTROBIN_21" DiskId="1" KeyPath="yes" Guid="5130DBD1-4CBA-443C-B82F-C43F48F2362F">
             <File Id="file_MAESTROBIN_21" Name="ApplicationDefinition-1.0.0.xsd" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Schemas\ApplicationDefinition-1.0.0.xsd" />
             <File Id="file_MAESTROBIN_22" Name="ApplicationDefinitionInfo-1.0.0.xsd" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Schemas\ApplicationDefinitionInfo-1.0.0.xsd" />
             <File Id="file_MAESTROBIN_23" Name="DataStoreList-1.0.0.xsd" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Schemas\DataStoreList-1.0.0.xsd" />
@@ -109,7 +109,7 @@
           </Component>
         </Directory>
         <Directory Id="dir_MapGuideMaestro_stdicons_2" Name="stdicons">
-          <Component Id="comp_MAESTROBIN_68" DiskId="1" KeyPath="yes" Guid="CE0C39CE-6986-426F-8CFE-E128EFA6B6CA">
+          <Component Id="comp_MAESTROBIN_68" DiskId="1" KeyPath="yes" Guid="8D3D6343-05A3-4E14-B703-2F71C444657A">
             <File Id="file_MAESTROBIN_68" Name="copyright.txt" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\stdicons\copyright.txt" />
             <File Id="file_MAESTROBIN_69" Name="icon_back.gif" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\stdicons\icon_back.gif" />
             <File Id="file_MAESTROBIN_70" Name="icon_back_disabled.gif" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\stdicons\icon_back_disabled.gif" />
@@ -192,7 +192,7 @@
           </Component>
         </Directory>
         <Directory Id="dir_MapGuideMaestro_Templates_3" Name="Templates">
-          <Component Id="comp_MAESTROBIN_147" DiskId="1" KeyPath="yes" Guid="44F7C37A-C3D1-4E2C-9C2F-86EB6442E1E1">
+          <Component Id="comp_MAESTROBIN_147" DiskId="1" KeyPath="yes" Guid="9727B438-FEAD-48C8-9FB5-ED99F8BC7A5D">
             <File Id="file_MAESTROBIN_147" Name="Compound Symbol.SymbolDefinition" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Templates\Compound Symbol.SymbolDefinition" />
             <File Id="file_MAESTROBIN_148" Name="Dataconnection.FeatureSource" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Templates\Dataconnection.FeatureSource" />
             <File Id="file_MAESTROBIN_149" Name="Fusion Application.ApplicationDefinition" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\Templates\Fusion Application.ApplicationDefinition" />
@@ -205,11 +205,11 @@
           </Component>
         </Directory>
         <Directory Id="dir_MapGuideMaestro_WebStudio_4" Name="WebStudio">
-          <Component Id="comp_MAESTROBIN_156" DiskId="1" KeyPath="yes" Guid="F989DA0F-62FE-460C-98DE-260D6238F5E9">
+          <Component Id="comp_MAESTROBIN_156" DiskId="1" KeyPath="yes" Guid="0B80088B-6B79-4615-A2CD-BCBF1F4D87FC">
             <File Id="file_MAESTROBIN_156" Name="copyright.txt" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\copyright.txt" />
           </Component>
           <Directory Id="dir_MapGuideMaestro_WebStudio_areas_5" Name="areas">
-            <Component Id="comp_MAESTROBIN_157" DiskId="1" KeyPath="yes" Guid="D1DC796B-8D85-4400-BC6A-F895CB8C08E4">
+            <Component Id="comp_MAESTROBIN_157" DiskId="1" KeyPath="yes" Guid="2002BB88-0ACD-45C0-9502-D007B62D30B4">
               <File Id="file_MAESTROBIN_157" Name="Acad_iso02w100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\areas\Acad_iso02w100.png" />
               <File Id="file_MAESTROBIN_158" Name="Acad_iso03w100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\areas\Acad_iso03w100.png" />
               <File Id="file_MAESTROBIN_159" Name="Acad_iso04w100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\areas\Acad_iso04w100.png" />
@@ -349,7 +349,7 @@
             </Component>
           </Directory>
           <Directory Id="dir_MapGuideMaestro_WebStudio_lines_6" Name="lines">
-            <Component Id="comp_MAESTROBIN_293" DiskId="1" KeyPath="yes" Guid="5C5124DE-35FC-4376-92D4-B41FCC14DBAF">
+            <Component Id="comp_MAESTROBIN_293" DiskId="1" KeyPath="yes" Guid="1F5080AC-1D88-4CFA-BD8F-0D703E838329">
               <File Id="file_MAESTROBIN_293" Name="ACAD_ISO02W100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\lines\ACAD_ISO02W100.png" />
               <File Id="file_MAESTROBIN_294" Name="ACAD_ISO03W100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\lines\ACAD_ISO03W100.png" />
               <File Id="file_MAESTROBIN_295" Name="ACAD_ISO04W100.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\lines\ACAD_ISO04W100.png" />
@@ -423,7 +423,7 @@
             </Component>
           </Directory>
           <Directory Id="dir_MapGuideMaestro_WebStudio_points_7" Name="points">
-            <Component Id="comp_MAESTROBIN_363" DiskId="1" KeyPath="yes" Guid="BF5DAE1F-EA4B-423A-B213-4D42087A8AC6">
+            <Component Id="comp_MAESTROBIN_363" DiskId="1" KeyPath="yes" Guid="CEA9D2B2-BE7D-48D6-9DE1-A8734E0DEEDA">
               <File Id="file_MAESTROBIN_363" Name="circle.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\points\circle.png" />
               <File Id="file_MAESTROBIN_364" Name="cross.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\points\cross.png" />
               <File Id="file_MAESTROBIN_365" Name="square.png" Source="C:\Users\Kenneth\Documents\Maestro-build\InstallerTempRelease\MapGuideMaestro\WebStudio\points\square.png" />

Modified: trunk/Tools/Maestro/Installer/incLocFiles.da-DK.wxs
===================================================================
--- trunk/Tools/Maestro/Installer/incLocFiles.da-DK.wxs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Installer/incLocFiles.da-DK.wxs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -3,7 +3,7 @@
   <!--<CommandLineOptions>
   <Producer>Autogenerated by Paraffin - Wintellect - John Robbins - john at wintellect.com</Producer>
   <WARNING>Manual changes to this file may cause incorrect behavior.</WARNING>
-  <CreatedOn>14-12-2009 23:27</CreatedOn>
+  <CreatedOn>24-12-2009 13:04</CreatedOn>
   <Directory>compiled\da-DK\</Directory>
   <Custom>MAESTROBIN_da-DK</Custom>
   <DirAlias>..\Localization\compiled\da-DK\</DirAlias>
@@ -27,14 +27,14 @@
     </ComponentGroup>
     <DirectoryRef Id="dir_MapGuideMaestro_0">
       <Directory Id="dir_da_DK_0" Name="da-DK">
-        <Component Id="comp_MAESTROBIN_da_DK_0" DiskId="1" KeyPath="yes" Guid="F9FD8BB0-DAFF-4475-A760-DCE426722B2C">
+        <Component Id="comp_MAESTROBIN_da_DK_0" DiskId="1" KeyPath="yes" Guid="9BEA29DE-1792-4D7B-8D03-D640079932B7">
           <File Id="file_MAESTROBIN_da_DK_0" Name="Maestro.resources.dll" Source="..\Localization\compiled\da-DK\Maestro.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_1" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_2" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_3" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_4" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_5" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
-          <File Id="file_MAESTROBIN_da_DK_6" Name="OSGeo.MapGuide.MgCooker.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_1" Name="MgCooker.resources.dll" Source="..\Localization\compiled\da-DK\MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_2" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_3" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_4" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_5" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
+          <File Id="file_MAESTROBIN_da_DK_6" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\da-DK\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
         </Component>
       </Directory>
     </DirectoryRef>

Modified: trunk/Tools/Maestro/Installer/incLocFiles.es-ES.wxs
===================================================================
--- trunk/Tools/Maestro/Installer/incLocFiles.es-ES.wxs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Installer/incLocFiles.es-ES.wxs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -3,7 +3,7 @@
   <!--<CommandLineOptions>
   <Producer>Autogenerated by Paraffin - Wintellect - John Robbins - john at wintellect.com</Producer>
   <WARNING>Manual changes to this file may cause incorrect behavior.</WARNING>
-  <CreatedOn>14-12-2009 23:27</CreatedOn>
+  <CreatedOn>24-12-2009 13:04</CreatedOn>
   <Directory>compiled\es-ES\</Directory>
   <Custom>MAESTROBIN_es-ES</Custom>
   <DirAlias>..\Localization\compiled\es-ES\</DirAlias>
@@ -27,14 +27,14 @@
     </ComponentGroup>
     <DirectoryRef Id="dir_MapGuideMaestro_0">
       <Directory Id="dir_es_ES_0" Name="es-ES">
-        <Component Id="comp_MAESTROBIN_es_ES_0" DiskId="1" KeyPath="yes" Guid="DA92A686-0C1A-4A6F-B87B-EB0FBE490DD8">
+        <Component Id="comp_MAESTROBIN_es_ES_0" DiskId="1" KeyPath="yes" Guid="381101B2-8D81-40D5-BF83-8064565A2F2E">
           <File Id="file_MAESTROBIN_es_ES_0" Name="Maestro.resources.dll" Source="..\Localization\compiled\es-ES\Maestro.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_1" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_2" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_3" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_4" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_5" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
-          <File Id="file_MAESTROBIN_es_ES_6" Name="OSGeo.MapGuide.MgCooker.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_1" Name="MgCooker.resources.dll" Source="..\Localization\compiled\es-ES\MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_2" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_3" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_4" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_5" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
+          <File Id="file_MAESTROBIN_es_ES_6" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\es-ES\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
         </Component>
       </Directory>
     </DirectoryRef>

Modified: trunk/Tools/Maestro/Installer/incLocFiles.fr-FR.wxs
===================================================================
--- trunk/Tools/Maestro/Installer/incLocFiles.fr-FR.wxs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Installer/incLocFiles.fr-FR.wxs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -3,7 +3,7 @@
   <!--<CommandLineOptions>
   <Producer>Autogenerated by Paraffin - Wintellect - John Robbins - john at wintellect.com</Producer>
   <WARNING>Manual changes to this file may cause incorrect behavior.</WARNING>
-  <CreatedOn>14-12-2009 23:27</CreatedOn>
+  <CreatedOn>24-12-2009 13:04</CreatedOn>
   <Directory>compiled\fr-FR\</Directory>
   <Custom>MAESTROBIN_fr-FR</Custom>
   <DirAlias>..\Localization\compiled\fr-FR\</DirAlias>
@@ -27,14 +27,14 @@
     </ComponentGroup>
     <DirectoryRef Id="dir_MapGuideMaestro_0">
       <Directory Id="dir_fr_FR_0" Name="fr-FR">
-        <Component Id="comp_MAESTROBIN_fr_FR_0" DiskId="1" KeyPath="yes" Guid="A98F3D85-86CA-4468-8DA5-715B671F3D84">
+        <Component Id="comp_MAESTROBIN_fr_FR_0" DiskId="1" KeyPath="yes" Guid="418E5B5C-2387-40D8-91EB-BCDFACDD37D2">
           <File Id="file_MAESTROBIN_fr_FR_0" Name="Maestro.resources.dll" Source="..\Localization\compiled\fr-FR\Maestro.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_1" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_2" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_3" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_4" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_5" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
-          <File Id="file_MAESTROBIN_fr_FR_6" Name="OSGeo.MapGuide.MgCooker.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_1" Name="MgCooker.resources.dll" Source="..\Localization\compiled\fr-FR\MgCooker.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_2" Name="OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.FusionEditor.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_3" Name="OSGeo.MapGuide.Maestro.LoginForm.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.LoginForm.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_4" Name="OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceBrowser.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_5" Name="OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceEditors.resources.dll" />
+          <File Id="file_MAESTROBIN_fr_FR_6" Name="OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" Source="..\Localization\compiled\fr-FR\OSGeo.MapGuide.Maestro.ResourceValidators.resources.dll" />
         </Component>
       </Directory>
     </DirectoryRef>

Modified: trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Localization/es-ES/MgCooker/Strings/Progress.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/MgCooker/Strings/Progress.es-ES.resx	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Localization/es-ES/MgCooker/Strings/Progress.es-ES.resx	2009-12-24 12:13:35 UTC (rev 4475)
@@ -142,4 +142,8 @@
     <value>({0} failed tiles)</value>
     <comment>Text inserted in the CurrentTileCounter if any tiles are failed</comment>
   </data>
+  <data name="PauseMessage" xml:space="preserve">
+    <value>MgCooker is now paused, click OK to resume rendering</value>
+    <comment>A text message displayed when MgCooker is paused</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/fr-FR/MgCooker/Strings/Progress.fr-FR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/MgCooker/Strings/Progress.fr-FR.resx	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Localization/fr-FR/MgCooker/Strings/Progress.fr-FR.resx	2009-12-24 12:13:35 UTC (rev 4475)
@@ -142,4 +142,8 @@
     <value>({0} failed tiles)</value>
     <comment>Text inserted in the CurrentTileCounter if any tiles are failed</comment>
   </data>
+  <data name="PauseMessage" xml:space="preserve">
+    <value>MgCooker is now paused, click OK to resume rendering</value>
+    <comment>A text message displayed when MgCooker is paused</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.1.0.4437")]
+[assembly: AssemblyFileVersionAttribute("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.1.0.4437")]
+[assembly: AssemblyFileVersionAttribute("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -50,5 +50,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.1.0.4437")]
+[assembly: AssemblyFileVersionAttribute("1.1.0.4475")]

Modified: trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.1.0.4437")]
+[assembly: AssemblyFileVersionAttribute("1.1.0.4475")]

Modified: trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("..\\..\\maestroapi.key")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("1.1.0.4437")]
+[assembly: AssemblyFileVersionAttribute("1.1.0.4475")]

Modified: trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

Modified: trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2009-12-24 11:53:14 UTC (rev 4474)
+++ trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2009-12-24 12:13:35 UTC (rev 4475)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.0.4437")]
-[assembly: AssemblyFileVersion("1.1.0.4437")]
+[assembly: AssemblyVersion("1.1.0.4475")]
+[assembly: AssemblyFileVersion("1.1.0.4475")]

