diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources
index fdca5fa789..10faff824e 100644
Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ
diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources
index e91c2d8378..234619e44e 100644
Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ
diff --git a/data/resources/StringResources.it.resources b/data/resources/StringResources.it.resources
index 8f2abf030e..635e99054b 100644
Binary files a/data/resources/StringResources.it.resources and b/data/resources/StringResources.it.resources differ
diff --git a/data/resources/StringResources.pl.resources b/data/resources/StringResources.pl.resources
index 7fdcab2826..57a3df244f 100644
Binary files a/data/resources/StringResources.pl.resources and b/data/resources/StringResources.pl.resources differ
diff --git a/data/resources/StringResources.pt-br.resources b/data/resources/StringResources.pt-br.resources
index 6487372ca8..eb14768ba9 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.se.resources b/data/resources/StringResources.se.resources
index a057457223..877d62297e 100644
Binary files a/data/resources/StringResources.se.resources and b/data/resources/StringResources.se.resources differ
diff --git a/data/resources/StringResources.tr.resources b/data/resources/StringResources.tr.resources
index 6dd96a1d2a..3f5bcdd5e0 100644
Binary files a/data/resources/StringResources.tr.resources and b/data/resources/StringResources.tr.resources differ
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs
index da4a5b33c5..eb858ba03e 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs
@@ -85,7 +85,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 				return null;
 			}
-		}		
+		}
 		
 		public AbstractProjectBrowserTreeNode()
 		{
@@ -178,5 +178,10 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 			return data;
 		}
+		
+		protected string GetQuestionText(string question)
+		{
+			return StringParser.Parse(question, new string[,] {{"FileName", Text}});
+		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
index c9b591c9ba..7764cf5cdf 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
@@ -515,7 +515,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				FileService.RemoveFile(Directory, true);
 				Project.Save();
 			} else {
-				if (MessageService.AskQuestion("Delete '" + Text + "' and all its contents permanently ?")) {
+				if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.DeleteWithContents.Question}"))) {
 					FileService.RemoveFile(Directory, true);
 					Project.Save();
 				}
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
index 9d93e90cf9..c96145516e 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
@@ -182,13 +182,13 @@ namespace ICSharpCode.SharpDevelop.Project
 				ProjectService.SaveSolution();
 			} else {
 				if (Nodes.Count > 0) {
-					if (MessageService.AskQuestion("Delete '" + Text + "' and its dependent files permanently?")) {
+					if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.DeleteWithDependentFiles.Question}"))) {
 						DeleteChildNodes();
 						FileService.RemoveFile(FileName, false);
 						ProjectService.SaveSolution();
 					}
 				}
-				else if (MessageService.AskQuestion("Delete '" + Text + "' permanently ?")) {
+				else if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.Delete.Question}"))) {
 					FileService.RemoveFile(FileName, false);
 					ProjectService.SaveSolution();
 				}
diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs
index a40ddbe617..ffa3b6c970 100644
--- a/src/Main/Base/Project/Src/Project/AbstractProject.cs
+++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs
@@ -33,12 +33,14 @@ namespace ICSharpCode.SharpDevelop.Project
 		protected string fileName;
 		protected string language;
 		
+		[Browsable(false)]
 		public Dictionary<string, PropertyGroup> Configurations {
 			get {
 				return configurations;
 			}
 		}
 		
