Browse Source

Fixed SD2-1381: Missing String Resources

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2952 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
b48ee36f99
  1. 11
      AddIns/ICSharpCode.SharpDevelop.addin
  2. BIN
      data/resources/StringResources.de.resources
  3. BIN
      data/resources/StringResources.es-mx.resources
  4. BIN
      data/resources/StringResources.es.resources
  5. BIN
      data/resources/StringResources.kr.resources
  6. BIN
      data/resources/StringResources.nl.resources
  7. BIN
      data/resources/StringResources.pl.resources
  8. BIN
      data/resources/StringResources.pt-br.resources
  9. BIN
      data/resources/StringResources.tr.resources
  10. 2
      src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.addin
  11. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
  12. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
  13. 3
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  14. 6
      src/Main/Base/Project/Src/Gui/Dialogs/AddOpenWithEntryDialog.Designer.cs
  15. 1
      src/Main/Base/Project/Src/Gui/Dialogs/AddOpenWithEntryDialog.cs
  16. 16
      src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.Designer.cs
  17. 14
      src/Main/Base/Project/Src/Gui/Dialogs/OpenWithDialog.Designer.cs
  18. 7
      src/Main/Base/Project/Src/Gui/Dialogs/OpenWithDialog.cs
  19. 16
      src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.Designer.cs
  20. 10
      src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.cs
  21. 120
      src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.resx
  22. 18
      src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/EditAvailableConfigurationsDialog.cs
  23. 7
      src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/SolutionConfigurationEditor.cs
  24. 3
      src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs
  25. 2
      src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingService.cs
  26. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

11
AddIns/ICSharpCode.SharpDevelop.addin

@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "Browser"
title = "Built-in Web Browser"
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.WebBrowser}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.BrowserDisplayBinding"/>
</Path>
@ -1619,7 +1619,7 @@ @@ -1619,7 +1619,7 @@
<MenuItem id = "DockManager Control" label = "DockPanel Suite" icon = "Icons.16x16.WebSearchIcon" link = "http://sourceforge.net/projects/dockpanelsuite/" />
<MenuItem id = "NUnit" label = "NUnit" icon = "PadIcons.NUnitTest" link = "http://www.nunit.org/" />
<MenuItem id = "WiX" label = "WiX" icon = "Icons.16x16.WebSearchIcon" link = "http://sourceforge.net/projects/wix/" />
<MenuItem id = "NDoc" label = "NDoc" icon = "Icons.16x16.WebSearchIcon" link = "http://ndoc.sourceforge.net/" />
<MenuItem id = "SHFB" label = "Sandcastle Help File Builder" icon = "Icons.16x16.WebSearchIcon" link = "http://www.codeplex.com/SHFB" />
<MenuItem id = "#ZipLib" label = "#ZipLib" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SharpZipLib/" />
</MenuItem>
<MenuItem id = "NETPlatforms" label = ".NET Platforms" type="Menu">
@ -1659,11 +1659,11 @@ @@ -1659,11 +1659,11 @@
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "Text"
insertafter = "Browser"
title = "Text editor"
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.TextEditor}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding" />
<DisplayBinding id = "ShellExecute"
insertafter = "Text"
title = "Use the default Windows application for this file"
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.DefaultWindowsApplication}"
class = "ICSharpCode.SharpDevelop.ShellExecuteDisplayBinding" />
</Path>
@ -2169,10 +2169,13 @@ @@ -2169,10 +2169,13 @@
<Path name="/SharpDevelop/Services/ParserService/SingleFileGacReferences">
<String id = "System" text = "System"/>
<String id = "System.Core" text = "System.Core"/>
<String id = "System.Data" text = "System.Data"/>
<String id = "System.Data.DataSetExtensions" text = "System.Data.DataSetExtensions"/>
<String id = "System.Drawing" text = "System.Drawing"/>
<String id = "System.Windows.Forms" text = "System.Windows.Forms"/>
<String id = "System.Xml" text = "System.Xml"/>
<String id = "System.Xml.Linq" text = "System.Xml.Linq"/>
</Path>
<Path name = "/Workspace/ProjectContentRegistry">

BIN
data/resources/StringResources.de.resources

Binary file not shown.

BIN
data/resources/StringResources.es-mx.resources

Binary file not shown.

BIN
data/resources/StringResources.es.resources

Binary file not shown.

BIN
data/resources/StringResources.kr.resources

Binary file not shown.

