Browse Source

Synchronize English string resources with database on translation server.

pull/4/head
Daniel Grunwald 15 years ago
parent
commit
408ccb482d
  1. 30
      data/resources/StringResources.resx
  2. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  3. 6
      src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
  4. 2
      src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml
  5. 11
      src/Main/Base/Project/Src/Commands/DebugCommands.cs

30
data/resources/StringResources.resx

@ -4297,12 +4297,6 @@ you have write permission in that path and file. (maybe a write protection probl @@ -4297,12 +4297,6 @@ you have write permission in that path and file. (maybe a write protection probl
<data name="ICSharpCode.SharpDevelop.CodeGenerator.ToString.Hint" xml:space="preserve">
<value>Choose Properties to include in the description</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPoints" xml:space="preserve">
<value>Do you want to remove all breakpoints?</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPointsCaption" xml:space="preserve">
<value>Remove breakpoints</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.CharpConvertProjectToVB" xml:space="preserve">
<value>From C# to VB.NET</value>
</data>
@ -5648,17 +5642,16 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment> @@ -5648,17 +5642,16 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
<data name="MainWindow.Windows.BookmarkPad.GotoPrev.ToolTip" xml:space="preserve">
<value>Goto previous bookmark</value>
</data>
<data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
<value>Bookmarks</value>
</data>
<data name="MainWindow.Windows.BookmarkPad.LineText" xml:space="preserve">
<value>{0} @line {1}</value>
<comment>format string for displaying "filename @line #" in the bookmarks pad</comment>
</data>
<data name="MainWindow.Windows.BookmarkPad.LocationText" xml:space="preserve">
<value>Location</value>
<comment>Column title for the bookmark location</comment>
</data>
<data name="MainWindow.Windows.BookmarkPad.LanguageHeader" xml:space="preserve">
<value>Language</value>
<data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
<value>Bookmarks</value>
</data>
<data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
<value>Back</value>
@ -5766,6 +5759,10 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment> @@ -5766,6 +5759,10 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Condition" xml:space="preserve">
<value>Conditional</value>
</data>
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.ConditionalColumnHeader" xml:space="preserve">
<value>Condition</value>
<comment>column title for a conditional breakpoint's condition</comment>
</data>
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Continue" xml:space="preserve">
<value>Continue</value>
</data>
@ -5790,9 +5787,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment> @@ -5790,9 +5787,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Trace" xml:space="preserve">
<value>Trace</value>
</data>
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.ConditionalColumnHeader" xml:space="preserve">
<value>Condition</value>
</data>
<data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
<value>Console</value>
</data>
@ -7861,6 +7855,10 @@ The resources files have been renamed/moved accordingly.</value> @@ -7861,6 +7855,10 @@ The resources files have been renamed/moved accordingly.</value>
<data name="XML.MainMenu.DebugMenu.Error.ProcessRunning" xml:space="preserve">
<value>Can not perform action because process is running.</value>
</data>
<data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
<value>Remove all breakpoints</value>
<comment>Main menu command for removing all breakpoints + tooltip for the corresponding toolbar button (in the breakpoints pad)</comment>
</data>
<data name="XML.MainMenu.DebugMenu.RunWithoutDebug" xml:space="preserve">
<value>Run &amp;without debugger</value>
</data>
@ -7895,10 +7893,6 @@ The resources files have been renamed/moved accordingly.</value> @@ -7895,10 +7893,6 @@ The resources files have been renamed/moved accordingly.</value>
<value>Toggle Breakpoint</value>
<comment>Set/remove breakpoint on current line</comment>
</data>
<data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
<value>Remove all breakpoints</value>
<comment>Remove all breakpoints</comment>
</data>
<data name="XML.MainMenu.EditMenu" xml:space="preserve">
<value>&amp;Edit</value>
</data>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@ -990,7 +990,7 @@ @@ -990,7 +990,7 @@
<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
<ToolbarItem id = "DeleteAllBreakpoints"
icon = "Bookmarks.DeleteAllBreakpoints"
tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteAllMarks.ToolTip}"
tooltip = "${res:XML.MainMenu.DebugMenu.RemoveAllBreakpoints}"
class = "ICSharpCode.SharpDevelop.Project.Commands.RemoveAllBreakpointsCommand"/>
</Path>
<!-- end toolbars -->

6
src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs

@ -90,11 +90,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -90,11 +90,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
public override void Run()
{
var result = BookmarkManager.Bookmarks
.Where(b => !(b is SDMarkerBookmark))
.Select(b => b);
foreach (var b in result.ToArray())
BookmarkManager.RemoveMark(b);
BookmarkManager.RemoveAll(b => !(b is BreakpointBookmark));
}
}

2
src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
Width="Auto"
DisplayMemberBinding="{Binding Path=Location}" />
<GridViewColumn
Header="{core:Localize MainWindow.Windows.BookmarkPad.LanguageHeader}"
Header="{core:Localize MainWindow.Windows.Debug.CallStack.Language}"
Width="Auto"
DisplayMemberBinding="{Binding Path=Language, UpdateSourceTrigger=PropertyChanged}" />
</GridView>

11
src/Main/Base/Project/Src/Commands/DebugCommands.cs

@ -124,16 +124,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -124,16 +124,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (DebuggerService.Breakpoints.Count <= 0) return;
if(System.Windows.Forms.MessageBox.Show(
StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPoints}"),
StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPointsCaption}"),
System.Windows.Forms.MessageBoxButtons.YesNo,
System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes)
{
BookmarkManager.RemoveAll(b => b is BreakpointBookmark);
}
BookmarkManager.RemoveAll(b => b is BreakpointBookmark);
}
}

Loading…
Cancel
Save