Merge remote-tracking branch 'origin/master' into main-menu-redesign

4 files changed, 23 insertions, 22 deletions

diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs
index 13e923934d..d8cee8af52 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs
@@ -31,6 +31,7 @@ using System.Collections;
 using Gtk;
 using Gdk;
 using MonoDevelop.Components.Chart;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.UnitTesting
 {
@@ -89,14 +90,14 @@ namespace MonoDevelop.UnitTesting
 			SetAutoScale (AxisDimension.Y, false, true);
 			StartY = 0;
 			
-			serieFailed = new Serie ("Failed tests");
+			serieFailed = new Serie (GettextCatalog.GetString("Failed tests"));
 			serieFailed.Color = new Cairo.Color (1, 0, 0);
-			serieSuccess = new Serie ("Successful tests");
+			serieSuccess = new Serie (GettextCatalog.GetString("Successful tests"));
 			serieSuccess.Color = new Cairo.Color (0, 0.65, 0);
-			serieIgnored = new Serie ("Ignored tests");
+			serieIgnored = new Serie (GettextCatalog.GetString("Ignored tests"));
 			serieIgnored.Color = new Cairo.Color (0.8, 0.8, 0);
 			
-			serieTime = new Serie ("Time");
+			serieTime = new Serie (GettextCatalog.GetString("Time"));
 			serieTime.Color = new Cairo.Color (0, 0, 1);
 			
 			UpdateMode ();
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs
index e09a748a95..027f8b4265 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs
@@ -161,7 +161,7 @@ namespace MonoDevelop.UnitTesting
 //			UnitTestResult res = test.GetLastResult ();
 			loc = test.SourceCodeLocation;
 			if (loc != null)
-				await IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+				await IdeApp.Workbench.OpenDocument (loc.FileName, null, loc.Line, loc.Column);
 		}
 		
 		[CommandHandler (TestCommands.GoToFailure)]
@@ -175,7 +175,7 @@ namespace MonoDevelop.UnitTesting
 			if (loc == null)
 				loc = test.SourceCodeLocation;
 			if (loc != null)
-				await IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+				await IdeApp.Workbench.OpenDocument (loc.FileName, null, loc.Line, loc.Column);
 		}
 
 		[CommandUpdateHandler (TestCommands.GoToFailure)]
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
index c207a05218..33ac16a75c 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
@@ -473,7 +473,7 @@ namespace MonoDevelop.UnitTesting
 				int line = (int)failuresStore.GetValue (iter, 4);
 				try {
 					if (file != null && File.Exists (file)) {
-						IdeApp.Workbench.OpenDocument (file, line, -1);
+						IdeApp.Workbench.OpenDocument (file, null, line, -1);
 						return;
 					}
 				} catch (Exception) {
@@ -521,7 +521,7 @@ namespace MonoDevelop.UnitTesting
 					clipboard.Text = last.StackTrace;
 					break;
 					default:
-					clipboard.Text = last.Message + Environment.NewLine + "Stack trace:" + Environment.NewLine + last.StackTrace;
+					clipboard.Text = last.Message + Environment.NewLine + GettextCatalog.GetString("Stack trace:") + Environment.NewLine + last.StackTrace;
 					break;
 				}
 			} else {
@@ -544,7 +544,7 @@ namespace MonoDevelop.UnitTesting
 					clipboard.Text = error.StackTrace;
 					break;
 				default:
-					clipboard.Text = error.Message + Environment.NewLine + "Stack trace:" + Environment.NewLine + error.StackTrace;
+					clipboard.Text = error.Message + Environment.NewLine + GettextCatalog.GetString("Stack trace:") + Environment.NewLine + error.StackTrace;
 					break;
 				}
 			}
@@ -607,7 +607,7 @@ namespace MonoDevelop.UnitTesting
 			if (loc == null)
 				loc = test.SourceCodeLocation;
 			if (loc != null) {
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+				IdeApp.Workbench.OpenDocument (loc.FileName, null, loc.Line, loc.Column);
 			} else {
 				LoggingService.LogError ("Can't get source code location for test : "+ test);
 				MessageService.ShowError (GettextCatalog.GetString ("Can't get source code location for :" + test.Name));
@@ -622,7 +622,7 @@ namespace MonoDevelop.UnitTesting
 				return;
 			SourceCodeLocation loc = test.SourceCodeLocation;
 			if (loc != null) {
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+				IdeApp.Workbench.OpenDocument (loc.FileName, null, loc.Line, loc.Column);
 			}  else {
 				LoggingService.LogError ("Can't get source code location for test : "+ test);
 				MessageService.ShowError (GettextCatalog.GetString ("Can't get source code location for :" + test.Name));
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
index 1831e69db4..8d4e500097 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
@@ -193,47 +193,47 @@ namespace MonoDevelop.UnitTesting
 					return;
 				var menu = new ContextMenu ();
 				if (unitTest.IsFixture) {
-					var menuItem = new ContextMenuItem ("_Run All");
+					var menuItem = new ContextMenuItem (GettextCatalog.GetString("_Run All"));
 					menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
 					menu.Add (menuItem);
 					if (debugModeSet != null) {
-						menuItem = new ContextMenuItem ("_Debug All");
+						menuItem = new ContextMenuItem (GettextCatalog.GetString("_Debug All"));
 						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
 						menu.Add (menuItem);
 					}
-					menuItem = new ContextMenuItem ("_Select in Test Pad");
+					menuItem = new ContextMenuItem (GettextCatalog.GetString("_Select in Test Pad"));
 					menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Select;
 					menu.Add (menuItem);
 				} else {
 					if (unitTest.TestCases.Count == 0) {
-						var menuItem = new ContextMenuItem ("_Run");
+						var menuItem = new ContextMenuItem (GettextCatalog.GetString("_Run"));
 						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
 						menu.Add (menuItem);
 						if (debugModeSet != null) {
-							menuItem = new ContextMenuItem ("_Debug");
+							menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Debug"));
 							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
 							menu.Add (menuItem);
 						}
-						menuItem = new ContextMenuItem ("_Select in Test Pad");
+						menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Select in Test Pad"));
 						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Select;
 						menu.Add (menuItem);
 					} else {
-						var menuItem = new ContextMenuItem ("_Run All");
+						var menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Run All"));
 						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
 						menu.Add (menuItem);
 						if (debugModeSet != null) {
-							menuItem = new ContextMenuItem ("_Debug All");
+							menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Debug All"));
 							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
 							menu.Add (menuItem);
 						}
 						menu.Add (new SeparatorContextMenuItem ());
 						foreach (var id in unitTest.TestCases) {
 							var submenu = new ContextMenu ();
-							menuItem = new ContextMenuItem ("_Run");
+							menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Run"));
 							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, false).Run;
 							submenu.Add (menuItem);
 							if (debugModeSet != null) {
-								menuItem = new ContextMenuItem ("_Debug");
+								menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Debug"));
 								menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, true).Run;
 								submenu.Add (menuItem);
 							}
@@ -249,7 +249,7 @@ namespace MonoDevelop.UnitTesting
 								}
 							}
 
-							menuItem = new ContextMenuItem ("_Select in Test Pad");
+							menuItem = new ContextMenuItem (GettextCatalog.GetString ("_Select in Test Pad"));
 							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, true).Select;
 							submenu.Add (menuItem);