Fixed some translation issues.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1612 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

data/templates/file/SharpDevelop/AddInOptions.xft

@@ -2,13 +2,13 @@
 <Template author="Mike Krueger" version="1.0">
 	
 	<Config
-		  name        = "AddIn Options"
+		  name        = "${res:Templates.File.#Develop.AddInOptions.Name}"
 		  icon        = "C#.File.FullFile"
 		  category    = "#Develop"
 		  defaultname = "AddInOptions${Number}.cs"
 		  language    = "C#"/>
 	 
-	<Description>This class provides an easy access to persistent properties.</Description>
+	<Description>${res:Templates.File.#Develop.AddInOptions.Description}</Description>
 	
 	<!-- 
 	Special new file templates:
@@ -28,7 +28,7 @@ namespace ${StandardNamespace}
 {
 	public class AddInOptions
 	{
-		public static readonly string OptionsProperty = "${StandardNamespace}.Options";
+		public const string OptionsProperty = "${StandardNamespace}.Options";
 		
 		static Properties properties;
 		
@@ -38,8 +38,8 @@ namespace ${StandardNamespace}
 		}
 		
 		public static event PropertyChangedEventHandler PropertyChanged {
-			add    { Properties.PropertyChanged += value; }
-			remove { Properties.PropertyChanged -= value; }
+			add    { properties.PropertyChanged += value; }
+			remove { properties.PropertyChanged -= value; }
 		}
 		
 //		public static string MyStringProperty {

data/templates/file/SharpDevelop/ExampleView.xft

@@ -32,7 +32,6 @@ namespace ${StandardNamespace}
 	/// </summary>
 	public class ${FileNameWithoutExtension} : AbstractViewContent
 	{
-#region AbstractViewContent requirements
 		/// <summary>
 		/// The <see cref="System.Windows.Forms.Control"/> representing the view
 		/// </summary>
@@ -67,7 +66,7 @@ namespace ${StandardNamespace}
 		/// </summary>
 		public override void RedrawContent()
 		{
-			// TODO: Refresh the whole view control here, renew all resource strings whatever
+			// TODO: Refresh the whole view control here, renew all resource strings
 			//       Note that you do not need to recreate the control.
 		}
 		
@@ -79,7 +78,6 @@ namespace ${StandardNamespace}
 			// TODO: Clean up resources in this method
 			// Control.Dispose();
 		}
-#endregion
 	}
 	
 }

samples/NRefactoryDemo/MainForm.Designer.cs

@@ -136,7 +136,7 @@ namespace NRefactoryDemo
 			// 
 			// applyTransformation
 			// 
-			this.applyTransformation.Location = new System.Drawing.Point(25, 105);
+			this.applyTransformation.Location = new System.Drawing.Point(13, 105);
 			this.applyTransformation.Name = "applyTransformation";
 			this.applyTransformation.Size = new System.Drawing.Size(96, 23);
 			this.applyTransformation.TabIndex = 3;

samples/NRefactoryExample/WrapperGeneratorVisitor.cs

@@ -23,7 +23,7 @@ namespace NRefactoryExample
 			// add constructor accepting the wrapped object and the field holding the object
 			FieldDeclaration fd = new FieldDeclaration(null, // no attributes
 			                                           new TypeReference(typeDeclaration.Name),
-			                                           Modifier.Private);
+			                                           Modifiers.Private);
 			fd.Fields.Add(new VariableDeclaration("wrappedObject"));
 			typeDeclaration.AddChild(fd);
 			
