Merge branch '4.1' into master (4.2)

SharpDevelop.sln

@@ -1,69 +1,69 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.1.0.7646-alpha
+# SharpDevelop 4.1.0.7854-beta
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -72,188 +72,203 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{39327899-ED91-4F7F-988C-4FE4E17C014D}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Decompiler", "Decompiler", "{814DFF39-5324-40BE-90EA-F62F758660B3}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyAddIn", "src\AddIns\DisplayBindings\ILSpyAddIn\ILSpyAddIn.csproj", "88305E42-C90D-410F-B831-15161E23BAAA"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "src\Libraries\NewNRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "src\Libraries\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -262,42 +277,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -307,200 +316,189 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Mi
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Decompiler", "Decompiler", "{814DFF39-5324-40BE-90EA-F62F758660B3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "src\Libraries\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "src\Libraries\NewNRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyAddIn", "src\AddIns\DisplayBindings\ILSpyAddIn\ILSpyAddIn.csproj", "88305E42-C90D-410F-B831-15161E23BAAA"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -567,10 +565,6 @@ Global
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1124,113 +1118,112 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
-		{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272}
-		{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272}
-		{35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
-		{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
-		{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{814DFF39-5324-40BE-90EA-F62F758660B3} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
 		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		88305E42-C90D-410F-B831-15161E23BAAA = {814DFF39-5324-40BE-90EA-F62F758660B3}
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {814DFF39-5324-40BE-90EA-F62F758660B3}
+		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{814DFF39-5324-40BE-90EA-F62F758660B3} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{984CC812-9470-4A13-AFF9-CC44068D666C} = {814DFF39-5324-40BE-90EA-F62F758660B3}
-		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {814DFF39-5324-40BE-90EA-F62F758660B3}
+		88305E42-C90D-410F-B831-15161E23BAAA = {814DFF39-5324-40BE-90EA-F62F758660B3}
+		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
+		{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
+		{A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A}
+		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272}
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272}
+		{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272}
+		{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
 	EndGlobalSection
 EndGlobal

data/resources/StringResources.cz.resx

@@ -574,9 +574,6 @@ SharpDevelop může sledovat využívání jednotlivých funkcí a informace aut
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Soubor</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Řádek</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>O Inspektoru</value>
   </data>
@@ -2983,6 +2980,9 @@ Můžete se také rozhodnout, že všechny volby budou uloženy ve vlastním .us
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Řádek</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Akt&amp;ualizovat</value>
   </data>
@@ -3250,9 +3250,6 @@ Můžete se také rozhodnout, že všechny volby budou uloženy ve vlastním .us
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Koncový řádek</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Řádek</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Nemohu najít konzolovou aplikaci NCover.
 

data/resources/StringResources.de.resx

@@ -298,6 +298,15 @@ Laden Sie ein AddIn aus dem Internet herunter, klicken Sie auf "AddIn installier
   <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
     <value>Zahlensystem</value>
   </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Decimal" xml:space="preserve">
+    <value>Dezimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Hexadecimal" xml:space="preserve">
+    <value>Hexadezimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Octal" xml:space="preserve">
+    <value>Oktal</value>
+  </data>
   <data name="AddIns.HexEditor.SizeToFit" xml:space="preserve">
     <value>Größe an aktuelle Breite anpassen</value>
   </data>
@@ -780,9 +789,6 @@ Optional können Sie auch ein Arbeitsverzeichnis und Kommandozeilen-Argumente an
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' wurde von der Ignorier-Liste entfernt.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Alte Projektmappe offen halten</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Datei sperren</value>
   </data>
@@ -810,13 +816,6 @@ Optional können Sie auch ein Arbeitsverzeichnis und Kommandozeilen-Argumente an
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Zeige &amp;Vergangenheits-Tab für Dateien unter Versionskontrolle</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Projektmappe neu laden</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop hat festgestellt, dass die Versionskontroll-Operation Projektdateien verändert hat.
-Sie sollten die Projektmappe neu laden.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Umplatzieren</value>
   </data>
@@ -978,9 +977,6 @@ Ein Ausführungskommando kann in den Projektoptionen eingestellt werden.</value>
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Datei</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Zeile</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Info</value>
   </data>
@@ -3482,6 +3478,9 @@ Sie können die Einstellungen auch in einer .user-Datei anstelle der Projektdate
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Zeile</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Akt&amp;ualisieren</value>
   </data>
@@ -3759,9 +3758,6 @@ Bitte einen anderen Dateinamen wählen.</value>
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Endzeile</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Zeile</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Kann die NCover Konsolenanwendung nicht finden.
 
@@ -4803,6 +4799,12 @@ Grund: Der Wert zu dem zurückgesetzt werden soll ist ungültig weil sich eine a
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Lade ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Alte Projektmappe offen halten</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Projektmappe neu laden</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Neue &amp;Compilerversion:</value>
   </data>

data/resources/StringResources.es-mx.resx

@@ -298,6 +298,15 @@ Descargue un complemento de Internet, luego haga clic en "Instalar AddIn" y sele
   <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
     <value>Sistema numérico</value>
   </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Decimal" xml:space="preserve">
+    <value>Decimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Hexadecimal" xml:space="preserve">
+    <value>Hexadecimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Octal" xml:space="preserve">
+    <value>Octal</value>
+  </data>
   <data name="AddIns.HexEditor.SizeToFit" xml:space="preserve">
     <value>Ajustar al ancho actual</value>
   </data>
@@ -781,9 +790,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' fue quitado de la lista de ignorados.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Mantener abierta la solución antigua</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Bloquear</value>
   </data>
@@ -811,13 +817,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Mostrar el tab &amp;historial para archivos de control de versión</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Recargar solución</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop detectó que la operación de control de versión cambió archivos de proyecto.
-Debería recargar la solución.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Realojar</value>
   </data>
@@ -979,9 +978,6 @@ SharpDevelop puede obtener esta información y enviarla automáticamente.
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Archivo</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Línea</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Acerca de</value>
   </data>
@@ -2420,6 +2416,12 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Depuración</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
+    <value>Excepciones</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.PauseOnHandledExceptions" xml:space="preserve">
+    <value>Pausar en excepciones controladas</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping" xml:space="preserve">
     <value>Paso por Instrucciones</value>
   </data>
@@ -2618,6 +2620,15 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
   <data name="Dialog.Options.IDEOptions.SelectVisualStyle.PanelName" xml:space="preserve">
     <value>Apariencia</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.ExpandReferences" xml:space="preserve">
+    <value>Expandir referencias de proyectos (reflect references)</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.GroupBoxHeader" xml:space="preserve">
+    <value>Opciones de Interfaz Gráfica de Sharp Develop</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.PanelName" xml:space="preserve">
+    <value>Opciones de Interfaz Gráfica de Sharp Develop</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TaskListOptions.CommentTagsGroupBox" xml:space="preserve">
     <value>Etiquetas de comentarios</value>
   </data>
@@ -2973,7 +2984,7 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
     <value>Procesador Intel Itanium de 64-bits</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x64" xml:space="preserve">
-    <value>Procesador AMD de 64-bits</value>
+    <value>Procesador x86-64</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x86" xml:space="preserve">
     <value>Procesador Intel-compatible de 32-bits</value>
@@ -3487,6 +3498,9 @@ También puede elegir guardar la opción en el archivo .user en lugar de en el a
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Iniciar</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Línea</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>&amp;Actualizar</value>
   </data>
@@ -3763,9 +3777,6 @@ También puede elegir guardar la opción en el archivo .user en lugar de en el a
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Línea Final</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Línea</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Si NCover está instalado, por favor especifique la ubicación de la aplicación en las opciones de Cobertura de Código.</value>
   </data>
@@ -4282,7 +4293,7 @@ Por favor configure la ubicación del archivo ejecutable de NAnt en las opciones
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage" xml:space="preserve">
     <value>El archivo
 ${File}
-ha sido cambiado de manera externa, ¿desea recargarlo?</value>
+ha sido cambiado de manera externa. ¿Desea recargarlo?</value>
   </data>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ForwardsSearchStatusBarMessage" xml:space="preserve">
     <value>Búsqueda Incremental:</value>
@@ -4801,6 +4812,15 @@ Utilice solamente letras, dígitos, espacio, '.' ó '_'.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Cargando ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Mantener abierta la solución antigua</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Recargar solución</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
+    <value>La solución ha sido cambiada externamente.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Convertir &amp;proyectos seleccionados a:</value>
   </data>
@@ -5335,6 +5355,24 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.XmlEditor.XslOutputView.Title" xml:space="preserve">
     <value>Salida XSLT</value>
   </data>
+  <data name="ILSpyAddIn.ILSpyDoesNotExist" xml:space="preserve">
+    <value>ILSpy no se pudo encontrar en la ubicación especificada, o SharpDevelop no tiene suficientes permisos para acceder a dicha ubicación.</value>
+  </data>
+  <data name="ILSpyAddIn.ILSpyPathNotSet" xml:space="preserve">
+    <value>La ruta a ILSpy aun no ha sido establecida.</value>
+  </data>
+  <data name="ILSpyAddIn.OpenILSpyCommand" xml:space="preserve">
+    <value>Abrir ILSpy</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialog.ILSpyInfo" xml:space="preserve">
+    <value>Esta caracteristica requiere ILSpy. Si aun no la tiene, puede descargarlo gratuitamente aquí:</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialog.PathToILSpyExe" xml:space="preserve">
+    <value>Ruta completa a ILSpy.exe</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialogTitle" xml:space="preserve">
+    <value>Establecer ruta a ILSpy</value>
+  </data>
   <data name="Internal.ExternalTool.CantLoadToolConfigWarining" xml:space="preserve">
     <value>No se pudo cargar el archivo de configuración de herramientas externas.</value>
   </data>
@@ -5503,6 +5541,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.CallStack.Language" xml:space="preserve">
     <value>Lenguaje</value>
   </data>
+  <data name="MainWindow.Windows.Debug.CallStack.Module" xml:space="preserve">
+    <value>Módulo</value>
+  </data>
   <data name="MainWindow.Windows.Debug.CallStack.ShowArgumentNames" xml:space="preserve">
     <value>Mostrar nombres de argumentos</value>
   </data>
@@ -5512,6 +5553,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.CallStack.ShowExternalMethods" xml:space="preserve">
     <value>Mostrar métodos externos</value>
   </data>
+  <data name="MainWindow.Windows.Debug.CallStack.ShowLineNumber" xml:space="preserve">
+    <value>Mostrar número de línea</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.CallStack.ShowModuleNames" xml:space="preserve">
+    <value>Mostrar nombres de módulos</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Ask" xml:space="preserve">
     <value>Preguntar</value>
   </data>
@@ -5659,6 +5706,39 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.LocalVariables.StaticMembers" xml:space="preserve">
     <value>Miembros Estáticos (Static)</value>
   </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad" xml:space="preserve">
+    <value>Memoria</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.AddressNotFound" xml:space="preserve">
+    <value>La dirección {0} no se encontró!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.ByteSize" xml:space="preserve">
+    <value>Mostrar tamaño en bytes:</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.JumpTo" xml:space="preserve">
+    <value>Saltar a la dirección:</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NextAddress" xml:space="preserve">
+    <value>Siguientes direcciones virtuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NoMappings" xml:space="preserve">
+    <value>No hay mapeo para direcciones de memoria!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NotDebuggingOrProcessRunning" xml:space="preserve">
+    <value>Ninguna depuración o proceso esta en ejecución!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.PreviousAddress" xml:space="preserve">
+    <value>Anteriores direcciones virtuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.ReadingFromFormat" xml:space="preserve">
+    <value>Leyendo desde {0} hasta {1} - tamaño {2}.</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.Refresh" xml:space="preserve">
+    <value>Actualizar direcciones actuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.UnableToReadFormat" xml:space="preserve">
+    <value>Incapaz de leer la dirección {0} de tamaño {1}.</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Modules" xml:space="preserve">
     <value>Módulos cargados</value>
   </data>
@@ -5987,7 +6067,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
     <value>Copiar ruta/nombre de archivo</value>
   </data>
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
-    <value>Abrir Carpeta Contenedora en el Explorador</value>
+    <value>Abrir carpeta contenedora en el Explorador</value>
   </data>
   <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
     <value>Colapsar todos los nodos</value>
@@ -7502,6 +7582,9 @@ Los archivos de recursos han sido renombrados/movidos convenientemente.</value>
   <data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
     <value>Eliminar todos los puntos de interrupción</value>
   </data>
+  <data name="XML.MainMenu.DebugMenu.RunLastBuild" xml:space="preserve">
+    <value>Ejecutar último build</value>
+  </data>
   <data name="XML.MainMenu.DebugMenu.RunWithoutDebug" xml:space="preserve">
     <value>Ejecutar &amp;sin depurador</value>
   </data>

data/resources/StringResources.es.resx

@@ -298,6 +298,15 @@ Descargue un complemento de Internet, luego haga clic en 'Instalar Complemento'
   <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
     <value>Sistema numérico</value>
   </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Decimal" xml:space="preserve">
+    <value>Decimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Hexadecimal" xml:space="preserve">
+    <value>Hexadecimal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Octal" xml:space="preserve">
+    <value>Octal</value>
+  </data>
   <data name="AddIns.HexEditor.SizeToFit" xml:space="preserve">
     <value>Ajustar al ancho actual</value>
   </data>
@@ -780,9 +789,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' fue quitado de la lista de ignorados.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Mantener abierta la solución antigua</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Bloquear</value>
   </data>
@@ -810,13 +816,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Mostrar el tab &amp;historial para archivos de control de versión</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Recargar solución</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop ha detectado que la operación de control de versión ha cambiado archivos de proyecto.
-Debería recargar la solución.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Realojar</value>
   </data>
@@ -977,9 +976,6 @@ SharpDevelop puede obtener esta información y enviarla automáticamente.</value
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Archivo</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Línea</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Acerca de</value>
   </data>
@@ -2417,6 +2413,12 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Depuración</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
+    <value>Excepciones</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.PauseOnHandledExceptions" xml:space="preserve">
+    <value>Pausar en excepciones controladas</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping" xml:space="preserve">
     <value>Paso por Instrucciones</value>
   </data>
@@ -2615,6 +2617,15 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
   <data name="Dialog.Options.IDEOptions.SelectVisualStyle.PanelName" xml:space="preserve">
     <value>Apariencia</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.ExpandReferences" xml:space="preserve">
+    <value>Expandir referencias de proyectos (reflect references)</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.GroupBoxHeader" xml:space="preserve">
+    <value>Opciones de Interfaz Gráfica de Sharp Develop</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.SharpDevelop.GeneralUI.PanelName" xml:space="preserve">
+    <value>Opciones de Interfaz Gráfica de Sharp Develop</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TaskListOptions.CommentTagsGroupBox" xml:space="preserve">
     <value>Etiquetas de Comentarios</value>
   </data>
@@ -2970,7 +2981,7 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin
     <value>Procesador Intel Itanium de 64 bits</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x64" xml:space="preserve">
-    <value>Procesador AMD de 64 bits</value>
+    <value>Procesador x86-64</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x86" xml:space="preserve">
     <value>procesador compatible con un Intel de 32 bits</value>
@@ -3488,6 +3499,9 @@ También puede escoger almacenar el parámetro de configuración en el archivo .
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Empezar</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Línea</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>&amp;Actualizar</value>
   </data>
@@ -3764,9 +3778,6 @@ También puede escoger almacenar el parámetro de configuración en el archivo .
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Línea Final</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Línea</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Si NCover está instalado, por favor especifique la ubicación de la aplicación en las opciones de Cobertura de Código.</value>
   </data>
@@ -4284,7 +4295,7 @@ Se perderán todos los cambios.</value>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage" xml:space="preserve">
     <value>El archivo
 ${File}
-ha sido modificado externamente, ¿desea volver a cargarlo?</value>
+ha sido modificado externamente. ¿Desea volver a cargarlo?</value>
   </data>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ForwardsSearchStatusBarMessage" xml:space="preserve">
     <value>Búsqueda Incremental:</value>
@@ -4804,6 +4815,15 @@ Solamente letras, dígitos, espacio, '.' o '_' son permitidos.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Cargando ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Mantener abierta la solución antigua</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Recargar solución</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
+    <value>La solución ha sido cambiada externamente.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Convertir &amp;proyectos seleccionados a:</value>
   </data>
@@ -5339,6 +5359,24 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.XmlEditor.XslOutputView.Title" xml:space="preserve">
     <value>Salida XSLT</value>
   </data>
+  <data name="ILSpyAddIn.ILSpyDoesNotExist" xml:space="preserve">
+    <value>ILSpy no se pudo encontrar en la ubicación especificada, o SharpDevelop no tiene suficientes permisos para acceder a dicha ubicación.</value>
+  </data>
+  <data name="ILSpyAddIn.ILSpyPathNotSet" xml:space="preserve">
+    <value>La ruta a ILSpy aun no ha sido establecida.</value>
+  </data>
+  <data name="ILSpyAddIn.OpenILSpyCommand" xml:space="preserve">
+    <value>Abrir ILSpy</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialog.ILSpyInfo" xml:space="preserve">
+    <value>Esta caracteristica requiere ILSpy. Si aun no la tiene, puede descargarlo gratuitamente aquí:</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialog.PathToILSpyExe" xml:space="preserve">
+    <value>Ruta completa a ILSpy.exe</value>
+  </data>
+  <data name="ILSpyAddIn.SetILSpyPathDialogTitle" xml:space="preserve">
+    <value>Establecer ruta a ILSpy</value>
+  </data>
   <data name="Internal.ExternalTool.CantLoadToolConfigWarining" xml:space="preserve">
     <value>No se puede cargar archivo de configuración de herramientas externas.</value>
   </data>
@@ -5507,6 +5545,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.CallStack.Language" xml:space="preserve">
     <value>Lenguaje</value>
   </data>
+  <data name="MainWindow.Windows.Debug.CallStack.Module" xml:space="preserve">
+    <value>Módulo</value>
+  </data>
   <data name="MainWindow.Windows.Debug.CallStack.ShowArgumentNames" xml:space="preserve">
     <value>Mostrar los nombres de los argumentos</value>
   </data>
@@ -5516,6 +5557,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.CallStack.ShowExternalMethods" xml:space="preserve">
     <value>Mostrar métodos externos</value>
   </data>
+  <data name="MainWindow.Windows.Debug.CallStack.ShowLineNumber" xml:space="preserve">
+    <value>Mostrar número de línea</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.CallStack.ShowModuleNames" xml:space="preserve">
+    <value>Mostrar nombres de módulos</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Ask" xml:space="preserve">
     <value>Preguntar</value>
   </data>
@@ -5663,6 +5710,39 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.LocalVariables.StaticMembers" xml:space="preserve">
     <value>Miembros Estáticos (Static)</value>
   </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad" xml:space="preserve">
+    <value>Memoria</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.AddressNotFound" xml:space="preserve">
+    <value>La dirección {0} no se encontró!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.ByteSize" xml:space="preserve">
+    <value>Mostrar tamaño en bytes:</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.JumpTo" xml:space="preserve">
+    <value>Saltar a la dirección:</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NextAddress" xml:space="preserve">
+    <value>Siguientes direcciones virtuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NoMappings" xml:space="preserve">
+    <value>No hay mapeo para direcciones de memoria!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.NotDebuggingOrProcessRunning" xml:space="preserve">
+    <value>Ninguna depuración o proceso esta en ejecución!</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.PreviousAddress" xml:space="preserve">
+    <value>Anteriores direcciones virtuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.ReadingFromFormat" xml:space="preserve">
+    <value>Leyendo desde {0} hasta {1} - tamaño {2}.</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.Refresh" xml:space="preserve">
+    <value>Actualizar direcciones actuales</value>
+  </data>
+  <data name="MainWindow.Windows.Debug.MemoryPad.UnableToReadFormat" xml:space="preserve">
+    <value>Incapaz de leer la dirección {0} de tamaño {1}.</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Modules" xml:space="preserve">
     <value>Módulos Cargados</value>
   </data>
@@ -5991,7 +6071,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
     <value>Copiar ruta/nombre del archivo</value>
   </data>
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
-    <value>Abrir Carpeta Contenedora en el Explorador</value>
+    <value>Abrir carpeta contenedora en el Explorador</value>
   </data>
   <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
     <value>Colapsar todos los nodos</value>
@@ -7507,6 +7587,9 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer
   <data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
     <value>Eliminar todos los puntos de interrupción</value>
   </data>
+  <data name="XML.MainMenu.DebugMenu.RunLastBuild" xml:space="preserve">
+    <value>Ejecutar último build</value>
+  </data>
   <data name="XML.MainMenu.DebugMenu.RunWithoutDebug" xml:space="preserve">
     <value>Ejecutar &amp;sin depurador</value>
   </data>

data/resources/StringResources.fr.resx

@@ -779,9 +779,6 @@ En option, vous pouvez spécifer un répertoire de travail et des arguments en l
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' a été supprimé de la liste d'ignorés.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Laisser la solution précédente ouverte</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Poser un verrou</value>
   </data>
@@ -809,12 +806,6 @@ En option, vous pouvez spécifer un répertoire de travail et des arguments en l
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Afficher l'&amp;historique des fichiers sous contrôle de version</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Recharger la solution</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop a detecté que l'opération de contrôle de version a changée des fichiers du projet. Rechargez la solution.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Relocaliser</value>
   </data>
@@ -975,9 +966,6 @@ Sauvegardez ces fichiers avant de déclencher l'opération.</value>
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Fichier</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Ligne</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>A propos</value>
   </data>
@@ -2412,6 +2400,12 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Déboguage en cours</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
+    <value>Exceptions</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.PauseOnHandledExceptions" xml:space="preserve">
+    <value>Pause lors des exceptions gérées</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping" xml:space="preserve">
     <value>Pas-à-pas en cours</value>
   </data>
@@ -2976,7 +2970,7 @@ Un changement des arrangements est visible lors du prochain relancement de #Deve
     <value>Processeur Itanium 64bits</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x64" xml:space="preserve">
-    <value>Processeur AMD 64bits</value>
+    <value>Processeur 64 bits (x64)</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x86" xml:space="preserve">
     <value>Processeur 32bits compatible Intel</value>
@@ -3491,6 +3485,9 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Démarrer</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Ligne</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Mettre à jo&amp;ur</value>
   </data>
@@ -3767,9 +3764,6 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Fin de ligne</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Ligne</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Impossible de localiser l'application console NCover.
 
@@ -4806,6 +4800,12 @@ Utilisez seulement des lettres, chiffres, espace, '.' ou '_'.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Chargement de ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Laisser la solution précédente ouverte</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Recharger la solution</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Convertir les projets sélectionnés vers:</value>
   </data>
@@ -5525,9 +5525,6 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.Debug.CallStack.Language" xml:space="preserve">
     <value>Langage</value>
   </data>
-  <data name="MainWindow.Windows.Debug.CallStack.LineString" xml:space="preserve">
-    <value>Ligne</value>
-  </data>
   <data name="MainWindow.Windows.Debug.CallStack.Module" xml:space="preserve">
     <value>Module</value>
   </data>

data/resources/StringResources.it.resx

@@ -779,9 +779,6 @@ Installare il .NET Framework SDK per utilizzare il sistema di help.</value>
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' è stato rimosso dalla lista degli elementi da ignorare.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Mantieni aperta la vecchia soluzione</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Acquisisci blocco</value>
   </data>
@@ -809,12 +806,6 @@ Installare il .NET Framework SDK per utilizzare il sistema di help.</value>
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Mostra cronologia per i files sotto il controllo della versione</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Ricarica soluzione</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop ha individuato dei cambiamenti nei file di progetto a causa del sistema di controllo versione. E' necessario ricaricare la soluzione.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Cambia posizione</value>
   </data>
@@ -975,9 +966,6 @@ Salva questi file prima di eseguire l'operazione.</value>
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>File</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Linea</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Informazioni su</value>
   </data>
@@ -2416,6 +2404,12 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Debugging</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
+    <value>Eccezioni</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.PauseOnHandledExceptions" xml:space="preserve">
+    <value>Fermati sulle Eccezioni gestite</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping" xml:space="preserve">
     <value>Stepping</value>
   </data>
@@ -2979,7 +2973,7 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
     <value>Processore Intel 64-bit Itanium</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x64" xml:space="preserve">
-    <value>Processori AMD 64-bit</value>
+    <value>Processore x86-64</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x86" xml:space="preserve">
     <value>Processore compatibile Intel 32-bit</value>
@@ -3495,6 +3489,9 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Esegui</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Linea</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>&amp;Aggiorna</value>
   </data>
@@ -3771,9 +3768,6 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Fine riga</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Riga</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Impossibile trovare l'applicazione console NCover
 
@@ -4815,6 +4809,12 @@ Sono ammesse solo lettere, numeri, spazi, '.' o '_'.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Caricamento ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Mantieni aperta la vecchia soluzione</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Ricarica soluzione</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Converti &amp;progetti selezionati in:</value>
   </data>
@@ -5534,9 +5534,6 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.CallStack.Language" xml:space="preserve">
     <value>Linguaggio</value>
   </data>
-  <data name="MainWindow.Windows.Debug.CallStack.LineString" xml:space="preserve">
-    <value>Riga</value>
-  </data>
   <data name="MainWindow.Windows.Debug.CallStack.Module" xml:space="preserve">
     <value>Modulo</value>
   </data>
@@ -6063,7 +6060,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
     <value>Percorso/nome del file di copia</value>
   </data>
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
-    <value>Apri la cartella in Explorer</value>
+    <value>Apri la cartella in Esplora risorse</value>
   </data>
   <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
     <value>Comprimi tutti i nodi</value>

data/resources/StringResources.kr.resx

@@ -508,9 +508,6 @@
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>파일</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>줄</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>정보</value>
   </data>
@@ -2945,6 +2942,9 @@ ${CurrentProjectName} 프로젝트에 이 새 파일을 더하겠습니까?</val
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>시작</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>줄</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>새로 고침(&amp;U)</value>
   </data>
@@ -3212,9 +3212,6 @@ ${CurrentProjectName} 프로젝트에 이 새 파일을 더하겠습니까?</val
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>마지막 줄</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>줄</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>NCover 콘솔 응용 프로그램을 찾을 수 없습니다.
 

data/resources/StringResources.nl.resx

@@ -297,6 +297,15 @@
   <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
     <value>Nummering systeem</value>
   </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Decimal" xml:space="preserve">
+    <value>Decimaal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Hexadecimal" xml:space="preserve">
+    <value>Hexadecimaal</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem.Octal" xml:space="preserve">
+    <value>Octaal</value>
+  </data>
   <data name="AddIns.HexEditor.SizeToFit" xml:space="preserve">
     <value>De breedte aanpassen aan de aktueel benodigde</value>
   </data>
@@ -780,9 +789,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' is verwijderd uit de negeer lijst.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>De oude oplossing open houden.</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Vergrendel</value>
   </data>
@@ -810,12 +816,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Geef gesc&amp;hiedenis tab weer voor versie-controle bestanden</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Oplossing opnieuw laden</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop heeft ontdekt dat de versiecontrole project bestanden gewijzigd heeft. U dient de oplossing opnieuw te laden.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Verplaatsen</value>
   </data>
@@ -975,9 +975,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Bestand</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Regel</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Info</value>
   </data>
@@ -2419,6 +2416,12 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Foutopsporing</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
+    <value>Uitzonderingen</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.PauseOnHandledExceptions" xml:space="preserve">
+    <value>Wachten na afhandeling van uitzonderingen</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping" xml:space="preserve">
     <value>Stapsgewijs</value>
   </data>
@@ -2981,7 +2984,7 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
     <value>Intel 64-bit Itanium processor</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x64" xml:space="preserve">
-    <value>AMD 64-bit processor</value>
+    <value>AMD / Intel 64-bit processor</value>
   </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.x86" xml:space="preserve">
     <value>32 bit Intel-compatibele processor</value>
@@ -3494,6 +3497,9 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Starten</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Regel</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Bijwerken</value>
   </data>
@@ -3770,9 +3776,6 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Eindregel</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Regel</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Kan de NCover console toepassing niet vinden.
 
@@ -4289,7 +4292,7 @@ Noot: Dit beïnvloed eigen aangepaste opmaak niet.</value>
     <value>${CurrentMethodNumber} van ${NumberOfTotalMethods}</value>
   </data>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage" xml:space="preserve">
-    <value>Bestand ${File} is extern gewijzigd. Wilt u deze opnieuw laden?</value>
+    <value>Bestand ${File} is extern gewijzigd. Wilt u het herladen?</value>
   </data>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ForwardsSearchStatusBarMessage" xml:space="preserve">
     <value>Aanvullend zoeken:</value>
@@ -4807,6 +4810,15 @@ Alleen letters, getallen, spatie, '.' of '_' zijn toegestaan.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Laden van ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>De oude oplossing open houden.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Oplossing opnieuw laden</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
+    <value>De oplossing is extern gewijzigd.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Converteer geselecteerde &amp;projecten naar</value>
   </data>
@@ -5526,9 +5538,6 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.Debug.CallStack.Language" xml:space="preserve">
     <value>Taal</value>
   </data>
-  <data name="MainWindow.Windows.Debug.CallStack.LineString" xml:space="preserve">
-    <value>Regel</value>
-  </data>
   <data name="MainWindow.Windows.Debug.CallStack.Module" xml:space="preserve">
     <value>Module</value>
   </data>
@@ -6055,7 +6064,7 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
     <value>Kopieer bestandspad/-naam</value>
   </data>
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
-    <value>Open de map met document in de Explorer</value>
+    <value>Open de document bevattende map in de Explorer</value>
   </data>
   <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
     <value>Alle knooppunten invouwen</value>
@@ -7571,6 +7580,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value>
   <data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
     <value>Verwijder alle breekpunten</value>
   </data>
+  <data name="XML.MainMenu.DebugMenu.RunLastBuild" xml:space="preserve">
+    <value>Voer laatste bouw uit.</value>
+  </data>
   <data name="XML.MainMenu.DebugMenu.RunWithoutDebug" xml:space="preserve">
     <value>Uitvoeren &amp;zonder foutopsporing</value>
   </data>

data/resources/StringResources.no.resx

@@ -779,9 +779,6 @@ Du må installere .NET Framework SDK for å få tilgang til hjelpesystemet.</val
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' ble fjernet fra ignorerings-listen.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Behold den gamle løsningen åpen</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Sett lås</value>
   </data>
@@ -809,12 +806,6 @@ Du må installere .NET Framework SDK for å få tilgang til hjelpesystemet.</val
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Vis historikk-fanen for filer under versjonskontroll</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Last inn løsningen på nytt</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop har oppdaget at versjonskontroll-handlingen har endret prosjektfilene. Du bør laste inn løsningen på nytt.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Skift server</value>
   </data>
@@ -976,9 +967,6 @@ SharpDevelop kan samle inn denne informasjonen og laste den opp automatisk.</val
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Fil</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Linje</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Om</value>
   </data>
@@ -3477,6 +3465,9 @@ Du kan også velge å lagre innstillingen i .user-filen istedet for i prosjektfi
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Linje</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Oppdater</value>
   </data>
@@ -3753,9 +3744,6 @@ Du kan også velge å lagre innstillingen i .user-filen istedet for i prosjektfi
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Linjeslutt</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Linje</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Finner ikke NCover konsollapplikasjonen. 
 
@@ -4790,6 +4778,12 @@ Bare bokstaver, tall, mellomrom, '.' eller '_' er tillatt.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Laster ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Behold den gamle løsningen åpen</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Last inn løsningen på nytt</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Konverter valgte &amp;prosjekter til:</value>
   </data>

data/resources/StringResources.pl.resx

@@ -527,9 +527,6 @@ Musisz zainstalować .NET Framework SDK aby otrzymać system pomocy.</value>
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Plik</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Wiersz</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>O...</value>
   </data>
@@ -2753,6 +2750,9 @@ Możesz również wybrać przechowywanie ustawienia w pliku użytkownika zamiast
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Wiersz</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Akt&amp;ualizuj</value>
   </data>
@@ -2969,9 +2969,6 @@ Możesz również wybrać przechowywanie ustawienia w pliku użytkownika zamiast
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Końcowy Wiersz</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Wiersz</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Jeżeli NCover jest zainstalowane, proszę wskazać lokalizację aplikacji w opcjach Pokrywania Kodu.</value>
   </data>

data/resources/StringResources.pt-br.resx

@@ -775,9 +775,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0} foi removido da lista ignorar.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Manter a solução antiga aberta</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Obter trava</value>
   </data>
@@ -805,12 +802,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Exibir aba do &amp;historico para arquivos de versão controlada</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Recarregar solução</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop verificou que a operação de controle de versão mudou os arquivos do projeto.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Realocar</value>
   </data>
@@ -970,9 +961,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Arquivo</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Linha</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Sobre</value>
   </data>
@@ -3466,6 +3454,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Iniciar</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Linha</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>&amp;Atualizar</value>
   </data>
@@ -3742,9 +3733,6 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Linha Final</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Linha</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Se NCover estiver instalado, favor especificar a localização da aplicação nas opções do Code Coverage.</value>
   </data>
@@ -4604,6 +4592,12 @@ Use somente letras, dígitos, espaço, "." ou "_" são permitidos.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Carregando ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Manter a solução antiga aberta</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Recarregar solução</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Services.AmbienceService.AmbienceNotFoundError" xml:space="preserve">
     <value>Ambiente corrente não encontrado. Va para 'Opções-&gt;Estilo Visual' e mude o idioma corrente.</value>
   </data>

data/resources/StringResources.pt.resx

@@ -479,12 +479,24 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda.</valu
   <data name="AddIns.Profiler.DatabaseTooNewError" xml:space="preserve">
     <value>O perfil de sessão SharpDevelop seleccionado foi criado por uma versão mais recente de SharpDevelop e assim não pode ser aberto.</value>
   </data>
+  <data name="AddIns.Profiler.FileExtensionDescription" xml:space="preserve">
+    <value>Sessão de Profiling SharpDevelop</value>
+  </data>
   <data name="AddIns.Profiler.Messages.FileNotFound" xml:space="preserve">
     <value>Este projecto não pode ser iniciado porque o ficheiro executável não foi encontrado, assegure-se, por favor,de que o projecto e todas as suas dependências são construídas correctamente!</value>
   </data>
   <data name="AddIns.Profiler.Messages.NoStartableProjectFound" xml:space="preserve">
     <value>Nenhum projecto iniciável foi encontrado. Abortar...</value>
   </data>
+  <data name="AddIns.Profiler.Messages.NoStartableProjectWantToProfileStartupProject" xml:space="preserve">
+    <value>Este projecto não pode ser iniciado. Deseja obter perfil da solução do projecto StartUp em seu lugar?</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.PreparingForAnalysis" xml:space="preserve">
+    <value>A preparar a análise ...</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.RegisterFailed" xml:space="preserve">
+    <value>Não foi registado o perfilador no COM Registry. Não é possível começar a obter perfil!</value>
+  </data>
   <data name="AddIns.Profiler.ProfilingView.CpuCyclesText" xml:space="preserve">
     <value>Ciclos CPU:</value>
   </data>
@@ -599,9 +611,6 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda.</valu
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Ficheiro</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Linha</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Acerca</value>
   </data>
@@ -2880,6 +2889,9 @@ Pode também escolher guardar o parâmetro num ficheiro .user-file em vez de no
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Iniciar</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Linha</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>&amp;Actualizar</value>
   </data>
@@ -3105,9 +3117,6 @@ Pode também escolher guardar o parâmetro num ficheiro .user-file em vez de no
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Fim de Linha</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Linha</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>Impossível localizar o executável de consola NCover.
 

data/resources/StringResources.ru.resx

@@ -756,9 +756,6 @@
   <data name="AddIns.Subversion.ItemRemovedFromIgnoreList" xml:space="preserve">
     <value>'{0}' был удалён из чёрного списка.</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Держать старое решение открытым</value>
-  </data>
   <data name="AddIns.Subversion.Lock" xml:space="preserve">
     <value>Заблокировать</value>
   </data>
@@ -786,9 +783,6 @@
   <data name="AddIns.Subversion.Options.UseHistoryDisplayBinding" xml:space="preserve">
     <value>Показывать вкладку истории для файлов управления версиями</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Перезагрузить решение</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Переместить</value>
   </data>
@@ -911,9 +905,6 @@
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Файл</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Строка</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>О программе</value>
   </data>
@@ -3265,6 +3256,9 @@
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Старт</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Строка</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Перерисовать</value>
   </data>
@@ -3523,9 +3517,6 @@
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Конец строки</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Строка</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.OptionsPanel.CodeCoverageColoursGroupBoxText" xml:space="preserve">
     <value>Цвета сокрытия кода</value>
   </data>
@@ -4461,6 +4452,12 @@
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Загрузка ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Держать старое решение открытым</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Перезагрузить решение</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
     <value>Преобразовать выбранные проекты в:</value>
   </data>

data/resources/StringResources.tr.resx

@@ -614,9 +614,6 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.<
   <data name="AddIns.Subversion.History" xml:space="preserve">
     <value>Geçmiş</value>
   </data>
-  <data name="AddIns.Subversion.KeepOldSolution" xml:space="preserve">
-    <value>Eski çözümü açık tut</value>
-  </data>
   <data name="AddIns.Subversion.Merge" xml:space="preserve">
     <value>Birleştir</value>
   </data>
@@ -629,12 +626,6 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.<
   <data name="AddIns.Subversion.Options.Title" xml:space="preserve">
     <value>Yansürüm Ayarları</value>
   </data>
-  <data name="AddIns.Subversion.ReloadSolution" xml:space="preserve">
-    <value>Çözümü yenile</value>
-  </data>
-  <data name="AddIns.Subversion.ReloadSolutionAfterProjectChanges" xml:space="preserve">
-    <value>SharpDevelop sürüm kontrol işleminin proje dosyalarını değiştirdiğini algıladı. Bu çözümü yenilemeniz gerekiyor.</value>
-  </data>
   <data name="AddIns.Subversion.Relocate" xml:space="preserve">
     <value>Yerleştir</value>
   </data>
@@ -702,9 +693,6 @@ SharpDevelop bu bilgileri otomatik olarak toplayıp gönderebilir.</value>
   <data name="CompilerResultView.FileText" xml:space="preserve">
     <value>Dosya</value>
   </data>
-  <data name="CompilerResultView.LineText" xml:space="preserve">
-    <value>Satır</value>
-  </data>
   <data name="ComponentInspector.AboutDialog.Title" xml:space="preserve">
     <value>Hakkında</value>
   </data>
@@ -2929,6 +2917,9 @@ Ayrıca bir ayarı proje dosyası yerine .kullanıcı-dosyası(.user-file) için
   <data name="Global.StartButtonText" xml:space="preserve">
     <value>Başla</value>
   </data>
+  <data name="Global.TextLine" xml:space="preserve">
+    <value>Satır</value>
+  </data>
   <data name="Global.UpdateButtonText" xml:space="preserve">
     <value>Güncelle</value>
   </data>
@@ -3142,9 +3133,6 @@ Ayrıca bir ayarı proje dosyası yerine .kullanıcı-dosyası(.user-file) için
   <data name="ICSharpCode.CodeCoverage.EndLine" xml:space="preserve">
     <value>Satır Sonu</value>
   </data>
-  <data name="ICSharpCode.CodeCoverage.Line" xml:space="preserve">
-    <value>Satır</value>
-  </data>
   <data name="ICSharpCode.CodeCoverage.NCoverNotFound" xml:space="preserve">
     <value>NCover konsol uygulaması bulunamadı.
 
@@ -4008,6 +3996,12 @@ Sadece harf,rakam, boşluk, '.' yada '_' kullanabilirsiniz.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Yüklüyor ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.KeepOldSolution" xml:space="preserve">
+    <value>Eski çözümü açık tut</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.ReloadSolution" xml:space="preserve">
+    <value>Çözümü yenile</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.CompilerVersion" xml:space="preserve">
     <value>Derleyici Sürümü</value>
   </data>

data/templates/project/CSharp/EmptyMvcWebProject.xpt

@@ -5,9 +5,9 @@
 
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>Empty ASP.NET MVC Application</Name>
+		<Name>Empty MVC Application</Name>
 		<Category>C#</Category>
-		<Subcategory>ASP.NET</Subcategory>
+		<Subcategory>ASP.NET MVC</Subcategory>
 		<Icon>C#.Project.Form</Icon>
 		<Description>Empty ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>

data/templates/project/CSharp/MvcWebProject.xpt

@@ -5,9 +5,9 @@
 
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>ASP.NET MVC Application</Name>
+		<Name>MVC Application</Name>
 		<Category>C#</Category>
-		<Subcategory>ASP.NET</Subcategory>
+		<Subcategory>ASP.NET MVC</Subcategory>
 		<Icon>C#.Project.Form</Icon>
 		<Description>ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>

data/templates/project/VB/EmptyMvcWebProject.xpt

@@ -5,9 +5,9 @@
 
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>Empty ASP.NET MVC Application</Name>
+		<Name>Empty MVC Application</Name>
 		<Category>VB</Category>
-		<Subcategory>ASP.NET</Subcategory>
+		<Subcategory>ASP.NET MVC</Subcategory>
 		<Icon>VBNet.Project.Form</Icon>
 		<Description>Empty ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>

data/templates/project/VB/MvcWebProject.xpt

@@ -5,9 +5,9 @@
 
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>ASP.NET MVC Application</Name>
+		<Name>MVC Application</Name>
 		<Category>VB</Category>
-		<Subcategory>ASP.NET</Subcategory>
+		<Subcategory>ASP.NET MVC</Subcategory>
 		<Icon>VBNet.Project.Form</Icon>
 		<Description>ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>

data/templates/project/VB/NotifyIcon.xpt

@@ -27,17 +27,25 @@
 			<Reference Include="System.Xml" />
 		</ProjectItems>
 		
+		<ProjectItems>
+			<Import Include="Microsoft.VisualBasic" />
+			<Import Include="System" />
+			<Import Include="System.Collections" />
+			<Import Include="System.Collections.Generic" />
+			<Import Include="System.Drawing" />
+			<Import Include="System.Diagnostics" />
+			<Import Include="System.Windows.Forms" />
+		</ProjectItems>
+		
 		<PropertyGroup>
 			<OutputType>WinExe</OutputType>
 			<AppDesignerFolder>Properties</AppDesignerFolder>
+			<MyType>WindowsFormsWithCustomSubMain</MyType>
 		</PropertyGroup>
 		
 		<Files>
 			<File name="NotificationIcon.vb"><![CDATA[${StandardHeader.VBNET}
-Imports System.Diagnostics
-Imports System.Drawing
 Imports System.Threading
-Imports System.Windows.Forms
 
 Public NotInheritable Class NotificationIcon
 	Private notifyIcon As NotifyIcon

data/templates/project/VB/SharpDevelopCustomTool.xpt

@@ -175,7 +175,7 @@ Public Class ${ProjectName}Tool
 End Class
 ]]></File>
 			<File name="FileTemplate.xft" src="SharpDevelopCustomToolTemplate.xft.xml" binary="true" CopyToOutputDirectory="Always"/>
-			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.cs"/>
+			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			<File name="AddInWritingHelp.txt" src="..\AddInWritingHelp.txt"/>
 		</Files>
 	</Project>

samples/ILAsmBinding/Project/Src/ILAsmProjectBinding.cs

@@ -31,5 +31,9 @@ namespace ICSharpCode.ILAsmBinding
 		{
 			return new ILAsmProject(info);
 		}
+		
+		public bool HandlingMissingProject {
+			get { return false; }
+		}
 	}
 }

samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd

@@ -2,282 +2,279 @@
 <ReportModel>
     <ReportSettings>
         <ReportSettings>
-            <DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
-            <DataModel>PushData</DataModel>
-            <RightMargin>50</RightMargin>
-            <UseStandardPrinter>True</UseStandardPrinter>
-            <SortColumnCollection />
-            <AvailableFieldsCollection />
-            <NoDataMessage>No Data for this Report</NoDataMessage>
+            <ReportName>Report1</ReportName>
+            <ReportType>DataReport</ReportType>
+            <BottomMargin>50</BottomMargin>
+            <TopMargin>50</TopMargin>
             <LeftMargin>50</LeftMargin>
+            <RightMargin>50</RightMargin>
             <PageSize>827, 1169</PageSize>
-            <Padding>5, 5, 5, 5</Padding>
-            <BottomMargin>50</BottomMargin>
-            <CommandType>Text</CommandType>
-            <ParameterCollection />
             <Landscape>False</Landscape>
-            <ReportName>Report1</ReportName>
-            <TopMargin>50</TopMargin>
-            <GroupColumnsCollection />
             <GraphicsUnit>Millimeter</GraphicsUnit>
-            <CommandText />
-            <ReportType>DataReport</ReportType>
+            <Padding>5, 5, 5, 5</Padding>
+            <AvailableFieldsCollection />
+            <SortColumnsCollection />
+            <GroupColumnsCollection />
+            <ParameterCollection />
             <ConnectionString />
+            <CommandText />
+            <CommandType>Text</CommandType>
+            <DataModel>PushData</DataModel>
+            <NoDataMessage>No Data for this Report</NoDataMessage>
+            <DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
+            <UseStandardPrinter>True</UseStandardPrinter>
         </ReportSettings>
     </ReportSettings>
     <SectionCollection>
         <BaseSection>
+            <Location>50, 50</Location>
             <Size>786, 35</Size>
-            <Name>ReportHeader</Name>
-            <PageBreakAfter>False</PageBreakAfter>
-            <SectionMargin>50</SectionMargin>
-            <SectionOffset>0</SectionOffset>
             <BackColor>Window</BackColor>
-            <Items />
-            <Location>50, 50</Location>
+            <SectionOffset>0</SectionOffset>
+            <SectionMargin>50</SectionMargin>
             <DrawBorder>False</DrawBorder>
+            <PageBreakAfter>False</PageBreakAfter>
+            <Items />
+            <FrameColor>Black</FrameColor>
+            <Name>ReportHeader</Name>
         </BaseSection>
         <BaseSection>
+            <Location>50, 100</Location>
             <Size>786, 108</Size>
-            <Name>ReportPageHeader</Name>
-            <PageBreakAfter>False</PageBreakAfter>
-            <SectionMargin>50</SectionMargin>
-            <SectionOffset>0</SectionOffset>
             <BackColor>Window</BackColor>
+            <SectionOffset>0</SectionOffset>
+            <SectionMargin>50</SectionMargin>
+            <DrawBorder>False</DrawBorder>
+            <PageBreakAfter>False</PageBreakAfter>
             <Items>
                 <BaseTextItem>
+                    <Location>429, 63</Location>
+                    <Size>100, 20</Size>
                     <BackColor>White</BackColor>
-                    <CanShrink>False</CanShrink>
+                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <StringTrimming>None</StringTrimming>
-                    <Text>Job</Text>
-                    <Location>429, 63</Location>
                     <ContentAlignment>TopLeft</ContentAlignment>
-                    <Visible>True</Visible>
-                    <DrawBorder>False</DrawBorder>
-                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <CanGrow>False</CanGrow>
-                    <FormatString />
-                    <Name>Job</Name>
+                    <CanShrink>False</CanShrink>
+                    <Text>Job</Text>
+                    <DrawBorder>False</DrawBorder>
                     <FrameColor>WindowFrame</FrameColor>
-                    <Size>100, 20</Size>
                     <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <Name>Job</Name>
                 </BaseTextItem>
                 <BaseTextItem>
+                    <Location>234, 63</Location>
+                    <Size>100, 20</Size>
                     <BackColor>White</BackColor>
-                    <CanShrink>False</CanShrink>
+                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <StringTrimming>None</StringTrimming>
-                    <Text>Lastname</Text>
-                    <Location>234, 63</Location>
                     <ContentAlignment>TopLeft</ContentAlignment>
-                    <Visible>True</Visible>
-                    <DrawBorder>False</DrawBorder>
-                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <CanGrow>False</CanGrow>
-                    <FormatString />
-                    <Name>Lastname</Name>
+                    <CanShrink>False</CanShrink>
+                    <Text>Lastname</Text>
+                    <DrawBorder>False</DrawBorder>
                     <FrameColor>WindowFrame</FrameColor>
-                    <Size>100, 20</Size>
                     <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <Name>Lastname</Name>
                 </BaseTextItem>
                 <BaseImageItem>
-                    <ImageSource>File</ImageSource>
                     <Location>47, 6</Location>
-                    <Name>ReportImageControl</Name>
                     <Size>661, 42</Size>
-                    <ScaleImageToSize>False</ScaleImageToSize>
                     <BackColor>Window</BackColor>
-                    <RelativeFileName>..\..\..\..\..\..\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</RelativeFileName>
-                    <ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
+                    <ImageFileName>D:\git_Sharpdevelop_Reporting\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
+                    <ScaleImageToSize>False</ScaleImageToSize>
+                    <ImageSource>File</ImageSource>
+                    <RelativeFileName>..\..\Logos\Bannerbeige2.gif</RelativeFileName>
+                    <Name>ReportImageControl</Name>
                 </BaseImageItem>
                 <BaseLineItem>
-                    <StartLineCap>Flat</StartLineCap>
-                    <FromPoint>0, 3</FromPoint>
                     <Location>47, 87</Location>
-                    <Name />
                     <Size>661, 18</Size>
-                    <EndLineCap>Flat</EndLineCap>
-                    <DashStyle>Solid</DashStyle>
                     <BackColor>White</BackColor>
-                    <DashLineCap>Flat</DashLineCap>
                     <ForeColor>ControlText</ForeColor>
+                    <FromPoint>0, 3</FromPoint>
                     <ToPoint>614, 3</ToPoint>
+                    <StartLineCap>Flat</StartLineCap>
+                    <EndLineCap>Flat</EndLineCap>
+                    <DashLineCap>Flat</DashLineCap>
+                    <DashStyle>Solid</DashStyle>
                     <Thickness>2</Thickness>
+                    <Name />
                 </BaseLineItem>
                 <BaseTextItem>
+                    <Location>46, 63</Location>
+                    <Size>109, 20</Size>
                     <BackColor>White</BackColor>
-                    <CanShrink>False</CanShrink>
+                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <StringTrimming>EllipsisCharacter</StringTrimming>
-                    <Text>Firstname</Text>
-                    <Location>46, 63</Location>
                     <ContentAlignment>TopLeft</ContentAlignment>
-                    <Visible>True</Visible>
-                    <DrawBorder>False</DrawBorder>
-                    <Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
                     <CanGrow>False</CanGrow>
-                    <FormatString />
-                    <Name>reportTextItem1</Name>
+                    <CanShrink>False</CanShrink>
+                    <Text>Firstname</Text>
+                    <DrawBorder>False</DrawBorder>
                     <FrameColor>WindowFrame</FrameColor>
-                    <Size>109, 20</Size>
                     <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <Name>reportTextItem1</Name>
                 </BaseTextItem>
             </Items>
-            <Location>50, 100</Location>
-            <DrawBorder>False</DrawBorder>
+            <FrameColor>Black</FrameColor>
+            <Name>ReportPageHeader</Name>
         </BaseSection>
         <BaseSection>
-            <Size>750, 51</Size>
-            <Name>ReportDetail</Name>
-            <PageBreakAfter>False</PageBreakAfter>
-            <SectionMargin>50</SectionMargin>
-            <SectionOffset>0</SectionOffset>
+            <Location>50, 223</Location>
+            <Size>750, 60</Size>
             <BackColor>Window</BackColor>
+            <SectionOffset>0</SectionOffset>
+            <SectionMargin>50</SectionMargin>
+            <DrawBorder>False</DrawBorder>
+            <PageBreakAfter>False</PageBreakAfter>
             <Items>
                 <BaseRowItem>
                     <Location>3, 10</Location>
-                    <AlternateBackColor />
-                    <Name>Row</Name>
+                    <Size>699, 47</Size>
+                    <BackColor>White</BackColor>
+                    <DrawBorder>False</DrawBorder>
+                    <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <FrameColor>WindowFrame</FrameColor>
                     <Items>
                         <BaseDataItem>
-                            <DataType>System.String</DataType>
-                            <Text>First</Text>
-                            <Font>Microsoft Sans Serif, 10pt</Font>
                             <Location>43, 12</Location>
+                            <Size>147, 25</Size>
+                            <BackColor>White</BackColor>
+                            <Font>Microsoft Sans Serif, 10pt</Font>
+                            <StringTrimming>EllipsisCharacter</StringTrimming>
+                            <ContentAlignment>MiddleLeft</ContentAlignment>
                             <CanGrow>False</CanGrow>
+                            <CanShrink>False</CanShrink>
+                            <DataType>System.String</DataType>
+                            <Text>First</Text>
+                            <DrawBorder>False</DrawBorder>
+                            <FrameColor>WindowFrame</FrameColor>
                             <ForeColor>ControlText</ForeColor>
-                            <StringTrimming>EllipsisCharacter</StringTrimming>
+                            <Visible>True</Visible>
                             <ColumnName>First</ColumnName>
-                            <DrawBorder>False</DrawBorder>
-                            <CanShrink>False</CanShrink>
-                            <ContentAlignment>MiddleLeft</ContentAlignment>
-                            <BackColor>White</BackColor>
-                            <FormatString />
                             <Name>unbound1</Name>
-                            <Visible>True</Visible>
-                            <Size>147, 25</Size>
-                            <FrameColor>WindowFrame</FrameColor>
                         </BaseDataItem>
                         <BaseDataItem>
-                            <DataType>System.String</DataType>
-                            <Text>last</Text>
-                            <Font>Microsoft Sans Serif, 10pt</Font>
                             <Location>231, 12</Location>
-                            <CanGrow>False</CanGrow>
-                            <ForeColor>ControlText</ForeColor>
+                            <Size>139, 25</Size>
+                            <BackColor>White</BackColor>
+                            <Font>Microsoft Sans Serif, 10pt</Font>
                             <StringTrimming>EllipsisCharacter</StringTrimming>
-                            <ColumnName>last</ColumnName>
-                            <DrawBorder>False</DrawBorder>
-                            <CanShrink>False</CanShrink>
                             <ContentAlignment>MiddleLeft</ContentAlignment>
-                            <BackColor>White</BackColor>
-                            <FormatString />
-                            <Name>unbound2</Name>
-                            <Visible>True</Visible>
-                            <Size>139, 25</Size>
+                            <CanGrow>False</CanGrow>
+                            <CanShrink>False</CanShrink>
+                            <DataType>System.String</DataType>
+                            <Text>Last</Text>
+                            <DrawBorder>False</DrawBorder>
                             <FrameColor>WindowFrame</FrameColor>
+                            <ForeColor>ControlText</ForeColor>
+                            <Visible>True</Visible>
+                            <ColumnName>Last</ColumnName>
+                            <Name>unbound2</Name>
                         </BaseDataItem>
                         <BaseDataItem>
-                            <DataType>System.String</DataType>
-                            <Text>Job</Text>
-                            <Font>Microsoft Sans Serif, 10pt</Font>
                             <Location>426, 10</Location>
+                            <Size>216, 25</Size>
+                            <BackColor>White</BackColor>
+                            <Font>Microsoft Sans Serif, 10pt</Font>
+                            <StringTrimming>EllipsisCharacter</StringTrimming>
+                            <ContentAlignment>MiddleLeft</ContentAlignment>
                             <CanGrow>False</CanGrow>
+                            <CanShrink>False</CanShrink>
+                            <DataType>System.String</DataType>
+                            <Text>Job</Text>
+                            <DrawBorder>False</DrawBorder>
+                            <FrameColor>WindowFrame</FrameColor>
                             <ForeColor>ControlText</ForeColor>
-                            <StringTrimming>EllipsisCharacter</StringTrimming>
+                            <Visible>True</Visible>
                             <ColumnName>Job</ColumnName>
-                            <DrawBorder>False</DrawBorder>
                             <NullValue>--------------</NullValue>
-                            <CanShrink>False</CanShrink>
-                            <ContentAlignment>MiddleLeft</ContentAlignment>
-                            <BackColor>White</BackColor>
-                            <FormatString />
                             <Name>unbound3</Name>
-                            <Visible>True</Visible>
-                            <Size>216, 25</Size>
-                            <FrameColor>WindowFrame</FrameColor>
                         </BaseDataItem>
                     </Items>
-                    <DrawBorder>False</DrawBorder>
+                    <AlternateBackColor />
                     <ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
-                    <FrameColor>WindowFrame</FrameColor>
-                    <Size>699, 40</Size>
-                    <BackColor>White</BackColor>
-                    <Visible>True</Visible>
-                    <ForeColor>ControlText</ForeColor>
+                    <Name>Row</Name>
                 </BaseRowItem>
             </Items>
-            <Location>50, 223</Location>
-            <DrawBorder>False</DrawBorder>
+            <FrameColor>Black</FrameColor>
+            <Name>ReportDetail</Name>
         </BaseSection>
         <BaseSection>
+            <Location>50, 298</Location>
             <Size>750, 49</Size>
-            <Name>ReportPageFooter</Name>
-            <PageBreakAfter>False</PageBreakAfter>
-            <SectionMargin>50</SectionMargin>
-            <SectionOffset>0</SectionOffset>
             <BackColor>Window</BackColor>
+            <SectionOffset>0</SectionOffset>
+            <SectionMargin>50</SectionMargin>
+            <DrawBorder>False</DrawBorder>
+            <PageBreakAfter>False</PageBreakAfter>
             <Items>
                 <BaseTextItem>
+                    <Location>45, 24</Location>
+                    <Size>483, 20</Size>
                     <BackColor>White</BackColor>
-                    <CanShrink>False</CanShrink>
+                    <Font>Microsoft Sans Serif, 8.25pt</Font>
                     <StringTrimming>None</StringTrimming>
-                    <Text>=Globals!ReportFolder</Text>
-                    <Location>45, 24</Location>
                     <ContentAlignment>TopLeft</ContentAlignment>
-                    <Visible>True</Visible>
-                    <DrawBorder>False</DrawBorder>
-                    <Font>Microsoft Sans Serif, 8.25pt</Font>
                     <CanGrow>False</CanGrow>
-                    <FormatString />
-                    <Name>=Globals!ReportFolder</Name>
+                    <CanShrink>False</CanShrink>
+                    <Text>=Globals!ReportFolder</Text>
+                    <DrawBorder>False</DrawBorder>
                     <FrameColor>WindowFrame</FrameColor>
-                    <Size>483, 20</Size>
                     <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <Name>=Globals!ReportFolder</Name>
                 </BaseTextItem>
                 <BaseLineItem>
-                    <StartLineCap>Flat</StartLineCap>
-                    <FromPoint>0, 0</FromPoint>
                     <Location>45, 3</Location>
-                    <Name>object_177a5444_b8e0_4202_87d2_05cdc7cd1194</Name>
                     <Size>663, 15</Size>
-                    <EndLineCap>Flat</EndLineCap>
-                    <DashStyle>Solid</DashStyle>
                     <BackColor>White</BackColor>
-                    <DashLineCap>Flat</DashLineCap>
                     <ForeColor>ControlText</ForeColor>
+                    <FromPoint>0, 0</FromPoint>
                     <ToPoint>656, 0</ToPoint>
+                    <StartLineCap>Flat</StartLineCap>
+                    <EndLineCap>Flat</EndLineCap>
+                    <DashLineCap>Flat</DashLineCap>
+                    <DashStyle>Solid</DashStyle>
                     <Thickness>2</Thickness>
+                    <Name>object_177a5444_b8e0_4202_87d2_05cdc7cd1194</Name>
                 </BaseLineItem>
                 <BaseTextItem>
+                    <Location>602, 24</Location>
+                    <Size>100, 20</Size>
                     <BackColor>White</BackColor>
-                    <CanShrink>False</CanShrink>
+                    <Font>Microsoft Sans Serif, 8.25pt</Font>
                     <StringTrimming>None</StringTrimming>
-                    <Text>='Page ' + Globals!PageNumber</Text>
-                    <Location>602, 24</Location>
                     <ContentAlignment>TopLeft</ContentAlignment>
-                    <Visible>True</Visible>
-                    <DrawBorder>False</DrawBorder>
-                    <Font>Microsoft Sans Serif, 8.25pt</Font>
                     <CanGrow>False</CanGrow>
-                    <FormatString />
-                    <Name>='Page ' + Globals!PageNumber</Name>
+                    <CanShrink>False</CanShrink>
+                    <Text>='Page ' + Globals!PageNumber</Text>
+                    <DrawBorder>False</DrawBorder>
                     <FrameColor>WindowFrame</FrameColor>
-                    <Size>100, 20</Size>
                     <ForeColor>ControlText</ForeColor>
+                    <Visible>True</Visible>
+                    <Name>='Page ' + Globals!PageNumber</Name>
                 </BaseTextItem>
             </Items>
-            <Location>50, 289</Location>
-            <DrawBorder>False</DrawBorder>
+            <FrameColor>Black</FrameColor>
+            <Name>ReportPageFooter</Name>
         </BaseSection>
         <BaseSection>
+            <Location>50, 362</Location>
             <Size>750, 55</Size>
-            <Name>ReportFooter</Name>
-            <PageBreakAfter>False</PageBreakAfter>
-            <SectionMargin>50</SectionMargin>
-            <SectionOffset>0</SectionOffset>
             <BackColor>Window</BackColor>
-            <Items />
-            <Location>50, 353</Location>
+            <SectionOffset>0</SectionOffset>
+            <SectionMargin>50</SectionMargin>
             <DrawBorder>False</DrawBorder>
+            <PageBreakAfter>False</PageBreakAfter>
+            <Items />
+            <FrameColor>Black</FrameColor>
+            <Name>ReportFooter</Name>
         </BaseSection>
     </SectionCollection>
 </ReportModel>

samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs

@@ -41,6 +41,7 @@ namespace SharpReportSamples
 			list.Add(new Contributor("Nathan","Allen",""));
 			list.Add(new Contributor("Troy","Simpson","Prg."));
 			list.Add(new Contributor("David","Alpert","Prg."));
+			list.Add(new Contributor("Fred","Flintstone",null));
 			return list;
 		}
 	}

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@@ -153,6 +153,9 @@ namespace SharpReportSamples
 		private void RunContributors (string fileName)
 		{
 			ReportModel model = ReportEngine.LoadReportModel(fileName);
+//			Console.WriteLine(model.ReportSettings.PageSize);
+//			model.ReportSettings.PageSize = new Size(model.ReportSettings.PageSize.Width,400);
+//			Console.WriteLine(model.ReportSettings.PageSize);
 			
 			// sorting is done here, but, be carefull, misspelled fieldnames will cause an exception
 			
@@ -302,7 +305,7 @@ namespace SharpReportSamples
 		private void PushPrinting (object sender, SectionRenderEventArgs e )
 		{
 			string sectionName = e.Section.Name;
-			
+			/*
 			if (sectionName == ReportSectionNames.ReportHeader) {
 				Console.WriteLine("PushPrinting  :" + ReportSectionNames.ReportHeader);
 			} 
@@ -372,6 +375,7 @@ namespace SharpReportSamples
 			else{
 				throw new WrongSectionException(sectionName);
 			}
+			*/
 		}
 		
 		

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs

@@ -368,7 +368,7 @@ namespace ICSharpCode.CodeCoverage
 			visitCountColumnHeader.Width = 80;
 			
 			startLineColumnHeader = new ColumnHeader();
-			startLineColumnHeader.Text = StringParser.Parse("${res:ICSharpCode.CodeCoverage.Line}");
+			startLineColumnHeader.Text = StringParser.Parse("${res:Global.TextLine}");
 			startLineColumnHeader.Width = 80;
 				
 			startColumnColumnHeader = new ColumnHeader();

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs

@@ -1,15 +1,17 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.SharpDevelop.Internal.Templates;
 using System;
 using System.IO;
 using System.Text;
 using System.Xml;
+
 using ICSharpCode.CodeCoverage;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
+using UnitTesting.Tests.Utils;
 
 namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
@@ -59,7 +61,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 		{
 			MSBuildBasedProject project = new MSBuildBasedProject(
 				new ProjectCreateInformation {
-					Solution = new Solution(),
+					Solution = new Solution(new MockProjectChangeWatcher()),
 					OutputProjectFileName = @"C:\temp\test.csproj",
 					ProjectName = "test"
 				});

src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin

@@ -36,7 +36,7 @@
 	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
 		<DisplayBinding id = "ProfilerDisplayBinding"
 		                insertbefore="Text"
-		                fileNamePattern=".sdps"
+		                fileNamePattern="\.(sdps)$"
 		                title = "${res:AddIns.Profiler.ProfilingView.Title}"
 		                class = "ICSharpCode.Profiler.AddIn.Views.ProfilerDisplayBinding"/>
 	</Path>
@@ -78,7 +78,8 @@
 		<FileFilter id = "SharpDevelopProfilingSession"
 		            insertbefore="AllFiles"
 		            name = "${res:AddIns.Profiler.FileExtensionDescription}"
-		            extensions = "*.sdps"/>
+		            extensions = "*.sdps"
+		            mimeType = "application/x-sharpdevelop-profiler"/>
 	</Path>
 	
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs

@@ -35,8 +35,8 @@ namespace ICSharpCode.Profiler.AddIn.Commands
 			string memberName = member.DeclaringType.Name + "." + member.Name;
 			using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}"))
 			{
-				FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}",
-				                                                                     new string[,] {{ "Name", memberName }}),
+				FindReferencesAndRenameHelper.ShowAsSearchResults(
+					StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", new StringTagPair("Name", memberName)),
 					RefactoringService.FindReferences(member, monitor));
 			}
 		}

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Views/ProfilerDisplayBinding.cs