BIN
data/resources/StringResources.nl.resources

Binary file not shown.

BIN
data/resources/StringResources.pl.resources

Binary file not shown.

BIN
data/resources/StringResources.pt-br.resources

Binary file not shown.

BIN
data/resources/StringResources.tr.resources

Binary file not shown.

2
src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.addin

@ -23,6 +23,6 @@ @@ -23,6 +23,6 @@
class = "ICSharpCode.IconEditorAddIn.IconDisplayBinding"
insertbefore = "Text"
fileNamePattern = "\.ico$"
title = "Icon editor"/>
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.IconEditor}"/>
</Path>
</AddIn>

2
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin

@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
class = "ResourceEditor.ResourceEditorDisplayBinding"
insertbefore = "Text"
fileNamePattern = "\.res(x|ources)$"
title = "Resource editor"/>
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.ResourceEditor}"/>
</Path>
<Path name="/SharpDevelop/ResourceEditor/ResourceList/ContextMenu">

2
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "XmlEditor"
insertbefore = "Text"
title = "XML editor"
title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.XmlEditor}"
class = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
</Path>

3
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -700,6 +700,9 @@ @@ -700,6 +700,9 @@
<EmbeddedResource Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ConvertToMSBuild35Dialog.resx">
<DependentUpon>ConvertToMSBuild35Dialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Src\Gui\Dialogs\SolutionConfiguration\AddNewConfigurationDialog.resx">
<DependentUpon>AddNewConfigurationDialog.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">

6
src/Main/Base/Project/Src/Gui/Dialogs/AddOpenWithEntryDialog.Designer.cs generated

@ -49,7 +49,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -49,7 +49,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(100, 23);
this.label1.TabIndex = 0;
this.label1.Text = "&Program name:";
this.label1.Text = "${res:Gui.ProjectBrowser.OpenWith.AddProgram.Program}";
//
// programNameTextBox
//
@ -78,7 +78,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -78,7 +78,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(100, 23);
this.label2.TabIndex = 3;
this.label2.Text = "&Display name:";
this.label2.Text = "${res:Gui.ProjectBrowser.OpenWith.AddProgram.DisplayName}";
//
// displayNameTextBox
//
@ -130,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -130,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AddOpenWithEntryDialog";
this.Text = "Add program";
this.Text = "${res:Gui.ProjectBrowser.OpenWith.AddProgram.DialogTitle}";
this.ResumeLayout(false);
this.PerformLayout();
}

1
src/Main/Base/Project/Src/Gui/Dialogs/AddOpenWithEntryDialog.cs

@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.Gui
foreach (Control ctl in this.Controls) {
ctl.Text = StringParser.Parse(ctl.Text);
}
this.Text = StringParser.Parse(this.Text);
}
public string ProgramName {

16
src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.Designer.cs generated

@ -79,8 +79,8 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -79,8 +79,8 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
this.splitContainer1.Panel2.Controls.Add(this.smallIconsRadioButton);
this.splitContainer1.Panel2.Controls.Add(this.targetFrameworkComboBox);
this.splitContainer1.Panel2.Controls.Add(this.label2);
this.splitContainer1.Size = new System.Drawing.Size(571, 258);
this.splitContainer1.SplitterDistance = 189;
this.splitContainer1.Size = new System.Drawing.Size(576, 258);
this.splitContainer1.SplitterDistance = 190;
this.splitContainer1.TabIndex = 0;
//
// categoryTreeView
@ -173,7 +173,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -173,7 +173,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
this.bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomPanel.Location = new System.Drawing.Point(0, 258);
this.bottomPanel.Name = "bottomPanel";
this.bottomPanel.Size = new System.Drawing.Size(571, 167);
this.bottomPanel.Size = new System.Drawing.Size(576, 167);
this.bottomPanel.TabIndex = 1;
//
// cancelButton
@ -209,11 +209,11 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -209,11 +209,11 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
// createDirectoryForSolutionCheckBox
//
this.createDirectoryForSolutionCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.createDirectoryForSolutionCheckBox.Location = new System.Drawing.Point(362, 88);
this.createDirectoryForSolutionCheckBox.Location = new System.Drawing.Point(337, 88);
this.createDirectoryForSolutionCheckBox.Name = "createDirectoryForSolutionCheckBox";
this.createDirectoryForSolutionCheckBox.Size = new System.Drawing.Size(197, 24);
this.createDirectoryForSolutionCheckBox.Size = new System.Drawing.Size(222, 24);
this.createDirectoryForSolutionCheckBox.TabIndex = 8;
this.createDirectoryForSolutionCheckBox.Text = "Create &directory for solution";
this.createDirectoryForSolutionCheckBox.Text = "${res:Dialog.NewProject.CreateDirectoryForSolution}";
this.createDirectoryForSolutionCheckBox.UseVisualStyleBackColor = true;
//
// browseButton
@ -231,7 +231,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -231,7 +231,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
| System.Windows.Forms.AnchorStyles.Right)));
this.solutionNameTextBox.Location = new System.Drawing.Point(137, 90);
this.solutionNameTextBox.Name = "solutionNameTextBox";
this.solutionNameTextBox.Size = new System.Drawing.Size(219, 20);
this.solutionNameTextBox.Size = new System.Drawing.Size(194, 20);
this.solutionNameTextBox.TabIndex = 7;
//
// locationTextBox
@ -249,7 +249,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -249,7 +249,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
this.solutionNameLabel.Name = "solutionNameLabel";
this.solutionNameLabel.Size = new System.Drawing.Size(128, 23);
this.solutionNameLabel.TabIndex = 6;
this.solutionNameLabel.Text = "Solution Na&me:";
this.solutionNameLabel.Text = "${res:Dialog.NewProject.SolutionName}";
this.solutionNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label4