+		[Browsable(false)]
 		public Dictionary<string, PropertyGroup> UserConfigurations {
 			get {
 				return userConfigurations;
@@ -192,7 +194,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
-		[Browsable(false)]
+		[ReadOnly(true)]
+		[LocalizedProperty("${res:MainWindow.Windows.Debug.CallStack.Language}")]
 		public string Language {
 			get {
 				return language;
@@ -224,6 +227,8 @@ namespace ICSharpCode.SharpDevelop.Project
 		string activeConfiguration = "Debug";
 		string activePlatform = "AnyCPU";
 		
+		[ReadOnly(true)]
+		[LocalizedProperty("${res:Dialog.ProjectOptions.Platform}")]
 		public string Platform {
 			get {
 				return activePlatform;
@@ -240,6 +245,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[ReadOnly(true)]
+		[LocalizedProperty("${res:Dialog.ProjectOptions.Configuration}")]
 		public string Configuration {
 			get {
 				return activeConfiguration;
@@ -382,6 +389,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		{
 		}
 		
+		[Browsable(false)]
 		public virtual bool IsStartable {
 			get {
 				return false;
diff --git a/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
index bae7b5b3f0..2f81150bbc 100644
--- a/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
@@ -13,6 +13,7 @@ using ICSharpCode.SharpDevelop.Gui;
 namespace ICSharpCode.SharpDevelop.Project
 {
 	public enum CopyToOutputDirectory {
+		[Description("test")]
 		Never,
 		Always,
 		PreserveNewest
@@ -51,8 +52,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
-		[LocalizedProperty("Copy to output Directory",
-		                   Description ="Specifies if the file should be copied to the output directory")]
+		[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CopyToOutputDirectory}",
+		                   Description = "${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CopyToOutputDirectory.Description}")]
 		public CopyToOutputDirectory CopyToOutputDirectory {
 			get {
 				return base.Properties.Get("CopyToOutputDirectory", CopyToOutputDirectory.Never);
@@ -62,8 +63,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
-		[LocalizedProperty("Custom Tool",
-		                   Description ="Specifies the tool that converts the file to the output.")]
+		[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CustomTool}",
+		                   Description ="${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CustomTool.Description}")]
 		public string CustomTool {
 			get {
 				return base.Properties["Generator"];
@@ -73,8 +74,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
-		[LocalizedProperty("Custom Tool Namespace",
-		                   Description ="Specifies the namespace the custom tool places it's output.")]
+		[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CustomToolNamespace}",
+		                   Description ="${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.CustomToolNamespace.Description}")]
 		public string CustomToolNamespace {
 			get {
 				return base.Properties["CustomToolNamespace"];
diff --git a/src/Main/Base/Project/Src/Project/MSBuildProject.cs b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
index 2d8d613015..78075ce767 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildProject.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
@@ -6,7 +6,7 @@
 // </file>
 
 using System;
-using System.CodeDom.Compiler;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Globalization;
@@ -350,6 +350,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string StartProgram {
 			get {
 				return GetProperty("StartProgram");
@@ -359,6 +360,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string StartUrl {
 			get {
 				return GetProperty("StartURL");
@@ -368,6 +370,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public StartAction StartAction {
 			get {
 				return GetProperty("StartAction", StartAction.Project);
@@ -377,6 +380,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string StartArguments {
 			get {
 				return GetProperty("StartArguments");
@@ -386,6 +390,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string StartWorkingDirectory {
 			get {
 				return GetProperty("StartWorkingDirectory");
diff --git a/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs b/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
index eb35276bd5..4abce072ac 100644
--- a/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
@@ -7,13 +7,14 @@
 
 using System;
 using System.ComponentModel;
+using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Project
 {
 	/// <summary>
 	/// Description of ISolutionFolderContainer.
 	/// </summary>
-	public abstract class AbstractSolutionFolder : ISolutionFolder
+	public abstract class AbstractSolutionFolder : LocalizedObject, ISolutionFolder
 	{
 		ISolutionFolderContainer parent   = null;
 		string                   typeGuid = null;
diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
index cf6cf82231..841d52cb23 100644
--- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
@@ -138,6 +138,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string FileName {
 			get {
 				return fileName;
@@ -147,6 +148,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
 		public string Directory {
 			get {
 				return Path.GetDirectoryName(fileName);
@@ -189,6 +191,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		SolutionPreferences preferences;
 		
+		[Browsable(false)]
 		public SolutionPreferences Preferences {
 			get {
 				return preferences;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index c56c1fdbc3..8472a4b8f7 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