@@ -21,7 +21,7 @@ namespace ICSharpCode.Profiler.AddIn.Views
 		
 		public bool CanCreateContentForFile(string fileName)
 		{
-			return Path.GetExtension(fileName) == ".sdps";
+			return true; // definition in .addin does extension-based filtering
 		}
 		
 		public ICSharpCode.SharpDevelop.Gui.IViewContent CreateContentForFile(OpenedFile file)
@@ -45,5 +45,15 @@ namespace ICSharpCode.Profiler.AddIn.Views
 			}
 			return new WpfViewer(file, provider);
 		}
+		
+		public bool IsPreferredBindingForFile(string fileName)
+		{
+			return true;
+		}
+		
+		public double AutoDetectFileContent(string fileName, Stream fileContent, string detectedMimeType)
+		{
+			return 1;
+		}
 	}
 }

src/AddIns/Analysis/SourceAnalysis/SharpDevelop.SourceAnalysis.targets

@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<UsingTask TaskName="StyleCopTask"
-	           AssemblyFile="$(StyleCopDir)\Microsoft.StyleCop.dll"/>
+	<UsingTask Condition="'$(StyleCopFile)' != ''"
+	           TaskName="StyleCopTask"
+	           AssemblyFile="$(StyleCopFile)"/>
 	
 	<PropertyGroup>
 		<BuildDependsOn>$(BuildDependsOn);SourceAnalysis</BuildDependsOn>

