pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

#561 some more work on localization

pull/416/merge
Siegfried Pammer 11 years ago
parent
cf73e52596
commit
f8f04d04be
13 changed files with 88 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      data/resources/StringResources.resx
  2. 5
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml
  3. 4
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
  4. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/InsertionCursorLayer.cs
  5. 1
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs
  6. 5
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Views/BooleanView.xaml
  7. 24
      src/AddIns/Misc/PackageManagement/Project/PackageManagement.addin
  8. 5
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  9. 12
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
  10. 4
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
  11. 9
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
  12. 6
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/MessageViewCategory.cs
  13. 2
      src/Main/Base/Project/Src/Project/AbstractProject.cs

53
data/resources/StringResources.resx
Unescape View File

@ -8282,6 +8282,59 @@ a line break</value> @@ -8282,6 +8282,59 @@ a line break</value>
<data name="AddIns.Debugger.Console.DeleteHistory" xml:space="preserve">
<value>Delete history</value>
</data>
<data name="MainWindow.Windows.OutputWindow.TextTooLong" xml:space="preserve">
<value>&lt;Text was truncated because it was too long&gt;</value>
</data>
<data name="MainWindow.CompilerMessages.BuildingProjectIsNotSupported" xml:space="preserve">
<value>Building project ${Name} is not supported.</value>
</data>
<data name="Dialog.AddServiceReference.ServicesLabel" xml:space="preserve">
<value>Services:</value>
</data>
<data name="Dialog.AddServiceReference.OperationsLabel" xml:space="preserve">
<value>Operations:</value>
</data>
<data name="AddIns.PackageManagement.Menu.ManagePackages" xml:space="preserve">
<value>Manage Packages...</value>
</data>
<data name="AddIns.PackageManagement.Menu.RestorePackages" xml:space="preserve">
<value>Restore Packages</value>
</data>
<data name="AddIns.PackageManagement.Options.Title" xml:space="preserve">
<value>Package Management</value>
</data>
<data name="AddIns.PackageManagement.Options.PackageSources" xml:space="preserve">
<value>Package Sources</value>
</data>
<data name="AddIns.PackageManagement.ConsolePad.Title" xml:space="preserve">
<value>Package Management Console</value>
</data>
<data name="Dialog.Options.IDEOptions.CodingOptions.CodeIssues.Title" xml:space="preserve">
<value>Code inspection</value>
</data>
<data name="Dialog.Options.IDEOptions.CodingOptions.CodeFormatting.Title" xml:space="preserve">
<value>Formatting</value>
</data>
<data name="CSharpBinding.Refactoring.InsertWithCursor.Description" xml:space="preserve">
<value>Use Up/Down to move to another location.
Press Enter to select the location.
Press Esc to cancel this operation.</value>
</data>
<data name="Dialog.AdvancedService.ClientHeader" xml:space="preserve">
<value>Client</value>
</data>
<data name="Dialog.AdvancedService.Client.GenerateAsyncOperations" xml:space="preserve">
<value>Generate asynchronous operations</value>
</data>
<data name="Dialog.AdvancedService.Client.AccessLevel.Public" xml:space="preserve">
<value>Public</value>
</data>
<data name="Dialog.AdvancedService.Client.AccessLevel.Internal" xml:space="preserve">
<value>Internal</value>
</data>
<data name="Dialog.AdvancedService.Client.AccessLevelLabel" xml:space="preserve">
<value>Access level for generated classes:</value>
</data>
<data name="SharpReport.Wizard.Welcome" xml:space="preserve">
<value>Welcome to the SharpReport Wizard</value>
</data>

5
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml
Unescape View File

@ -7,12 +7,11 @@ @@ -7,12 +7,11 @@
<GroupBox Header="{core:Localize ICSharpCode.CodeAnalysis.IdeOptions.FxCopPath}">
<StackPanel>
<TextBlock Margin="3,5,3,20" x:Name="status"
HorizontalAlignment="Center" TextWrapping="Wrap"
Text="(showing current FxCop path)"></TextBlock>
HorizontalAlignment="Center" TextWrapping="Wrap" />
<Button Content="{core:Localize ICSharpCode.CodeAnalysis.IdeOptions.FindFxCopPath}"
HorizontalAlignment="Center"
Click="FindFxCopPath_Click"
Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
Style="{x:Static core:GlobalStyles.ButtonStyle}" />
</StackPanel>
</GroupBox>
</gui:OptionPanel>

