diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index d9f7fd02b7..960398fccf 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -8446,4 +8446,10 @@ Press Esc to cancel this operation. Enable App.xaml parsing + + Loading solution... + + + Loading ${ProjectName} + \ No newline at end of file diff --git a/src/Main/SharpDevelop/Project/ProjectService.cs b/src/Main/SharpDevelop/Project/ProjectService.cs index 1b5da97114..ea0bd52747 100644 --- a/src/Main/SharpDevelop/Project/ProjectService.cs +++ b/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. diff --git a/src/Main/SharpDevelop/Project/SolutionLoader.cs b/src/Main/SharpDevelop/Project/SolutionLoader.cs index f98253f9fe..460effefa7 100644 --- a/src/Main/SharpDevelop/Project/SolutionLoader.cs +++ b/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); }