Merge branch 'master' into dotnetcore2

Conflicts:
	main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml

3 files changed, 26 insertions, 4 deletions

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 7086f1fd3c..9e3b1bca3f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
@@ -372,7 +372,7 @@ namespace MonoDevelop.Ide.Projects
 

 		EventBoxTooltip CreateTooltip (EventBox eventBox, string tooltipText)

 		{

-			Xwt.Drawing.Image image = ImageService.GetIcon ("md-information");

+			Xwt.Drawing.Image image = ImageService.GetIcon ("md-help");

 			eventBox.ModifyBg (StateType.Normal, leftHandBackgroundColor);

 			eventBox.Add (new ImageView (image));

 			eventBox.ShowAll ();

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewConfigurationDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewConfigurationDialog.cs
index 39d4104a4e..64888728c7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewConfigurationDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewConfigurationDialog.cs
@@ -26,6 +26,7 @@
 //
 
 using System.Collections.Generic;
+using MonoDevelop.Components.AtkCocoaHelper;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui.Dialogs;
@@ -59,8 +60,28 @@ namespace MonoDevelop.Ide.Projects
 				createChildrenCheck.Visible = false;
 				DefaultHeight = 0;
 			}
+
+			SetupAccessibility ();
 		}
-		
+
+		void SetupAccessibility ()
+		{
+			comboName.SetCommonAccessibilityAttributes ("NewConfiguration.Name",
+			                                            GettextCatalog.GetString ("Name"),
+			                                            GettextCatalog.GetString ("Select or enter the name of the new configuration"));
+			comboName.Accessible.SetTitleUIElement (label1.Accessible);
+			label1.Accessible.SetTitleFor (comboName.Accessible);
+
+			comboPlatform.SetCommonAccessibilityAttributes ("NewConfiguration.Platform",
+			                                                GettextCatalog.GetString ("Platform"),
+			                                                GettextCatalog.GetString ("Select or enter the platform for the new configuration"));
+			comboPlatform.Accessible.SetTitleUIElement (label2.Accessible);
+			label2.Accessible.SetTitleFor (comboPlatform.Accessible);
+
+			createChildrenCheck.SetCommonAccessibilityAttributes ("NewConfiguration.CreateCheck", null,
+			                                                      GettextCatalog.GetString ("Check to create configurations for all the solution items"));
+		}
+
 		public string ConfigName {
 			get {
 				string plat = MultiConfigItemOptionsPanel.GetPlatformId (comboPlatform.Entry.Text.Trim ());
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 c9cd9eb305..54d1a3e1d5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
@@ -104,8 +104,9 @@ namespace MonoDevelop.Ide.Projects
 			iconView.Accessible.Description = GettextCatalog.GetString ("Select a template for the new file");
 			iconView.Accessible.SetTitle (GettextCatalog.GetString ("Templates"));
 
-			nameEntry.Accessible.Name = "NewFileDialog.NameEntry";
-			nameEntry.Accessible.Description = GettextCatalog.GetString ("Enter the name of the new file");
+			nameEntry.SetCommonAccessibilityAttributes ("NewFileDialog.NameEntry",
+														GettextCatalog.GetString ("Name"),
+														GettextCatalog.GetString ("Enter the name of the new file"));
 			nameEntry.Accessible.SetTitleUIElement (label1.Accessible);
 
 			label1.Accessible.Name = "NewFileDialog.NameLabel";