Browse Source

Some debugger strings made translatable

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1807 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 20 years ago
parent
commit
b2634a3a87
  1. 6
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
  3. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
  4. 14
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs
  5. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
  6. 8
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
  7. 35
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  8. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

6
AddIns/ICSharpCode.SharpDevelop.addin

@ -901,11 +901,11 @@ @@ -901,11 +901,11 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>
<ToolbarItem id = "Step into"
icon = "Icons.16x16.Debug.StepInto"
tooltip = "${res:XML.MainMenu.DebugMenu.StepInto}"
tooltip = "${res:XML.MainMenu.DebugMenu.StepInto.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/>
<ToolbarItem id = "Step out"
icon = "Icons.16x16.Debug.StepOut"
tooltip = "${res:XML.MainMenu.DebugMenu.StepOut}"
tooltip = "${res:XML.MainMenu.DebugMenu.StepOut.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/>
</Condition>
</Condition>
@ -1470,7 +1470,7 @@ @@ -1470,7 +1470,7 @@
<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
<MenuItem id = "BeforeSteppingSeparator" type = "Separator" />
<MenuItem id = "Step over"
label = "${res:XML.MainMenu.DebugMenu.Step}"
label = "${res:XML.MainMenu.DebugMenu.StepOver}"
icon = "Icons.16x16.Debug.StepOver"
shortcut = "F10"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>

4
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs

