Merge c332f8f349 into 3f3ae2a5d4

data/resources/StringResources.resx

@@ -8446,4 +8446,10 @@ Press Esc to cancel this operation.</value>
   <data name="ICSharpCode.WpfDesign.AddIn.Options.EnableAppXamlParsing" xml:space="preserve">
     <value>Enable App.xaml parsing</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title" xml:space="preserve">
+    <value>Loading solution...</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.LoadProject" xml:space="preserve">
+    <value>Loading ${ProjectName}</value>
+  </data>
 </root>

src/Main/SharpDevelop/Project/ProjectService.cs

@@ -172,7 +172,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		void OpenSolutionInternal(FileName fileName)
 		{
 			ISolution solution;
-			using (var progress = AsynchronousWaitDialog.ShowWaitDialog("Loading Solution...")) {
+			using (var progress = AsynchronousWaitDialog.ShowWaitDialog("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title}")) {
 				
 				solution = LoadSolutionFile(fileName, progress);
 				
@@ -226,7 +226,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			// Use try-finally block to dispose the solution unless it is opened successfully. 
 			try {
 				if (SD.FileSystem.FileExists(solutionFile)) {
-					using (var progress = AsynchronousWaitDialog.ShowWaitDialog("Loading Solution...")) {
+					using (var progress = AsynchronousWaitDialog.ShowWaitDialog("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title}")) {
 						solution = LoadSolutionFile(solutionFile, progress);
 					}
 					// If LoadSolutionFile() throws ProjectLoadException, let that be handled by the ObservedLoad.

src/Main/SharpDevelop/Project/SolutionLoader.cs

@@ -155,7 +155,8 @@ namespace ICSharpCode.SharpDevelop.Project
 				} else {
 					// Load project:
 					projectInfo.ActiveProjectConfiguration = projectInfo.ConfigurationMapping.GetProjectConfiguration(solution.ActiveConfiguration);
-					progress.TaskName = "Loading " + projectInfo.ProjectName;
+					var parseArgs = new[] { new StringTagPair("ProjectName", projectInfo.ProjectName) };
+					progress.TaskName =  StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.LoadProject}", parseArgs);
 					using (projectInfo.ProgressMonitor = progress.CreateSubTask(1.0 / projectCount)) {
 						solutionItem = LoadProjectWithErrorHandling(projectInfo);
 					}