src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin

@@ -17,10 +17,6 @@
 		<String id="SourceAnalysis" text = "${AddInPath:MattEverson.SourceAnalysis}/SharpDevelop.SourceAnalysis.targets"/>
 	</Path>
 	
-	<Path name = "/SharpDevelop/MSBuildEngine/AdditionalProperties">
-		<String id="StyleCopDir" text = "${property:SourceAnalysis.StyleCopPath}"/>
-	</Path>
-	
 	<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
 		<OptionPanel id          = "SourceAnalysis"
 		             label       = "${res:AddIns.SourceAnalysis.Title}"

src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.cs

@@ -42,13 +42,13 @@ namespace MattEverson.SourceAnalysis
 		{
 			using (OpenFileDialog dlg = new OpenFileDialog()) {
 				dlg.DefaultExt = "dll";
-				dlg.Filter = StringParser.Parse("StyleCop|Microsoft.StyleCop.dll|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
+				dlg.Filter = StringParser.Parse("StyleCop|*" + StyleCopWrapper.STYLE_COP_FILE + "|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
 				if (dlg.ShowDialog() == DialogResult.OK) {
-					string path = Path.GetDirectoryName(dlg.FileName);
+					string path = dlg.FileName;
 					if (StyleCopWrapper.IsStyleCopPath(path)) {
 						StyleCopPath = path;
 					} else {
-						MessageService.ShowError("Directory does not contain StyleCop.");
+						MessageService.ShowError(string.Format("Directory does not contain StyleCop (*{0}).", StyleCopWrapper.STYLE_COP_FILE));
 					}
 				}
 			}
@@ -57,7 +57,7 @@ namespace MattEverson.SourceAnalysis
 		
 		void ModifyStyleCopSettingsClick(object sender, EventArgs e)
 		{
-		    var executable = Path.Combine(StyleCopWrapper.FindStyleCopPath(), "StyleCopSettingsEditor.exe");
+			var executable = Path.Combine(Path.GetDirectoryName(StyleCopWrapper.FindStyleCopPath()), "StyleCopSettingsEditor.exe");
 		    var parameters = "\"" + StyleCopWrapper.GetMasterSettingsFile() + "\"";
 
             if (!File.Exists(executable)) {

src/AddIns/Analysis/SourceAnalysis/Src/AnalysisProjectOptionsPanel.cs

@@ -63,7 +63,7 @@ namespace MattEverson.SourceAnalysis {
 			string styleCopPath = StyleCopWrapper.FindStyleCopPath();
 			string executable;
 			if (styleCopPath != null)
-				executable = Path.Combine(styleCopPath, "StyleCopSettingsEditor.exe");
+				executable = Path.Combine(Path.GetDirectoryName(styleCopPath), "StyleCopSettingsEditor.exe");
 			else
 				executable = null;
 			string parameters = "\"" + settingsFile + "\"";

src/AddIns/Analysis/SourceAnalysis/Src/CheckCurrentProjectCommand.cs

@@ -15,6 +15,7 @@ namespace MattEverson.SourceAnalysis
 			BuildOptions options = new BuildOptions(BuildTarget.Rebuild, CallbackMethod);
 			options.TargetForDependencies = BuildTarget.Build;
 			options.ProjectAdditionalProperties["RunSourceAnalysis"] = "true";
+			options.ProjectAdditionalProperties["StyleCopFile"] = StyleCopWrapper.FindStyleCopPath() ?? string.Empty;
 			BuildEngine.BuildInGui(this.ProjectToBuild, options);
 		}
 	}

src/AddIns/Analysis/SourceAnalysis/Src/StyleCopWrapper.cs

@@ -12,13 +12,14 @@ namespace MattEverson.SourceAnalysis
 	public static class StyleCopWrapper
 	{		
 	    public static readonly string MasterSettingsFileName = Path.Combine(PropertyService.ConfigDirectory, @"Settings.SourceAnalysis");
+	    public const string STYLE_COP_FILE = "StyleCop.dll";
 	    
 		public static bool IsStyleCopPath(string styleCopPath)
 		{
 			if (string.IsNullOrEmpty(styleCopPath))
 				return false;
-			else
-				return File.Exists(Path.Combine(styleCopPath, "Microsoft.StyleCop.dll"));
+			
+			return File.Exists(styleCopPath);
 		}
 		
 		public static string FindStyleCopPath()

src/AddIns/Analysis/UnitTesting/Src/TestFrameworkDoozer.cs

@@ -17,9 +17,9 @@ namespace ICSharpCode.UnitTesting
 			get { return false; }
 		}
 		
-		public object BuildItem(object caller, Codon codon, ArrayList subItems)
+		public object BuildItem(BuildItemArgs args)
 		{
-			return BuildItem(codon, new TestFrameworkFactory(codon.AddIn));
+			return BuildItem(args.Codon, new TestFrameworkFactory(args.AddIn));
 		}
 		
 		public TestFrameworkDescriptor BuildItem(Codon codon, ITestFrameworkFactory factory)

src/AddIns/Analysis/UnitTesting/Src/TestResultTask.cs

@@ -69,8 +69,7 @@ namespace ICSharpCode.UnitTesting
 		
 		static string GetTestResultMessageFromResource(TestResult result, string stringResource)
 		{
-			string [,] customTags = new string[,] {{"TestCase", result.Name}};
-			return StringParser.Parse(stringResource, customTags);
+			return StringParser.Parse(stringResource, new StringTagPair("TestCase", result.Name));
 		}
 		
 		/// <summary>

src/AddIns/Analysis/UnitTesting/Test/Tree/ClassWithNoRootNamespaceTestFixture.cs

@@ -36,7 +36,7 @@ namespace UnitTesting.Tests.Tree
 		public void SetUp()
 		{
 			// Create solution.
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			
 			// Create a project to display in the test tree view.
 			project = new MockCSharpProject();

src/AddIns/Analysis/UnitTesting/Test/Tree/GetProjectsTestFixture.cs

@@ -27,7 +27,7 @@ namespace UnitTesting.Tests.Tree
 		[SetUp]
 		public void Init()
 		{
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			project1 = new MockCSharpProject(solution, "A");
 			ReferenceProjectItem refProjectItem = new ReferenceProjectItem(project1);
 			refProjectItem.Include = "NUnit.Framework";

src/AddIns/Analysis/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs

@@ -33,7 +33,7 @@ namespace UnitTesting.Tests.Tree
 			treeView = new DummyParserServiceTestTreeView(testFrameworks);
 			
 			// Create a solution with two test projects.
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			
 			// Create the first test project.
 			firstProject = new MockCSharpProject(solution, "FirstTestProject");

src/AddIns/Analysis/UnitTesting/Test/Tree/NonTestProjectNotAddedToTestTreeTestFixture.cs

@@ -23,7 +23,7 @@ namespace UnitTesting.Tests.Tree
 		[SetUp]
 		public void Init()
 		{
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			testProject = new MockCSharpProject(solution, "A");
 			solution.Folders.Add(testProject);
 			

src/AddIns/Analysis/UnitTesting/Test/Tree/OpenUnitTestsPadWithSolutionOpenTestFixture.cs

@@ -23,7 +23,7 @@ namespace UnitTesting.Tests.Tree
 		[TestFixtureSetUp]
 		public void SetUp()
 		{
-			Solution solution = new Solution();
+			Solution solution = new Solution(new MockProjectChangeWatcher());
 			MockCSharpProject project = new MockCSharpProject();
 			MockProjectContent projectContent = new MockProjectContent();
 			projectContent.Project = project;

src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionLoadedAfterUnitTestsTreeDisposedTestFixture.cs

@@ -24,7 +24,7 @@ namespace UnitTesting.Tests.Tree
 		[Test]
 		public void SolutionLoadedAfterTreeDisposedDoesNotThrowNullReferenceException()
 		{
-			Solution solution = new Solution();
+			Solution solution = new Solution(new MockProjectChangeWatcher());
 			Assert.DoesNotThrow(delegate { pad.CallSolutionLoaded(solution); });
 		}
 	}

src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionOpenedTestFixture.cs

@@ -37,7 +37,7 @@ namespace UnitTesting.Tests.Tree
 			testFrameworks = new MockTestFrameworksWithNUnitFrameworkSupport();
 			projectContent = new MockProjectContent();
 			pad.ProjectContent = projectContent;
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			project = new MockCSharpProject();
 			projectContent.Project = project;
 			projectContent.Language = LanguageProperties.None;

src/AddIns/Analysis/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs

@@ -37,7 +37,7 @@ namespace UnitTesting.Tests.Tree
 		[SetUp]
 		public void SetUp()
 		{
-			solution = new Solution();
+			solution = new Solution(new MockProjectChangeWatcher());
 			
 			// Create a project to display in the test tree view.
 			project = new MockCSharpProject(solution, "TestProject");

src/AddIns/Analysis/UnitTesting/Test/Utils/MockCSharpProject.cs

@@ -13,7 +13,7 @@ namespace UnitTesting.Tests.Utils
 		bool saved;
 		
 		public MockCSharpProject()
-			: this(new Solution(), "MyTests")
+			: this(new Solution(new MockProjectChangeWatcher()), "MyTests")
 		{
 		}
 		

src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@@ -29,7 +29,8 @@
 		<FileFilter id = "Boo"
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.Boo} (*.boo)"
-		            extensions = "*.boo"/>
+		            extensions = "*.boo"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<!-- Makes SharpDevelop show the text 'Compiling ProjectName...' whenever an MSBuild task named 'booc' is started -->

src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitorExpressions.cs

@@ -468,13 +468,7 @@ namespace NRefactoryToBooConverter
 				newRank[i] = elementType.RankSpecifier[i + 1];
 			elementType.RankSpecifier = newRank;
 			mie.Arguments.Add(MakeReferenceExpression(elementType));
-			if (arrayCreateExpression.Arguments.Count == 1) {
-				mie.Arguments.Add(ConvertExpression(arrayCreateExpression.Arguments[0]));
-			} else {
-				B.ArrayLiteralExpression dims = new B.ArrayLiteralExpression(GetLexicalInfo(arrayCreateExpression));
-				ConvertExpressions(arrayCreateExpression.Arguments, dims.Items);
-				mie.Arguments.Add(dims);
-			}
+			ConvertExpressions(arrayCreateExpression.Arguments, mie.Arguments);
 			return mie;
 		}
 		

src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/ExpressionTests.cs

@@ -204,7 +204,7 @@ namespace NRefactoryToBooConverter.Tests
 		[Test]
 		public void CreateMultidimensionalArray()
 		{
-			TestExpr("new int[2, 3]", "matrix(System.Int32, (2, 3))");
+			TestExpr("new int[2, 3]", "matrix(System.Int32, 2, 3)");
 		}
 		
 		[Test]

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@@ -36,7 +36,8 @@
 		<FileFilter id = "C#"
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.CSharpFiles}"
-		            extensions = "*.cs"/>
+		            extensions = "*.cs"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/Combine/FileFilter">

src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs

@@ -43,7 +43,6 @@ namespace CSharpBinding
 			} else if (ch == ',' && CodeCompletionOptions.InsightRefreshOnComma && CodeCompletionOptions.InsightEnabled) {
 				IInsightWindow insightWindow;
 				if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow)) {
-					insightHandler.HighlightParameter(insightWindow, -1); // disable highlighting
 					return CodeCompletionKeyPressResult.Completed;
 				}
 			} else if(ch == '=') {

src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin

@@ -65,7 +65,8 @@
 		            insertafter="C#"
 		            insertbefore="Resources"
 		            name="C++ files (*.cpp, *.h)"
-		            extensions="*.cpp;*.c;*.hpp;*.h"/>
+		            extensions="*.cpp;*.c;*.hpp;*.h"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<Path name="/SharpDevelop/Workbench/ProjectBindings">

src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin

@@ -41,7 +41,8 @@
 		<FileFilter id = "F#"
 		            insertbefore="AllFiles"
 		            name = "F# (*.fs)"
-		            extensions = "*.fs"/>
+		            extensions = "*.fs"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/Combine/FileFilter">

src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin

@@ -36,7 +36,8 @@
 		            insertbefore="Resources"
 		            insertafter="Icons"
 		            name="${res:ICSharpCode.PythonBinding.PythonFiles} (*.py)"
-			extensions="*.py"/>
+		            extensions="*.py"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<!-- Add the "Python" entry to the Open Project Dialog -->

src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs

@@ -71,7 +71,7 @@ namespace PythonBinding.Tests.Converter
 			convertProjectCommand.ProjectContent = mockProjectContent;
 			convertProjectCommand.FileServiceDefaultEncoding = Encoding.Unicode;
 			
-			Solution solution = new Solution();
+			Solution solution = new Solution(new MockProjectChangeWatcher());
 			sourceProject = new MSBuildBasedProject(
 				new ProjectCreateInformation() {
 					Solution = solution,

src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/AppSettingsPanelTestFixture.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
 using ICSharpCode.SharpDevelop;
@@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using PythonBinding.Tests.Utils;
+using UnitTesting.Tests.Utils;
 
 namespace PythonBinding.Tests.Gui
 {
@@ -29,7 +31,7 @@ namespace PythonBinding.Tests.Gui
 			PythonMSBuildEngineHelper.InitMSBuildEngine();
 			
 			ProjectCreateInformation info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj";
 			info.RootNamespace = "Test";

src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/CompilingOptionsPanelTestFixture.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
 using ICSharpCode.PythonBinding;
 using ICSharpCode.SharpDevelop;
@@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using PythonBinding.Tests.Utils;
+using UnitTesting.Tests.Utils;
 
 namespace PythonBinding.Tests.Gui
 {
@@ -29,7 +31,7 @@ namespace PythonBinding.Tests.Gui
 			PythonMSBuildEngineHelper.InitMSBuildEngine();
 			
 			ProjectCreateInformation info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj";
 			info.RootNamespace = "Test";

src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs

@@ -11,6 +11,7 @@ using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using PythonBinding.Tests;
 using PythonBinding.Tests.Utils;
+using UnitTesting.Tests.Utils;
 
 namespace PythonBinding.Tests.Parsing
 {
@@ -87,7 +88,7 @@ namespace PythonBinding.Tests.Parsing
 		public void CanParsePythonProject()
 		{
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			createInfo.OutputProjectFileName = @"C:\projects\test.pyproj";
 			PythonProject project = new PythonProject(createInfo);
 			Assert.IsTrue(parser.CanParse(project));

src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs

@@ -2,9 +2,10 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Linq;
 using System.IO;
+using System.Linq;
 using System.Text;
+
 using ICSharpCode.PythonBinding;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
@@ -12,6 +13,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using PythonBinding.Tests.Utils;
+using UnitTesting.Tests.Utils;
 
 namespace PythonBinding.Tests.PythonLanguage
 {
@@ -30,7 +32,7 @@ namespace PythonBinding.Tests.PythonLanguage
 			PythonMSBuildEngineHelper.InitMSBuildEngine();
 			
 			info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj";
 			info.RootNamespace = "Test";

src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs

@@ -3,9 +3,10 @@
 
 using System;
 using ICSharpCode.PythonBinding;
-using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Internal.Templates;
+using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
+using UnitTesting.Tests.Utils;
 
 namespace PythonBinding.Tests.PythonLanguage
 {
@@ -25,7 +26,7 @@ namespace PythonBinding.Tests.PythonLanguage
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
 			createInfo.ProjectName = "Python";
 			createInfo.OutputProjectFileName = @"C:\Projects\Python.pyproj";
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			project = projectBinding.CreateProject(createInfo) as PythonProject;
 		}
 		

src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs

@@ -39,7 +39,7 @@ namespace PythonBinding.Tests.Testing
 		public void IsTestProjectReturnsTrueForPythonProject()
 		{
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			createInfo.OutputProjectFileName = @"C:\projects\test.pyproj";
 			PythonProject project = new PythonProject(createInfo);
 			

src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin

@@ -30,7 +30,8 @@
 		            insertbefore="Resources"
 		            insertafter="Icons"
 		            name="Ruby Files (*.rb)"
-			extensions="*.rb"/>
+		            extensions="*.rb"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<!-- Add the "Ruby" entry to the Open Project Dialog -->
@@ -110,7 +111,7 @@
 	</Path>
 	
 	<!-- The Ruby code completion binding -->
-<!--	<Path name = "/AddIns/DefaultTextEditor/CodeCompletion">
+	<!--	<Path name = "/AddIns/DefaultTextEditor/CodeCompletion">
 		<CodeCompletionBinding id="Ruby"
 			extensions=".rb"
 			class="ICSharpCode.RubyBinding.RubyCodeCompletionBinding"/>

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs

@@ -12,6 +12,7 @@ using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 using RubyBinding.Tests;
 using RubyBinding.Tests.Utils;
+using UnitTesting.Tests.Utils;
 
 namespace RubyBinding.Tests.Parsing
 {
@@ -87,7 +88,7 @@ namespace RubyBinding.Tests.Parsing
 		public void CanParseRubyProject()
 		{
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			createInfo.OutputProjectFileName = @"C:\projects\test.rbproj";
 			RubyProject project = new RubyProject(createInfo);
 			Assert.IsTrue(parser.CanParse(project));

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/CreateNewRubyProjectTestFixture.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Text;
+
 using ICSharpCode.RubyBinding;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
@@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using Microsoft.Build.Construction;
 using NUnit.Framework;
+using UnitTesting.Tests.Utils;
 
 namespace RubyBinding.Tests.RubyLanguage
 {
@@ -27,7 +29,7 @@ namespace RubyBinding.Tests.RubyLanguage
 		public void SetUpFixture()
 		{
 			info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.rbproj";
 			info.RootNamespace = "Test";

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/ProjectBindingTestFixture.cs

@@ -3,9 +3,10 @@
 
 using System;
 using ICSharpCode.RubyBinding;
-using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Internal.Templates;
+using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
+using UnitTesting.Tests.Utils;
 
 namespace RubyBinding.Tests.RubyLanguage
 {
@@ -25,7 +26,7 @@ namespace RubyBinding.Tests.RubyLanguage
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
 			createInfo.ProjectName = "Ruby";
 			createInfo.OutputProjectFileName = @"C:\Projects\Ruby.rbproj";
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			project = projectBinding.CreateProject(createInfo) as RubyProject;
 		}
 		

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs

@@ -39,7 +39,7 @@ namespace RubyBinding.Tests.Testing
 		public void IsTestProjectWhenPassedRubyPythonProjectReturnsTrue()
 		{
 			ProjectCreateInformation createInfo = new ProjectCreateInformation();
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(new MockProjectChangeWatcher());
 			createInfo.OutputProjectFileName = @"C:\projects\test.rbproj";
 			RubyProject project = new RubyProject(createInfo);
 			

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerResponseFileTestFixture.cs

@@ -67,7 +67,7 @@ namespace RubyBinding.Tests.Testing
 		[Test]
 		public void WriteTestsAddsFileNamesForFileInProject()
 		{
-			MockCSharpProject project = new MockCSharpProject(new Solution(), "mytests");
+			MockCSharpProject project = new MockCSharpProject(new Solution(new MockProjectChangeWatcher()), "mytests");
 			
 			FileProjectItem item = new FileProjectItem(project, ItemType.Compile);
 			item.FileName = @"c:\projects\mytests\myTests.rb";
@@ -83,7 +83,7 @@ namespace RubyBinding.Tests.Testing
 		[Test]
 		public void WriteTestsDoesNotThrowNullReferenceExceptionWhenNonFileProjectItemInProject()
 		{
-			MockCSharpProject project = new MockCSharpProject(new Solution(), "mytests");
+			MockCSharpProject project = new MockCSharpProject(new Solution(new MockProjectChangeWatcher()), "mytests");
 			WebReferenceUrl webRef = new WebReferenceUrl(project);
 			webRef.Include = "test";
 			ProjectService.AddProjectItem(project, webRef);

src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs

@@ -120,7 +120,7 @@ namespace ICSharpCode.Scripting
 			return method.Parameters.Count == 2;
 		}
 
-		public void NotifyFormRenamed(string newName)
+		public void NotifyComponentRenamed(object component, string newName, string oldName)
 		{
 		}
 		

src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerGenerator.cs

@@ -55,7 +55,7 @@ namespace ICSharpCode.Scripting.Tests.Utils
 		{
 		}
 		
-		public void NotifyFormRenamed(string newName)
+		public void NotifyComponentRenamed(object component, string newName, string oldName)
 		{
 		}
 		

src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs

@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
+using UnitTesting.Tests.Utils;
 
 namespace ICSharpCode.Scripting.Tests.Utils
 {
@@ -169,7 +171,7 @@ namespace ICSharpCode.Scripting.Tests.Utils
 		}
 		
 		public Solution ParentSolution {
-			get { return new Solution(); }
+			get { return new Solution(new MockProjectChangeWatcher()); }
 		}
 		
 		public string TypeGuid {
@@ -214,6 +216,12 @@ namespace ICSharpCode.Scripting.Tests.Utils
 			}
 		}
 		
+		public Properties ProjectSpecificProperties {
+			get {
+				throw new NotImplementedException();
+			}
+		}
+		
 		public IEnumerable<ProjectItem> GetItemsOfType(ItemType type)
 		{
 			throw new NotImplementedException();
@@ -310,6 +318,5 @@ namespace ICSharpCode.Scripting.Tests.Utils
 			throw new NotImplementedException();
 		}
 		#endregion
-
 	}
 }

src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs

@@ -67,7 +67,6 @@ namespace ICSharpCode.VBNetBinding
 						if (insightWindow != null) {
 							insightHandler.InitializeOpenedInsightWindow(editor, insightWindow);
 							insightHandler.HighlightParameter(insightWindow, 0);
-							insightWindow.CaretPositionChanged += delegate { Run(insightWindow, editor); };
 						}
 						return CodeCompletionKeyPressResult.Completed;
 					}
@@ -75,14 +74,8 @@ namespace ICSharpCode.VBNetBinding
 				case ',':
 					if (CodeCompletionOptions.InsightRefreshOnComma && CodeCompletionOptions.InsightEnabled) {
 						IInsightWindow insightWindow;
-						editor.Document.Insert(editor.Caret.Offset, ",");
-						if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow)) {
-							if (insightWindow != null) {
-								insightHandler.HighlightParameter(insightWindow, GetArgumentIndex(editor) + 1);
-								insightWindow.CaretPositionChanged += delegate { Run(insightWindow, editor); };;
-							}
-						}
-						return CodeCompletionKeyPressResult.EatKey;
+						if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow))
+							return CodeCompletionKeyPressResult.Completed;
 					}
 					break;
 				case '\n':
@@ -145,26 +138,6 @@ namespace ICSharpCode.VBNetBinding
 			return CodeCompletionKeyPressResult.None;
 		}
 		
-		void Run(IInsightWindow insightWindow, ITextEditor editor)
-		{
-			insightHandler.HighlightParameter(insightWindow, GetArgumentIndex(editor));
-		}
-		
-		static int GetArgumentIndex(ITextEditor editor)
-		{
-			ILexer lexer = ParserFactory.CreateLexer(SupportedLanguage.VBNet, editor.Document.CreateReader());
-			ExpressionFinder ef = new ExpressionFinder();
-			
-			Token t = lexer.NextToken();
-			
-			while (t.Kind != Tokens.EOF && t.Location < editor.Caret.Position) {
-				ef.InformToken(t);
-				t = lexer.NextToken();
-			}
-			
-			return ef.ActiveArgument;
-		}
-		
 		static bool IsTypeCharacter(char ch, char prevChar)
 		{
 			ch = char.ToUpperInvariant(ch);

src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@@ -23,7 +23,8 @@
 		<FileFilter id = "VBNet"
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.VBNetFiles}"
-		            extensions = "*.vb"/>
+		            extensions = "*.vb"
+		            mimeType = "text/plain"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/Combine/FileFilter">

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs

@@ -101,7 +101,7 @@ namespace ICSharpCode.WixBinding
 		{
 		}
 		
-		public void NotifyFormRenamed(string newName)
+		public void NotifyComponentRenamed(object component, string newName, string oldName)
 		{
 		}
 		

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

@@ -28,7 +28,8 @@
 		<FileFilter id = "Wix"
 		            insertbefore="AllFiles"
 		            name = "${res:ICSharpCode.WixBinding.WixFileFilterName} (*.wxs;*.wxi)"
-		            extensions = "*.wxs;*.wxi"/>
+		            extensions = "*.wxs;*.wxi"
+		            mimeType = "text/xml"/>
 	</Path>
 
 	<Path name = "/SharpDevelop/MSBuildEngine/CompileTaskNames">

src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixExtensionNodeTestFixture.cs

@@ -29,7 +29,7 @@ namespace WixBinding.Tests.Gui
 			
 			// create the project.
 			ProjectCreateInformation info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj";
 

src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixLibraryNodeTestFixture.cs

@@ -29,7 +29,7 @@ namespace WixBinding.Tests.Gui
 			
 			// create the project.
 			ProjectCreateInformation info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj";
 

src/AddIns/BackendBindings/WixBinding/Test/Project/CreateNewWixProjectObjectTestFixture.cs

@@ -29,7 +29,7 @@ namespace WixBinding.Tests.Project
 			WixBindingTestsHelper.InitMSBuildEngine();
 			
 			info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj";
 			info.RootNamespace = "Test";

src/AddIns/BackendBindings/WixBinding/Test/Project/WixBuilderCannotBuildNonWixProjectTestFixture.cs

@@ -1,11 +1,12 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.SharpDevelop.Internal.Templates;
 using System;
+using ICSharpCode.SharpDevelop.Internal.Templates;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.WixBinding;
 using NUnit.Framework;
+using WixBinding.Tests.Utils;
 
 namespace WixBinding.Tests.Project
 {
@@ -25,7 +26,7 @@ namespace WixBinding.Tests.Project
 			project = new MSBuildBasedProject(
 				new ProjectCreateInformation {
 					OutputProjectFileName = @"C:\Projects\Test\test.csproj",
-					Solution = new Solution(),
+					Solution = new Solution(new MockProjectChangeWatcher()),
 					ProjectName = "test"
 				}
 			);

src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs

@@ -43,7 +43,7 @@ namespace WixBinding.Tests.Utils
 			
 			// create the project.
 			ProjectCreateInformation info = new ProjectCreateInformation();
-			info.Solution = new Solution();
+			info.Solution = new Solution(new MockProjectChangeWatcher());
 			info.ProjectName = "Test";
 			info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj";
 

src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml

@@ -2,18 +2,19 @@
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
                  xmlns:addin="clr-namespace:ICSharpCode.XamlBinding"
+                 xmlns:wd="http://icsharpcode.net/sharpdevelop/widgets"
                  xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<StackPanel>
 		<GroupBox Header="{sd:Localize AddIns.XamlBinding.Options.CodeCompletionGroupLabel}">
-      <StackPanel>
+			<wd:StackPanelWithSpacing SpaceBetweenItems="5">
 				<CheckBox Content="{sd:Localize AddIns.XamlBinding.Options.UseExtensionCompletion}" IsChecked="{sd:OptionBinding addin:XamlBindingOptions.UseExtensionCompletion}" />
 				<CheckBox Content="{sd:Localize AddIns.XamlBinding.Options.SwitchToCodeViewAfterInsertion}" IsChecked="{sd:OptionBinding addin:XamlBindingOptions.SwitchToCodeViewAfterInsertion}" />
 				<DockPanel>
 					<Label Content="{sd:Localize AddIns.XamlBinding.Options.EventHandlerNamePattern}" />
 					<TextBox Text="{sd:OptionBinding addin:XamlBindingOptions.EventHandlerNamePattern}" />
 				</DockPanel>
-      </StackPanel>
+			</wd:StackPanelWithSpacing>
 		</GroupBox>
 		<GroupBox Header="{sd:Localize AddIns.XamlBinding.Options.HighlightingGroupLabel}">
 			<Grid>
@@ -35,10 +36,10 @@
 				<Label Grid.Row="3" Content="{sd:Localize AddIns.XamlBinding.Options.EventColor}" />
 				<Label Grid.Row="4" Content="{sd:Localize AddIns.XamlBinding.Options.NamespaceDeclarationColor}" />
 				<Label Grid.Row="5" Content="{sd:Localize AddIns.XamlBinding.Options.IgnoredElementColor}" />
-        <gui:ColorPicker Grid.Row="2" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.PropertyForegroundColor}" />
-        <gui:ColorPicker Grid.Row="3" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.EventForegroundColor}" />
-        <gui:ColorPicker Grid.Row="4" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.NamespaceDeclarationForegroundColor}" />
-        <gui:ColorPicker Grid.Row="5" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.IgnoredForegroundColor}" />
+				<gui:ColorPickerButton Grid.Row="2" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.PropertyForegroundColor}" />
+				<gui:ColorPickerButton Grid.Row="3" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.EventForegroundColor}" />
+				<gui:ColorPickerButton Grid.Row="4" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.NamespaceDeclarationForegroundColor}" />
+				<gui:ColorPickerButton Grid.Row="5" Grid.Column="1" Value="{sd:OptionBinding addin:XamlBindingOptions.IgnoredForegroundColor}" />
 			</Grid>
 		</GroupBox>
 	</StackPanel>

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin

@@ -29,7 +29,8 @@
 		<FileFilter id = "Xaml"
 		            insertbefore="AllFiles"
 		            name = "Xaml files (*.xaml)"
-		            extensions = "*.xaml"/>
+		            extensions = "*.xaml"
+		            mimeType = "text/xml"/>
 	</Path>
 	
 	<Path name = "/Workspace/Parser">

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs

@@ -23,18 +23,21 @@ namespace ICSharpCode.XamlBinding
 				this.Text = entity.Name;
 			else
 				this.Text = prefix + ":" + entity.Name;
+			this.Content = this.Text;
 		}
 		
 		public XamlCodeCompletionItem(IEntity entity)
 			: base(entity)
 		{
 			this.Text = entity.Name;
+			this.Content = this.Text;
 		}
 		
 		public XamlCodeCompletionItem(string text, IEntity entity)
 			: base(entity)
 		{
 			this.Text = text;
+			this.Content = this.Text;
 		}
 		
 		public XamlCodeCompletionItem(IEntity entity, string prefix, string className)
@@ -44,6 +47,7 @@ namespace ICSharpCode.XamlBinding
 				this.Text = className + "." + entity.Name;
 			else
 				this.Text = prefix + ":" + className + "." + entity.Name;
+			this.Content = this.Text;
 		}
 		
 		public override string ToString()