@ -136,7 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -136,7 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
name += argValue;
}
if (parameterName == null && argValue == null) {
name += "n/a";
name += ResourceService.GetString("Global.NA");
}
if (i < f.ArgumentCount - 1) {
name += ", ";
@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (lastItemIsExternalMethod) {
continue;
} else {
item = new ListViewItem(new string[] { "[External methods]", "" });
item = new ListViewItem(new string[] { ResourceService.GetString("MainWindow.Windows.Debug.CallStack.ExternalMethods"), "" });
lastItemIsExternalMethod = true;
}
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs

@ -111,7 +111,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -111,7 +111,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (exception.Location != null) {
location = exception.Location.SourceFilename + ":" + exception.Location.StartLine;
} else {
location = "n/a";
location = ResourceService.GetString("Global.NA");
}
location += " (type=" + exception.ExceptionType.ToString() + ")";
ListViewItem item = new ListViewItem(new string[] {exception.CreationTime.ToLongTimeString() , exception.Type + " - " + exception.Message, location});

14
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs

@ -66,13 +66,13 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -66,13 +66,13 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public override void RedrawContent()
{
name.Text = StringParser.Parse("${res:Global.Name}");
address.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.AddressColumn}");
address.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.AddressColumn}");
path.Text = StringParser.Parse("${res:Global.Path}");
order.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.OrderColumn}");
version.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.VersionColumn}");
program.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.ProgramColumn}");
timestamp.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.TimestampColumn}");
information.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.InformationColumn}");
order.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.OrderColumn}");
version.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.VersionColumn}");
program.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.ProgramColumn}");
timestamp.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.TimestampColumn}");
information.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.SymbolsColumn}");
}
@ -119,7 +119,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -119,7 +119,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
"",
"",
"",
StringParser.Parse(module.SymbolsLoaded ? "${res:MainWindow.Windows.Debug.HasSymbols}" : "${res:MainWindow.Windows.Debug.HasNoSymbols}")
StringParser.Parse(module.SymbolsLoaded ? "${res:MainWindow.Windows.Debug.Modules.HasSymbols}" : "${res:MainWindow.Windows.Debug.Modules.HasNoSymbols}")
});
newItem.Tag = module;
loadedModulesList.Items.Add(newItem);

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@ -153,7 +153,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -153,7 +153,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (location != null) {
item.SubItems.Add(location.Name);
} else {
item.SubItems.Add("N/A");
item.SubItems.Add(ResourceService.GetString("Global.NA"));
}
switch (thread.Priority) {
case System.Threading.ThreadPriority.Highest:

8
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs

@ -122,7 +122,9 @@ namespace ICSharpCode.SharpDevelop.Services @@ -122,7 +122,9 @@ namespace ICSharpCode.SharpDevelop.Services
try {
val.Primitive = newValue;
} catch (NotSupportedException) {
MessageBox.Show(WorkbenchSingleton.MainForm, "Can not covert " + newValue + " to " + val.ManagedType.ToString(), "Can not set value");
string format = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CannotSetValue");
string msg = String.Format(format, newValue, val.ManagedType.ToString());
MessageService.ShowMessage(msg ,"${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}");
}
}
@ -133,7 +135,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -133,7 +135,7 @@ namespace ICSharpCode.SharpDevelop.Services
ToolStripMenuItem copyItem;
copyItem = new ToolStripMenuItem();
copyItem.Text = "Copy value to clipboard";
copyItem.Text = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CopyToClipboard");
copyItem.Checked = false;
copyItem.Click += delegate {
ClipboardWrapper.SetText(((DynamicListItem)sender).Text);
@ -141,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -141,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Services
ToolStripMenuItem hewView;
hewView = new ToolStripMenuItem();
hewView.Text = "Show values in hexadecimal";
hewView.Text = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.ShowInHexadecimal");
hewView.Checked = ShowValuesInHexadecimal;
hewView.Click += delegate {
ShowValuesInHexadecimal = !ShowValuesInHexadecimal;

35
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

@ -81,10 +81,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -81,10 +81,11 @@ namespace ICSharpCode.SharpDevelop.Services
#region IDebugger Members
string errorDebugging = "Can not preform action because some process is debugged.";
string errorNotDebugging = "Can not preform action because no process is debugged.";
string errorProcessRunning = "Can not preform action because process is running.";
string errorProcessPaused = "Can not preform action because process is paused.";
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 errorCannotStepNoActiveFunction = "${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}";
public bool IsDebugging {
get {
@ -114,9 +115,9 @@ namespace ICSharpCode.SharpDevelop.Services @@ -114,9 +115,9 @@ namespace ICSharpCode.SharpDevelop.Services
}
string version = debugger.GetProgramVersion(processStartInfo.FileName);
if (version.StartsWith("v1.0")) {
MessageBox.Show("Debugging of .NET Framework 1.0 programs is not supported");
MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.Net10NotSupported}");
} else if (version == null || version.Length == 0) {
MessageBox.Show("Can not get .NET Framework version of program. Check that the program is managed assembly.");
MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.BadAssembly}");
} else {
Debugger.Process process = debugger.Start(processStartInfo.FileName,
processStartInfo.WorkingDirectory,
@ -133,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -133,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void Stop()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Stop}");
return;
}
debuggedProcess.Terminate();
@ -144,11 +145,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -144,11 +145,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void Break()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Break}");
return;
}
if (!IsProcessRunning) {
MessageService.ShowMessage(errorProcessPaused);
MessageService.ShowMessage(errorProcessPaused, "${res:XML.MainMenu.DebugMenu.Break}");
return;
}
debuggedProcess.Break();
@ -157,11 +158,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -157,11 +158,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void Continue()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Continue}");
return;
}
if (IsProcessRunning) {
MessageService.ShowMessage(errorProcessRunning);
MessageService.ShowMessage(errorProcessRunning, "${res:XML.MainMenu.DebugMenu.Continue}");
return;
}
debuggedProcess.Continue();
@ -172,11 +173,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -172,11 +173,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepInto()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepInto}");
return;
}
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepInto}");
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepInto}");
} else {
debuggedProcess.StepInto();
}
@ -185,11 +186,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -185,11 +186,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepOver()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOver}");
return;
}
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepOver.Description}");
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOver}");
} else {
debuggedProcess.StepOver();
}
@ -198,11 +199,11 @@ namespace ICSharpCode.SharpDevelop.Services @@ -198,11 +199,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepOut()
{
if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging);
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOut}");
return;
}
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepOut}");
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOut}");
} else {
debuggedProcess.StepOut();
}

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save