diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 3f34359a..4f3b768d 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -42,6 +42,7 @@
 		<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
 		<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
 		<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
+		<LocalizationToolkitBuild>$(BuildFolder)\LocalizationToolkit</LocalizationToolkitBuild>
 
 		<ftphost></ftphost>
 		<ftpUsername></ftpUsername>
@@ -79,6 +80,7 @@
 		<RemoveDir Directories="$(ImportEnterpriseBuild)"/>
 		<RemoveDir Directories="$(AWStatsViewerBuild)"/>
 		<RemoveDir Directories="$(WSPTransportAgentBuild)"/>
+		<RemoveDir Directories="$(LocalizationToolkitBuild)"/>
 		<RemoveDir Directories="$(BuildFolder)"/>
 
 		<MakeDir Directories="$(BuildFolder)"/>
@@ -89,6 +91,7 @@
 		<MakeDir Directories="$(ImportEnterpriseBuild)"/>
 		<MakeDir Directories="$(AWStatsViewerBuild)"/>
 		<MakeDir Directories="$(WSPTransportAgentBuild)"/>
+		<MakeDir Directories="$(LocalizationToolkitBuild)"/>
 	</Target>
 
 	<Target Name="CreateServerBuild" DependsOnTargets="PrepareBuilds">
@@ -195,27 +198,47 @@
 	</Target>
 
 	<Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateAWStatsViewerBuild">
-    <ItemGroup>
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cache" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\microsoft.*" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\app.config" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.txt" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cs" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.csproj" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\Code\**" />
-			<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.publish.xml" />
-      			<WSPTransportAgentBuildFiles Include="$(WSPTransportAgentSrc)\**\*.*" Exclude="@(WSPTransportAgentBuildExclude)" />
-    </ItemGroup>
-    <Copy SourceFiles="@(WSPTransportAgentBuildFiles)" DestinationFolder="$(WSPTransportAgentBuild)\%(RecursiveDir)" />
-  </Target>
+		<ItemGroup>
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cache" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\microsoft.*" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\app.config" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.txt" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cs" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.csproj" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\Code\**" />
+				<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.publish.xml" />
+				<WSPTransportAgentBuildFiles Include="$(WSPTransportAgentSrc)\**\*.*" Exclude="@(WSPTransportAgentBuildExclude)" />
+		</ItemGroup>
+		<Copy SourceFiles="@(WSPTransportAgentBuildFiles)" DestinationFolder="$(WSPTransportAgentBuild)\%(RecursiveDir)" />
+	</Target>
+	
+	<Target Name="CreateLocalizationToolkitBuild" DependsOnTargets="CreateWSPTransportAgentBuild">
+		<!-- compile toolkit -->
+		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.LocalizationToolkit\WebsitePanel.LocalizationToolkit.csproj" Properties="Configuration=$(BuildConfiguration)">
+			<Output
+                TaskParameter="TargetOutputs"
+                ItemName="LocalizationToolkitExe" />		
+		</MSBuild>
+		
+		<!-- generate default resources -->
+		<Exec Command="@(LocalizationToolkitExe) -L $(PortalSrc)"/>
+		
+		<!-- build MSI package -->
+		<MSBuild Projects="$(TrunkFolder)\Sources\Tools\WebsitePanel.LocalizationToolkit.Wix\WebsitePanel.LocalizationToolkit.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
+			<Output
+                TaskParameter="TargetOutputs"
+                ItemName="LocalizationToolkitMsi" />	
+		</MSBuild>
+		<Copy SourceFiles="@(LocalizationToolkitMsi)" DestinationFolder="$(LocalizationToolkitBuild)\%(RecursiveDir)" />
+	</Target>	
 
-	<Target Name="Build" DependsOnTargets="CreateWSPTransportAgentBuild">
+	<Target Name="Build" DependsOnTargets="CreateLocalizationToolkitBuild">
 		<!-- Do nothing -->
 	</Target>
 
@@ -300,17 +323,7 @@
 		<Copy SourceFiles="@(ImportEnterpriseDeployFiles)" DestinationFolder="$(ImportEnterpriseInstall)\%(RecursiveDir)" />
 		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(ImportEnterpriseInstall)" />
 	</Target>
-
-	<Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateWSPTransportAgentInstall">
-		<ItemGroup>
-			<AWStatsViewerDeployFiles Include="$(AWStatsViewerBuild)\**\*.*" />
-		</ItemGroup>
-		<RemoveDir Directories="$(AWStatsViewerInstall)"/>
-		<MakeDir Directories="$(AWStatsViewerInstall)"/>
-		<Copy SourceFiles="@(AWStatsViewerDeployFiles)" DestinationFolder="$(AWStatsViewerInstall)\%(RecursiveDir)" />
-		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(AWStatsViewerInstall)" />
-	</Target>
-
+	
 	<Target Name="CreateWSPTransportAgentInstall" DependsOnTargets="CreateImportEnterpriseInstall">
 		<ItemGroup>
 			<WSPTransportAgentDeployFiles Include="$(WSPTransportAgentBuild)\**\*.*" />
@@ -321,6 +334,23 @@
 		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(WSPTransportAgentInstall)" />
 	</Target>
 
+	<Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateWSPTransportAgentInstall">
+		<ItemGroup>
+			<AWStatsViewerDeployFiles Include="$(AWStatsViewerBuild)\**\*.*" />
+		</ItemGroup>
+		<RemoveDir Directories="$(AWStatsViewerInstall)"/>
+		<MakeDir Directories="$(AWStatsViewerInstall)"/>
+		<Copy SourceFiles="@(AWStatsViewerDeployFiles)" DestinationFolder="$(AWStatsViewerInstall)\%(RecursiveDir)" />
+		<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(AWStatsViewerInstall)" />
+	</Target>
+	
+	<Target Name="CreateLocalizationToolkitInstall" DependsOnTargets="CreateAWStatsViewerInstall">
+		<ItemGroup>
+			<LocalizationToolkitDeployFiles Include="$(LocalizationToolkitBuild)\**\*.*" />
+		</ItemGroup>
+		<Copy SourceFiles="@(LocalizationToolkitDeployFiles)" DestinationFolder="$(ToolsFolder)\%(RecursiveDir)" />
+	</Target>	
+
 	<!-- Create update from previous version -->
 	<PropertyGroup>
 		<UpdateFolder>$(DeployFolder)\Update</UpdateFolder>
@@ -329,7 +359,7 @@
 		<PortalUpdate>$(UpdateFolder)\Portal</PortalUpdate>
 	</PropertyGroup>
 
-	<Target Name="PrepareUpdates" DependsOnTargets="CreateAWStatsViewerInstall">
+	<Target Name="PrepareUpdates" DependsOnTargets="CreateLocalizationToolkitInstall">
 		<RemoveDir Directories="$(UpdateFolder)"/>
 		<MakeDir Directories="$(UpdateFolder)"/>
 
@@ -493,7 +523,7 @@
 	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" RemoteFiles="WebsitePanel-Import-Enterprise-$(Version).zip" />
 	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" RemoteFiles="WebsitePanel-AWStatsViewer-$(Version).zip" />
 	    	<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
-
+			<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/beta/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit.msi" />
 	</Target>
 
 	<Target Name="uploadtocodeplex">