@@ -61,6 +65,7 @@ namespace ICSharpCode.XamlBinding
 		{
 			this.addType = addType;
 			this.Text = text;
+			this.Content = this.Text;
 		}
 		
 		public override void Complete(CompletionContext context)

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs

@@ -79,7 +79,6 @@ namespace ICSharpCode.XamlBinding
 			XamlOutlineNode node = new XamlOutlineNode() {
 				Name = item.Name,
 				ElementName = item.ElementName,
-				ShowIcon = false,
 				Marker = editor.Document.CreateAnchor(Utils.MinMax(item.StartOffset, 0, editor.Document.TextLength - 1)),
 				EndMarker = editor.Document.CreateAnchor(Utils.MinMax(item.EndOffset, 0, editor.Document.TextLength - 1)),
 				Editor = editor

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs

@@ -40,14 +40,9 @@ namespace ICSharpCode.XamlBinding
 			return false; //nodes.All(node => node.Parent != null);
 		}
 		
-		public override DropEffect CanDrop(IDataObject data, DropEffect requestedEffect)
+		public override bool CanDrop(DragEventArgs e, int index)
 		{
-			return  DropEffect.None; //DropEffect.Move;
-		}
-		
-		public override bool CanCopy(SharpTreeNode[] nodes)
-		{
-			return true;
+			return false;
 		}
 		
 		public string GetMarkupText()
