diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 4c59c15faa..6ab821b868 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -271,9 +271,9 @@
 		<MenuItem id = "Clean project"
 		          label = "${res:ProjectComponent.ContextMenu.Clean}"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
-		<MenuItem id = "Publish project"
+		<!--<MenuItem id = "Publish project"
 		          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
 		<MenuItem id = "CombineBuildGroupSeparator" type = "Separator"/>
 		
 		<MenuItem id = "ProjectAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu" >
@@ -1327,9 +1327,9 @@
 					<MenuItem id    = "Clean project"
 					          label = "${res:XML.MainMenu.BuildMenu.CleanProject}"
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
-					<MenuItem id    = "Publish project"
+					<!--<MenuItem id    = "Publish project"
 					          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
 				</Condition>
 				<MenuItem id = "Separator2" type = "Separator" />
 				<MenuItem id = "SetConfiguration"
diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources
index eb13aad2a6..ffb6ec06da 100644
Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ
diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources
index 37a08f0583..d16d5a3b18 100644
Binary files a/data/resources/StringResources.es-mx.resources and b/data/resources/StringResources.es-mx.resources differ
diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources
index 8c26ae2fd2..9b7426d1b5 100644
Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ
diff --git a/data/resources/StringResources.hu.resources b/data/resources/StringResources.hu.resources
index aedf123e9c..ec2a232f21 100644
Binary files a/data/resources/StringResources.hu.resources and b/data/resources/StringResources.hu.resources differ
diff --git a/data/resources/StringResources.it.resources b/data/resources/StringResources.it.resources
index c9045fbc56..3b85855fc4 100644
Binary files a/data/resources/StringResources.it.resources and b/data/resources/StringResources.it.resources differ
diff --git a/data/resources/StringResources.kr.resources b/data/resources/StringResources.kr.resources
index c7eb09937b..536406bb27 100644
Binary files a/data/resources/StringResources.kr.resources and b/data/resources/StringResources.kr.resources differ
diff --git a/data/resources/StringResources.nl.resources b/data/resources/StringResources.nl.resources
index 136d727fbf..371dd6e154 100644
Binary files a/data/resources/StringResources.nl.resources and b/data/resources/StringResources.nl.resources differ
diff --git a/data/resources/StringResources.pt-br.resources b/data/resources/StringResources.pt-br.resources
index 53e534c68d..333b2a1b0d 100644
Binary files a/data/resources/StringResources.pt-br.resources and b/data/resources/StringResources.pt-br.resources differ
diff --git a/data/resources/StringResources.ro.resources b/data/resources/StringResources.ro.resources
index 41a8e66298..7b58613610 100644
Binary files a/data/resources/StringResources.ro.resources and b/data/resources/StringResources.ro.resources differ
diff --git a/data/templates/project/CSharp/ConsoleProject.xpt b/data/templates/project/CSharp/ConsoleProject.xpt
index dbc817de2c..61cb895b65 100644
--- a/data/templates/project/CSharp/ConsoleProject.xpt
+++ b/data/templates/project/CSharp/ConsoleProject.xpt
@@ -47,34 +47,7 @@ namespace ${StandardNamespace}
 		}
 	}
 }]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+			<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/ControlLibrary.xpt b/data/templates/project/CSharp/ControlLibrary.xpt
index 3397c3f022..b3ea6b323d 100644
--- a/data/templates/project/CSharp/ControlLibrary.xpt
+++ b/data/templates/project/CSharp/ControlLibrary.xpt
@@ -102,35 +102,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/DefaultAssemblyInfo.cs b/data/templates/project/CSharp/DefaultAssemblyInfo.cs
new file mode 100644
index 0000000000..17a1d024a7
--- /dev/null
+++ b/data/templates/project/CSharp/DefaultAssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("${ProjectName}")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("${ProjectName}")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/data/templates/project/CSharp/Direct3DProject.xpt b/data/templates/project/CSharp/Direct3DProject.xpt
index 282742c80f..3c5c38e6e5 100644
--- a/data/templates/project/CSharp/Direct3DProject.xpt
+++ b/data/templates/project/CSharp/Direct3DProject.xpt
@@ -171,34 +171,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+			<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/FormsProject.xpt b/data/templates/project/CSharp/FormsProject.xpt
index f0b558daaa..c67b68f850 100644
--- a/data/templates/project/CSharp/FormsProject.xpt
+++ b/data/templates/project/CSharp/FormsProject.xpt
@@ -112,35 +112,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="AssemblyInfo.cs" language="C#">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/GladeProject.xpt b/data/templates/project/CSharp/GladeProject.xpt
index 6f807f6a71..2ca860cc81 100644
--- a/data/templates/project/CSharp/GladeProject.xpt
+++ b/data/templates/project/CSharp/GladeProject.xpt
@@ -105,35 +105,7 @@ namespace ${StandardNamespace}
 
 </glade-interface>
 ]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Solution>