4
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
Unescape View File

@ -148,11 +148,11 @@ @@ -148,11 +148,11 @@
insertafter = "Highlighting"
label = "C#">
<OptionPanel id="Issues"
label="Code inspection"
label="${res:Dialog.Options.IDEOptions.CodingOptions.CodeIssues.Title}"
class="CSharpBinding.Refactoring.IssueOptions"/>
<ContextActionOptionPanel id="ContextActions" path="/SharpDevelop/ViewContent/TextEditor/C#/ContextActions"/>
<OptionPanel id="Formatting"
label="Formatting"
label="${res:Dialog.Options.IDEOptions.CodingOptions.CodeFormatting.Title}"
class="CSharpBinding.OptionPanels.CSharpGlobalFormattingOptionPanel"/>
</OptionPanel>
</Path>

2
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/InsertionCursorLayer.cs
Unescape View File

@ -281,7 +281,7 @@ namespace CSharpBinding.Refactoring @@ -281,7 +281,7 @@ namespace CSharpBinding.Refactoring
var content = new StackPanel {
Children = {
new TextBlock {
Text = "Use Up/Down to move to another location.\r\n" + "Press Enter to select the location.\r\n" + "Press Esc to cancel this operation."
Text = SD.ResourceService.GetString("CSharpBinding.Refactoring.InsertWithCursor.Description")
}
}
};

1
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs
Unescape View File

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// created on 08.08.2003 at 13:02
using System;
using System.Windows.Forms;
using ICSharpCode.Core;

5
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Views/BooleanView.xaml
Unescape View File

@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
<UserControl x:Class="ResourceEditor.Views.BooleanView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical">
<RadioButton
Name="falseValueRadioButton"
GroupName="BooleanResourceValue"
Content="False"
Content="{core:Localize ICSharpCode.SharpDevelop.Gui.Components.BooleanTypeConverter.FalseString}"
IsThreeState="False"
Margin="3,3,3,3"
Click="RadioButtonValueChanged" />
<RadioButton
Name="trueValueRadioButton"
GroupName="BooleanResourceValue"
Content="True"
Content="{core:Localize ICSharpCode.SharpDevelop.Gui.Components.BooleanTypeConverter.TrueString}"
IsThreeState="False"
Margin="3,3,3,3"
Click="RadioButtonValueChanged" />

24
src/AddIns/Misc/PackageManagement/Project/PackageManagement.addin
Unescape View File

