From aad7945bc089dce58c5990b6aeb4240641c1dfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Srbeck=C3=BD?= Date: Mon, 18 Sep 2006 14:21:38 +0000 Subject: [PATCH] Fixed SD2-1058: Some string resources not parsed. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1818 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Boo.InterpreterAddIn/Project/ContextEntry.boo | 2 +- .../Project/Src/Service/DynamicTreeDebuggerRow.cs | 6 +++--- .../Project/Src/Service/WindowsDebugger.cs | 12 ++++++------ .../Project/Src/DebugeeInterpreterContext.cs | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo b/src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo index 1ca7038c51..e0e936f3d8 100644 --- a/src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo +++ b/src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo @@ -32,7 +32,7 @@ class ContextEntry: _ctl.Dock = DockStyle.Fill _item = ToolStripButton(StringParser.Parse(context.Title), context.Image) - _item.ToolTipText = context.ToolTipText + _item.ToolTipText = StringParser.Parse(context.ToolTipText) _item.Visible = context.Visible _item.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs index 09160c6d86..eda0263f85 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs @@ -125,12 +125,12 @@ namespace ICSharpCode.SharpDevelop.Services } catch (NotSupportedException) { string format = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CannotSetValue.BadFormat"); string msg = String.Format(format, newValue, val.ManagedType.ToString()); - MessageService.ShowMessage(msg ,"${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); + MessageService.ShowMessage(msg ,"${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); } catch (COMException) { // COMException (0x80131330): Cannot perfrom SetValue on non-leaf frames. // Happens if trying to set value after exception is breaked - MessageService.ShowMessage("${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.UnknownError}", - "${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); + MessageService.ShowMessage("${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.UnknownError}", + "${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); } } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs index 65ff08d671..fb9b65d282 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs @@ -81,10 +81,10 @@ namespace ICSharpCode.SharpDevelop.Services #region IDebugger Members - string errorDebugging = "${XML.MainMenu.DebugMenu.Error.Debugging}"; - string errorNotDebugging = "${XML.MainMenu.DebugMenu.Error.NotDebugging}"; - string errorProcessRunning = "${XML.MainMenu.DebugMenu.Error.ProcessRunning}"; - string errorProcessPaused = "${XML.MainMenu.DebugMenu.Error.ProcessPaused}"; + string errorDebugging = "${res:XML.MainMenu.DebugMenu.Error.Debugging}"; + string errorNotDebugging = "${res:XML.MainMenu.DebugMenu.Error.NotDebugging}"; + string errorProcessRunning = "${res:XML.MainMenu.DebugMenu.Error.ProcessRunning}"; + string errorProcessPaused = "${res:XML.MainMenu.DebugMenu.Error.ProcessPaused}"; string errorCannotStepNoActiveFunction = "${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}"; public bool IsDebugging { @@ -115,9 +115,9 @@ namespace ICSharpCode.SharpDevelop.Services } string version = debugger.GetProgramVersion(processStartInfo.FileName); if (version.StartsWith("v1.0")) { - MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.Net10NotSupported}"); + MessageService.ShowMessage("${res:XML.MainMenu.DebugMenu.Error.Net10NotSupported}"); } else if (version == null || version.Length == 0) { - MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.BadAssembly}"); + MessageService.ShowMessage("${res:XML.MainMenu.DebugMenu.Error.BadAssembly}"); } else { Debugger.Process process = debugger.Start(processStartInfo.FileName, processStartInfo.WorkingDirectory, diff --git a/src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs b/src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs index 808c679000..f7c4582d29 100644 --- a/src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs +++ b/src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs @@ -42,16 +42,16 @@ namespace Debugger bool InjectInterpreter() { if (!DebuggerService.IsDebuggerLoaded) { - PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorDebuggerNotLoaded}"); + PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorDebuggerNotLoaded")); return false; } WindowsDebugger winDebugger = DebuggerService.CurrentDebugger as WindowsDebugger; if (winDebugger == null) { - PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorIncompatibleDebugger}"); + PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorIncompatibleDebugger")); return false; } if (winDebugger.DebuggedProcess == null) { - PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorNoProgramDebugged}"); + PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorNoProgramDebugged")); return false; } process = winDebugger.DebuggedProcess;