diff --git a/data/templates/project/CSharp/GtkProject.xpt b/data/templates/project/CSharp/GtkProject.xpt
index 70c4323a60..e05c524e19 100644
--- a/data/templates/project/CSharp/GtkProject.xpt
+++ b/data/templates/project/CSharp/GtkProject.xpt
@@ -76,35 +76,7 @@ namespace ${StandardNamespace}
 		}
 	}
 }]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Solution>
diff --git a/data/templates/project/CSharp/Library.xpt b/data/templates/project/CSharp/Library.xpt
index 9a64dfe2f5..cd74437347 100644
--- a/data/templates/project/CSharp/Library.xpt
+++ b/data/templates/project/CSharp/Library.xpt
@@ -46,35 +46,7 @@ namespace ${StandardNamespace}
 			
 	}
 }]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/Service.xpt b/data/templates/project/CSharp/Service.xpt
index d42ffdb809..de00515a69 100644
--- a/data/templates/project/CSharp/Service.xpt
+++ b/data/templates/project/CSharp/Service.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "02/01/2003"
-          lastModified = "14/01/2006">
+          lastModified = "16/06/2006">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -29,6 +29,7 @@
 
 			<ProjectItems>
 				<Reference Include="System" />
+				<Reference Include="System.Configuration.Install" />
 				<Reference Include="System.Data" />
 				<Reference Include="System.ServiceProcess" />
 				<Reference Include="System.Xml" />
@@ -49,6 +50,8 @@ namespace ${StandardNamespace}
 {
 	public class ${ProjectName} : ServiceBase
 	{
+		public const string MyServiceName = "${ProjectName}";
+		
 		public ${ProjectName}()
 		{
 			InitializeComponent();
@@ -56,7 +59,7 @@ namespace ${StandardNamespace}
 		
 		private void InitializeComponent()
 		{
-			this.ServiceName = "${ProjectName}";
+			this.ServiceName = MyServiceName;
 		}
 		
 		/// <summary>
@@ -85,6 +88,35 @@ namespace ${StandardNamespace}
 		}
 	}
 }
+]]></File>
+				<File name="ProjectInstaller.cs"><![CDATA[${StandardHeader.C#}
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Install;
+using System.ServiceProcess;
+
+namespace ${StandardNamespace}
+{
+	[RunInstaller(true)]
+	public class ProjectInstaller : Installer
+	{
+		private ServiceProcessInstaller serviceProcessInstaller;
+		private ServiceInstaller serviceInstaller;
+		
+		public ProjectInstaller()
+		{
+			serviceProcessInstaller = new ServiceProcessInstaller();
+			serviceInstaller = new ServiceInstaller();
+			// Here you can set properties on serviceProcessInstaller or register event handlers
+			serviceProcessInstaller.Account = ServiceAccount.LocalService;
+			
+			serviceInstaller.ServiceName = ${ProjectName}.MyServiceName;
+			this.Installers.AddRange(new Installer[] { serviceProcessInstaller, serviceInstaller });
+		}
+	}
+}
 ]]></File>
 				<File name="Program.cs"><![CDATA[${StandardHeader.C#}
 
@@ -108,34 +140,7 @@ namespace ${ProjectName}
 	}
 }
 ]]></File>
-				<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+				<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/SharpDevelopAddin.xpt b/data/templates/project/CSharp/SharpDevelopAddin.xpt
index 41b0f9b201..9096a7f680 100644
--- a/data/templates/project/CSharp/SharpDevelopAddin.xpt
+++ b/data/templates/project/CSharp/SharpDevelopAddin.xpt
@@ -157,35 +157,7 @@ namespace ${ProjectName}
 	}
 }
 ]]></File>
