* MonoDevelop.Ide.Templates/CombineDescriptor.cs,

  MonoDevelop.Ide.Templates/SolutionItemDescriptor.cs,
  MonoDevelop.Ide.Templates/ProjectTemplate.cs,
  MonoDevelop.Ide.Templates/ISolutionItemDescriptor.cs,
  MonoDevelop.Ide.Templates/ProjectDescriptor.cs: Split solution item
  creation in two steps: creation of the instance, and
  initialization. In this way the new project dialog can create a new
  instance of the project to check availability of features without
  having to expand the whole template.
* MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs: Fix node
  label.
* MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs: When adding a
  project to an existing solution, always use the solution's format.
  Skip the 'project features' page if there are no features available
  for that kind of project.

svn path=/trunk/monodevelop/; revision=104419

1 files changed, 2 insertions, 2 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
index 77d60c33b3..e64397f9c1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
@@ -59,8 +59,8 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon)
 		{
-			SolutionFolder combine = dataObject as SolutionFolder;
-			label = GettextCatalog.GetString ("Solution {0}", combine.Name);
+			SolutionFolder folder = dataObject as SolutionFolder;
+			label = folder.Name;
 			icon = Context.GetIcon (Stock.SolutionFolderOpen);
 			closedIcon = Context.GetIcon (Stock.SolutionFolderClosed);
 		}