Fix warnings shown by MonoDevelop.Analyzers (#6657)

* [Core] Name is already localized

* Fix up invalid GettextCatalog.GetString calls or optimize them

* Optimize SignatureHelpParameterHintingData appends

* Fix extra allocatins in appends found by string append analyzer

24 files changed, 64 insertions, 36 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
index 2caeb0f648..59c75a96bd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
@@ -716,7 +716,8 @@ namespace MonoDevelop.CSharp.Refactoring
 						var name = Enum.GetName (p.ExplicitDefaultValue.GetType (), p.ExplicitDefaultValue);
 						if (name != null) {
 							AppendReturnType (result, options, p.Type);
-							result.Append ("." + name);
+							result.Append (".");
+							result.Append (name);
 						} else {
 							result.Append ("(");
 							AppendReturnType (result, options, p.Type);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
index 8f0f0bb29e..f64f56e204 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
@@ -84,7 +84,9 @@ namespace MonoDevelop.SourceEditor
 
 			var formatter = ctx.RoslynWorkspace.Services.GetLanguageServices (model.Language).GetService<IDocumentationCommentFormattingService> ();
 			var documentation = symbol.GetDocumentationParts (model, caretOffset, formatter, cancellationToken);
-			sb.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+			sb.Append ("<span font='");
+			sb.Append (FontService.SansFontName);
+			sb.Append("' size='small'>");
 
 			if (documentation != null && documentation.Any ()) {
 				sb.AppendLine ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
index 9ef7ed1c24..3fc792ccb1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
@@ -1844,7 +1844,7 @@ namespace MonoDevelop.CSharp
 				if (arrayType.Rank == 1)
 					result.Append ("index");
 				else
-					result.Append ("i").Append (i + 1);
+					result.Append ("i").Append ((i + 1).ToString ());
 				if (doHighightParameter)
 					result.Append ("</u>");
 			}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
index 233d6e4c35..dc90bb5ca3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
@@ -173,7 +173,9 @@ namespace MonoDevelop.Ide.Completion.Presentation
 			}

 			else {
 				markup.AppendTaggedText (theme, taggedParts.Take (i));
-				markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+				markup.Append ("<span font='");

+				markup.Append (FontService.SansFontName);

+				markup.Append ("' size='small'>");
 				markup.AppendLine ();
 				markup.AppendLine ();
 				markup.AppendTaggedText (theme, taggedParts.Skip (i + 1), 0, 50);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
index a584b497be..2bc932d588 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
@@ -395,10 +395,9 @@ namespace XmlDocIdLib
 
             if (tpType.GenericParameters.Count > 0)
             {
-                CurrPath.Append(
-                    tpType.Namespace +
-                    ((CanAppendSpecialExplicitChar() && ExplicitMode) ? "#" : ".") +
-                    StripGenericName(tpType.Name));
+                CurrPath.Append(tpType.Namespace)
+					.Append ((CanAppendSpecialExplicitChar () && ExplicitMode) ? "#" : ".")
+					.Append(StripGenericName(tpType.Name));
 
                 // list parameters or types
                 bool firstAppend = true;
diff --git a/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs b/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
index e61eb4635d..8fa40ae4cb 100644
--- a/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
+++ b/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
@@ -117,7 +117,8 @@ namespace MonoDevelop.Autotools
 				foreach (string s in list)
 					sb.AppendFormat (" \\\n\t{0}", s);
 			} else if (list.Count == 1) {
-				sb.Append (" " + list [0]);
+				sb.Append (" ");
+				sb.Append (list [0]);
 			}
 
 			return sb.ToString ();
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
index 1f91abddaf..d1e5822717 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
@@ -325,7 +325,7 @@ namespace MonoDevelop.UnitTesting
 					if (foundTest != null)
 						RunTest (foundTest);
 					else
-						UnitTestService.ReportExecutionError (GettextCatalog.GetString ($"Unit test '{testCase}' could not be loaded."));
+						UnitTestService.ReportExecutionError (GettextCatalog.GetString ("Unit test '{0}' could not be loaded.", testCase));
 				}
 
 				internal void Select (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
index acaa0eec15..14c9492527 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
@@ -64,7 +64,9 @@ namespace MonoDevelop.WebReferences
 		/// <returns>An XmlDocument containing the generated xml for the specified discovery document.</returns>
 		public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
 		{
-			text.Append ("<big><b>" + GettextCatalog.GetString ("Web Service References") + "</b></big>\n\n");
+			text.Append ("<big><b>")
+				.Append (GettextCatalog.GetString ("Web Service References"))
+				.Append ("</b></big>\n\n");
 			foreach (object oref in doc.References)
 			{

 				var dref = oref as DiscoveryReference;

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs
index 355adfb22f..71ca5a9350 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs
@@ -72,7 +72,7 @@ namespace MonoDevelop.Projects.Extensions
 		public PolicySet Set {
 			get {
 				if (polSet == null) {
-					polSet = new PolicySet (Id, MonoDevelop.Core.GettextCatalog.GetString (name));
+					polSet = new PolicySet (Id, name);
 					polSet.Visible = visible;
 					polSet.AllowDiffSerialize = allowDiffSerialize;
 					foreach (PolicyResourceNode res in ChildNodes) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs
index a6639df494..3a30610968 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs
@@ -129,7 +129,9 @@ namespace MonoDevelop.Ide.CodeCompletion
 			}
 
 			if (documentation.Count > 0) {
-				markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+				markup.Append ("<span font='");
+				markup.Append (FontService.SansFontName);
+				markup.Append ("' size='small'>");
 				markup.AppendLine ();
 				markup.AppendLine ();
 				markup.AppendTaggedText (theme, documentation, 0, MaxParamColumnCount);
@@ -146,7 +148,9 @@ namespace MonoDevelop.Ide.CodeCompletion
 						LoggingService.LogError ("Error while getting parameter documentation", e);
 					}
 					if (documentation.Count > 0) {
-						markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+						markup.Append ("<span font='");
+						markup.Append (FontService.SansFontName);
+						markup.Append ("' size='small'>");
 						markup.AppendLine ();
 						markup.AppendLine ();
 						markup.Append ("<b>");
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeDialog.cs
index c74a3371fc..889c467e13 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeDialog.cs
@@ -114,7 +114,7 @@ namespace MonoDevelop.Ide.Execution
 					cdata = data.GetCommandData (customizer.Id);
 				Gtk.Widget w = e.Load (ctx, cdata);
 				w.Show ();
-				notebook.AppendPage (w, new Gtk.Label (GettextCatalog.GetString (customizer.Name)));
+				notebook.AppendPage (w, new Gtk.Label (customizer.Name));
 			}
 			
 			ParameterizedExecutionHandler handler = mode.ExecutionHandler as ParameterizedExecutionHandler;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
index 4dc229e283..98c0d235fb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
@@ -604,7 +604,7 @@ namespace MonoDevelop.Ide.Execution
 	{
 		IExecutionCommandCustomizer customizer;
 		
-		[NodeAttribute ("_name")]
+		[NodeAttribute ("_name", Localizable=true)]
 		string name;
 		
 		protected override void Read (Mono.Addins.NodeElement elem)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
index a3c16ccd05..1c8861c3d2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
@@ -74,7 +74,7 @@ namespace MonoDevelop.Ide.Fonts
 
 			foreach (var desc in FontService.FontDescriptions) {
 				selectedFonts [desc.Name] = FontService.GetUnderlyingFontName (desc.Name);
-				var fontNameLabel = new Label (GettextCatalog.GetString (desc.DisplayName));
+				var fontNameLabel = new Label (desc.DisplayName);
 				fontNameLabel.Justify = Justification.Left;
 				fontNameLabel.Xalign = 0;
 				mainBox.PackStart (fontNameLabel, false, false, 0);
@@ -82,7 +82,7 @@ namespace MonoDevelop.Ide.Fonts
 				var setFontButton = new Button ();
 				setFontButton.Label = FontService.FilterFontName (GetFont (desc.Name));
 
-				var descStr = GettextCatalog.GetString ("Set the font options for {0}", GettextCatalog.GetString (desc.DisplayName));
+				var descStr = GettextCatalog.GetString ("Set the font options for {0}", desc.DisplayName);
 				setFontButton.Accessible.Description = descStr;
 				setFontButton.Clicked += delegate {
 					var selectionDialog = new FontSelectionDialog (GettextCatalog.GetString ("Select Font")) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontDescriptionCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontDescriptionCodon.cs
index 0148e1658e..004ac07aa3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontDescriptionCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontDescriptionCodon.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.Ide.Fonts
 			}
 		}
 		
-		[NodeAttribute("_displayName", "Name of the font displayed to the user.")]
+		[NodeAttribute("_displayName", "Name of the font displayed to the user.", Localizable=true)]
 		string displayName;
 		public string DisplayName {
 			get {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
index 97fad822ff..cea4114b08 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
@@ -767,7 +767,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 					nb.InsertPage (box, blab, -1);
 				}
 				foreach (PanelInstance pi in tabPanels) {
-					Gtk.Label lab = new Gtk.Label (GettextCatalog.GetString (pi.Node.Label));
+					Gtk.Label lab = new Gtk.Label (pi.Node.Label);
 					lab.Show ();
 					Gtk.Alignment a = new Alignment (0, 0, 1, 1);
 					a.BorderWidth = 9;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index a65a2b870c..9c52e25224 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -503,7 +503,7 @@ namespace MonoDevelop.Ide.Gui
 		void RegisterPad (PadCodon content)
 		{
 			if (content.HasId) {
-				string lab = content.Label.Length > 0 ? GettextCatalog.GetString (content.Label) : "";
+				string lab = content.Label.Length > 0 ? content.Label : "";
 				ActionCommand cmd = new ActionCommand ("Pad|" + content.PadId, lab, null);
 				cmd.DefaultHandler = new PadActivationHandler (this, content);
 				cmd.Category = GettextCatalog.GetString ("View (Pads)");
@@ -1498,7 +1498,7 @@ namespace MonoDevelop.Ide.Gui
 			string location = ToDockLocation (placement);
 			
 			DockItem item = dock.AddItem (padCodon.PadId);
-			item.Label = GettextCatalog.GetString (padCodon.Label);
+			item.Label = padCodon.Label;
 			item.Icon = ImageService.GetIcon (padCodon.Icon).WithSize (IconSize.Menu);
 			item.DefaultLocation = location;
 			item.DefaultVisible = false;
@@ -1536,10 +1536,10 @@ namespace MonoDevelop.Ide.Gui
 			PadCodon codon = padCodons [window];
 			DockItem item = GetDockItem (codon);
 			if (item != null) {
-				string windowTitle = GettextCatalog.GetString (window.Title);
+				string windowTitle = window.Title;
 				var windowIcon = ImageService.GetIcon (window.Icon).WithSize (IconSize.Menu);
 				if (String.IsNullOrEmpty (windowTitle)) 
-					windowTitle = GettextCatalog.GetString (codon.Label);
+					windowTitle = codon.Label;
 				if (window.HasErrors && !window.ContentVisible) {
 					windowTitle = "<span foreground='" + Styles.ErrorForegroundColor.ToHexString (false) + "'>" + windowTitle + "</span>";
 					windowIcon = windowIcon.WithStyles ("error");
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
index 87cb6f5e54..d8b48d2615 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
@@ -149,7 +149,7 @@ namespace MonoDevelop.Ide.Gui
 		{
 			this.workbench = workbench;
 			this.codon = codon;
-			this.title = GettextCatalog.GetString (codon.Label);
+			this.title = codon.Label;
 			this.icon = codon.Icon;
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
index fcc5b2426c..6c8eb48f7a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
@@ -176,7 +176,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 				IMimeTypePolicyOptionsPanel panel = (IMimeTypePolicyOptionsPanel) node.CreateInstance (typeof(IMimeTypePolicyOptionsPanel));
 				panel.Initialize (ParentDialog, DataObject);
 				panel.InitializePolicy (policyContainer, defaultPolicyContainer, mimeType, mimeType == node.MimeType);
-				panel.Label = GettextCatalog.GetString (node.Label);
+				panel.Label = node.Label;
 				if (!panel.IsVisible ())
 					continue;
 				
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs
index dd01c1279d..46faffd4e3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs
@@ -36,7 +36,7 @@ namespace MonoDevelop.Ide.Projects
 			HasSeparator = true;
 			this.Build ();
 			radioCopy.Active = true;
-			labelTitle.Markup = GettextCatalog.GetString (labelTitle.Text, "<b>" + GLib.Markup.EscapeText (file) + "</b>");
+			labelTitle.Markup = string.Format (labelTitle.Text, "<b>" + GLib.Markup.EscapeText (file) + "</b>");
 			Resizable = false;
 			buttonOk.GrabFocus ();
 		}
@@ -47,7 +47,7 @@ namespace MonoDevelop.Ide.Projects
 			string here = "." + System.IO.Path.DirectorySeparatorChar;
 			if (!dir.StartsWith (here))
 				dir = here + dir;
-			labelKeep.Markup = GettextCatalog.GetString (labelKeep.LabelProp, dir);
+			labelKeep.Markup = string.Format (labelKeep.LabelProp, dir);
 			radioKeep.Active = true;
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
index e1c784cb94..24717e2c89 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
@@ -384,7 +384,7 @@ namespace MonoDevelop.Ide.Projects
 			eventBox.ShowAll ();

 

 			return new EventBoxTooltip (eventBox) {

-				ToolTip = GettextCatalog.GetString (tooltipText),

+				ToolTip = tooltipText,

 				Severity = TaskSeverity.Information

 			};

 		}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
index 7d5fb442c4..27c99ec8cd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
@@ -855,7 +855,7 @@ namespace MonoDevelop.Ide.Projects
 			
 			public void Add (TemplateItem templateItem)
 			{
-				string name = GLib.Markup.EscapeText (GettextCatalog.GetString (templateItem.Name));
+				string name = GLib.Markup.EscapeText (templateItem.Name);
 				if (!string.IsNullOrEmpty (templateItem.Language))
 					name += "\n<span foreground='darkgrey'><small>" + templateItem.Language + "</small></span>";
 				string icon = templateItem.Template.Icon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
index 60476127d6..2aaed15542 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
@@ -32,6 +32,7 @@ using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
+using System.Runtime.CompilerServices;
 
 namespace MonoDevelop.Ide.Tasks
 {	
@@ -63,7 +64,21 @@ namespace MonoDevelop.Ide.Tasks
 		bool solutionLoaded = false;
 		bool updating;
 		string[] priorities = { GettextCatalog.GetString ("High"), GettextCatalog.GetString ("Normal"), GettextCatalog.GetString ("Low")};
-		
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		static int GetEnumIndex(TaskPriority priority)
+		{
+			switch (priority) {
+			case TaskPriority.High:
+				return 0;
+			case TaskPriority.Normal:
+				return 1;
+			case TaskPriority.Low:
+			default:
+				return 2;
+			}
+		}
+
 		public UserTasksView ()
 		{
 			highPrioColor = StringToColor (IdeApp.Preferences.UserTasksHighPrioColor);
@@ -169,7 +184,8 @@ namespace MonoDevelop.Ide.Tasks
 
 			store.Clear ();
 			foreach (TaskListEntry task in TaskService.UserTasks) {
-				store.AppendValues (GettextCatalog.GetString (Enum.GetName (typeof (TaskPriority), task.Priority)), task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold);
+				var text = priorities [GetEnumIndex (task.Priority)];
+				store.AppendValues (text, task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold);
 			}
 			ValidateButtons ();
 		}
@@ -209,7 +225,8 @@ namespace MonoDevelop.Ide.Tasks
 			updating = true;
 			TaskService.UserTasks.Add (task);
 			updating = false;
-			TreeIter iter = store.AppendValues (GettextCatalog.GetString (Enum.GetName (typeof (TaskPriority), task.Priority)), task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold);
+			var text = priorities [GetEnumIndex (task.Priority)];
+			TreeIter iter = store.AppendValues (text, task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold);
 			view.Selection.SelectIter (sortModel.ConvertChildIterToIter (iter));
 			TreePath sortedPath = sortModel.ConvertChildPathToPath (store.GetPath (iter));
 			view.ScrollToCell (sortedPath, view.Columns[(int)Columns.Description], true, 0, 0);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
index 4ff818b7cb..9ac23c21f7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
@@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.WelcomePage
 			UpdateStyle ();
 
 			VisibleWindow = false;
-			this.Text = GettextCatalog.GetString (title);
+			this.Text = title;
 			this.actionLink = href;
 			if (!string.IsNullOrEmpty (iconResource)) {
 				imageHover = Xwt.Drawing.Image.FromResource (iconResource);
diff --git a/main/tests/UnitTests/Util.cs b/main/tests/UnitTests/Util.cs
index d52ae10485..0a0981062c 100644
--- a/main/tests/UnitTests/Util.cs
+++ b/main/tests/UnitTests/Util.cs
@@ -159,12 +159,12 @@ namespace UnitTests
 				break;
 			case XmlNodeType.Attribute:
 				if (nod.LocalName == "xmlns" && nod.NamespaceURI == "http://www.w3.org/2000/xmlns/") return;
-				sb.Append (" " + nod.NamespaceURI + ":" + nod.LocalName + "='" + nod.Value + "'");
+				sb.Append (" ").Append (nod.NamespaceURI).Append (":").Append (nod.LocalName).Append ("='").Append (nod.Value).Append ("'");
 				break;
 
 			case XmlNodeType.Element:
 				XmlElement elem = (XmlElement) nod;
-				sb.Append ("<" + elem.NamespaceURI + ":" + elem.LocalName);
+				sb.Append ("<").Append (elem.NamespaceURI).Append (":").Append (elem.LocalName);
 
 				ArrayList ats = new ArrayList ();
 				foreach (XmlAttribute at in elem.Attributes)