14
src/Main/Base/Project/Src/Gui/Dialogs/OpenWithDialog.Designer.cs generated

@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(372, 23);
this.label1.TabIndex = 0;
this.label1.Text = "Choose the program you want to use to open this file:";
this.label1.Text = "${res:Gui.ProjectBrowser.OpenWith.ChooseProgram}";
//
// programListBox
//
@ -73,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -73,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.addButton.Name = "addButton";
this.addButton.Size = new System.Drawing.Size(98, 23);
this.addButton.TabIndex = 2;
this.addButton.Text = "Add...";
this.addButton.Text = "${res:Global.AddButtonText}...";
this.addButton.UseVisualStyleBackColor = true;
this.addButton.Click += new System.EventHandler(this.AddButtonClick);
//
@ -85,7 +85,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -85,7 +85,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.removeButton.Name = "removeButton";
this.removeButton.Size = new System.Drawing.Size(98, 23);
this.removeButton.TabIndex = 3;
this.removeButton.Text = "Remove";
this.removeButton.Text = "${res:Global.RemoveButtonText}";
this.removeButton.UseVisualStyleBackColor = true;
this.removeButton.Click += new System.EventHandler(this.RemoveButtonClick);
//
@ -97,7 +97,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -97,7 +97,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.setAsDefaultButton.Name = "setAsDefaultButton";
this.setAsDefaultButton.Size = new System.Drawing.Size(98, 23);
this.setAsDefaultButton.TabIndex = 4;
this.setAsDefaultButton.Text = "Set as Default";
this.setAsDefaultButton.Text = "${res:Gui.ProjectBrowser.OpenWith.SetAsDefault}";
this.setAsDefaultButton.UseVisualStyleBackColor = true;
this.setAsDefaultButton.Click += new System.EventHandler(this.SetAsDefaultButtonClick);
//
@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 5;
this.okButton.Text = "OK";
this.okButton.Text = "${res:Global.OKButtonText}";
this.okButton.UseVisualStyleBackColor = true;
//
// cancelButton
@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 6;
this.cancelButton.Text = "Cancel";
this.cancelButton.Text = "${res:Global.CancelButtonText}";
this.cancelButton.UseVisualStyleBackColor = true;
//
// OpenWithDialog
@ -143,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -143,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(292, 186);
this.Name = "OpenWithDialog";
this.Text = "Open With";
this.Text = "${res:Gui.ProjectBrowser.OpenWith.DialogTitle}";
this.ResumeLayout(false);
}
private System.Windows.Forms.Button cancelButton;

7
src/Main/Base/Project/Src/Gui/Dialogs/OpenWithDialog.cs

@ -32,7 +32,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -32,7 +32,7 @@ namespace ICSharpCode.SharpDevelop.Gui
public override string ToString()
{
if (IsDefault)
return StringParser.Parse(desc.Title) + " (Default)";
return StringParser.Parse(desc.Title + " (${res:Gui.ProjectBrowser.OpenWith.Default})");
else
return StringParser.Parse(desc.Title);
}
@ -49,6 +49,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -49,6 +49,11 @@ namespace ICSharpCode.SharpDevelop.Gui
// The InitializeComponent() call is required for Windows Forms designer support.
InitializeComponent();
foreach (Control ctl in this.Controls) {
ctl.Text = StringParser.Parse(ctl.Text);
}
this.Text = StringParser.Parse(this.Text);
this.fileExtension = fileExtension;
this.defaultBindingIndex = defaultBindingIndex;
if (string.IsNullOrEmpty(fileExtension))

