Browse Source

Added some strings to the translation database (mostly message box texts in the Subversion AddIn).

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3821 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
9ca580024d
  1. 4
      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.fr.resources
  6. BIN
      data/resources/StringResources.nl.resources
  7. BIN
      data/resources/StringResources.no.resources
  8. 2
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.addin
  9. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj
  10. 6
      src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin
  11. 2
      src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
  12. 16
      src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs
  13. 14
      src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs
  14. 1
      src/Main/Base/Project/Src/Gui/Dialogs/AddOpenWithEntryDialog.Designer.cs
  15. 3
      src/Main/Base/Project/Src/Gui/Dialogs/OpenWithDialog.Designer.cs
  16. 1
      src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs
  17. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

4
AddIns/ICSharpCode.SharpDevelop.addin

@ -2233,8 +2233,8 @@ @@ -2233,8 +2233,8 @@
<Condition name = "ProjectItem" itemType = "EmbeddedResource">
<CustomProperty id = "EmbeddedResourceLogicalName"
name = "LogicalName"
displayName = "Logical Name"
description = "The name of the embedded resource. If left empty, the name is automatically generated." />
displayName = "${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.LogicalName}"
description = "${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.LogicalName.Description}" />
</Condition>
</Path>
</AddIn>

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.fr.resources

Binary file not shown.

BIN
data/resources/StringResources.nl.resources

Binary file not shown.

BIN
data/resources/StringResources.no.resources

Binary file not shown.

2
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.addin

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectActions">
<MenuItem id = "ShowClassDiagram"
label = "Show Class Diagram"
label = "${res:AddIns.ClassDiagram.ShowClassDiagram}"
class = "ClassDiagramAddin.ShowClassDiagramCommand"
icon = "ClassDiagram.ShowClassDiagram"/>
</Path>

2
src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj

@ -170,4 +170,4 @@ @@ -170,4 +170,4 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<Import Project="PostBuildEvent.proj" />
</Project>
</Project>

6
src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin

@ -23,20 +23,20 @@ @@ -23,20 +23,20 @@
<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
<DialogPanel id = "SourceAnalysis"
label = "Source Analysis"
label = "${res:AddIns.SourceAnalysis.Title}"
class = "MattEverson.SourceAnalysis.AnalysisProjectOptionsPanel"/>
</Path>
<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectActions">
<MenuItem id = "CheckWithStyleCop"
label = "Check with StyleCop"
label = "${res:AddIns.SourceAnalysis.CheckWithStyleCop}"
class = "MattEverson.SourceAnalysis.CheckCurrentProjectCommand"/>
</Path>
<!-- Options panel -->
<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
<DialogPanel id = "SourceAnalysisOptionPanel"
label = "Source Analysis"
label = "${res:AddIns.SourceAnalysis.Title}"
class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"/>
</Path>
</AddIn>

2
src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin

@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
class = "ICSharpCode.Svn.Commands.RevisionGraphCommand"/>
<MenuItem id = "Sep1" type = "Separator"/>
<MenuItem id = "SvnUpdate"
label = "Update"
label = "${res:AddIns.Subversion.Update}"
icon = "Svn.Update"
class = "ICSharpCode.Svn.Commands.UpdateCommand"/>
<MenuItem id = "SvnUpdateToRev"

16
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs

@ -237,10 +237,10 @@ namespace ICSharpCode.Svn.Commands @@ -237,10 +237,10 @@ namespace ICSharpCode.Svn.Commands
if (ex.ErrorCode == CannotDeleteFileWithLocalModifications
|| ex.ErrorCode == CannotDeleteFileNotUnderVersionControl)
{
if (MessageService.ShowCustomDialog("Delete directory",
"Error deleting " + fullName + ":\n" +
if (MessageService.ShowCustomDialog("${res:AddIns.Subversion.DeleteDirectory}",
StringParser.Parse("${res:AddIns.Subversion.ErrorDelete}:\n", new string[,] { { "File", fullName } }) +
ex.Message, 0, 1,
"Force delete", "${res:Global.CancelButtonText}")
"${res:AddIns.Subversion.ForceDelete}", "${res:Global.CancelButtonText}")
== 0)
{
try {
@ -281,7 +281,7 @@ namespace ICSharpCode.Svn.Commands @@ -281,7 +281,7 @@ namespace ICSharpCode.Svn.Commands
break;
case StatusKind.Modified:
case StatusKind.Replaced:
if (MessageService.AskQuestion("The file has local modifications. Do you really want to remove it?")) {
if (MessageService.AskQuestion("${res:AddIns.Subversion.RevertLocalModifications}")) {
// modified files cannot be deleted, so we need to revert the changes first
client.Revert(new string[] { fullName }, e.IsDirectory ? Recurse.Full : Recurse.None);
} else {
@ -291,7 +291,7 @@ namespace ICSharpCode.Svn.Commands @@ -291,7 +291,7 @@ namespace ICSharpCode.Svn.Commands
break;
case StatusKind.Added:
if (status.Copied) {
if (!MessageService.AskQuestion("The file has just been moved to this location, do you really want to remove it?")) {
if (!MessageService.AskQuestion("${res:AddIns.Subversion.RemoveMovedFile}")) {
e.Cancel = true;
return;
}
@ -299,7 +299,7 @@ namespace ICSharpCode.Svn.Commands @@ -299,7 +299,7 @@ namespace ICSharpCode.Svn.Commands
client.Revert(new string[] { fullName }, e.IsDirectory ? Recurse.Full : Recurse.None);
return;
default:
MessageService.ShowError("The file/directory cannot be removed because it is in subversion status '" + status.TextStatus + "'.");
MessageService.ShowErrorFormatted("${res:AddIns.Subversion.CannotRemoveError}", status.TextStatus.ToString());
e.Cancel = true;
return;
}
@ -333,7 +333,7 @@ namespace ICSharpCode.Svn.Commands @@ -333,7 +333,7 @@ namespace ICSharpCode.Svn.Commands
// copy without problem
break;
default:
MessageService.ShowError("The file/directory cannot be copied because it is in subversion status '" + status.TextStatus + "'.");
MessageService.ShowErrorFormatted("${res:AddIns.Subversion.CannotCopyError}", status.TextStatus.ToString());
e.Cancel = true;
return;
}
@ -371,7 +371,7 @@ namespace ICSharpCode.Svn.Commands @@ -371,7 +371,7 @@ namespace ICSharpCode.Svn.Commands
// rename without problem
break;
default:
MessageService.ShowError("The file/directory cannot be renamed because it is in subversion status '" + status.TextStatus + "'.");
MessageService.ShowErrorFormatted("${res:AddIns.Subversion.CannotMoveError}", status.TextStatus.ToString());
e.Cancel = true;
return;
}

14
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs

@ -43,13 +43,11 @@ namespace ICSharpCode.Svn.Commands @@ -43,13 +43,11 @@ namespace ICSharpCode.Svn.Commands
}
}
if (unsavedFiles.Count > 0) {
// TODO: Translate
if (MessageService.ShowCustomDialog(
MessageService.DefaultMessageBoxTitle,
"The version control operation would affect files with unsaved modifications.\n" +
"You have to save those files before running the operation.",
"${res:AddIns.Subversion.SVNRequiresSavingFiles}",
0, 1,
"Save files", "Cancel")
"${res:AddIns.Subversion.SaveFiles}", "${res:Global.CancelButtonText}")
== 0)
{
// Save
@ -155,11 +153,9 @@ namespace ICSharpCode.Svn.Commands @@ -155,11 +153,9 @@ namespace ICSharpCode.Svn.Commands
// if at least one project was changed:
if (MessageService.ShowCustomDialog(
MessageService.DefaultMessageBoxTitle,
"SharpDevelop detected that the version control operation changed " +
"project files.\n" +
"You should reload the solution.",
"${res:AddIns.Subversion.ReloadSolutionAfterProjectChanges}",
0, 1,
"Reload solution", "Keep old solution open")
"${res:AddIns.Subversion.ReloadSolution}", "${res:AddIns.Subversion.KeepOldSolution}")
== 0)
{
ProjectService.LoadSolution(solution.FileName);
@ -260,7 +256,7 @@ namespace ICSharpCode.Svn.Commands @@ -260,7 +256,7 @@ namespace ICSharpCode.Svn.Commands
}
}
client.SetPropertyValue(Path.GetDirectoryName(filename), "svn:ignore", b.ToString());
MessageService.ShowMessage(shortFileName + " was removed from the ignore list.");
MessageService.ShowMessageFormatted("${res:AddIns.Subversion.ItemRemovedFromIgnoreList}", shortFileName);
watcher.Callback();
}
}

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

@ -129,6 +129,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -129,6 +129,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.Controls.Add(this.label1);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(225, 140);
this.Name = "AddOpenWithEntryDialog";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

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

@ -138,10 +138,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -138,10 +138,9 @@ namespace ICSharpCode.SharpDevelop.Gui
this.Controls.Add(this.addButton);
this.Controls.Add(this.programListBox);
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(292, 186);
this.MinimumSize = new System.Drawing.Size(292, 196);
this.Name = "OpenWithDialog";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

1
src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs

@ -371,6 +371,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -371,6 +371,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
public string CreateProject(ProjectCreateInformation projectCreateInformation)
{
LoggingService.Info("Creating project from template '" + this.Category + "/" + this.Subcategory + "/" + this.Name + "'");
if (wizardpath != null) {
Properties customizer = new Properties();
customizer.Set("ProjectCreateInformation", projectCreateInformation);

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

Binary file not shown.
Loading…
Cancel
Save