@@ -33,7 +33,7 @@ namespace NRefactoryExample
 				typeDeclaration.Name = typeDeclaration.Name.Substring(1);
 			}
 			ConstructorDeclaration cd = new ConstructorDeclaration(typeDeclaration.Name,
-			                                                       Modifier.Public,
+			                                                       Modifiers.Public,
 			                                                       new List<ParameterDeclarationExpression>(),
 			                                                       null);
 			cd.Parameters.Add(new ParameterDeclarationExpression(fd.TypeReference,
@@ -73,11 +73,11 @@ namespace NRefactoryExample
 			base.VisitMethodDeclaration(methodDeclaration, data); // visit parameters
 			methodDeclaration.Attributes.Clear();
 			methodDeclaration.Body = new BlockStatement();
-			methodDeclaration.Modifier = Modifier.Public;
+			methodDeclaration.Modifier = Modifiers.Public;
 			
 			if (methodDeclaration.Parameters.Count > 0) {
 				ParameterDeclarationExpression lastParameter = methodDeclaration.Parameters[methodDeclaration.Parameters.Count - 1];
-				if (lastParameter.ParamModifier == ParamModifier.Out) {
+				if (lastParameter.ParamModifier == ParameterModifiers.Out) {
 					methodDeclaration.TypeReference = lastParameter.TypeReference;
 					methodDeclaration.Parameters.RemoveAt(methodDeclaration.Parameters.Count - 1);
 					
@@ -105,7 +105,7 @@ namespace NRefactoryExample
 			InvocationExpression ie = new InvocationExpression(methodName, null);
 			foreach (ParameterDeclarationExpression param in method.Parameters) {
 				Expression expr = new IdentifierExpression(param.ParameterName);
-				if (param.ParamModifier == ParamModifier.Ref) {
+				if (param.ParamModifier == ParameterModifiers.Ref) {
 					expr = new DirectionExpression(FieldDirection.Ref, expr);
 				}
 				ie.Arguments.Add(expr);

src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs

@@ -39,16 +39,16 @@ namespace ResourceEditor
 			sdialog.FileName = key;
 			
 			if (item.ResourceValue is Bitmap) {
-				sdialog.Filter 		= "Image files (*.png)|*.png";
+				sdialog.Filter 		= StringParser.Parse("${res:SharpDevelop.FileFilter.ImageFiles} (*.png)|*.png");
 				sdialog.DefaultExt 	= ".png";
 			} else if (item.ResourceValue is Icon) {
-				sdialog.Filter 		= "Icon files (*.ico)|*.ico";
+				sdialog.Filter 		= StringParser.Parse("${res:SharpDevelop.FileFilter.Icons}|*.ico");
 				sdialog.DefaultExt 	= ".ico";
 			} else if (item.ResourceValue is Cursor) {
-				sdialog.Filter 		= "Cursor files (*.cur)|*.cur";
+				sdialog.Filter 		= StringParser.Parse("${res:SharpDevelop.FileFilter.CursorFiles} (*.cur)|*.cur");
 				sdialog.DefaultExt 	= ".cur";
 			} else if (item.ResourceValue is byte[]){
-				sdialog.Filter      = "Binary files (*.*)|*.*";
+				sdialog.Filter      = StringParser.Parse("${res:SharpDevelop.FileFilter.BinaryFiles} (*.*)|*.*");
 				sdialog.DefaultExt  = ".bin";
 			} else {
 				return;

src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs

@@ -483,7 +483,9 @@ namespace ICSharpCode.StartPage
 			builder.Append(m_strMainColColor);
 			builder.Append("\" class=\"copy\"><img src=\""+ startPageLocation + "/Layout/Common/blind.gif\" width=15 height=1>");
 			builder.Append("<font size=\"-2\">");
-			builder.Append("Copyright &copy;2000-2006 <A HREF=\"mailto:webmaster@icsharpcode.net\" title=\"Contact Us\">IC#SharpCode</a>. ");
+			builder.Append("Copyright &copy;2000-2006 <A HREF=\"mailto:webmaster@icsharpcode.net\" title=\"");
+			builder.Append(StringParser.Parse("${res:StartPage.ContactUs}"));
+			builder.Append("\">IC#SharpCode</a>. ");
 			builder.Append(ICSharpCode.SharpDevelop.Gui.AboutSharpDevelopTabPage.LicenseSentence);
 			builder.Append("</font></td>\r\n");
 

src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/BaseTypesNode.cs

@@ -47,12 +47,12 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
 			sortOrder = 0;
 			this.project = project;
 			this.c       = c;
-			Text         = "Base types";
+			Text         = ResourceService.GetString("MainWindow.Windows.ClassBrowser.BaseTypes");
 			
 			OpenedIcon = "ProjectBrowser.Folder.Open";
 			ClosedIcon = "ProjectBrowser.Folder.Closed";
 			
-			Nodes.Add(new TreeNode(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode}")));
+			Nodes.Add(new TreeNode(ResourceService.GetString("ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode")));
 		}
 		
 		protected override void Initialize()

src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/DerivedTypesNode.cs

@@ -48,12 +48,12 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
 			
 			this.project = project;
 			this.c       = c;
-			Text         = "Derived types";
+			Text         = ResourceService.GetString("MainWindow.Windows.ClassBrowser.DerivedTypes");
 			
 			OpenedIcon = "ProjectBrowser.Folder.Open";
 			ClosedIcon = "ProjectBrowser.Folder.Closed";
 			
-			Nodes.Add(new TreeNode(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode}")));
+			Nodes.Add(new TreeNode(ResourceService.GetString("ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode")));
 		}
 		
 		protected override void Initialize()

src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/ReferenceFolderNode.cs

@@ -50,7 +50,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
 			OpenedIcon = "ProjectBrowser.ReferenceFolder.Open";
 			ClosedIcon = "ProjectBrowser.ReferenceFolder.Closed";
 			
-			Nodes.Add(new TreeNode(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode}")));
+			Nodes.Add(new TreeNode(ResourceService.GetString("ICSharpCode.SharpDevelop.Gui.Pads.ClassScout.LoadingNode")));
 		}
 		
 		protected override void Initialize()

src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs

@@ -126,7 +126,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 			IProject sourceProject = ProjectService.CurrentProject;
 			string targetProjectDirectory = sourceProject.Directory + ".ConvertedTo" + TargetLanguageName;
 			if (Directory.Exists(targetProjectDirectory)) {
-				MessageService.ShowMessageFormatted("${res:ICSharpCode.SharpDevelop.Commands.Convert.TargetAlreadyExists}", targetProjectDirectory);
+				MessageService.ShowMessageFormatted(translatedTitle, "${res:ICSharpCode.SharpDevelop.Commands.Convert.TargetAlreadyExists}", targetProjectDirectory);
 				return;
 			}
 			conversionLog.Append(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.SourceDirectory")).Append(": ");

src/SharpDevelop.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.1582
+# SharpDevelop 2.1.0.1602
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection