Merge remote-tracking branch 'upstream/master' into a11y

3 files changed, 21 insertions, 20 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
index 15f096ced4..681c3c749f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/CustomStringTagProvider.cs
@@ -41,20 +41,20 @@ namespace MonoDevelop.Ide.Commands
 	{
 		public override IEnumerable<StringTagDescription> GetTags ()
 		{
-			yield return new StringTagDescription ("FilePath", "File Path");
-			yield return new StringTagDescription ("FileDir", "File Directory");
-			yield return new StringTagDescription ("FileName", "File Name");
-			yield return new StringTagDescription ("FileNamePrefix", "File Name Without Extension");
-			yield return new StringTagDescription ("FileExt", "File Extension");
-			yield return new StringTagDescription ("CurLine", "Cursor Line", false);
-			yield return new StringTagDescription ("CurColumn", "Cursor Column", false);
-			yield return new StringTagDescription ("CurOffset", "Cursor Offset", false);
-			yield return new StringTagDescription ("CurText", "Selected Editor Text", false);
-			yield return new StringTagDescription ("EditorText", "Editor Text", false);
-			yield return new StringTagDescription ("StartupPath", "MonoDevelop Startup Directory", false);
-			yield return new StringTagDescription ("ConfigDir", "MonoDevelop Configuration Directory", false);
-			yield return new StringTagDescription ("DataDir", "MonoDevelop User Data Directory", false);
-			yield return new StringTagDescription ("LogDir", "MonoDevelop Log Directory", false);
+			yield return new StringTagDescription ("FilePath", GettextCatalog.GetString ("File Path"));
+			yield return new StringTagDescription ("FileDir", GettextCatalog.GetString ("File Directory"));
+			yield return new StringTagDescription ("FileName", GettextCatalog.GetString ("File Name"));
+			yield return new StringTagDescription ("FileNamePrefix", GettextCatalog.GetString ("File Name Without Extension"));
+			yield return new StringTagDescription ("FileExt", GettextCatalog.GetString ("File Extension"));
+			yield return new StringTagDescription ("CurLine", GettextCatalog.GetString ("Cursor Line"), false);
+			yield return new StringTagDescription ("CurColumn", GettextCatalog.GetString ("Cursor Column"), false);
+			yield return new StringTagDescription ("CurOffset", GettextCatalog.GetString ("Cursor Offset"), false);
+			yield return new StringTagDescription ("CurText", GettextCatalog.GetString ("Selected Editor Text"), false);
+			yield return new StringTagDescription ("EditorText", GettextCatalog.GetString ("Editor Text"), false);
+			yield return new StringTagDescription ("StartupPath", GettextCatalog.GetString ("MonoDevelop Startup Directory"), false);
+			yield return new StringTagDescription ("ConfigDir", GettextCatalog.GetString ("MonoDevelop Configuration Directory"), false);
+			yield return new StringTagDescription ("DataDir", GettextCatalog.GetString ("MonoDevelop User Data Directory"), false);
+			yield return new StringTagDescription ("LogDir", GettextCatalog.GetString ("MonoDevelop Log Directory"), false);
 		}
 		
 		public override object GetTagValue (Workbench wb, string tag)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
index 128eb40283..6a5210c52e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
@@ -401,7 +401,7 @@ namespace MonoDevelop.Ide.Commands
 		{
 			var ce = IdeApp.ProjectOperations.CurrentSelectedBuildTarget as WorkspaceObject;
 			CustomCommand cmd = (CustomCommand) dataItem;
-			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ();
+			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor (cmd.Name);
 			
 			Thread t = new Thread (
 				async delegate () {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
index 26980e42ed..3fae99b2eb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
@@ -141,10 +141,10 @@ namespace MonoDevelop.Ide.Commands
 		static LayoutListHandler ()
 		{
 			NameMapping = new Dictionary<string, string> ();
-			NameMapping ["Solution"] = "Code";
-			NameMapping ["Visual Design"] = "Design";
-			NameMapping ["Debug"] = "Debug";
-			NameMapping ["Unit Testing"] = "Test";
+			NameMapping ["Solution"] = GettextCatalog.GetString ("Code");
+			NameMapping ["Visual Design"] = GettextCatalog.GetString ("Design");
+			NameMapping ["Debug"] = GettextCatalog.GetString ("Debug");
+			NameMapping ["Unit Testing"] = GettextCatalog.GetString ("Test");
 		}
 
 		protected override void Update (CommandArrayInfo info)
@@ -153,7 +153,7 @@ namespace MonoDevelop.Ide.Commands
 			foreach (var name in IdeApp.Workbench.Layouts) {
 				if (!NameMapping.TryGetValue (name, out text))
 					text = name;
-				CommandInfo item = new CommandInfo(GettextCatalog.GetString (text));
+				CommandInfo item = new CommandInfo (text);
 				item.Checked = IdeApp.Workbench.CurrentLayout == name;
 				item.Description = GettextCatalog.GetString ("Switch to layout '{0}'", name);
 				info.Add (item, name);
@@ -422,6 +422,7 @@ namespace MonoDevelop.Ide.Commands
 
 		protected override void Run ()
 		{
+			IdeApp.Workbench.ActiveDocument.Select ();
 			IdeApp.Workbench.ActiveDocument.Editor.StartCaretPulseAnimation ();
 		}