Browse Source

Fixed various translation issues.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1927 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
6f8dff4b67
  1. BIN
      data/resources/StringResources.de.resources
  2. 2
      src/AddIns/Misc/CodeAnalysis/Src/AnalysisProjectOptions.cs
  3. 2
      src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
  4. 2
      src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
  5. 6
      src/Libraries/ICSharpCode.Build.Tasks/Project/FxCop.cs
  6. 4
      src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkPath.cs
  7. 2
      src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkSdkPath.cs
  8. 1
      src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj
  9. 61
      src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs
  10. 14
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
  11. 14
      src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs
  12. 10
      src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs
  13. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

BIN
data/resources/StringResources.de.resources

Binary file not shown.

2
src/AddIns/Misc/CodeAnalysis/Src/AnalysisProjectOptions.cs

@ -404,7 +404,7 @@ namespace ICSharpCode.CodeAnalysis @@ -404,7 +404,7 @@ namespace ICSharpCode.CodeAnalysis
ed.ManualOrder = false;
ed.BrowseForDirectory = true;
ed.AutoAddAfterBrowse = true;
ed.TitleText = "${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}";
ed.TitleText = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}");
ed.LoadList(GetRuleAssemblyList(false));
FlowLayoutPanel p = new FlowLayoutPanel();

2
src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin

@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
<DialogPanel id="ComponentInspectorOptions"
label="Component Inspector"
label="${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}"
insertafter="CodingOptions"
insertbefore="TextEditorOptions">
<DialogPanel id="GeneralOptionsPanel"

2
src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs

@ -75,7 +75,7 @@ namespace ICSharpCode.ComponentInspector.AddIn @@ -75,7 +75,7 @@ namespace ICSharpCode.ComponentInspector.AddIn
public override string TitleName {
get {
return "Component Inspector";
return "${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}";
}
set {
}

6
src/Libraries/ICSharpCode.Build.Tasks/Project/FxCop.cs

@ -83,11 +83,11 @@ namespace ICSharpCode.Build.Tasks @@ -83,11 +83,11 @@ namespace ICSharpCode.Build.Tasks
{
if (string.IsNullOrEmpty(ToolPath)) {
string path = FindFxCopPath();
Log.LogMessage(MessageImportance.High, "Running Code Analysis...");
Log.LogMessage(MessageImportance.High, Resources.RunningCodeAnalysis);
if (path != null) {
ToolPath = path;
} else {
Log.LogError("SharpDevelop cannot find FxCop. Please specify the MSBuild property 'FxCopDir'.");
Log.LogError(Resources.CannotFindFxCop);
return false;
}
}
@ -122,7 +122,7 @@ namespace ICSharpCode.Build.Tasks @@ -122,7 +122,7 @@ namespace ICSharpCode.Build.Tasks
result &= LogMessage(el);
}
} catch (XmlException e) {
Log.LogError("Cannot read FxCop log file: " + e.Message);
Log.LogError(Resources.CannotReadFxCopLogFile + " " + e.Message);
}
}
return result;

4
src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkPath.cs

@ -53,7 +53,7 @@ namespace ICSharpCode.Build.Tasks @@ -53,7 +53,7 @@ namespace ICSharpCode.Build.Tasks
System.Diagnostics.Debug.WriteLine("MonoFrameworkPath: " + path);
return true;
}
Log.LogError("Mono is not installed.");
Log.LogError(Resources.MonoIsNotInstalled);
return false;
}
@ -75,7 +75,7 @@ namespace ICSharpCode.Build.Tasks @@ -75,7 +75,7 @@ namespace ICSharpCode.Build.Tasks
} else if (frameworkVersion == TargetMonoFrameworkVersion20) {
return TargetMonoFrameworkVersion.Version20;
}
throw new ArgumentException(String.Concat("Unknown Target Mono Framework Version: ", frameworkVersion));
throw new ArgumentException(Resources.UnknownTargetMonoFrameworkVersion + " " + frameworkVersion);
}
}
}

2
src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkSdkPath.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.Build.Tasks @@ -39,7 +39,7 @@ namespace ICSharpCode.Build.Tasks
System.Diagnostics.Debug.WriteLine("MonoSdk: " + path);
return true;
}
Log.LogError("Mono is not installed.");
Log.LogError(Resources.MonoIsNotInstalled);
return false;
}

1
src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj

@ -85,6 +85,7 @@ @@ -85,6 +85,7 @@
<Compile Include="MonoBasicCompilerResultsParser.cs" />
<Compile Include="MonoCSharpCompilerTask.cs" />
<Compile Include="FxCop.cs" />
<Compile Include="Resources.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="SharpDevelop.Build.CSharp.targets">

61
src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs

@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
namespace ICSharpCode.Build.Tasks
{
internal static class Resources
{
public static string MonoIsNotInstalled {
get { return GetTranslation("${res:ICSharpCode.Build.MonoIsNotInstalled}")
?? "Mono is not installed."; }
}
public static string UnknownTargetMonoFrameworkVersion {
get { return GetTranslation("${res:ICSharpCode.Build.UnknownTargetMonoFrameworkVersion}")
?? "Unknown Target Mono Framework Version:"; }
}
public static string RunningCodeAnalysis {
get { return GetTranslation("${res:ICSharpCode.Build.RunningCodeAnalysis}")
?? "Running Code Analysis..."; }
}
public static string CannotFindFxCop {
get { return GetTranslation("${res:ICSharpCode.Build.CannotFindFxCop}")
?? "SharpDevelop cannot find FxCop. Please specify the MSBuild property 'FxCopDir'."; }
}
public static string CannotReadFxCopLogFile {
get { return GetTranslation("${res:ICSharpCode.Build.CannotReadFxCopLogFile}")
?? "Cannot read FxCop log file:"; }
}
static bool initialized;
static Type resourceService;
static string GetTranslation(string key)
{
if (!initialized) {
initialized = true;
try {
resourceService = Type.GetType("ICSharpCode.Core.StringParser, ICSharpCode.Core");
} catch {}
}
if (resourceService != null) {
const BindingFlags flags = BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static;
return (string)resourceService.InvokeMember("Parse", flags, null, null, new object[] { key });
} else {
return null;
}
}
}
}

14
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs

@ -32,14 +32,24 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -32,14 +32,24 @@ namespace ICSharpCode.SharpDevelop.Gui
ToolStripContainer toolStripContainer;
AutoHideMenuStripContainer mainMenuContainer;
AutoHideStatusStripContainer statusStripContainer;
static bool firstTimeError = true; // TODO: Debug statement only, remove me
public IWorkbenchWindow ActiveWorkbenchwindow {
get {
if (dockPanel == null || dockPanel.ActiveDocument == null) {
if (dockPanel == null) {
return null;
}
// TODO: Debug statements only, remove me
if (dockPanel.ActiveDocument != null && !(dockPanel.ActiveDocument is IWorkbenchWindow)) {
if (firstTimeError) {
MessageBox.Show("ActiveDocument was " + dockPanel.ActiveDocument.GetType().FullName);
firstTimeError = false;
}
}
IWorkbenchWindow window = dockPanel.ActiveDocument as IWorkbenchWindow;
if (window.IsDisposed) {
if (window == null || window.IsDisposed) {
return null;
}
return window;

14
src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs

@ -32,7 +32,10 @@ namespace ICSharpCode.SharpDevelop @@ -32,7 +32,10 @@ namespace ICSharpCode.SharpDevelop
};
HostCallback.BeginAssemblyLoad = delegate(string shortName) {
StatusBarService.ProgressMonitor.BeginTask("Loading " + shortName + "...", 100);
StatusBarService.ProgressMonitor.BeginTask(
StringParser.Parse("${res:ICSharpCode.SharpDevelop.LoadingFile}", new string[,] {{"Filename", shortName}}),
100
);
};
HostCallback.FinishAssemblyLoad = StatusBarService.ProgressMonitor.Done;
@ -45,9 +48,12 @@ namespace ICSharpCode.SharpDevelop @@ -45,9 +48,12 @@ namespace ICSharpCode.SharpDevelop
static void ShowAssemblyLoadError(string fileName, string include, string message)
{
WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
TaskService.BuildMessageViewCategory.AppendText("Error loading code-completion information for "
+ include + " from " + fileName
+ ":\r\n" + message + "\r\n");
TaskService.BuildMessageViewCategory.AppendText(
StringParser.Parse(
"${res:ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation}",
new string[,] { {"Assembly", include}, {"Filename", fileName}}
) + "\r\n" + message + "\r\n"
);
}
}
}

10
src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs

@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
if (c == null) {
ShowUnknownSymbolError();
} else if (c.CompilationUnit.FileName == null) {
MessageService.ShowMessage("The type cannot be renamed because it is not defined in user code.");
ShowNoUserCodeError();
} else {
FindReferencesAndRenameHelper.RenameClass(c);
}
@ -133,7 +133,11 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -133,7 +133,11 @@ namespace ICSharpCode.SharpDevelop.Refactoring
static void ShowUnknownSymbolError()
{
MessageService.ShowMessage("The element at the caret position cannot be renamed.");
MessageService.ShowMessage("${res:SharpDevelop.Refactoring.CannotRenameElement}");
}
static void ShowNoUserCodeError()
{
MessageService.ShowMessage("${res:SharpDevelop.Refactoring.CannotRenameBecauseNotUserCode}");
}
static void Rename(IMember member)
@ -141,7 +145,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -141,7 +145,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
if (member == null) {
ShowUnknownSymbolError();
} else if (member.DeclaringType.CompilationUnit.FileName == null) {
MessageService.ShowMessage("The member cannot be renamed because it is not defined in user code.");
ShowNoUserCodeError();
} else {
FindReferencesAndRenameHelper.RenameMember(member);
}

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

Binary file not shown.
Loading…
Cancel
Save