-		<File name="Configuration/AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("${ProjectName}")]
-[assembly: AssemblyDescription("Addin for SharpDevelop 2.0")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="Configuration/AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/SharpDevelopMacro.xpt b/data/templates/project/CSharp/SharpDevelopMacro.xpt
index 38af382366..9bfe54d3d3 100644
--- a/data/templates/project/CSharp/SharpDevelopMacro.xpt
+++ b/data/templates/project/CSharp/SharpDevelopMacro.xpt
@@ -100,30 +100,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="Configuration/AssemblyInfo.cs">
-			<![CDATA[${StandardHeader.C#}
-
-using System.Reflection;
-
-[assembly: AssemblyTitle("${ProjectName}")]
-[assembly: AssemblyDescription("Macro AddIn for SharpDevelop 2.0")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="Configuration/AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt
index a85590754a..fdf46341a7 100644
--- a/data/templates/project/VBNet/ConsoleProject.xpt
+++ b/data/templates/project/VBNet/ConsoleProject.xpt
@@ -51,6 +51,7 @@ Module Main
 	End Sub
 End Module
 ]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/ControlLibrary.xpt b/data/templates/project/VBNet/ControlLibrary.xpt
index 26cdfb397a..72c7d81016 100644
--- a/data/templates/project/VBNet/ControlLibrary.xpt
+++ b/data/templates/project/VBNet/ControlLibrary.xpt
@@ -92,35 +92,7 @@ Partial Class UserControl1
 	End Sub
 End Class
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-' 
-' Change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-
-]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/DefaultAssemblyInfo.vb b/data/templates/project/VBNet/DefaultAssemblyInfo.vb
new file mode 100644
index 0000000000..719627fbe9
--- /dev/null
+++ b/data/templates/project/VBNet/DefaultAssemblyInfo.vb
@@ -0,0 +1,31 @@
+Imports System.Reflection
+Imports System.Runtime.CompilerServices
+Imports System.Runtime.InteropServices
+
+' Information about this assembly is defined by the following
+' attributes.
+'
+' change them to the information which is associated with the assembly
+' you compile.
+
+<assembly: AssemblyTitle("${ProjectName}")>
+<assembly: AssemblyDescription("")>
+<assembly: AssemblyConfiguration("")>
+<assembly: AssemblyCompany("")>
+<assembly: AssemblyProduct("${ProjectName}")>
+<assembly: AssemblyCopyright("")>
+<assembly: AssemblyTrademark("")>
+<assembly: AssemblyCulture("")>
+
+' This sets the default COM visibility of types in the assembly to invisible.
+' If you need to expose a type to COM, use <ComVisible(true)> on that type.
+<assembly: ComVisible(False)>
+
+' The assembly version has following format :
+'
+' Major.Minor.Build.Revision
+'
+' You can specify all values by your own or you can build default build and revision
+' numbers with the '*' character (the default):
+
+<assembly: AssemblyVersion("1.0.*")>
diff --git a/data/templates/project/VBNet/Direct3DProject.xpt b/data/templates/project/VBNet/Direct3DProject.xpt
index 30c6edefbd..2866e2d71b 100644
--- a/data/templates/project/VBNet/Direct3DProject.xpt
+++ b/data/templates/project/VBNet/Direct3DProject.xpt
@@ -154,33 +154,7 @@ Public Class MainClass
 	End Sub
 End Class
 ]]></File>
-			<File name="AssemblyInfo.vb"><![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-'	<ProjectOptions Target = "WinExe" PauseConsoleOutput = "False" />
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+			<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/FormsProject.xpt b/data/templates/project/VBNet/FormsProject.xpt
index 35eac0db45..f8bbac6005 100644
--- a/data/templates/project/VBNet/FormsProject.xpt
+++ b/data/templates/project/VBNet/FormsProject.xpt
@@ -116,34 +116,7 @@ Namespace My
 	End Class
 End Namespace
 ]]></File>
-			<File name="AssemblyInfo.vb">
-				<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-'
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+			<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Library.xpt b/data/templates/project/VBNet/Library.xpt
index a6f55fb844..35648576f4 100644
--- a/data/templates/project/VBNet/Library.xpt
+++ b/data/templates/project/VBNet/Library.xpt
@@ -46,34 +46,7 @@ Public Class NewClass
 	
 End Class
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-' 
-' Change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Service.xpt b/data/templates/project/VBNet/Service.xpt
index c80d0ab09d..f347b328d1 100644
--- a/data/templates/project/VBNet/Service.xpt
+++ b/data/templates/project/VBNet/Service.xpt
@@ -27,8 +27,8 @@
 			
 			<ProjectItems>
 				<Reference Include="System" />
+				<Reference Include="System.Configuration.Install" />
 				<Reference Include="System.Data" />
-				<Reference Include="System.Deployment" />
 				<Reference Include="System.ServiceProcess" />
 				<Reference Include="System.Xml" />
 				
@@ -49,6 +49,8 @@ Imports System.ServiceProcess
 Public Class ${ProjectName}
 	Inherits ServiceBase
 	
+	Public Const MyServiceName As String = "${ProjectName}"
+	
 	' The main entry point for the process
 	<MTAThread()> _
 	Shared Sub Main()
@@ -56,6 +58,10 @@ Public Class ${ProjectName}
 		ServiceBase.Run(New ServiceBase() {New ${ProjectName}})
 	End Sub
 	
+	Public Sub New()
+		Me.ServiceName = MyServiceName
+	End Sub
+	
 	Protected Overrides Sub OnStart(ByVal args() As String)
 		' TODO: Add start code here to start your service.
 	End Sub
@@ -66,34 +72,30 @@ Public Class ${ProjectName}
 End Class
 
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
+				<File name="ProjectInstaller.vb"><![CDATA[${StandardHeader.VBNET}
 
-' Information about this assembly is defined by the following
-' attributes.
-'
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
+Imports System.ComponentModel
+Imports System.Configuration.Install
+Imports System.ServiceProcess
 
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
+<RunInstaller(True)> _
+Public Class ProjectInstaller
+	Inherits Installer
+	
+	Private serviceProcessInstaller As New ServiceProcessInstaller
+	Private serviceInstaller As New ServiceInstaller
+	
+	Public Sub New()
+		' Here you can set properties on serviceProcessInstaller or register event handlers
+		serviceProcessInstaller.Account = ServiceAccount.LocalService
+		
+		serviceInstaller.ServiceName = ${ProjectName}.MyServiceName
+		Me.Installers.AddRange(New Installer() { serviceProcessInstaller, serviceInstaller })
+	End Sub
+End Class
 
-<assembly: AssemblyVersion("1.0.*")>
 ]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/SharpDevelopAddin.xpt b/data/templates/project/VBNet/SharpDevelopAddin.xpt
index 4838af703a..12c37e4d97 100644
--- a/data/templates/project/VBNet/SharpDevelopAddin.xpt
+++ b/data/templates/project/VBNet/SharpDevelopAddin.xpt
@@ -146,36 +146,7 @@ Public Class TestPad
 	End Sub
 End Class
 ]]></File>
-		<File name="Configuration/AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-'Information about this assembly is defined by the following
-'attributes.
-
-'change them to the information which is associated with the assembly
-'you compile.
-
-<assembly: AssemblyTitle("${ProjectName}")>
-<assembly: AssemblyDescription("Addin for SharpDevelop 2.0")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("SharpDevelop")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-'The assembly version has following format :
-
-'Major.Minor.Build.Revision
-
-'You can specify all values by your own or you can build default build and revision
-'numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-
-]]>
-				</File>
+		<File name="Configuration/AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/SharpDevelopMacro.xpt b/data/templates/project/VBNet/SharpDevelopMacro.xpt
index 410058b67c..67d553a675 100644
--- a/data/templates/project/VBNet/SharpDevelopMacro.xpt
+++ b/data/templates/project/VBNet/SharpDevelopMacro.xpt
@@ -98,36 +98,7 @@ Inherits AbstractMenuCommand
 	End Sub
 End Class
 ]]></File>