16
src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.Designer.cs generated

@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui
| System.Windows.Forms.AnchorStyles.Right)));
this.nameTextBox.Location = new System.Drawing.Point(12, 26);
this.nameTextBox.Name = "nameTextBox";
this.nameTextBox.Size = new System.Drawing.Size(237, 20);
this.nameTextBox.Size = new System.Drawing.Size(284, 20);
this.nameTextBox.TabIndex = 1;
//
// label2
@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(237, 23);
this.label2.TabIndex = 2;
this.label2.Text = "Copy &settings from:";
this.label2.Text = "${res:Dialog.EditAvailableConfigurationsDialog.CopySettingsFrom}";
//
// copyFromComboBox
//
@ -84,15 +84,16 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -84,15 +84,16 @@ namespace ICSharpCode.SharpDevelop.Gui
| System.Windows.Forms.AnchorStyles.Right)));
this.createInAllCheckBox.Location = new System.Drawing.Point(12, 92);
this.createInAllCheckBox.Name = "createInAllCheckBox";
this.createInAllCheckBox.Size = new System.Drawing.Size(237, 24);
this.createInAllCheckBox.Size = new System.Drawing.Size(284, 24);
this.createInAllCheckBox.TabIndex = 4;
this.createInAllCheckBox.Text = "&Create this configuration in all projects";
this.createInAllCheckBox.Text = "${res:Dialog.EditAvailableConfigurationsDialog.CreateConfigurationInAllProjects}";
this.createInAllCheckBox.UseVisualStyleBackColor = true;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.Enabled = false;
this.okButton.Location = new System.Drawing.Point(93, 127);
this.okButton.Location = new System.Drawing.Point(142, 127);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 5;
@ -102,8 +103,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -102,8 +103,9 @@ namespace ICSharpCode.SharpDevelop.Gui
//
// cancelButton
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(174, 127);
this.cancelButton.Location = new System.Drawing.Point(223, 127);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 6;
@ -116,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -116,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(263, 162);
this.ClientSize = new System.Drawing.Size(310, 162);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
this.Controls.Add(this.createInAllCheckBox);

10
src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.cs

@ -40,20 +40,20 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -40,20 +40,20 @@ namespace ICSharpCode.SharpDevelop.Gui
nameTextBox.TextChanged += delegate {
okButton.Enabled = nameTextBox.TextLength > 0;
};
copyFromComboBox.Items.Add("<Empty>");
copyFromComboBox.Items.Add(StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.EmptyItem}"));
copyFromComboBox.Items.AddRange(availableSourceItems.ToArray());
copyFromComboBox.SelectedIndex = 0;
if (solution) {
if (editPlatforms)
this.Text = "Add Solution Platform";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.AddSolutionPlatform}");
else
this.Text = "Add Solution Configuration";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.AddSolutionConfiguration}");
} else {
if (editPlatforms)
this.Text = "Add Project Platform";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.AddProjectPlatform}");
else
this.Text = "Add Project Configuration";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.AddProjectConfiguration}");
}
}

120
src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/AddNewConfigurationDialog.resx

@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

18
src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/EditAvailableConfigurationsDialog.cs