@ -20,13 +20,13 @@ @@ -20,13 +20,13 @@
<Condition name="WriteableProject" action="Disable">
<MenuItem
id="ManagePackages"
label="Manage Packages..."
label="${res:AddIns.PackageManagement.Menu.ManagePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
<MenuItem
id="RestorePackages"
label="Restore Packages"
label="${res:AddIns.PackageManagement.Menu.RestorePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.RestorePackagesCommand"/>
@ -38,13 +38,13 @@ @@ -38,13 +38,13 @@
<Condition name="WriteableProject" action="Disable">
<MenuItem
id="ManagePackages"
label="Manage Packages..."
label="${res:AddIns.PackageManagement.Menu.ManagePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
<MenuItem
id="RestorePackages"
label="Restore Packages"
label="${res:AddIns.PackageManagement.Menu.RestorePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.RestorePackagesCommand"/>
@ -56,13 +56,13 @@ @@ -56,13 +56,13 @@
<Condition name="WriteableProject" action="Disable">
<MenuItem
id="ManagePackages"
label="Manage Packages..."
label="${res:AddIns.PackageManagement.Menu.ManagePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
<MenuItem
id="RestorePackages"
label="Restore Packages"
label="${res:AddIns.PackageManagement.Menu.RestorePackages}"
insertafter="AddWebReference"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.RestorePackagesCommand"/>
@ -74,13 +74,13 @@ @@ -74,13 +74,13 @@
<Condition name="WriteableSolution" action="Disable">
<MenuItem
id="ManagePackagesForSolution"
label="Manage Packages..."
label="${res:AddIns.PackageManagement.Menu.ManagePackages}"
insertafter="CombineAddMenu"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
<MenuItem
id="RestorePackagesForSolution"
label="Restore Packages"
label="${res:AddIns.PackageManagement.Menu.RestorePackages}"
insertafter="CombineAddMenu"
insertbefore="AddSeparator"
class="ICSharpCode.PackageManagement.RestorePackagesCommand"/>
@ -91,16 +91,16 @@ @@ -91,16 +91,16 @@
<Path name="/SharpDevelop/Dialogs/OptionsDialog">
<OptionPanel
id="PackageManagement"
label="Package Management"
label="${res:AddIns.PackageManagement.Options.Title}"
insertafter="Debugging"
insertbefore="TextEditorOptions">
<OptionPanel
id="PackageManagementOptions"
label="General"
label="${res:Dialog.Options.IDEOptions.General}"
class="ICSharpCode.PackageManagement.PackageManagementOptionsView"/>
<OptionPanel
id="PackageSources"
label="Package Sources"
label="${res:AddIns.PackageManagement.Options.PackageSources}"
class="ICSharpCode.PackageManagement.RegisteredPackageSourcesView"/>
</OptionPanel>
</Path>
@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
<Pad
id="PackageManagementConsole"
category="Tools"
title="Package Management Console"
title="${res:AddIns.PackageManagement.ConsolePad.Title}"
icon="PadIcons.Output"
defaultPosition="Bottom, Hidden"
class="ICSharpCode.PackageManagement.Scripting.PackageManagementConsolePad"/>

5
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -2094,11 +2094,6 @@ @@ -2094,11 +2094,6 @@
icon = "Icons.16x16.CommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
class = "ICSharpCode.SharpDevelop.Editor.Commands.CommentRegion"/>
<!-- <ToolbarItem id = "Uncomment"
icon = "Icons.16x16.UnCommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.UncommentSelection}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.UncommentRegion"/> -->
<ToolbarItem id = "SearchSeparator2" type = "Separator"/>
<ToolbarItem id = "ToggleBookmark"
icon = "Bookmarks.ToggleMark"

12
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
Unescape View File

@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
Text="{Binding HeadLine}">
</TextBox>
<TextBlock Grid.Row="1" Text="Address:" Margin="5,0,4,0" VerticalAlignment="Bottom"></TextBlock>
<TextBlock Grid.Row="1" Text="{core:Localize ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.UrlAddressLabel}" Margin="5,0,4,0" VerticalAlignment="Bottom"></TextBlock>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
Margin="4,0,4,0"
IsDefault="True"
Style="{x:Static core:GlobalStyles.ButtonStyle}"
Content="Go"
Content="{core:Localize ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.GoButtonTooltip}"
HorizontalContentAlignment="Center"
Command="{Binding GoCommand}" />
</Grid>
@ -86,8 +86,8 @@ @@ -86,8 +86,8 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="Services:" Margin="4,0,4,0"></TextBlock>
<TextBlock Grid.Column="1" Text="Operations:" Margin="4,0,4,0"></TextBlock>
<TextBlock Text="{core:Localize Dialog.AddServiceReference.ServicesLabel}" Margin="4,0,4,0"></TextBlock>
<TextBlock Grid.Column="1" Text="{core:Localize Dialog.AddServiceReference.OperationsLabel}" Margin="4,0,4,0"></TextBlock>
<TreeView
Grid.Row="1"
Grid.Column="0"
@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
<TextBlock Text="{Binding ServiceDescriptionMessage}"></TextBlock>
</Border>
<TextBlock Grid.Row="6" Text="Namespace:" Margin="4,0,4,0" VerticalAlignment="Bottom"></TextBlock>
<TextBlock Grid.Row="6" Text="{core:Localize ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.NamespaceLabel}" Margin="4,0,4,0" VerticalAlignment="Bottom"></TextBlock>
<TextBox Grid.Row="7" Grid.ColumnSpan="3"
Margin="4" Background="White"
Text="{Binding DefaultNameSpace}">
@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Button Content="Advanced..."
<Button Content="{core:StringParse ${res:Global.Advanced}...}"
Command="{Binding AdvancedDialogCommand}"
Style="{x:Static core:GlobalStyles.ButtonStyle}"
Margin="4,4,12,12">

