diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources index 0e5964b5d3..d1547c233e 100644 Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources index 6fb5b2a0f1..3adc2888a5 100644 Binary files a/data/resources/StringResources.es-mx.resources and b/data/resources/StringResources.es-mx.resources differ diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources index f0e9e753a2..0187eab932 100644 Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ diff --git a/data/resources/StringResources.it.resources b/data/resources/StringResources.it.resources index 6cf98f7fb0..c9045fbc56 100644 Binary files a/data/resources/StringResources.it.resources and b/data/resources/StringResources.it.resources differ diff --git a/data/resources/StringResources.nl.resources b/data/resources/StringResources.nl.resources index caff6e8e44..d5f9941ecf 100644 Binary files a/data/resources/StringResources.nl.resources and b/data/resources/StringResources.nl.resources differ diff --git a/data/resources/StringResources.ro.resources b/data/resources/StringResources.ro.resources index 2a0a0d1e2d..41a8e66298 100644 Binary files a/data/resources/StringResources.ro.resources and b/data/resources/StringResources.ro.resources differ diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin index 48427d2db1..1bd9c035e0 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin @@ -26,7 +26,7 @@ diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin index b9ef1a7f0b..4d1e623a73 100644 --- a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin +++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin @@ -15,7 +15,7 @@ diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs index 0474fa1905..b514998d8b 100644 --- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs +++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs @@ -13,17 +13,28 @@ namespace ICSharpCode.ILAsmBinding { public class ILAsmProject : MSBuildProject { + static bool initialized = false; + + void Init() + { + if (!initialized) { + initialized = true; + MSBuildEngine.CompileTaskNames.Add("ilasm"); + } + this.Language = "ILAsm"; + } + public ILAsmProject(string fileName, string projectName) { this.Name = projectName; - Language = "ILAsm"; + Init(); SetupProject(fileName); IdGuid = BaseConfiguration["ProjectGuid"]; } public ILAsmProject(ProjectCreateInformation info) { - Language = "ILAsm"; + Init(); Create(info); imports.Add(@"$(SharpDevelopBinPath)\SharpDevelop.Build.MSIL.Targets"); } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs index 546c28627e..d7ccf710df 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs @@ -105,7 +105,7 @@ namespace ICSharpCode.XmlEditor changed = AddSchema(schemaFileName); } } catch (Exception ex) { - MessageService.ShowError(ex, "${res:ICSharpCode.XmlEditor.XmlSchemasPanel.UnableToAddSchema}"); + MessageService.ShowError("${res:ICSharpCode.XmlEditor.XmlSchemasPanel.UnableToAddSchema}\n\n" + ex.Message); } } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin index a221b50d7e..0b6a815eae 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin @@ -44,7 +44,7 @@ extensions = "*.xml"/> diff --git a/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin b/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin index bff34be550..caca257951 100644 --- a/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin +++ b/src/AddIns/Misc/NAntAddIn/Project/NAnt.addin @@ -17,7 +17,7 @@ diff --git a/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs b/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs index 5af4e4c716..4497a7e4fc 100644 --- a/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs +++ b/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs @@ -32,7 +32,7 @@ namespace Plugins.RegExpTk { public QuickInsert(string name, string text) { - Name = name; + Name = StringParser.Parse(name); Text = text; } @@ -67,13 +67,14 @@ namespace Plugins.RegExpTk { SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.RegExpTkMainForm.xfrm")); ArrayList quickies = new ArrayList(); - quickies.Add(new QuickInsert("Ungreedy star", "*?")); - quickies.Add(new QuickInsert("Word character value", "\\w")); - quickies.Add(new QuickInsert("Non-word character value", "\\W")); - quickies.Add(new QuickInsert("Whitespace character", "\\s")); - quickies.Add(new QuickInsert("Non-whitespace character", "\\S")); - quickies.Add(new QuickInsert("Digit character", "\\d")); - quickies.Add(new QuickInsert("Non-digit character", "\\D")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.UngreedyStar}", "*?")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.WordCharacter}", "\\w")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.NonWordCharacter}", "\\W")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.WhitespaceCharacter}", "\\s")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.NonWhitespaceCharacter}", "\\S")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.DigitCharacter}", "\\d")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.NonDigitCharacter}", "\\D")); + quickies.Add(new QuickInsert("${res:RegExpTk.RegExpMenu.WordBorder}", "\\b")); foreach (QuickInsert insert in quickies) { MenuCommand cmd = new MenuCommand(insert.Name, new EventHandler(quickInsert)); @@ -81,7 +82,7 @@ namespace Plugins.RegExpTk { quickInsertMenu.Items.Add(cmd); } - matchListViewContextMenu.Items.Add(new MenuCommand("Show groups", new EventHandler(MatchListViewContextMenu_Clicked))); + matchListViewContextMenu.Items.Add(new MenuCommand("${res:RegExpTk.MainDialog.ShowGroups}", new EventHandler(MatchListViewContextMenu_Clicked))); ((Button)ControlDictionary["OkButton"]).Click += new EventHandler(OkButton_Click); ((CheckBox)ControlDictionary["ReplaceCheckBox"]).CheckedChanged += new EventHandler(ReplaceCheckBox_CheckedChanged); @@ -248,7 +249,7 @@ namespace Plugins.RegExpTk { SaveFileDialog sfd = new SaveFileDialog(); sfd.InitialDirectory = "c:\\"; - sfd.Filter = "Assemblies (*.dll)|*.dll"; + sfd.Filter = "${res:RegExpTk.MainDialog.Assemblies}"; sfd.DefaultExt = "dll"; sfd.CheckPathExists = true; diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs index a45bf18c3c..0358a566a6 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs @@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Project static MSBuildEngine() { - CompileTaskNames = new List(new string[] {"csc", "vbc", "ilasm"}); + CompileTaskNames = new List(new string[] {"csc", "vbc"}); MSBuildProperties = new SortedList(); MSBuildProperties.Add("SharpDevelopBinPath", Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location)); } @@ -150,7 +150,7 @@ namespace ICSharpCode.SharpDevelop.Project if (isRunning) { CompilerResults results = new CompilerResults(null); results.NativeCompilerReturnValue = -42; - results.Errors.Add(new CompilerError(null, 0, 0, null, "MSBuild is already running!")); + results.Errors.Add(new CompilerError(null, 0, 0, null, ResourceService.GetString("MainWindow.CompilerMessages.MSBuildAlreadyRunning"))); callback(results); } else { isRunning = true; @@ -238,17 +238,17 @@ namespace ICSharpCode.SharpDevelop.Project void OnBuildStarted(object sender, BuildStartedEventArgs e) { - AppendText("Build started."); + AppendText("${res:MainWindow.CompilerMessages.BuildStarted}"); } void OnBuildFinished(object sender, BuildFinishedEventArgs e) { if (e.Succeeded) { - AppendText("Build finished successfully."); - StatusBarService.SetMessage("Build finished successfully."); + AppendText("${res:MainWindow.CompilerMessages.BuildFinished}"); + StatusBarService.SetMessage("${res:MainWindow.CompilerMessages.BuildFinished}"); } else { - AppendText("Build failed."); - StatusBarService.SetMessage("Build failed."); + AppendText("${res:MainWindow.CompilerMessages.BuildFailed}"); + StatusBarService.SetMessage("${res:MainWindow.CompilerMessages.BuildFailed}"); } } @@ -257,14 +257,14 @@ namespace ICSharpCode.SharpDevelop.Project void OnProjectStarted(object sender, ProjectStartedEventArgs e) { projectFiles.Push(e.ProjectFile); - StatusBarService.SetMessage("Building " + Path.GetFileNameWithoutExtension(e.ProjectFile) + "..."); + StatusBarService.SetMessage("${res:MainWindow.CompilerMessages.BuildVerb} " + Path.GetFileNameWithoutExtension(e.ProjectFile) + "..."); } void OnProjectFinished(object sender, ProjectFinishedEventArgs e) { projectFiles.Pop(); if (projectFiles.Count > 0) { - StatusBarService.SetMessage("Building " + Path.GetFileNameWithoutExtension(projectFiles.Peek()) + "..."); + StatusBarService.SetMessage("${res:MainWindow.CompilerMessages.BuildVerb} " + Path.GetFileNameWithoutExtension(projectFiles.Peek()) + "..."); } } @@ -284,7 +284,7 @@ namespace ICSharpCode.SharpDevelop.Project { activeTaskName = e.TaskName; if (CompileTaskNames.Contains(e.TaskName.ToLowerInvariant())) { - AppendText("Compiling " + Path.GetFileNameWithoutExtension(e.ProjectFile)); + AppendText("${res:MainWindow.CompilerMessages.CompileVerb} " + Path.GetFileNameWithoutExtension(e.ProjectFile)); } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs index 81c5b74695..258d9aa140 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs @@ -20,13 +20,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Abstract class overridings"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.AbstractClass}"; } } public override string Hint { get { - return "Choose abstract class to override"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.AbstractClass.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs index 26ac878e51..d8976740dc 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs @@ -71,7 +71,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands foreach (CodeGeneratorBase codeGenerator in codeGenerators) { if (codeGenerator.IsActive) { - ListViewItem newItem = new ListViewItem(codeGenerator.CategoryName); + ListViewItem newItem = new ListViewItem(StringParser.Parse(codeGenerator.CategoryName)); newItem.ImageIndex = codeGenerator.ImageIndex; newItem.Tag = codeGenerator; categoryListView.Items.Add(newItem); @@ -124,7 +124,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands return; } - statusLabel.Text = codeGenerator.Hint; + statusLabel.Text = StringParser.Parse(codeGenerator.Hint); selectionListBox.BeginUpdate(); selectionListBox.Items.Clear(); if (codeGenerator.Content.Count > 0) { @@ -217,7 +217,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands this.statusLabel.Name = "statusLabel"; this.statusLabel.Size = new System.Drawing.Size(262, 16); this.statusLabel.TabIndex = 1; - this.statusLabel.Text = "Choose fields to generate getters and setters"; + this.statusLabel.Text = "statusLabel"; this.statusLabel.UseCompatibleTextRendering = true; // // categoryListView diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerator.cs index 5e25785d87..adecc54d82 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerator.cs @@ -43,7 +43,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands public virtual string Hint { get { - return "no hint"; + return "-"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ConstructorCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ConstructorCodeGenerator.cs index dcfb63a6fc..57059e274e 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ConstructorCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ConstructorCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Constructor"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Constructor}"; } } public override string Hint { get { - return "Choose fields to initialize by constructor"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Constructor.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/EqualsCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/EqualsCodeGenerator.cs index d9d792c55e..abe57ec0c2 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/EqualsCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/EqualsCodeGenerator.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Generate Equals and GetHashCode methods"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.GenerateEqualsAndGetHashCode}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterAndSetterCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterAndSetterCodeGenerator.cs index 710372779a..7707153c5a 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterAndSetterCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterAndSetterCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Getter and Setter"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.GetterAndSetter}"; } } public override string Hint { get { - return "Choose fields to generate getters and setters"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.GetterAndSetter.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterCodeGenerator.cs index 737d1ebcfd..6e9d5bfe3b 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/GetterCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Getter"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Getter}"; } } public override string Hint { get { - return "Choose fields to generate getters"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Getter.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/InterfaceImplementorCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/InterfaceImplementorCodeGenerator.cs index d0594e9bd2..da395bf2df 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/InterfaceImplementorCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/InterfaceImplementorCodeGenerator.cs @@ -49,13 +49,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Interface implementation"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.ImplementInterface}"; } } public override string Hint { get { - return "Choose interfaces to implement"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.ImplementInterface.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OnXXXMethodsCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OnXXXMethodsCodeGenerator.cs index 92896b9a95..c316b0d620 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OnXXXMethodsCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OnXXXMethodsCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Event OnXXX methods"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.EventOnXXX}"; } } public override string Hint { get { - return "Choose events to generate OnXXX methods"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.EventOnXXX.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs index 10f1eb6e4f..3100c546dc 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Override methods"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.OverrideMethods}"; } } public override string Hint { get { - return "Choose methods to override"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.OverrideMethods.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs index 18d4f8088d..fa56be8f9b 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs @@ -19,13 +19,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Override properties"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.OverrideProperties}"; } } public override string Hint { get { - return "Choose properties to override"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.OverrideProperties.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/SetterCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/SetterCodeGenerator.cs index 157f4de6d0..bc314af2af 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/SetterCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/SetterCodeGenerator.cs @@ -20,13 +20,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override string CategoryName { get { - return "Setter"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Setter}"; } } public override string Hint { get { - return "Choose fields to generate setters"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.Setter.Hint}"; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs index ef3d7431d9..41efcb586a 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs @@ -51,13 +51,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands public override string CategoryName { get { - return "Generate default ToString() method"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.ToString}"; } } public override string Hint { get { - return "Choose Properties to include in the description"; + return "${res:ICSharpCode.SharpDevelop.CodeGenerator.ToString.Hint}"; } } public override int ImageIndex { diff --git a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchStrategy/RegExSearchStrategy.cs b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchStrategy/RegExSearchStrategy.cs index 657787fce2..5f460e6537 100644 --- a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchStrategy/RegExSearchStrategy.cs +++ b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchStrategy/RegExSearchStrategy.cs @@ -27,7 +27,7 @@ namespace SearchAndReplace regex = new Regex(SearchOptions.FindPattern, regexOptions); return true; } catch (ArgumentException ex) { - MessageService.ShowError("Error parsing regular expression:\n" + ex.Message); + MessageService.ShowError("${res:Dialog.NewProject.SearchReplace.ErrorParsingRegex}\n" + ex.Message); return false; } } diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources index 864c658f4e..609edf8068 100644 Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