-		<File name="Configuration/AssemblyInfo.vb">
-			<![CDATA[${StandardHeader.VBNET}
-
-Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-'Information about this assembly is defined by the following
-'attributes.
-'
-'change them to the information which is associated with the assembly
-'you compile.
-
-<assembly: AssemblyTitle("${ProjectName}")>
-<assembly: AssemblyDescription("Addin for SharpDevelop 2.0")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("SharpDevelop")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-'The assembly version has following format :
-'
-'Major.Minor.Build.Revision
-'
-'You can specify all values by your own or you can build default build and revision
-'numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+		<File name="Configuration/AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs b/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
index dc6eed9730..50dca58bd2 100644
--- a/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
@@ -132,7 +132,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			statusProgressBar.Value = 0;
 			statusProgressBar.Maximum = totalWork;
-			jobNamePanel.Text = taskName;
+			SetTaskName();
 			jobNamePanel.Visible = true;
 			statusProgressBar.Visible = true;
 		}
@@ -187,7 +187,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void SetTaskName()
 		{
-			jobNamePanel.Text = taskName;
+			jobNamePanel.Text = StringParser.Parse(taskName);
 		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
index 70fcba4899..446f7b80c1 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
@@ -115,8 +115,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		protected void ConnectBrowseFolder(string browseButton, string target)
 		{
-			// TODO: Translation:
-			ConnectBrowseFolder(browseButton, target, "Select folder");
+			ConnectBrowseFolder(browseButton, target, "${res:Dialog.ProjectOptions.SelectFolderTitle}");
 		}
 		protected void ConnectBrowseFolder(string browseButton, string target, string description)
 		{
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index ba270f8cb1..46a3cd2a0f 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -149,9 +149,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			bool wordWrap = this.WordWrap;
 			textEditorControl.WordWrap = wordWrap;
 			if (wordWrap) {
-				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedBoth;
-			} else {
 				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedVertical;
+			} else {
+				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedBoth;
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
index 593c9794cc..ad26df5bf5 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
@@ -146,18 +146,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			switch(GetDriveType(drive)) {
 				case DriveType.Removeable:
-					text += " (Removeable)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Removeable})";
 					break;
 				case DriveType.Fixed:
-					text += " (Fixed)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Fixed})";
 					break;
 				case DriveType.Cdrom:
-					text += " (CD)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.CD})";
 					break;
 				case DriveType.Remote:
-					text += " (Remote)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Remote})";
 					break;
 			}
+			text = StringParser.Parse(text);
 		}
 		
 		public override string ToString()
@@ -330,7 +331,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void deleteFiles(object sender, EventArgs e)
 		{
-			if (MessageService.AskQuestion("Are you sure ?", "Delete files")) {
+			string fileName = "";
+			foreach(FileListItem fileItem in SelectedItems) {
+				fileName = fileItem.FullName;
+				break;
+			}
+			if (MessageService.AskQuestion(StringParser.Parse("${res:ProjectComponent.ContextMenu.Delete.Question}", new string[,] {{"FileName", fileName}}),
+			                               "${Global.Delete}")) {
 				foreach(FileListItem fileItem in SelectedItems)
 				{
 					try {
@@ -521,7 +528,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			rootNode.SelectedImageIndex = 6;
 			rootNode.Tag = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
 			
-			TreeNode myFilesNode = rootNode.Nodes.Add("My Documents");
+			TreeNode myFilesNode = rootNode.Nodes.Add("${res:MainWindow.Windows.FileScout.MyDocuments}");
 			myFilesNode.ImageIndex = 7;
 			myFilesNode.SelectedImageIndex = 7;
 			try {
@@ -532,7 +539,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			myFilesNode.Nodes.Add("");
 			
-			TreeNode computerNode = rootNode.Nodes.Add("My Computer");
+			TreeNode computerNode = rootNode.Nodes.Add("${res:MainWindow.Windows.FileScout.MyComputer}");
 			computerNode.ImageIndex = 8;
 			computerNode.SelectedImageIndex = 8;
 			try {
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
index 27ea31e2af..c37e2630cd 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
@@ -105,6 +105,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		// -> nodes whose text contains '[' can not be saved
 		public static string GetViewStateString(TreeView treeView)
 		{
+			if (treeView.Nodes.Count == 0) return "";
 			StringBuilder b = new StringBuilder();
 			WriteViewStateString(b, treeView.Nodes[0]);
 			return b.ToString();
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
index 783a2483bc..c240b21ec1 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
@@ -37,7 +37,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		{
 			sortOrder = -1;
 			this.solution = solution;
-			Text = "Solution " + solution.Name;
+			UpdateText();;
 			autoClearNodes = false;
 			canLabelEdit = true;
 			
@@ -61,20 +61,25 @@ namespace ICSharpCode.SharpDevelop.Project
 					return;
 				string newFileName = Path.Combine(solution.Directory, newName + ".sln");
 				if (File.Exists(newFileName)) {
-					MessageService.ShowError("The file " + newFileName + " already exists.");
+					MessageService.ShowErrorFormatted("${res:Global.FileAlreadyExists}", newFileName);
 					return;
 				}
 				FileService.RenameFile(solution.FileName, newFileName, false);
 				solution.FileName = newFileName;
 				solution.Name = newName;
 			} finally {
-				Text = "Solution " + solution.Name;
+				UpdateText();
 			}
 		}
 		
+		void UpdateText()
+		{
+			Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.SolutionNodeText") + " " + solution.Name;
+		}
+		
 		public void AddItem(string fileName)
 		{
-			const string folderName = "Solution Items";
+			string folderName = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.SolutionItemsNodeText");
 			SolutionFolderNode node = null;
 			foreach (TreeNode n in Nodes) {
 				node = n as SolutionFolderNode;
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs b/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
index 318d8e68a8..815f7e9f9b 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
@@ -198,7 +198,7 @@ namespace ICSharpCode.Core
 			int progressStart = StatusBarService.ProgressMonitor.WorkDone;
 			ParseableFileContentEnumerator enumerator = new ParseableFileContentEnumerator(project);
 			try {
-				StatusBarService.ProgressMonitor.TaskName = "Parsing " + project.Name + "...";
+				StatusBarService.ProgressMonitor.TaskName = "${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing} " + project.Name + "...";
 				
 				IProjectContent[] referencedContents;
 				lock (this.referencedContents) {
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs b/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
index 36be4ce341..f919a40522 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
@@ -6,26 +6,16 @@
 // </file>
 
 using System;
-using System.IO;
-using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Security;
-using System.Security.Permissions;
-using System.Security.Policy;
-using System.Xml;
+using System.IO;
 using System.Text;
+using System.Threading;
 
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Dom;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.Core
 {
@@ -152,7 +142,7 @@ namespace ICSharpCode.Core
 					}
 					createdContents.Add(newContent);
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while retrieving project contents from " + project);
+					MessageService.ShowError(e, "Error while retrieving project contents from " + project);
 				}
 			}
 			WorkbenchSingleton.SafeThreadAsyncCall((ThreadStart)ProjectService.ParserServiceCreatedProjectContents);
@@ -163,16 +153,16 @@ namespace ICSharpCode.Core
 					newContent.Initialize1();
 					workAmount += newContent.GetInitializationWorkAmount();
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while initializing project references:" + newContent);
+					MessageService.ShowError(e, "Error while initializing project references:" + newContent);
 				}
 			}
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", workAmount);
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", workAmount);
 			foreach (ParseProjectContent newContent in createdContents) {
 				if (abortLoadSolutionProjectsThread) break;
 				try {
 					newContent.Initialize2();
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while initializing project contents:" + newContent);
+					MessageService.ShowError(e, "Error while initializing project contents:" + newContent);
 				}
 			}
 			StatusBarService.ProgressMonitor.Done();
@@ -182,7 +172,7 @@ namespace ICSharpCode.Core
 		{
 			ParseProjectContent newContent = (ParseProjectContent)state;
 			newContent.Initialize1();
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", newContent.GetInitializationWorkAmount());
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", newContent.GetInitializationWorkAmount());
 			newContent.Initialize2();
 			StatusBarService.ProgressMonitor.Done();
 		}
@@ -190,7 +180,7 @@ namespace ICSharpCode.Core
 		static void ReparseProject(object state)
 		{
 			ParseProjectContent newContent = (ParseProjectContent)state;
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", newContent.GetInitializationWorkAmount());
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", newContent.GetInitializationWorkAmount());
 			newContent.ReInitialize2();
 			StatusBarService.ProgressMonitor.Done();
 		}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
index 3dc77ed2c1..d407f46c4d 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
@@ -24,6 +24,7 @@ namespace ICSharpCode.Core
 		
 		public Menu(Codon codon, object caller, ArrayList subItems)
 		{
+			if (subItems == null) subItems = new ArrayList(); // don't crash when item has no children
 			this.codon    = codon;
 			this.caller   = caller;
 			this.subItems = subItems;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index 0a942f5942..ad90ad61db 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