@ -42,9 +42,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -42,9 +42,9 @@ namespace ICSharpCode.SharpDevelop.Gui
InitList();
if (editPlatforms)
this.Text = "Edit Solution Platforms";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.EditSolutionPlatforms}");
else
this.Text = "Edit Solution Configurations";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.EditSolutionConfigurations}");
}
public EditAvailableConfigurationsDialog(IProject project, bool editPlatforms)
@ -56,9 +56,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -56,9 +56,9 @@ namespace ICSharpCode.SharpDevelop.Gui
InitList();
if (editPlatforms)
this.Text = "Edit Project Platforms";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.EditProjectPlatforms}");
else
this.Text = "Edit Project Configurations";
this.Text = StringParser.Parse("${res:Dialog.EditAvailableConfigurationsDialog.EditProjectConfigurations}");
}
void InitList()
@ -92,10 +92,10 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -92,10 +92,10 @@ namespace ICSharpCode.SharpDevelop.Gui
void RemoveButtonClick(object sender, EventArgs e)
{
if (listBox.Items.Count == 1) {
MessageService.ShowMessage("You cannot delete all configurations/platforms.");
MessageService.ShowMessage("${res:Dialog.EditAvailableConfigurationsDialog.CannotDeleteAllConfigurationsOrPlatforms}");
}
string name = listBox.SelectedItem.ToString();
if (MessageService.AskQuestionFormatted("Do you really want to remove '{0}'?",
if (MessageService.AskQuestionFormatted("${res:Dialog.EditAvailableConfigurationsDialog.ConfirmRemoveConfigurationOrPlatform}",
new string[] { name }))
{
if (project != null) {
@ -129,7 +129,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -129,7 +129,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
string oldName = listBox.SelectedItem.ToString();
string newName = MessageService.ShowInputBox("${res:SharpDevelop.Refactoring.Rename}",
"Enter the new name:", oldName);
"${res:Dialog.EditAvailableConfigurationsDialog.EnterNewName}", oldName);
if (string.IsNullOrEmpty(newName) || newName == oldName)
return;
if (!EnsureCorrectName(ref newName))
@ -176,7 +176,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -176,7 +176,7 @@ namespace ICSharpCode.SharpDevelop.Gui
newName = "Any CPU";
foreach (string item in listBox.Items) {
if (string.Equals(item, newName, StringComparison.InvariantCultureIgnoreCase)) {
MessageService.ShowMessage("Duplicate name.");
MessageService.ShowMessage("${res:Dialog.EditAvailableConfigurationsDialog.DuplicateName}");
return false;
}
}
@ -184,7 +184,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -184,7 +184,7 @@ namespace ICSharpCode.SharpDevelop.Gui
|| !FileUtility.IsValidDirectoryName(newName)
|| newName.Contains("'"))
{
MessageService.ShowMessage("The name was invalid.");
MessageService.ShowMessage("${res:Dialog.EditAvailableConfigurationsDialog.InvalidName}");
return false;
}
return true;

7
src/Main/Base/Project/Src/Gui/Dialogs/SolutionConfiguration/SolutionConfigurationEditor.cs

@ -61,8 +61,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -61,8 +61,9 @@ namespace ICSharpCode.SharpDevelop.Gui
SelectElement(configurationComboBox, solution.Preferences.ActiveConfiguration);
SelectElement(platformComboBox, solution.Preferences.ActivePlatform);
configurationComboBoxEditIndex = configurationComboBox.Items.Add("<Edit>");
platformComboBoxEditIndex = platformComboBox.Items.Add("<Edit>");
string editItemText = EditTag.Instance.ToString();
configurationComboBoxEditIndex = configurationComboBox.Items.Add(editItemText);
platformComboBoxEditIndex = platformComboBox.Items.Add(editItemText);
}
void SetItems(IList items, IEnumerable<string> elements)
@ -94,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -94,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui
public override string ToString()
{
return "<Edit>";
return StringParser.Parse("${res:Dialog.Options.CombineOptions.Configurations.ConfigurationEditor.EditItem}");
}
}

3
src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
using System;
using System.Windows.Forms;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui
{
@ -38,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -38,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui
public ToolsPad()
{
noToolsAvailable.Text = "There are no tools available for the current document.";
noToolsAvailable.Text = StringParser.Parse("${res:SharpDevelop.SideBar.NoToolsAvailableForCurrentDocument}");
noToolsAvailable.Dock = DockStyle.Fill;
panel.Controls.Add(noToolsAvailable);
child = noToolsAvailable;

2
src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingService.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.SharpDevelop @@ -28,7 +28,7 @@ namespace ICSharpCode.SharpDevelop
internal static void InitializeService()
{
bindings = AddInTree.BuildItems<DisplayBindingDescriptor>("/SharpDevelop/Workbench/DisplayBindings", null, true);
bindings = AddInTree.BuildItems<DisplayBindingDescriptor>(displayBindingPath, null, true);
displayBindingServiceProperties = PropertyService.Get("DisplayBindingService", new Properties());
foreach (ExternalProcessDisplayBinding binding in displayBindingServiceProperties.Get("ExternalProcesses", new ExternalProcessDisplayBinding[0])) {
if (binding != null) {

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

Binary file not shown.
Loading…
Cancel
Save