4
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
Unescape View File

@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
</Grid.ColumnDefinitions>
<GroupBox
Header="Client"
Header="{core:Localize Dialog.AdvancedService.ClientHeader}"
Grid.ColumnSpan="2">
<Grid>
<Grid.RowDefinitions>
@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
Grid.Row="1" Margin="25,0,0,0"
VerticalAlignment="Center"
IsChecked="{Binding GenerateAsyncOperations}"
Content="Generate asynchronous operations"></CheckBox>
Content="{core:Localize Dialog.AdvancedService.Client.GenerateAsyncOperations}"></CheckBox>
</Grid>
</GroupBox>

9
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
Unescape View File

@ -19,18 +19,15 @@ @@ -19,18 +19,15 @@
using System;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Windows.Media.Imaging;
using ICSharpCode.Core.Presentation;
using ICSharpCode.SharpDevelop.Widgets;
namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{
public enum Modifiers
{
//[Description("${res:Dialog.ProjectOptions.RunPostBuildEvent.Always}")]
[Description("${res:Dialog.AdvancedService.Client.AccessLevel.Public}")]
Public,
//[Description("${res:Dialog.ProjectOptions.RunPostBuildEvent.OnOutputUpdated}")]
[Description("${res:Dialog.AdvancedService.Client.AccessLevel.Internal}")]
Internal
}
@ -76,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference @@ -76,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
internal class AdvancedServiceViewModel : ViewModelBase
{
string accesslevel = "Access level for generated classes:";
string accesslevel = SD.ResourceService.GetString("Dialog.AdvancedService.Client.AccessLevelLabel");
ServiceReferenceGeneratorOptions options;
public AdvancedServiceViewModel(ServiceReferenceGeneratorOptions options)

6
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/MessageViewCategory.cs
Unescape View File

@ -138,15 +138,15 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -138,15 +138,15 @@ namespace ICSharpCode.SharpDevelop.Gui
public void AppendText(string text)
{
const int MaxTextSize = 50 * 1000 * 1000; // 50m chars = 100 MB
const string TruncatedText = "<Text was truncated because it was too long>\r\n";
string truncatedText = SD.ResourceService.GetString("MainWindow.Windows.OutputWindow.TextTooLong") + "\r\n";
lock (textBuilder) {
if (textBuilder.Length + text.Length > MaxTextSize) {
int amountToCopy = MaxTextSize / 2 - text.Length;
if (amountToCopy <= 0) {
SetText(TruncatedText + text.Substring(text.Length - MaxTextSize / 2, MaxTextSize / 2));
SetText(truncatedText + text.Substring(text.Length - MaxTextSize / 2, MaxTextSize / 2));
} else {
SetText(TruncatedText + textBuilder.ToString(textBuilder.Length - amountToCopy, amountToCopy) + text);
SetText(truncatedText + textBuilder.ToString(textBuilder.Length - amountToCopy, amountToCopy) + text);
}
} else {
textBuilder.Append(text);

2
src/Main/Base/Project/Src/Project/AbstractProject.cs
Unescape View File

@ -545,7 +545,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -545,7 +545,7 @@ namespace ICSharpCode.SharpDevelop.Project
public virtual Task<bool> BuildAsync(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IProgressMonitor progressMonitor)
{
feedbackSink.ReportError(new BuildError { ErrorText = "Building project " + Name + " is not supported.", IsWarning = true });
feedbackSink.ReportError(new BuildError { ErrorText = StringParser.Parse("${res:MainWindow.CompilerMessages.BuildingProjectIsNotSupported}", new StringTagPair("Name", Name)), IsWarning = true });
// we don't know how to build anything, report that we're done.
return Task.FromResult(true);
}

Write Preview
Loading…
Cancel
Save