@@ -67,64 +62,47 @@ namespace ICSharpCode.XamlBinding
 			return dataObject;
 		}
 		
-		public override bool CanDelete(SharpTreeNode[] nodes)
+		public override bool CanDelete()
 		{
-			return nodes.All(node => node.Parent != null);
-		}
-		
-		public override void Drop(IDataObject data, int index, DropEffect finalEffect)
+			return Parent != null;
+		}
+		
+//		public override void Drop(IDataObject data, int index, DropEffect finalEffect)
+//		{
+//			try {
+//				string insertText = (data.GetData(typeof(string[])) as string[])
+//					.Aggregate((text, part) => text += part);
+//				ITextAnchor marker;
+//				int length = 0;
+//				if (index == this.Children.Count) {
+//					if (index == 0)
+//						marker = null;
+//					else
+//						marker = (this.Children[index - 1] as XamlOutlineNode).EndMarker;
+//					if (marker == null) {
+//						marker = this.EndMarker;
+//						length = -1; // move backwards
+//					} else {
+//						length = 2 + (this.Children[index - 1] as XamlOutlineNode).elementName.Length;
+//					}
+//				} else
+//					marker = (this.Children[index] as XamlOutlineNode).Marker;
+//
+//				int offset = marker.Offset + length;
+//				Editor.Document.Insert(offset, insertText);
+//			} catch (Exception ex) {
+//				throw ex;
+//			}
+//		}
+		
+		public override void Delete()
 		{
-			try {
-				string insertText = (data.GetData(typeof(string[])) as string[])
-					.Aggregate((text, part) => text += part);
-				ITextAnchor marker;
-				int length = 0;
-				if (index == this.Children.Count) {
-					if (index == 0)
-						marker = null;
-					else
-						marker = (this.Children[index - 1] as XamlOutlineNode).EndMarker;
-					if (marker == null) {
-						marker = this.EndMarker;
-						length = -1; // move backwards
-					} else {
-						length = 2 + (this.Children[index - 1] as XamlOutlineNode).elementName.Length;
+			DeleteCore();
 		}
-				} else
-					marker = (this.Children[index] as XamlOutlineNode).Marker;
 		
-				int offset = marker.Offset + length;
-				Editor.Document.Insert(offset, insertText);
-			} catch (Exception ex) {
-				throw ex;
-			}
-		}
-		
-		public override void Delete(SharpTreeNode[] nodes)
+		public override void DeleteCore()
 		{
-			DeleteCore(nodes);
-		}
-		
-		public override void DeleteCore(SharpTreeNode[] nodes)
-		{
-			foreach (XamlOutlineNode node in nodes.OfType<XamlOutlineNode>()) {
-				node.Editor.Document.Remove(node.Marker.Offset, node.EndMarker.Offset - node.Marker.Offset);
-			}
-		}
-		
-		ContextMenu menu;
-	
-		public override ContextMenu GetContextMenu()
-		{
-			if (menu == null) {
-				menu = new ContextMenu();
-				menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Cut });
-				menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Copy });
-				menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Paste });
-				menu.Items.Add(new Separator());
-				menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Delete });
-			}
-			return menu;
+			Editor.Document.Remove(Marker.Offset, EndMarker.Offset - Marker.Offset);
 		}
 		
 		public override object Text {

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@@ -300,9 +300,6 @@
     </Compile>
     <Compile Include="Pads\DebuggerPad.cs" />
     <Compile Include="Pads\RunningThreadsPad.Menu.cs" />
-    <Compile Include="TreeModel\Adapters\TreeViewVarNode.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="TreeModel\ArrayRangeNode.cs" />
     <Compile Include="TreeModel\ExpressionNode.cs" />
     <Compile Include="TreeModel\IContextMenu.cs" />
@@ -418,11 +415,6 @@
       <Name>NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj">
-      <Project>{E73BB233-D88B-44A7-A98F-D71EE158381D}</Project>
-      <Name>Aga.Controls</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
       <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
       <Name>ICSharpCode.Core.WinForms</Name>

src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.xaml

@@ -20,7 +20,7 @@
 							</DataTemplate>
 						</GridViewColumn.CellTemplate>
 					</GridViewColumn>
-					<GridViewColumn Header="{sd:Localize MainWindow.Windows.Debug.CallStack.LineString}">
+					<GridViewColumn Header="{sd:Localize Global.LineText}">
 						<GridViewColumn.CellTemplate>
 							<DataTemplate>
 								<TextBlock Text="{Binding Line}" Foreground="{Binding FontColor}" />

src/AddIns/Debugger/Debugger.AddIn/Pads/Commands/WatchPadCommands.cs

@@ -3,12 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Controls;
 using System.Windows.Forms;
 
-using Aga.Controls.Tree;
 using Debugger.AddIn.Pads;
-using Debugger.AddIn.Pads.Controls;
 using Debugger.AddIn.TreeModel;
 using ICSharpCode.Core;
 using ICSharpCode.Core.Presentation;
@@ -17,7 +14,6 @@ using ICSharpCode.NRefactory;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui.Pads;
 using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Debugging;
 
 namespace Debugger.AddIn
 {
@@ -43,7 +39,7 @@ namespace Debugger.AddIn
 					
 					string language = ProjectService.CurrentProject.Language;
 					
-					TextNode text = new TextNode(input,
+					TextNode text = new TextNode(null, input,
 					                             language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp);
 					var list = pad.WatchList;
 					
@@ -120,21 +116,22 @@ namespace Debugger.AddIn
 			if (owner is WatchPad) {
 				WatchPad pad = (WatchPad)owner;
 
-				TreeViewVarNode node = ((TreeViewAdv)pad.Control).SelectedNode as TreeViewVarNode;
+				var node = pad.WatchList.SelectedNode;
 				
 				if (node == null)
 					return items.ToArray();
 				
-				while (node.Parent != ((TreeViewAdv)pad.Control).Root)
+				
+				while (node.Parent != null && node.Parent.Parent != null)
 				{
-					node = node.Parent as TreeViewVarNode;
+					node = node.Parent;
 				}
 				
-				if (!(node.Content is TextNode))
+				if (!(node is TextNode))
 					return items.ToArray();
 				
 				foreach (string item in SupportedLanguage.GetNames(typeof(SupportedLanguage))) {
-					items.Add(MakeItem(item, item, node.Content as TextNode, (sender, e) => HandleItem(sender)));
+					items.Add(MakeItem(item, item, node as TextNode, (sender, e) => HandleItem(sender)));
 				}
 			}
 			

src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs

@@ -121,17 +121,21 @@ namespace Debugger.AddIn.Pads.Controls
 					
 			if (!string.IsNullOrEmpty(console.CommandText)) {
 				Breakpoint.Action = BreakpointAction.Condition;
-				Model.Image = PresentationResourceService.GetImage("Bookmarks.BreakpointConditional").Source;
+				if (Breakpoint.IsEnabled)
+					Model.Image = BreakpointBookmark.BreakpointConditionalImage.ImageSource;
 			}
 			else {
 				Breakpoint.Action = BreakpointAction.Break;
-				Model.Image = PresentationResourceService.GetImage("Bookmarks.Breakpoint").Source;
+				if (Breakpoint.IsEnabled)
+					Model.Image = BreakpointBookmark.BreakpointImage.ImageSource;
 			}
 		}
 		
 		private bool CheckSyntax()
 		{
 			string command = CommandText;
+			if (string.IsNullOrEmpty(command))
+				return true;
 			
 			// FIXME workaround the NRefactory issue that needs a ; at the end
 			if (language == "C#") {

src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs

@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using System.Xml.Serialization;
 
 using Debugger;
 using Debugger.AddIn;
@@ -13,9 +16,9 @@ using Debugger.AddIn.TreeModel;
 using ICSharpCode.Core;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.NRefactory;
+using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Project;
 using Exception = System.Exception;
-using ICSharpCode.SharpDevelop.Debugging;
 
 namespace ICSharpCode.SharpDevelop.Gui.Pads
 {
@@ -58,10 +61,70 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			watchList.Drop += watchList_Drop;
 			watchList.MouseDoubleClick += watchList_DoubleClick;
 			watchList.KeyUp += watchList_KeyUp;
+			watchList.WatchItems.CollectionChanged += OnWatchItemsCollectionChanged;
 			
 			panel.Children.Add(watchList);
 			panel.KeyUp += new KeyEventHandler(panel_KeyUp);
+			
+			// wire events that influence the items
+			LoadSavedNodes();
+			ProjectService.SolutionClosed += delegate { watchList.WatchItems.Clear(); };
+			ProjectService.ProjectAdded += delegate { LoadSavedNodes(); };
+			ProjectService.SolutionLoaded += delegate { LoadSavedNodes(); };
+		}
+
+		#region Saved nodes
+		
+		void LoadSavedNodes()
+		{
+			var props = GetSavedVariablesProperties();
+			if (props == null)
+				return;
+			
+			foreach (var element in props.Elements) {
+				watchList.WatchItems.Add(new TextNode(null, element, (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), props[element])));
+			}
+		}
+
+		void OnWatchItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			if (e.Action == NotifyCollectionChangedAction.Add) {
+				// add to saved data
+				var data = e.NewItems[0] as TextNode;
+				if (data != null) {
+					var props = GetSavedVariablesProperties(); 
+					if (props == null) return;
+					props.Set(data.FullName, data.Language.ToString());
 				}
+			}
+			
+			if (e.Action == NotifyCollectionChangedAction.Remove) {
+				// remove from saved data
+				var data = e.OldItems[0] as TextNode;
+				if (data != null) {
+					var props = GetSavedVariablesProperties();
+					if (props == null) return;
+					props.Remove(data.FullName);
+				}
+			}
+		}
+		
+		Properties GetSavedVariablesProperties()
+		{
+			if (ProjectService.CurrentProject == null)
+				return null;
+			if (ProjectService.CurrentProject.ProjectSpecificProperties == null)
+				return null;
+			
+			var props = ProjectService.CurrentProject.ProjectSpecificProperties.Get("watchVars") as Properties;
+			if (props == null) {
+				ProjectService.CurrentProject.ProjectSpecificProperties.Set("watchVars", new Properties());
+			}
+			
+			return ProjectService.CurrentProject.ProjectSpecificProperties.Get("watchVars") as Properties;
+		}
+
+		#endregion
 		
 		void panel_KeyUp(object sender, KeyEventArgs e)
 		{
@@ -89,7 +152,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			string language = ProjectService.CurrentProject.Language;
 			
 			// FIXME languages
-			TextNode text = new TextNode(e.Data.GetData(DataFormats.StringFormat).ToString(),
+			TextNode text = new TextNode(null, e.Data.GetData(DataFormats.StringFormat).ToString(),
 			                             language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp);
 
 			if (!watchList.WatchItems.Contains(text))
@@ -133,7 +196,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			// rebuild list
 			var nodes = new List<TreeNode>();
 			foreach (var nod in watchList.WatchItems)
-				nodes.Add(new TextNode(nod.Name,
+				nodes.Add(new TextNode(null, nod.Name,
 				                       language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp));
 			
 			watchList.WatchItems.Clear();
@@ -175,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 							LoggingService.Info("Evaluating: " + (string.IsNullOrEmpty(node.Name) ? "is null or empty!" : node.Name));
 							var nodExpression = debugger.GetExpression(node.Name);
 							//Value val = ExpressionEvaluator.Evaluate(nod.Name, nod.Language, debuggedProcess.SelectedStackFrame);
-							ExpressionNode valNode = new ExpressionNode(null, node.Name, nodExpression);
+							ExpressionNode valNode = new ExpressionNode(null, null, node.Name, nodExpression);
 							nodes.Add(valNode);
 						}
 						catch (GetValueException) {

src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs

@@ -2,15 +2,17 @@
 // This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
 
 using System;
+using System.Text;
 using Debugger.AddIn.TreeModel;
 using ICSharpCode.NRefactory;
-using ICSharpCode.SharpDevelop.Debugging;
+using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.SharpDevelop.Gui.Pads
 {
 	public class TextNode : TreeNode, ISetText
 	{
-		public TextNode(string text, SupportedLanguage language)
+		public TextNode(TreeNode parent, string text, SupportedLanguage language)
+			: base(parent)
 		{
 			this.Name = text;
 			this.Language = language;
@@ -39,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 	
 	public class ErrorInfoNode : ICorDebug.InfoNode
 	{
-		public ErrorInfoNode(string name, string text) : base(name, text)
+		public ErrorInfoNode(string name, string text) : base(null, name, text)
 		{
 			IconImage = DebuggerResourceService.GetImage("Icons.16x16.Error");
 		}

src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs

@@ -1,16 +1,13 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
 
-using ICSharpCode.Core.WinForms;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using Aga.Controls.Tree;
-using Aga.Controls.Tree.NodeControls;
+
 using Debugger;
-using Debugger.AddIn.TreeModel;
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Services

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -157,12 +157,12 @@ namespace ICSharpCode.SharpDevelop.Services
 			if (FileUtility.IsUrl(processStartInfo.FileName)) {
 				if (!CheckWebProjectStartInfo())
 					return;
-				
+				// we deal with a WebProject
+				try {
 					var project = ProjectService.OpenSolution.StartupProject as CompilableProject;
 					var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name);
 					System.Diagnostics.Process defaultAppProcess = null;
 					
-				if (options.Data.WebServer != WebServer.None) {
 					string processName = WebProjectService.WorkerProcessName;
 					
 					// try find the worker process directly or using the process monitor callback
@@ -185,28 +185,50 @@ namespace ICSharpCode.SharpDevelop.Services
 					
 					if (options.Data.WebServer == WebServer.IISExpress) {
 						// start IIS express and attach to it
-						if (WebProjectService.IISVersion == IISVersion.IISExpress)
+						if (WebProjectService.IISVersion == IISVersion.IISExpress) {
 							System.Diagnostics.Process.Start(WebProjectService.IISExpressProcessLocation);
-						else {
+						} else {
 							MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}");
 							return;
 						}
 					}
-				}
 					
-				// start default application(e.g. browser)
-				if (project.StartAction == StartAction.StartURL)
-					defaultAppProcess = System.Diagnostics.Process.Start(project.StartUrl);
-				else {
-					if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IIS)
+					// start default application(e.g. browser) or the one specified
+					switch (project.StartAction) {
+						case StartAction.Project:
+							if (FileUtility.IsUrl(options.Data.ProjectUrl)) {
 								defaultAppProcess = System.Diagnostics.Process.Start(options.Data.ProjectUrl);
+							} else {
+								MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}");
+								return;
+							}
+							break;
+						case StartAction.Program:
+							defaultAppProcess = System.Diagnostics.Process.Start(project.StartProgram);
+							break;
+						case StartAction.StartURL:
+							if (FileUtility.IsUrl(project.StartUrl))
+								defaultAppProcess = System.Diagnostics.Process.Start(project.StartUrl);
 							else {
-						if (options.Data.WebServer == WebServer.IISExpress)
-							defaultAppProcess = System.Diagnostics.Process.Start(options.Data.ProjectUrl);
+								string url = string.Concat(options.Data.ProjectUrl, project.StartUrl);
+								if (FileUtility.IsUrl(url)) {
+									defaultAppProcess = System.Diagnostics.Process.Start(url);
+								} else {
+									MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}");
+									return;
 								}
 							}
+							break;
+						default:
+							throw new System.Exception("Invalid value for StartAction");
 					}
-			else {
+				} catch (System.Exception ex) {
+					string err = "Error: " + ex.Message;
+					MessageService.ShowError(err);
+					LoggingService.Error(err);
+					return;
+				}
+			} else {
 				string version = debugger.GetProgramVersion(processStartInfo.FileName);
 				
 				if (version.StartsWith("v1.0")) {
@@ -319,11 +341,11 @@ namespace ICSharpCode.SharpDevelop.Services
 			if (FileUtility.IsUrl(processStartInfo.FileName)) {
 				if (!CheckWebProjectStartInfo())
 					return;
-				
-				var project = ProjectService.OpenSolution.Preferences.StartupProject as CompilableProject;
+				// we deal with a WebProject
+				try {
+					var project = ProjectService.OpenSolution.StartupProject as CompilableProject;
 					var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name);
 					
-				if (options.Data.WebServer != WebServer.None) {
 					string processName = WebProjectService.WorkerProcessName;
 					
 					if (options.Data.WebServer == WebServer.IISExpress) {
@@ -335,23 +357,43 @@ namespace ICSharpCode.SharpDevelop.Services
 							return;
 						}
 					}
-				}
 					
-				// start default application(e.g. browser)
-				if (project.StartAction == StartAction.StartURL)
-					System.Diagnostics.Process.Start(project.StartUrl);
-				else {
-					if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IIS)
+					// start default application(e.g. browser) or the one specified
+					switch (project.StartAction) {
+						case StartAction.Project:
+							if (FileUtility.IsUrl(options.Data.ProjectUrl)) {
 								System.Diagnostics.Process.Start(options.Data.ProjectUrl);
+							} else {
+								MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}");
+								return;
+							}
+							break;
+						case StartAction.Program:
+							System.Diagnostics.Process.Start(project.StartProgram);
+							break;
+						case StartAction.StartURL:
+							if (FileUtility.IsUrl(project.StartUrl))
+								System.Diagnostics.Process.Start(project.StartUrl);
 							else {
-						if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IISExpress)
-							System.Diagnostics.Process.Start(options.Data.ProjectUrl);
-						else
-							System.Diagnostics.Process.Start(processStartInfo.FileName);
+								string url = string.Concat(options.Data.ProjectUrl, project.StartUrl);
+								if (FileUtility.IsUrl(url)) {
+									System.Diagnostics.Process.Start(url);
+								} else {
+									MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}");
+									return;
 								}
 							}
+							break;
+						default:
+							throw new System.Exception("Invalid value for StartAction");
 					}
-			else
+				} catch (System.Exception ex) {
+					string err = "Error: " + ex.Message;
+					MessageService.ShowError(err);
+					LoggingService.Error(err);
+					return;
+				}
+			} else
 				System.Diagnostics.Process.Start(processStartInfo);
 		}
 		
@@ -650,7 +692,7 @@ namespace ICSharpCode.SharpDevelop.Services
 				var tooltipExpression = GetExpression(variableName);
 				string imageName;
 				var image = ExpressionNode.GetImageForLocalVariable(out imageName);
-				ExpressionNode expressionNode = new ExpressionNode(image, variableName, tooltipExpression);
+				ExpressionNode expressionNode = new ExpressionNode(null, image, variableName, tooltipExpression);
 				expressionNode.ImageName = imageName;
 				return new DebuggerTooltipControl(logicalPosition, expressionNode) { ShowPins = !IsInExternalCode };
 			} catch (GetValueException) {
@@ -671,7 +713,7 @@ namespace ICSharpCode.SharpDevelop.Services
 					image = new ResourceServiceImage(currentImageName);
 					imageName = currentImageName;
 				}
-				ExpressionNode expressionNode = new ExpressionNode(image, variable, expression);
+				ExpressionNode expressionNode = new ExpressionNode(null, image, variable, expression);
 				expressionNode.ImageName = imageName;
 				return expressionNode;
 			} catch (GetValueException) {

src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs

@@ -1,291 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Windows.Forms;
-
-using Aga.Controls.Tree;
-using Aga.Controls.Tree.NodeControls;
-using ICSharpCode.Core;
-using TreeNode = Debugger.AddIn.TreeModel.TreeNode;
-
-namespace Debugger.AddIn.TreeModel
-{
-	public sealed class ItemIcon: NodeIcon {
-		protected override Image GetIcon(TreeNodeAdv node)
-		{
-			return ((TreeViewVarNode)node).Content.Image;
-		}
-	}
-	
-	public sealed class ItemName: NodeTextBox {
-		protected override bool CanEdit(TreeNodeAdv node)
-		{
-			return false;
-		}
-		public override object GetValue(TreeNodeAdv node)
-		{
-			if (node is TreeViewVarNode) {
-				return ((TreeViewVarNode)node).Content.Name;
-			} else {
-				// Happens during incremental search
-				return base.GetValue(node);
-			}
-		}
-	}
-	
-	public sealed class ItemText: NodeTextBox {
-		public ItemText()
-		{
-			this.EditEnabled = true;
-			this.EditOnClick = true;
-		}
-		protected override bool CanEdit(TreeNodeAdv node)
-		{
-			TreeNode content = ((TreeViewVarNode)node).Content;
-			return (content is ISetText) && ((ISetText)content).CanSetText;
-		}
-		public override object GetValue(TreeNodeAdv node)
-		{
-			if (node is TreeViewVarNode) {
-				return ((TreeViewVarNode)node).Content.Text;
-			} else {
-				// Happens during incremental search
-				return base.GetValue(node);
-			}
-		}
-		public override void SetValue(TreeNodeAdv node, object value)
-		{
-			ISetText content = (ISetText)((TreeViewVarNode)node).Content;
-			if (content.CanSetText) {
-				content.SetText(value.ToString());
-			}
-		}
-		protected override void OnDrawText(DrawEventArgs args)
-		{
-			TreeNode content = ((TreeViewVarNode)args.Node).Content;
-			if (content is ExpressionNode && ((ExpressionNode)content).Error != null) {
-				args.TextColor = Color.Red;
-			} else if (((TreeViewVarNode)args.Node).TextChanged) {
-				args.TextColor = Color.Blue;
-			}
-			base.OnDrawText(args);
-		}
-		public override void MouseDown(TreeNodeAdvMouseEventArgs args)
-		{
-			TreeNode content = ((TreeViewVarNode)args.Node).Content;
-			if (content is IContextMenu && args.Button == MouseButtons.Right) {
-				ContextMenuStrip menu = ((IContextMenu)content).GetContextMenu();
-				if (menu != null) {
-					menu.Show(args.Node.Tree, args.Location);
-					args.Handled = true;
-				}
-			} else {
-				base.MouseDown(args);
-			}
-		}
-	}
-	
-	public sealed class ItemType: NodeTextBox {
-		protected override bool CanEdit(TreeNodeAdv node)
-		{
-			return false;
-		}
-		public override object GetValue(TreeNodeAdv node)
-		{
-			if (node is TreeViewVarNode) {
-				return ((TreeViewVarNode)node).Content.Type;
-			} else {
-				// Happens during incremental search
-				return base.GetValue(node);
-			}
-		}
-	}
-	
-	/// <summary>
-	/// A child class of TreeNodeAdv that displays exceptions.
-	/// </summary>
-	public class TreeViewVarNode: TreeNodeAdv
-	{
-		static Dictionary<string, bool> expandedNodes = new Dictionary<string, bool>();
-		
-		TreeViewAdv localVarList;
-		Process process;
-		TreeNode content;
-		
-		bool childsLoaded;
-		bool textChanged;
-		
-		public TreeNode Content {
-			get { return content; }
-		}
-		
-		public bool TextChanged {
-			get { return textChanged; }
-		}
-		
-		string FullName {
-			get {
-				if (this.Parent != null && this.Parent is TreeViewVarNode) {
-					return ((TreeViewVarNode)this.Parent).FullName + "." + Content.Name;
-				} else {
-					return Content.Name;
-				}
-			}
-		}
-		
-		public TreeViewVarNode(Process process, TreeViewAdv localVarList, TreeNode content): base(localVarList, new object())
-		{
-			this.process = process;
-			this.localVarList = localVarList;
-			SetContentRecursive(content);
-		}
-		
-		static TimeSpan workTime = TimeSpan.FromMilliseconds(40);
-		static Stopwatch timeSinceLastRepaintEnd;
-		
-		#region SetContentRecursive
-		
-		/// <summary>
-		/// A simple form of SetContentRecursive that changes the current ChildViewNode to
-		/// display the data provided by <c>content</c>. If the node had any children and is expanded,
-		/// it will recureively set those as well.
-		/// </summary>
-		/// <param name="content">Contains the name value and type of the variable stored in this particular TreeViewNode.</param>
-		private void SetContentRecursive(TreeNode content)
-		{
-			this.textChanged =
-				this.content != null &&
-				this.content.Name == content.Name &&
-				this.content.Text != content.Text;
-			this.content = content;
-			this.IsLeaf = (content.ChildNodes == null);
-			childsLoaded = false;
-			this.IsExpandedOnce = false;	
-			if (!IsLeaf && expandedNodes.ContainsKey(this.FullName) && expandedNodes[this.FullName]) {
-				LoadChildren();
-				this.Expand();
-			} else {
-				this.Children.Clear();
-				this.Collapse();
-			}
-			// Process user commands
-			Utils.DoEvents(process);
-			// Repaint
-			if (timeSinceLastRepaintEnd == null || timeSinceLastRepaintEnd.Elapsed > workTime) {
-				using(new PrintTime("Repainting Local Variables Pad")) {
-					try {
-						this.Tree.EndUpdate();   // Enable painting
-						Utils.DoEvents(process); // Paint
-					} finally {
-						this.Tree.BeginUpdate(); // Disable painting
-						timeSinceLastRepaintEnd = new Stopwatch();
-						timeSinceLastRepaintEnd.Start();
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Private form of SetContentRecursive. This form contains an extra parameter used by LoadChildren.
-		/// This adds the childNodes parameter, which can be set to the children of a particular child element.
-		/// </summary>
-		/// <param name="process"></param>
-		/// <param name="localVarList"></param>
-		/// <param name="childNodes"></param>
-		/// <param name="contentEnum"></param>
-		private static void SetContentRecursive(Process process, TreeViewAdv localVarList, IList<TreeNodeAdv> childNodes, IEnumerable<TreeNode> contentEnum)
-		{
-			contentEnum = contentEnum ?? new TreeNode[0];
-			
-			int index = 0;
-			foreach(TreeNode content in contentEnum) {
-				// Add or overwrite existing items
-				if (index < childNodes.Count) {
-					// Overwrite
-					((TreeViewVarNode)childNodes[index]).SetContentRecursive(content);
-				} else {
-					// Add
-					childNodes.Add(new TreeViewVarNode(process, localVarList, content));
-				}
-				index++;
-			}
-			int count = index;
-			// Delete other nodes
-			while(childNodes.Count > count) {
-				childNodes.RemoveAt(count);
-			}
-		}
-		
-		/// <summary>
-		/// Function for setting the root treenode of a TreeViewAdv ment to display debugger variables.
-		/// </summary>
-		/// <param name="process">The process that contains the stackframe with the given variables.</param>
-		/// <param name="localVarList">A list of local variables.</param>
-		/// <param name="contentEnum">A list of local variables.</param>
-		public static void SetContentRecursive(Process process, TreeViewAdv localVarList, IEnumerable<TreeNode> contentEnum) {
-			IList<TreeNodeAdv> childNodes = localVarList.Root.Children;
-			SetContentRecursive(process, localVarList, childNodes, contentEnum);
-		}
-		
-		#endregion SetContentRecursive
-		
-		protected override void OnExpanding()
-		{
-			base.OnExpanding();
-		}
-		
-		
-		/// <summary>
-		/// This displays all the immediate children of a TreeViewNode in its containing TreeViewAdv.
-		/// </summary>
-		void LoadChildren()
-		{
-			if (!childsLoaded) {
-				childsLoaded = true;
-				this.IsExpandedOnce = true;
-				SetContentRecursive(process, this.localVarList, this.Children, this.Content.ChildNodes);
-			}
-		}
-		
-		
-		/// <summary>
-		/// Expands the current treenode and displays all its immediate children.
-		/// </summary>
-		protected override void OnExpanded()
-		{
-			base.OnExpanded();
-			if (process == null)
-				return;
-			expandedNodes[FullName] = true;
-			if (process.IsRunning) {
-				MessageService.ShowMessage(
-					"${res:MainWindow.Windows.Debug.LocalVariables.CannotExploreVariablesWhileRunning}",
-					"${res:MainWindow.Windows.Debug.LocalVariables}"
-				);
-				return;
-			}
-			try {
-				this.Tree.BeginUpdate();
-				LoadChildren();
-			} catch (AbortedBecauseDebuggeeResumedException) {
-			} finally {
-				this.Tree.EndUpdate();
-			}
-		}
-		
-		protected override void OnCollapsing()
-		{
-			base.OnCollapsing();
-		}
-		
-		protected override void OnCollapsed()
-		{
-			base.OnCollapsed();
-			expandedNodes[FullName] = false;
-		}
-	}
-}

src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs

@@ -11,12 +11,12 @@ namespace Debugger.AddIn.TreeModel
 {
 	public partial class Utils
 	{
-		public static IEnumerable<TreeNode> LazyGetChildNodesOfArray(Expression expression, ArrayDimensions dimensions)
+		public static IEnumerable<TreeNode> LazyGetChildNodesOfArray(TreeNode parent, Expression expression, ArrayDimensions dimensions)
 		{
 			if (dimensions.TotalElementCount == 0)
-				return new TreeNode[] { new TreeNode(null, "(empty)", null, null, null) };
+				return new TreeNode[] { new TreeNode(null, "(empty)", null, null, parent, null) };
 			
-			return new ArrayRangeNode(expression, dimensions, dimensions).ChildNodes;
+			return new ArrayRangeNode(parent, expression, dimensions, dimensions).ChildNodes;
 		}
 	}
 	
@@ -29,14 +29,19 @@ namespace Debugger.AddIn.TreeModel
 		ArrayDimensions bounds;
 		ArrayDimensions originalBounds;
 		
-		public ArrayRangeNode(Expression arrayTarget, ArrayDimensions bounds, ArrayDimensions originalBounds)
+		public ArrayRangeNode(TreeNode parent, Expression arrayTarget, ArrayDimensions bounds, ArrayDimensions originalBounds)
+			: base(parent)
 		{
 			this.arrayTarget = arrayTarget;
 			this.bounds = bounds;
 			this.originalBounds = originalBounds;
 			
 			this.Name = GetName();
-			this.ChildNodes = LazyGetChildren();
+			this.childNodes = LazyGetChildren();
+		}
+		
+		public override IEnumerable<TreeNode> ChildNodes {
+			get { return base.ChildNodes; }
 		}
 		
 		string GetName()
@@ -87,7 +92,7 @@ namespace Debugger.AddIn.TreeModel
 				foreach(int[] indices in bounds.Indices) {
 					string imageName;
 					var image = ExpressionNode.GetImageForArrayIndexer(out imageName);
-					var expression = new ExpressionNode(image, GetName(indices), arrayTarget.AppendIndexer(indices));
+					var expression = new ExpressionNode(this, image, GetName(indices), arrayTarget.AppendIndexer(indices));
 					expression.ImageName = imageName;
 					yield return expression;
 				}
@@ -112,7 +117,7 @@ namespace Debugger.AddIn.TreeModel
 			for(int i = splitDim.LowerBound; i <= splitDim.UpperBound; i += elementsPerSegment) {
 				List<ArrayDimension> newDims = new List<ArrayDimension>(bounds);
 				newDims[splitDimensionIndex] = new ArrayDimension(i, Math.Min(i + elementsPerSegment - 1, splitDim.UpperBound));
-				yield return new ArrayRangeNode(arrayTarget, new ArrayDimensions(newDims), originalBounds);
+				yield return new ArrayRangeNode(this, arrayTarget, new ArrayDimensions(newDims), originalBounds);
 			}
 			yield break;
 		}

src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs

@@ -17,7 +17,7 @@ namespace Debugger.AddIn.TreeModel
 {
 	public partial class Utils
 	{
-		public static IEnumerable<TreeNode> LazyGetChildNodesOfObject(Expression targetObject, DebugType shownType)
+		public static IEnumerable<TreeNode> LazyGetChildNodesOfObject(TreeNode current, Expression targetObject, DebugType shownType)
 		{
 			MemberInfo[] publicStatic      = shownType.GetFieldsAndNonIndexedProperties(BindingFlags.Public    | BindingFlags.Static   | BindingFlags.DeclaredOnly);
 			MemberInfo[] publicInstance    = shownType.GetFieldsAndNonIndexedProperties(BindingFlags.Public    | BindingFlags.Instance | BindingFlags.DeclaredOnly);
@@ -31,7 +31,8 @@ namespace Debugger.AddIn.TreeModel
 					StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}"),
 					baseType.Name,
 					baseType.FullName,
-					baseType.FullName == "System.Object" ? null : Utils.LazyGetChildNodesOfObject(targetObject, baseType)
+					current,
+					newNode => baseType.FullName == "System.Object" ? null : Utils.LazyGetChildNodesOfObject(newNode, targetObject, baseType)
 				);
 			}
 			
@@ -41,53 +42,58 @@ namespace Debugger.AddIn.TreeModel
 					StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicMembers}"),
 					string.Empty,
 					string.Empty,
-					Utils.LazyGetMembersOfObject(targetObject, nonPublicInstance)
+					current,
+					newNode => Utils.LazyGetMembersOfObject(newNode, targetObject, nonPublicInstance)
 				);
 			}
 			
 			if (publicStatic.Length > 0 || nonPublicStatic.Length > 0) {
-				IEnumerable<TreeNode> childs = Utils.LazyGetMembersOfObject(targetObject, publicStatic);
+				yield return new TreeNode(
+					null,
+					StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.StaticMembers}"),
+					string.Empty,
+					string.Empty,
+					current,
+					p => {
+						var children = Utils.LazyGetMembersOfObject(p, targetObject, publicStatic);
 						if (nonPublicStatic.Length > 0) {
 							TreeNode nonPublicStaticNode = new TreeNode(
 								null,
 								StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicStaticMembers}"),
 								string.Empty,
 								string.Empty,
-						Utils.LazyGetMembersOfObject(targetObject, nonPublicStatic)
+								p,
+								newNode => Utils.LazyGetMembersOfObject(newNode, targetObject, nonPublicStatic)
 							);
-					childs = Utils.PrependNode(nonPublicStaticNode, childs);
+							children = Utils.PrependNode(nonPublicStaticNode, children);
+						}
+						return children;
 					}
-				yield return new TreeNode(
-					null,
-					StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.StaticMembers}"),
-					string.Empty,
-					string.Empty,
-					childs
 				);
 			}
 			
 			DebugType iListType = (DebugType)shownType.GetInterface(typeof(IList).FullName);
 			if (iListType != null) {
-				yield return new IListNode(targetObject);
+				yield return new IListNode(current, targetObject);
 			} else {
 				DebugType iEnumerableType, itemType;
 				if (shownType.ResolveIEnumerableImplementation(out iEnumerableType, out itemType)) {
-					yield return new IEnumerableNode(targetObject, itemType);
+					yield return new IEnumerableNode(current, targetObject, itemType);
 				}
 			}
 			
-			foreach(TreeNode node in LazyGetMembersOfObject(targetObject, publicInstance)) {
+			foreach(TreeNode node in LazyGetMembersOfObject(current, targetObject, publicInstance)) {
 				yield return node;
 			}
 		}
 		
-		public static IEnumerable<TreeNode> LazyGetMembersOfObject(Expression expression, MemberInfo[] members)
+		public static IEnumerable<TreeNode> LazyGetMembersOfObject(TreeNode parent, Expression expression, MemberInfo[] members)
 		{
 			List<TreeNode> nodes = new List<TreeNode>();
 			foreach(MemberInfo memberInfo in members) {
 				string imageName;
 				var image = ExpressionNode.GetImageForMember((IDebugMemberInfo)memberInfo, out imageName);
-				var exp = new ExpressionNode(image, memberInfo.Name, expression.AppendMemberReference((IDebugMemberInfo)memberInfo));
+				var exp = new ExpressionNode(parent, image, memberInfo.Name, expression.AppendMemberReference((IDebugMemberInfo)memberInfo));
 				exp.ImageName = imageName;
 				nodes.Add(exp);
 			}
@@ -96,7 +102,7 @@ namespace Debugger.AddIn.TreeModel
 		}
 
 		
-		public static IEnumerable<TreeNode> LazyGetItemsOfIList(Expression targetObject)
+		public static IEnumerable<TreeNode> LazyGetItemsOfIList(TreeNode parent, Expression targetObject)
 		{
 			// Add a cast, so that we are sure the expression has an indexer.
 			// (The expression can be e.g. of type 'object' but its value is a List.
@@ -111,14 +117,14 @@ namespace Debugger.AddIn.TreeModel
 				error = e;
 			}
 			if (error != null) {
-				yield return new TreeNode(null, "(error)", error.Message, null, null);
+				yield return new TreeNode(null, "(error)", error.Message, null, null, null);
 			} else if (count == 0) {
-				yield return new TreeNode(null, "(empty)", null, null, null);
+				yield return new TreeNode(null, "(empty)", null, null, null, null);
 			} else {
 				for(int i = 0; i < count; i++) {
 					string imageName;
 					var image = ExpressionNode.GetImageForArrayIndexer(out imageName);
-					var itemNode = new ExpressionNode(image, "[" + i + "]", targetObject.AppendIndexer(i));
+					var itemNode = new ExpressionNode(parent, image, "[" + i + "]", targetObject.AppendIndexer(i));
 					itemNode.ImageName = imageName;
 					yield return itemNode;
 				}

src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs

@@ -143,7 +143,8 @@ namespace Debugger.AddIn.TreeModel
 			}
 		}
 
-		public ExpressionNode(IImage image, string name, Expression expression)
+		public ExpressionNode(TreeNode parent, IImage image, string name, Expression expression)
+			: base(parent)
 		{
 			this.IconImage = image;
 			this.Name = name;
@@ -188,24 +189,24 @@ namespace Debugger.AddIn.TreeModel
 			} else if (val.Type.IsPrimitive || val.Type.FullName == typeof(string).FullName) { // Must be before IsClass
 			} else if (val.Type.IsArray) { // Must be before IsClass
 				if (val.ArrayLength > 0)
-					this.ChildNodes = Utils.LazyGetChildNodesOfArray(this.Expression, val.ArrayDimensions);
+					this.childNodes = Utils.LazyGetChildNodesOfArray(this, this.Expression, val.ArrayDimensions);
 			} else if (val.Type.IsClass || val.Type.IsValueType) {
 				if (val.Type.FullNameWithoutGenericArguments == typeof(List<>).FullName) {
 					if ((int)val.GetMemberValue("_size").PrimitiveValue > 0)
-						this.ChildNodes = Utils.LazyGetItemsOfIList(this.expression);
+						this.childNodes = Utils.LazyGetItemsOfIList(this, this.expression);
 				} else {
-					this.ChildNodes = Utils.LazyGetChildNodesOfObject(this.Expression, val.Type);
+					this.childNodes = Utils.LazyGetChildNodesOfObject(this, this.Expression, val.Type);
 				}
 			} else if (val.Type.IsPointer) {
 				Value deRef = val.Dereference();
 				if (deRef != null) {
-					this.ChildNodes = new ExpressionNode [] { new ExpressionNode(this.IconImage, "*" + this.Name, this.Expression.AppendDereference()) };
+					this.childNodes = new ExpressionNode [] { new ExpressionNode(this, this.IconImage, "*" + this.Name, this.Expression.AppendDereference()) };
 				}
 			}
 			
 			if (DebuggingOptions.Instance.ICorDebugVisualizerEnabled) {
 				TreeNode info = ICorDebug.GetDebugInfoRoot(val.AppDomain, val.CorValue);
-				this.ChildNodes = Utils.PrependNode(info, this.ChildNodes);
+				this.childNodes = Utils.PrependNode(info, this.ChildNodes);
 			}
 			
 			// Do last since it may expire the object

src/AddIns/Debugger/Debugger.AddIn/TreeModel/ICorDebug.cs

@@ -15,56 +15,59 @@ namespace Debugger.AddIn.TreeModel
 		{
 			List<TreeNode> children;
 			
-			public InfoNode(string name, string text): this(name, text, null)
+			public InfoNode(TreeNode parent, string name, string text)
+				: this(parent, name, text, null)
 			{
 				
 			}
 			
-			public InfoNode(string name, string text, List<TreeNode> children)
+			public InfoNode(TreeNode parent, string name, string text, Func<TreeNode, List<TreeNode>> children)
+				: base(parent)
 			{
 				this.Name = name;
 				this.Text = text;
-				this.ChildNodes = children;
-				this.children = children;
+				this.children = children(this);
+			}
+			
+			public override IEnumerable<TreeNode> ChildNodes {
+				get { return children; }
 			}
 			
 			public void AddChild(string name, string text)
 			{
 				if (children == null) {
 					children = new List<TreeNode>();
-					this.ChildNodes = children;
 				}
-				children.Add(new InfoNode(name, text));
+				children.Add(new InfoNode(this, name, text));
 			}
 			
-			public void AddChild(string name, string text, List<TreeNode> subChildren)
+			public void AddChild(string name, string text, Func<TreeNode, List<TreeNode>> subChildren)
 			{
 				if (children == null) {
 					children = new List<TreeNode>();
-					this.ChildNodes = children;
 				}
-				children.Add(new InfoNode(name, text, subChildren));
+				children.Add(new InfoNode(this, name, text, p => subChildren(p)));
 			}
 		}
 		
 		public static InfoNode GetDebugInfoRoot(AppDomain appDomain, ICorDebugValue corValue)
 		{
-			return new InfoNode("ICorDebug", "", GetDebugInfo(appDomain, corValue));
+			return new InfoNode(null, "ICorDebug", "", p => GetDebugInfo(p, appDomain, corValue));
 		}
 		
-		public static List<TreeNode> GetDebugInfo(AppDomain appDomain, ICorDebugValue corValue)
+		public static List<TreeNode> GetDebugInfo(TreeNode parent, AppDomain appDomain, ICorDebugValue corValue)
 		{
 			List<TreeNode> items = new List<TreeNode>();
 			
 			if (corValue is ICorDebugValue) {
-				InfoNode info = new InfoNode("ICorDebugValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugValue", "");
 				info.AddChild("Address", corValue.GetAddress().ToString("X8"));
 				info.AddChild("Type", ((CorElementType)corValue.GetTheType()).ToString());
 				info.AddChild("Size", corValue.GetSize().ToString());
 				items.Add(info);
 			}
 			if (corValue is ICorDebugValue2) {
-				InfoNode info = new InfoNode("ICorDebugValue2", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugValue2", "");
 				ICorDebugValue2 corValue2 = (ICorDebugValue2)corValue;
 				string fullname;
 				try {
@@ -76,7 +79,7 @@ namespace Debugger.AddIn.TreeModel
 				items.Add(info);
 			}
 			if (corValue is ICorDebugGenericValue) {
-				InfoNode info = new InfoNode("ICorDebugGenericValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugGenericValue", "");
 				try {
 					byte[] bytes = ((ICorDebugGenericValue)corValue).GetRawValue();
 					for(int i = 0; i < bytes.Length; i += 8) {
@@ -92,13 +95,13 @@ namespace Debugger.AddIn.TreeModel
 				items.Add(info);
 			}
 			if (corValue is ICorDebugReferenceValue) {
-				InfoNode info = new InfoNode("ICorDebugReferenceValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugReferenceValue", "");
 				ICorDebugReferenceValue refValue = (ICorDebugReferenceValue)corValue;
 				info.AddChild("IsNull", (refValue.IsNull() != 0).ToString());
 				if (refValue.IsNull() == 0) {
 					info.AddChild("Value", refValue.GetValue().ToString("X8"));
 					if (refValue.Dereference() != null) {
-						info.AddChild("Dereference", "", GetDebugInfo(appDomain, refValue.Dereference()));
+						info.AddChild("Dereference", "", p => GetDebugInfo(p, appDomain, refValue.Dereference()));
 					} else {
 						info.AddChild("Dereference", "N/A");
 					}
@@ -106,44 +109,44 @@ namespace Debugger.AddIn.TreeModel
 				items.Add(info);
 			}
 			if (corValue is ICorDebugHeapValue) {
-				InfoNode info = new InfoNode("ICorDebugHeapValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugHeapValue", "");
 				items.Add(info);
 			}
 			if (corValue is ICorDebugHeapValue2) {
-				InfoNode info = new InfoNode("ICorDebugHeapValue2", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugHeapValue2", "");
 				items.Add(info);
 			}
 			if (corValue is ICorDebugObjectValue) {
-				InfoNode info = new InfoNode("ICorDebugObjectValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugObjectValue", "");
 				ICorDebugObjectValue objValue = (ICorDebugObjectValue)corValue;
 				info.AddChild("Class", objValue.GetClass().GetToken().ToString("X8"));
 				info.AddChild("IsValueClass", (objValue.IsValueClass() != 0).ToString());
 				items.Add(info);
 			}
 			if (corValue is ICorDebugObjectValue2) {
-				InfoNode info = new InfoNode("ICorDebugObjectValue2", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugObjectValue2", "");
 				items.Add(info);
 			}
 			if (corValue is ICorDebugBoxValue) {
-				InfoNode info = new InfoNode("ICorDebugBoxValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugBoxValue", "");
 				ICorDebugBoxValue boxValue = (ICorDebugBoxValue)corValue;
-				info.AddChild("Object", "", GetDebugInfo(appDomain, boxValue.GetObject()));
+				info.AddChild("Object", "", p => GetDebugInfo(p, appDomain, boxValue.GetObject()));
 				items.Add(info);
 			}
 			if (corValue is ICorDebugStringValue) {
-				InfoNode info = new InfoNode("ICorDebugStringValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugStringValue", "");
 				ICorDebugStringValue stringValue = (ICorDebugStringValue)corValue;
 				info.AddChild("Length", stringValue.GetLength().ToString());
 				info.AddChild("String", stringValue.GetString());
 				items.Add(info);
 			}
 			if (corValue is ICorDebugArrayValue) {
-				InfoNode info = new InfoNode("ICorDebugArrayValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugArrayValue", "");
 				info.AddChild("...", "...");
 				items.Add(info);
 			}
 			if (corValue is ICorDebugHandleValue) {
-				InfoNode info = new InfoNode("ICorDebugHandleValue", "");
+				InfoNode info = new InfoNode(parent, "ICorDebugHandleValue", "");
 				ICorDebugHandleValue handleValue = (ICorDebugHandleValue)corValue;
 				info.AddChild("HandleType", handleValue.GetHandleType().ToString());
 				items.Add(info);