[Monodevelop-patches-list] r1869 - in trunk/MonoDevelop/Core: . build/AddIns build/AddIns/AddIns/BackendBindings build/AddIns/AddIns/BackendBindings/templates build/data/options build/data/resources data/resources po src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/AddIns/DisplayBindings/SourceEditor/Search src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Core/Services src/Main/Base src/Main/Base/Commands src/Main/Base/Commands/ProjectBrowserCommands src/Main/Base/Gui src/Main/Base/Gui/Components src/Main/Base/Gui/Components/SideBar src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/CombineConfiguration src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions src/Main/Base/Gui/Dialogs/ReferenceDialog src/Main/Base/Gui/Dialogs/Wizard src/Main/Base/Gui/Pads src/Main/Base/G ui/Pads/ClassScout src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Gui/Workbench/Layouts src/Main/Base/Internal/Codons/MenuItems src/Main/Base/Internal/Codons/Toolbars src/Main/Base/Internal/ExternalTool src/Main/Base/Internal/Project/Combine src/Main/Base/Internal/Project/Project src/Main/Base/Internal/Project/Project/Deployment src/Main/Base/Internal/Templates src/Main/Base/Internal/Templates/ProjectTemplates src/Main/Base/Services src/Main/Base/Services/Toolbar src/Main/StartUp/Dialogs

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Thu Jul 1 02:28:55 EDT 2004


Author: tberman
Date: 2004-07-01 02:28:55 -0400 (Thu, 01 Jul 2004)
New Revision: 1869

Added:
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt.xml
Removed:
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt
   trunk/MonoDevelop/Core/build/data/resources/languages/
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/FileUtilityService/
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/IResourceService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs
Modified:
   trunk/MonoDevelop/Core/ChangeLog
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/ILAsmBinding.addin.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/JavaBinding.addin.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/NemerleBinding.addin.xml
   trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am
   trunk/MonoDevelop/Core/build/AddIns/MonoDevelopNewEditor.addin.xml
   trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml
   trunk/MonoDevelop/Core/build/data/options/TipsOfTheDay.xml
   trunk/MonoDevelop/Core/build/data/resources/Makefile.am
   trunk/MonoDevelop/Core/configure.in
   trunk/MonoDevelop/Core/data/resources/AddIn.xsd
   trunk/MonoDevelop/Core/po/POTFILES.in
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenu.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdToolbarCommand.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/OpenTaskView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/SideBarView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/PixbufList.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/Toolbars/ToolbarItemCodon.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/FileTemplate.cs
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
   trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
   trunk/MonoDevelop/Core/src/Main/Base/Services/IconService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/Toolbar/ToolbarService.cs
   trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs
Log:
huge commit.

read the root ChangeLog for a summary of whats going on, its pretty basic
cleanup that needs to happen.


Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/ChangeLog	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,3 +1,35 @@
+2004-07-01  Todd Berman  <tberman at off.net>
+
+	* *: This is a huge changeset, so instead of annotating in every
+	possible place, I will explain the changeset here.
+
+	First, ResourceService.GetString was removed as it is a call that
+	is used for translation purposes in #D, and we use gettext to
+	handle translation.
+
+	Then, IResourceService was removed as it is useless now (just had
+	a GetString call). All files were updated to not use IResourceService
+	and in many cases, the resource service was able to be completely
+	removed.
+
+	The StringParserService has a way of allowing ${res:key} strings to
+	be localized through the ResourceService.GetString. Because this
+	functionality was removed, and any use of it is an error now, I
+	made that throw an exception.
+
+	As it turns out, there was a lot of code that used ${res:key}, most
+	notably the new project/file template stuff. This was updated to allow
+	for translation properly, and no longer use ${res:key} style i18n.
+
+	There were a handful of other places that still used the ${res:}
+	syntax.
+
+	Right now, there is the possibility that there are still some missing.
+	If this is the case, an exception will be thrown and MD will crash/hang.
+	
+	Please report these situations as soon as possible so we can fix
+	them, and get 100% i18n coverage.
+
 2004-06-29  Todd Berman  <tberman at off.net>
 
 	* configure.in: remove dead directories.

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -16,40 +16,40 @@
 
 	<Extension path = "/MonoDevelop/FileTemplates">
 		<FileTemplate id = "SessionState"
-		              location = "templates/CSharpSessionStateWebService.xft"/>
+		              location = "templates/CSharpSessionStateWebService.xft.xml"/>
 		<FileTemplate id = "WebService"
-		              location = "templates/CSharpWebService.xft"/>
+		              location = "templates/CSharpWebService.xft.xml"/>
 		<FileTemplate id = "Empty"
-		              location = "templates/EmptyCSharpFile.xft"/>
+		              location = "templates/EmptyCSharpFile.xft.xml"/>
 		<FileTemplate id = "GnomeSharpProgram"
-		              location = "templates/GnomeSharpProgram.xft"/>
+		              location = "templates/GnomeSharpProgram.xft.xml"/>
 		<FileTemplate id = "GtkSharpWindow"
-		              location = "templates/GtkSharpWindow.xft"/>
+		              location = "templates/GtkSharpWindow.xft.xml"/>
 		<FileTemplate id = "EmptyHTMLFile"
-		              location = "templates/EmptyHTMLFile.xft"/>
+		              location = "templates/EmptyHTMLFile.xft.xml"/>
 		<FileTemplate id = "EmptyResourceFile"
-		              location = "templates/EmptyResourceFile.xft"/>
+		              location = "templates/EmptyResourceFile.xft.xml"/>
 		<FileTemplate id = "EmptyTextFile"
-		              location = "templates/EmptyTextFile.xft"/>
+		              location = "templates/EmptyTextFile.xft.xml"/>
 		<FileTemplate id = "EmptyXMLFile"
-		              location = "templates/EmptyXMLFile.xft"/>
+		              location = "templates/EmptyXMLFile.xft.xml"/>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectTemplates">
 		<ProjectTemplate id = "ConsoleProject"
-		                 location = "templates/ConsoleProject.xpt"/>
+		                 location = "templates/ConsoleProject.xpt.xml"/>
 		<ProjectTemplate id = "EmptyProject"
-		                 location = "templates/EmptyProject.xpt"/>
+		                 location = "templates/EmptyProject.xpt.xml"/>
 		<ProjectTemplate id = "GladeSharpProject"
-		                 location = "templates/GladeSharpProject.xpt"/>
+		                 location = "templates/GladeSharpProject.xpt.xml"/>
 		<ProjectTemplate id = "GnomeSharpProject"
-		                 location = "templates/GnomeSharpProject.xpt"/>
+		                 location = "templates/GnomeSharpProject.xpt.xml"/>
 		<ProjectTemplate id = "GtkSharpProject"
-		                 location = "templates/GtkSharpProject.xpt"/>
+		                 location = "templates/GtkSharpProject.xpt.xml"/>
 		<ProjectTemplate id = "Library"
-		                 location = "templates/Library.xpt"/>
+		                 location = "templates/Library.xpt.xml"/>
 		<ProjectTemplate id = "BlankCombine"
-		                 location = "templates/BlankCombine.xpt"/>
+		                 location = "templates/BlankCombine.xpt.xml"/>
 	</Extension>
 	
 	<Extension path = "/SharpDevelop/Workbench/FileFilter">

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/ILAsmBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/ILAsmBinding.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/ILAsmBinding.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -11,7 +11,7 @@
 
   <Extension path = "/MonoDevelop/ProjectTemplates">
     <ProjectTemplate id = "ILAsmConsoleProject"
-                     location = "templates/ILAsmConsoleProject.xpt"/>
+                     location = "templates/ILAsmConsoleProject.xpt.xml"/>
   </Extension>
 
   <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/JavaBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/JavaBinding.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/JavaBinding.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,36 +18,36 @@
 
   <Extension path = "/MonoDevelop/FileTemplates">
     <FileTemplate id = "JavaApplet"
-                  location = "templates/JavaApplet.xft"/>
+                  location = "templates/JavaApplet.xft.xml"/>
     <FileTemplate id = "JavaApplication"
-                  location = "templates/JavaApplication.xft"/>
+                  location = "templates/JavaApplication.xft.xml"/>
     <FileTemplate id = "JavaDialog"
-                  location = "templates/JavaDialog.xft"/>
+                  location = "templates/JavaDialog.xft.xml"/>
     <FileTemplate id = "JavaFrame"
-                  location = "templates/JavaFrame.xft"/>
+                  location = "templates/JavaFrame.xft.xml"/>
     <FileTemplate id = "JavaOKDialog"
-                  location = "templates/JavaOKDialog.xft"/>
+                  location = "templates/JavaOKDialog.xft.xml"/>
     <FileTemplate id = "JavaPanel"
-                  location = "templates/JavaPanel.xft"/>
+                  location = "templates/JavaPanel.xft.xml"/>
     <FileTemplate id = "EmptyJavaFile"
-                  location = "templates/EmptyJavaFile.xft"/>
+                  location = "templates/EmptyJavaFile.xft.xml"/>
   </Extension>
 
   <Extension path = "/MonoDevelop/ProjectTemplates">
     <ProjectTemplate id = "EmptyJavaProject"
-                     location = "templates/EmptyJavaProject.xpt"/>
+                     location = "templates/EmptyJavaProject.xpt.xml"/>
     <ProjectTemplate id = "IkvmConsoleApplicationProject"
-                     location = "templates/IkvmConsoleApplicationProject.xpt"/>
+                     location = "templates/IkvmConsoleApplicationProject.xpt.xml"/>
     <ProjectTemplate id = "IkvmGladeApplicationProject"
-                     location = "templates/IkvmGladeApplicationProject.xpt"/>
+                     location = "templates/IkvmGladeApplicationProject.xpt.xml"/>
     <ProjectTemplate id = "IkvmGnomeApplicationProject"
-                     location = "templates/IkvmGnomeApplicationProject.xpt"/>
+                     location = "templates/IkvmGnomeApplicationProject.xpt.xml"/>
     <ProjectTemplate id = "IkvmGtkApplicationProject"
-                     location = "templates/IkvmGtkApplicationProject.xpt"/>
+                     location = "templates/IkvmGtkApplicationProject.xpt.xml"/>
     <ProjectTemplate id = "JavaApplicationProject"
-                     location = "templates/JavaApplicationProject.xpt"/>
+                     location = "templates/JavaApplicationProject.xpt.xml"/>
     <ProjectTemplate id = "JavaConsoleApplicationProject"
-                     location = "templates/JavaConsoleApplicationProject.xpt"/>
+                     location = "templates/JavaConsoleApplicationProject.xpt.xml"/>
   </Extension>
 
   <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/NemerleBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/NemerleBinding.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/NemerleBinding.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,12 +18,12 @@
 
   <Extension path = "/MonoDevelop/FileTemplates">
     <FileTemplate id = "EmptyNemerleFile"
-                  location = "templates/EmptyNemerleFile.xft"/>
+                  location = "templates/EmptyNemerleFile.xft.xml"/>
   </Extension>
 
   <Extension path = "/MonoDevelop/ProjectTemplates">
     <ProjectTemplate id = "EmptyNemerleProject"
-                     location = "templates/NemerleEmptyProject.xpt"/>
+                     location = "templates/NemerleEmptyProject.xpt.xml"/>
   </Extension>
 
   <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Mike Krueger"
-          created      = "07/06/2001"
-          lastModified = "04/09/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>${res:Templates.Project.Misc.BlankCombine.Name}</Name>
-		<Category>MonoDevelop</Category>
-		<Icon>Icons.32x32.CombineIcon</Icon>
-		<LanguageName/>
-		<Description>${res:Templates.Project.Misc.BlankCombine.Description}</Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = "."/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template originator   = "Mike Krueger"
+          created      = "07/06/2001"
+          lastModified = "07/01/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Blank Solution</_Name>
+		<Category>MonoDevelop</Category>
+		<Icon>Icons.32x32.CombineIcon</Icon>
+		<LanguageName/>
+		<_Description>A blank solution</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = "."/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Christoph Wille" Language="C#" Created="6/13/2001" LastModified="6/13/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.C#.SecureCSharpWebService.Name}</Name>
-		<Icon>C#.File.WebFile</Icon>
-		<Category>C#</Category>
-		<LanguageName>C#</LanguageName>
-		<Description>${res:Templates.File.C#.SecureCSharpWebService.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".asmx" DefaultName="WebService">
-
-<![CDATA[<%@ WebService Language="C#" Class="YourClassname" %>
-// created on ${Date} at ${Time}
-using System;
-using System.Web.Services;
-
-public class YourClassname : WebService
-{
-	[ WebMethod(EnableSession=true) ]
-	public bool Login(string Username, string Password) 
-	{ 
-		// replace with database code to your liking
-		if ("user" == Username && "pwd" == Password)
-		{
-		  Session["LoggedIn"] = true;
-		  return true;
-		}
-		else
-		{
-		  Session["LoggedIn"] = false;
-		}
-		return false;
-	}
-		
-	[ WebMethod(EnableSession=true) ]
-	public bool IsUserLoggedIn()
-	{
-		object loggedIn = Session["LoggedIn"];
-		if (null != loggedIn) return (bool)loggedIn;
-		return false;
-	}
-}
-]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<Template Originator="Christoph Wille" Language="C#" Created="6/13/2001" LastModified="6/13/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Secure C# Web Service</_Name>
+		<Icon>C#.File.WebFile</Icon>
+		<Category>C#</Category>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a secure C# Web Service, using SessionState</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".asmx" DefaultName="WebService">
+
+<![CDATA[<%@ WebService Language="C#" Class="YourClassname" %>
+// created on ${Date} at ${Time}
+using System;
+using System.Web.Services;
+
+public class YourClassname : WebService
+{
+	[ WebMethod(EnableSession=true) ]
+	public bool Login(string Username, string Password) 
+	{ 
+		// replace with database code to your liking
+		if ("user" == Username && "pwd" == Password)
+		{
+		  Session["LoggedIn"] = true;
+		  return true;
+		}
+		else
+		{
+		  Session["LoggedIn"] = false;
+		}
+		return false;
+	}
+		
+	[ WebMethod(EnableSession=true) ]
+	public bool IsUserLoggedIn()
+	{
+		object loggedIn = Session["LoggedIn"];
+		if (null != loggedIn) return (bool)loggedIn;
+		return false;
+	}
+}
+]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Christoph Wille" Language="C#" Created="6/13/2001" LastModified="6/13/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.C#.CSharpWebService.Name}</Name>
-		<Icon>C#.File.WebFile</Icon>
-		<Category>C#</Category>
-		<LanguageName>C#</LanguageName>
-		<Description>${res:Templates.File.C#.CSharpWebService.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".asmx" DefaultName="WebService">
-
-<![CDATA[<%@ WebService Language="C#" Class="YourClassname" %>
-// created on ${Date} at ${Time}
-using System;
-using System.Web.Services;
-
-public class YourClassname : WebService
-{
-	// [WebMethod]
-	// public string SampleMethod() { return "Hello World"; }
-}
-]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<Template Originator="Christoph Wille" Language="C#" Created="6/13/2001" LastModified="6/13/2001">
+	
+	<TemplateConfiguration>
+		<_Name>C# Web Service</_Name>
+		<Icon>C#.File.WebFile</Icon>
+		<Category>C#</Category>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a C# Web Service.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".asmx" DefaultName="WebService">
+
+<![CDATA[<%@ WebService Language="C#" Class="YourClassname" %>
+// created on ${Date} at ${Time}
+using System;
+using System.Web.Services;
+
+public class YourClassname : WebService
+{
+	// [WebMethod]
+	// public string SampleMethod() { return "Hello World"; }
+}
+]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Mike Krueger"
-          created      = "06/10/2001"
-          lastModified = "02/01/2003">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>${res:Templates.Project.C#.ConsoleProject.Name}</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.DOSProject</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>${res:Templates.Project.C#.ConsoleProject.Description}</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Main.cs"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
-			<Files>
-				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
-using System;
-
-class MainClass
-{
-	public static void Main(string[] args)
-	{
-		Console.WriteLine("Hello World!");
-	}
-}]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<Template originator   = "Mike Krueger"
+          created      = "06/10/2001"
+          lastModified = "02/01/2003">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Console Project</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.DOSProject</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a new console project.</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Main.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options/>
+			<Files>
+				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
+using System;
+
+class MainClass
+{
+	public static void Main(string[] args)
+	{
+		Console.WriteLine("Hello World!");
+	}
+}]]></File>
+			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="C#" Created="3/09/2001" LastModified="3/09/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.C#.EmptyC#File.Name}</Name>
-		<Icon>C#.File.EmptyFile</Icon>
-		<Category>C#</Category>
-		<LanguageName>C#</LanguageName>
-		<Description>${res:Templates.File.C#.EmptyC#File.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".cs" DefaultName="EmptyCSharpfile">
-			<![CDATA[// created on ${Date} at ${Time}]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<Template Originator="Mike Krueger" Language="C#" Created="3/09/2001" LastModified="3/09/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Empty File</_Name>
+		<Icon>C#.File.EmptyFile</Icon>
+		<Category>C#</Category>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates an empty C# file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".cs" DefaultName="EmptyCSharpfile">
+			<![CDATA[// created on ${Date} at ${Time}]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="HTML" Created="6/10/2001" LastModified="6/10/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.Html.EmptyHtml.Name}</Name>
-		<Icon>Icons.32x32.HTMLFileIcon</Icon>
-		<Category>Misc</Category>
-		<LanguageName>HTML</LanguageName>
-		<Description>${res:Templates.File.Html.EmptyHtmlFile.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".html" DefaultName="EmptyHtmlfile"><![CDATA[
-<Html>
-	<Head>
-		<Title></Title>
-	</Head>
-	<Body>
-	</Body>
-</Html>]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<Template Originator="Mike Krueger" Language="HTML" Created="6/10/2001" LastModified="6/10/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Empty HTML File</_Name>
+		<Icon>Icons.32x32.HTMLFileIcon</Icon>
+		<Category>Misc</Category>
+		<LanguageName>HTML</LanguageName>
+		<_Description>Creates an empty HTML file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".html" DefaultName="EmptyHtmlfile"><![CDATA[
+<Html>
+	<Head>
+		<Title></Title>
+	</Head>
+	<Body>
+	</Body>
+</Html>]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="Java" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-                <Name>${res:Templates.File.Java.EmptyJavaFile.Name}</Name>
-                <Icon>Java.File.EmptyFile</Icon>
-                <Category>Java</Category>
-                <LanguageName>Java</LanguageName>
-                <Description>${res:Templates.File.Java.EmptyJavaFile.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-                <File DefaultExtension=".java" DefaultName="EmptyJavafile">
-			<![CDATA[// created on ${Date} at ${Time}]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="Java" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+                <_Name>Empty Java File</_Name>
+                <Icon>Java.File.EmptyFile</Icon>
+                <Category>Java</Category>
+                <LanguageName>Java</LanguageName>
+                <_Description>Creates an empty Java file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+                <File DefaultExtension=".java" DefaultName="EmptyJavafile">
+			<![CDATA[// created on ${Date} at ${Time}]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Gary Gray" 
-          created      = "09/05/2001"
-          lastModified = "02/01/2003">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-                <Name>${res:Templates.Project.Java.EmptyJavaApp.Name}</Name>
-                <Category>Java</Category>
-                <Icon>Java.Project.EmptyProject</Icon>
-                <LanguageName>Java</LanguageName>
-                <Description>${res:Templates.Project.Java.EmptyJavaApp.Description}</Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "."/>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<Template originator   = "Gary Gray" 
+          created      = "09/05/2001"
+          lastModified = "02/01/2003">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+                <_Name>Empty Java Project</_Name>
+                <Category>Java</Category>
+                <Icon>Java.Project.EmptyProject</Icon>
+                <LanguageName>Java</LanguageName>
+                <_Description>Creates an empty Java solution.</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Project name = "${ProjectName}" directory = "."/>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator   = "Pawel Rozanski"
-	  Language     = "Nemerle"
-          Created      = "04/04/2004"
-          LastModified = "05/04/2004">
-	  
-	<TemplateConfiguration>
-		<Name>Empty Nemerle file</Name>
-		<Icon>Nemerle.File.EmptyFile</Icon>
-		<Category>Nemerle</Category>
-		<LanguageName>Nemerle</LanguageName>
-		<Description>Empty Nemerle file</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".n" DefaultName="EmptyNemerlefile">
-			<![CDATA[// created on ${Date} at ${Time}]]>
-		</File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<Template Originator   = "Pawel Rozanski"
+	  Language     = "Nemerle"
+          Created      = "04/04/2004"
+          LastModified = "05/04/2004">
+	  
+	<TemplateConfiguration>
+		<_Name>Empty Nemerle file</_Name>
+		<Icon>Nemerle.File.EmptyFile</Icon>
+		<Category>Nemerle</Category>
+		<LanguageName>Nemerle</LanguageName>
+		<_Description>Empty Nemerle file</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".n" DefaultName="EmptyNemerlefile">
+			<![CDATA[// created on ${Date} at ${Time}]]>
+		</File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Mike Krueger"
-          created      = "01/10/2001"
-          lastModified = "02/01/2003">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Empty Project</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.EmptyProject</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>Empty App</Description>
-	</TemplateConfiguration>
-	
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "."/>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template originator   = "Mike Krueger"
+          created      = "01/10/2001"
+          lastModified = "02/01/2003">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Empty Project</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.EmptyProject</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates an empty C# project.</_Description>
+	</TemplateConfiguration>
+	
+	<Combine name = "${ProjectName}" directory = ".">
+		<Project name = "${ProjectName}" directory = "."/>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="ResourceFiles" Created="6/10/2001" LastModified="6/10/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.Resource.EmptyResourceFile.Name}</Name>
-		<Icon>Icons.32x32.ResourceFileIcon</Icon>
-		<Category>Misc</Category>
-		<LanguageName>ResourceFiles</LanguageName>
-		<Description>${res:Templates.File.Resource.EmptyResourceFile.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".resources" DefaultName="EmptyResourcefile"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template Originator="Mike Krueger" Language="ResourceFiles" Created="6/10/2001" LastModified="6/10/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Empty Resource File</_Name>
+		<Icon>Icons.32x32.ResourceFileIcon</Icon>
+		<Category>Misc</Category>
+		<LanguageName>ResourceFiles</LanguageName>
+		<_Description>Creates an empty resource file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".resources" DefaultName="EmptyResourcefile"/>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="Default" Created="6/10/2001" LastModified="6/10/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.Text.EmptyText.Name}</Name>
-		<Icon>Icons.32x32.TextFileIcon</Icon>
-		<Category>Misc</Category>
-		<LanguageName>Default</LanguageName>
-		<Description>${res:Templates.File.Text.EmptyTextFile.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".txt" DefaultName="EmptyTextfile"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template Originator="Mike Krueger" Language="Default" Created="6/10/2001" LastModified="6/10/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Empty Text File</_Name>
+		<Icon>Icons.32x32.TextFileIcon</Icon>
+		<Category>Misc</Category>
+		<LanguageName>Default</LanguageName>
+		<_Description>Creates an empty text file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".txt" DefaultName="EmptyTextfile"/>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="XML" Created="6/10/2001" LastModified="6/10/2001">
-	
-	<TemplateConfiguration>
-		<Name>${res:Templates.File.Xml.EmptyXml.Name}</Name>
-		<Icon>Icons.32x32.XMLFileIcon</Icon>
-		<Category>Misc</Category>
-		<LanguageName>XML</LanguageName>
-		<Description>${res:Templates.File.Xml.EmptyXmlFile.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".xml" DefaultName="EmptyXmlfile"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template Originator="Mike Krueger" Language="XML" Created="6/10/2001" LastModified="6/10/2001">
+	
+	<TemplateConfiguration>
+		<_Name>Empty XML File</_Name>
+		<Icon>Icons.32x32.XMLFileIcon</Icon>
+		<Category>Misc</Category>
+		<LanguageName>XML</LanguageName>
+		<_Description>Creates an empty XML file.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".xml" DefaultName="EmptyXmlfile"/>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Erik Dasque"
-          created      = "03/10/2004"
-          lastModified = "03/11/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Glade# Project</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.Form</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>a Glade# project with one window and button</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Main.cs"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
-			
-			<References>
-				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-			</References>
-			
-			<Resources>
-<File name="gui.glade"><![CDATA[<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
-<glade-interface>
-<requires lib="gnome"/>
- 
-<widget class="GtkWindow" id="window1">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Glade Window</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="default_width">256</property>
-  <property name="default_height">256</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <signal name="delete_event" handler="OnWindowDeleteEvent"/>
-
-  <child>
-    <placeholder/>
-  </child>
-</widget>
- 
-</glade-interface>
-
-]]></File>
-			</Resources>
-			<Files>
-				<File name="Main.cs">
-<![CDATA[// project created on ${Date} at ${Time}
-using System;
-using Gtk;
-using Glade;
-
-public class GladeApp
-{
-        public static void Main (string[] args)
-        {
-                new GladeApp (args);
-        }
-
-        public GladeApp (string[] args) 
-        {
-                Application.Init();
-
-                Glade.XML gxml = new Glade.XML (null, "gui.glade", "window1", null);
-                gxml.Autoconnect (this);
-                Application.Run();
-        }
-
-        /* Connect the Signals defined in Glade */
-        public void OnWindowDeleteEvent (object o, DeleteEventArgs args) 
-        {
-                Application.Quit ();
-                args.RetVal = true;
-        }
-}
-
-]]>
-</File>
-<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<Template originator   = "Erik Dasque"
+          created      = "03/10/2004"
+          lastModified = "03/11/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Glade# Project</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Form</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>a Glade# project with one window and button</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Main.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options/>
+			
+			<References>
+				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+			</References>
+			
+			<Resources>
+<File name="gui.glade"><![CDATA[<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+<glade-interface>
+<requires lib="gnome"/>
+ 
+<widget class="GtkWindow" id="window1">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Glade Window</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">False</property>
+  <property name="default_width">256</property>
+  <property name="default_height">256</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <signal name="delete_event" handler="OnWindowDeleteEvent"/>
+
+  <child>
+    <placeholder/>
+  </child>
+</widget>
+ 
+</glade-interface>
+
+]]></File>
+			</Resources>
+			<Files>
+				<File name="Main.cs">
+<![CDATA[// project created on ${Date} at ${Time}
+using System;
+using Gtk;
+using Glade;
+
+public class GladeApp
+{
+        public static void Main (string[] args)
+        {
+                new GladeApp (args);
+        }
+
+        public GladeApp (string[] args) 
+        {
+                Application.Init();
+
+                Glade.XML gxml = new Glade.XML (null, "gui.glade", "window1", null);
+                gxml.Autoconnect (this);
+                Application.Run();
+        }
+
+        /* Connect the Signals defined in Glade */
+        public void OnWindowDeleteEvent (object o, DeleteEventArgs args) 
+        {
+                Application.Quit ();
+                args.RetVal = true;
+        }
+}
+
+]]>
+</File>
+<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="John Luke" 
-          Language="GnomeSharpProgram" Created="1/02/2004" LastModified="2/25/2004">
-	
-	<TemplateConfiguration>
-		<Name>Gnome# Program</Name>
-		<Icon>C#.File.Form</Icon>
-		<Category>C#</Category>
-		<LanguageName>C#</LanguageName>
-		<Description>creates a Gnome# program</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".cs" DefaultName="CreatedProgram">
-<![CDATA[// created on ${Date} at ${Time}
-using System;
-using Gnome;
-using GnomeSharp;
-
-namespace MyProgram
-{
-	public class CreatedProgram : Program
-	{
-		public CreatedProgram () : base ("ChangeMe", "0.1", Gnome.Modules.Info, new string[0])
-		{
-		}
-	}
-}
-]]></File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Template Originator="John Luke" 
+          Language="GnomeSharpProgram" Created="1/02/2004" LastModified="2/25/2004">
+	
+	<TemplateConfiguration>
+		<_Name>Gnome# Program</_Name>
+		<Icon>C#.File.Form</Icon>
+		<Category>C#</Category>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a Gnome# program.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".cs" DefaultName="CreatedProgram">
+<![CDATA[// created on ${Date} at ${Time}
+using System;
+using Gnome;
+using GnomeSharp;
+
+namespace MyProgram
+{
+	public class CreatedProgram : Program
+	{
+		public CreatedProgram () : base ("ChangeMe", "0.1", Gnome.Modules.Info, new string[0])
+		{
+		}
+	}
+}
+]]></File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke"
-          created      = "01/03/2004"
-          lastModified = "03/08/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Gnome# Project</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.Form</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>Gnome# project</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Main.cs"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
-			
-			<References>
-				<Reference type="Gac" refto="gnome-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-			</References>
-
-			<Files>
-				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
-using System;
-
-public class MainClass
-{
-	public static void Main (string[] args)
-	{
-		new MyProgram (args);
-	}
-}]]></File>
-			<File name="MyProgram.cs"><![CDATA[using System;
-using Gtk;
-using Gnome;
-
-public class MyProgram
-{
-	public MyProgram (string [] args)
-	{
-		Program program = new Program ("MyProgram", "0.0", Modules.UI, args);
-		App app = new App ("MyProgram", "MyWindow");
-		app.SetDefaultSize (400, 300);
-		app.DeleteEvent += new DeleteEventHandler (OnAppDelete);
-		app.ShowAll ();
-		program.Run ();
-	}
-	
-	private void OnAppDelete (object o, DeleteEventArgs args)
-	{
-		Application.Quit ();
-	}
-}]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke"
+          created      = "01/03/2004"
+          lastModified = "03/08/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Gnome# Project</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Form</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a Gnome# project</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Main.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options/>
+			
+			<References>
+				<Reference type="Gac" refto="gnome-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+			</References>
+
+			<Files>
+				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
+using System;
+
+public class MainClass
+{
+	public static void Main (string[] args)
+	{
+		new MyProgram (args);
+	}
+}]]></File>
+			<File name="MyProgram.cs"><![CDATA[using System;
+using Gtk;
+using Gnome;
+
+public class MyProgram
+{
+	public MyProgram (string [] args)
+	{
+		Program program = new Program ("MyProgram", "0.0", Modules.UI, args);
+		App app = new App ("MyProgram", "MyWindow");
+		app.SetDefaultSize (400, 300);
+		app.DeleteEvent += new DeleteEventHandler (OnAppDelete);
+		app.ShowAll ();
+		program.Run ();
+	}
+	
+	private void OnAppDelete (object o, DeleteEventArgs args)
+	{
+		Application.Quit ();
+	}
+}]]></File>
+			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,103 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke"
-          created      = "01/03/2004"
-          lastModified = "03/25/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Gtk# Project</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.Form</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>Gtk# project</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Main.cs"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
-			
-			<References>
-				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-			</References>
-		
-			<Files>
-				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
-using System;
-using Gtk;
-
-class MainClass {
-	public static void Main(string[] args)
-	{
-		Application.Init ();
-		new MyWindow ();
-		Application.Run ();
-	}
-}]]></File>
-			<File name="MyWindow.cs"><![CDATA[using System;
-using Gtk;
-
-public class MyWindow : Window {
-	
-	public MyWindow () : base ("MyWindow")
-	{
-		this.SetDefaultSize (400, 300);
-		this.DeleteEvent += new DeleteEventHandler (OnMyWindowDelete);
-		this.ShowAll ();
-	}
-	
-	void OnMyWindowDelete (object o, DeleteEventArgs args)
-	{
-		Application.Quit ();
-	}
-}]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke"
+          created      = "01/03/2004"
+          lastModified = "03/25/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Gtk# Project</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Form</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a Gtk# project.</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Main.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options/>
+			
+			<References>
+				<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+			</References>
+		
+			<Files>
+				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
+using System;
+using Gtk;
+
+class MainClass {
+	public static void Main(string[] args)
+	{
+		Application.Init ();
+		new MyWindow ();
+		Application.Run ();
+	}
+}]]></File>
+			<File name="MyWindow.cs"><![CDATA[using System;
+using Gtk;
+
+public class MyWindow : Window {
+	
+	public MyWindow () : base ("MyWindow")
+	{
+		this.SetDefaultSize (400, 300);
+		this.DeleteEvent += new DeleteEventHandler (OnMyWindowDelete);
+		this.ShowAll ();
+	}
+	
+	void OnMyWindowDelete (object o, DeleteEventArgs args)
+	{
+		Application.Quit ();
+	}
+}]]></File>
+			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="John Luke" 
-          Language="GtkSharpWindow" Created="1/02/2004" LastModified="2/25/2004">
-	
-	<TemplateConfiguration>
-		<Name>Gtk# Window</Name>
-		<Icon>C#.File.Form</Icon>
-		<Category>C#</Category>
-		<LanguageName>C#</LanguageName>
-		<Description>creates a top-level Gtk# window</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".cs" DefaultName="MyWindow">
-<![CDATA[// created on ${Date} at ${Time}
-using System;
-using Gtk;
-using GtkSharp;
-
-namespace MyWindow
-{
-	public class CreatedWindow : Window
-	{
-		public CreatedWindow () : base ("MyWindow")
-		{
-		}
-	}
-}
-]]></File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Template Originator="John Luke" 
+          Language="GtkSharpWindow" Created="1/02/2004" LastModified="2/25/2004">
+	
+	<TemplateConfiguration>
+		<_Name>Gtk# Window</_Name>
+		<Icon>C#.File.Form</Icon>
+		<Category>C#</Category>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a top-level Gtk# window.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+		<File DefaultExtension=".cs" DefaultName="MyWindow">
+<![CDATA[// created on ${Date} at ${Time}
+using System;
+using Gtk;
+using GtkSharp;
+
+namespace MyWindow
+{
+	public class CreatedWindow : Window
+	{
+		public CreatedWindow () : base ("MyWindow")
+		{
+		}
+	}
+}
+]]></File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke"
-          created      = "04/25/2004"
-          lastModified = "04/25/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>ILAsm Console Project</Name>
-		<Category>ILAsm</Category>
-		<Icon>C#.Project.DOSProject</Icon>
-		<LanguageName>ILAsm</LanguageName>
-		<Description>ILAsm Console Project</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "main.il"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
-			<Files>
-				<File name="main.il"><![CDATA[.assembly HelloWorld
-{
-}
-
-.namespace DefaultNamespace
-{
-	.class private auto ansi beforefieldinit MainClass
-	{
-		.method public hidebysig static void Main(string[] args) cil managed
-		{
-			.entrypoint
-			.maxstack  1
-			ldstr "Hello World!"
-			call void [mscorlib]System.Console::WriteLine(string)
-			ret
-		}
-	}
-}]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke"
+          created      = "04/25/2004"
+          lastModified = "04/25/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>ILAsm Console Project</_Name>
+		<Category>ILAsm</Category>
+		<Icon>C#.Project.DOSProject</Icon>
+		<LanguageName>ILAsm</LanguageName>
+		<_Description>ILAsm Console Project</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "main.il"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options/>
+			<Files>
+				<File name="main.il"><![CDATA[.assembly HelloWorld
+{
+}
+
+.namespace DefaultNamespace
+{
+	.class private auto ansi beforefieldinit MainClass
+	{
+		.method public hidebysig static void Main(string[] args) cil managed
+		{
+			.entrypoint
+			.maxstack  1
+			ldstr "Hello World!"
+			call void [mscorlib]System.Console::WriteLine(string)
+			ret
+		}
+	}
+}]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke" 
-          created      = "04/06/2004"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>IKVM Console Project</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.DOSProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>Create a console Java project with IKVM</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<!-- FIXME: remove path to jar -->
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/mscorlib.jar:." MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-import cli.System.*;
-
-public class application {
-    public static void main(java.lang.String[] args) {
-        Console.WriteLine ("Hello, World!");
-    }
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke" 
+          created      = "04/06/2004"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>IKVM Console Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.DOSProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Create a console Java project with IKVM</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<!-- FIXME: remove path to jar -->
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/mscorlib.jar:." MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+import cli.System.*;
+
+public class application {
+    public static void main(java.lang.String[] args) {
+        Console.WriteLine ("Hello, World!");
+    }
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke" 
-          created      = "04/06/2004"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>IKVM Glade# Project</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.DOSProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>Create a Glade# Java project with IKVM</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<!-- FIXME: do not hardcode these -->
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gtk-sharp.jar:/usr/lib/glade-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-import cli.Gtk.*;
-import cli.Glade.*;
-
-public class application {
-    public static void main (String[] args) {
-        Application.Init ();
-		Window w = new Window ("Hello Mono with Java#");
-		Button b = new Button ("Click me");
-		w.Add (b);
-		w.ShowAll ();
-		Application.Run ();
-    }
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke" 
+          created      = "04/06/2004"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>IKVM Glade# Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.DOSProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Create a Glade# Java project with IKVM</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<!-- FIXME: do not hardcode these -->
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gtk-sharp.jar:/usr/lib/glade-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+import cli.Gtk.*;
+import cli.Glade.*;
+
+public class application {
+    public static void main (String[] args) {
+        Application.Init ();
+		Window w = new Window ("Hello Mono with Java#");
+		Button b = new Button ("Click me");
+		w.Add (b);
+		w.ShowAll ();
+		Application.Run ();
+    }
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke" 
-          created      = "04/06/2004"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>IKVM Gnome# Project</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.DOSProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>Create a Gnome# Java project with IKVM</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<!-- FIXME: do not hardcode these -->
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gnome-sharp.jar:/usr/lib/gtk-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-import cli.Gnome.*;
-import cli.Gtk.*;
-
-public class application {
-    public static void main (String[] args) {
-        Program p = new Program ("Name", "0.0", Modules.UI, args);
-		App app = new App ("Hello Mono with Java#", "0.0");
-		Button b = new Button ("Click me");
-		app.Add (b);
-		app.ShowAll ();
-		p.Run ();
-    }
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke" 
+          created      = "04/06/2004"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>IKVM Gnome# Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.DOSProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Create a Gnome# Java project with IKVM</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<!-- FIXME: do not hardcode these -->
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gnome-sharp.jar:/usr/lib/gtk-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+import cli.Gnome.*;
+import cli.Gtk.*;
+
+public class application {
+    public static void main (String[] args) {
+        Program p = new Program ("Name", "0.0", Modules.UI, args);
+		App app = new App ("Hello Mono with Java#", "0.0");
+		Button b = new Button ("Click me");
+		app.Add (b);
+		app.ShowAll ();
+		p.Run ();
+    }
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "John Luke" 
-          created      = "04/06/2004"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>IKVM Gtk# Project</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.DOSProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>Create a Gtk# Java project with IKVM</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<!-- FIXME: do not hardcode these -->
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gtk-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-import cli.Gtk.*;
-
-public class application {
-    public static void main (String[] args) {
-        Application.Init ();
-		Window w = new Window ("Hello Mono with Java#");
-		Button b = new Button ("Click me");
-		w.Add (b);
-		w.ShowAll ();
-		Application.Run ();
-    }
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<Template originator   = "John Luke" 
+          created      = "04/06/2004"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>IKVM Gtk# Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.DOSProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Create a Gtk# Java project with IKVM</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<!-- FIXME: do not hardcode these -->
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "/usr/lib/gtk-sharp.jar:/usr/lib/glib-sharp.jar:/usr/lib/atk-sharp.jar:/usr/lib/mscorlib.jar:." MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+import cli.Gtk.*;
+
+public class application {
+    public static void main (String[] args) {
+        Application.Init ();
+		Window w = new Window ("Hello Mono with Java#");
+		Button b = new Button ("Click me");
+		w.Add (b);
+		w.ShowAll ();
+		Application.Run ();
+    }
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTApplet.Name}</Name>
-           <Icon>Java.File.FullFile</Icon>
-           <Category>Java</Category>
-           <LanguageName>Java</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTApplet.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="Applet">
-
-<![CDATA[
-/*
- * applet.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class applet extends java.applet.Applet {
-
-    /** Initializes the applet applet */
-    public void init() {
-        initComponents();
-    }
-
-    /** This method is called from within the init() method to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        setLayout(new java.awt.BorderLayout());
-
-    }//GEN-END:initComponents
-
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    // End of variables declaration//GEN-END:variables
-
-}]]>
-		</File>		
-           <File DefaultExtension=".html" DefaultName="Applet">
-
-<![CDATA[
-<HTML>
-<HEAD>
-   <TITLE>Applet HTML Page</TITLE>
-</HEAD>
-<BODY>
-
-<H3><HR WIDTH="100%">Applet HTML Page<HR WIDTH="100%"></H3>
-
-<P>
-<APPLET code="applet.class" width=350 height=200></APPLET>
-</P>
-
-<HR WIDTH="100%"><FONT SIZE=-1><I>Generated by SharpDevelop IDE</I></FONT>
-</BODY>
-</HTML>
-
-]]>
-                </File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT Applet</_Name>
+           <Icon>Java.File.FullFile</Icon>
+           <Category>Java</Category>
+           <LanguageName>Java</LanguageName>
+           <_Description>Creates an AWT Applet</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="Applet">
+
+<![CDATA[
+/*
+ * applet.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class applet extends java.applet.Applet {
+
+    /** Initializes the applet applet */
+    public void init() {
+        initComponents();
+    }
+
+    /** This method is called from within the init() method to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        setLayout(new java.awt.BorderLayout());
+
+    }//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+
+}]]>
+		</File>		
+           <File DefaultExtension=".html" DefaultName="Applet">
+
+<![CDATA[
+<HTML>
+<HEAD>
+   <TITLE>Applet HTML Page</TITLE>
+</HEAD>
+<BODY>
+
+<H3><HR WIDTH="100%">Applet HTML Page<HR WIDTH="100%"></H3>
+
+<P>
+<APPLET code="applet.class" width=350 height=200></APPLET>
+</P>
+
+<HR WIDTH="100%"><FONT SIZE=-1><I>Generated by SharpDevelop IDE</I></FONT>
+</BODY>
+</HTML>
+
+]]>
+                </File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTApp.Name}</Name>
-           <Icon>Java.File.FullFile</Icon>
-           <Category>Java</Category>
-           <LanguageName>Java</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTApp.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="Application">
-
-<![CDATA[
-/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class application extends javax.swing.JFrame {
-
-    /** Creates new form application */
-    public application() {
-        initComponents();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        menuBar = new javax.swing.JMenuBar();
-
-        fileMenu = new javax.swing.JMenu();
-        fileMenu.setText("File");
-
-        openMenuItem = new javax.swing.JMenuItem();
-        openMenuItem.setText("Open");
-
-        fileMenu.add(openMenuItem);
-        saveMenuItem = new javax.swing.JMenuItem();
-        saveMenuItem.setText("Save");
-
-        fileMenu.add(saveMenuItem);
-        saveAsMenuItem = new javax.swing.JMenuItem();
-        saveAsMenuItem.setText("Save As ...");
-
-        fileMenu.add(saveAsMenuItem);
-        exitMenuItem = new javax.swing.JMenuItem();
-        exitMenuItem.setText("Exit");
-        exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
-                                               exitMenuItemActionPerformed(evt);
-                                           }
-                                       }
-                                      );
-
-        fileMenu.add(exitMenuItem);
-        menuBar.add(fileMenu);
-        editMenu = new javax.swing.JMenu();
-        editMenu.setText("Edit");
-
-        cutMenuItem = new javax.swing.JMenuItem();
-        cutMenuItem.setText("Cut");
-
-        editMenu.add(cutMenuItem);
-        copyMenuItem = new javax.swing.JMenuItem();
-        copyMenuItem.setText("Copy");
-
-        editMenu.add(copyMenuItem);
-        pasteMenuItem = new javax.swing.JMenuItem();
-        pasteMenuItem.setText("Paste");
-
-        editMenu.add(pasteMenuItem);
-        deleteMenuItem = new javax.swing.JMenuItem();
-        deleteMenuItem.setText("Delete");
-
-        editMenu.add(deleteMenuItem);
-        menuBar.add(editMenu);
-        helpMenu = new javax.swing.JMenu();
-        helpMenu.setText("Help");
-
-        contentsMenuItem = new javax.swing.JMenuItem();
-        contentsMenuItem.setText("Contents");
-
-        helpMenu.add(contentsMenuItem);
-        aboutMenuItem = new javax.swing.JMenuItem();
-        aboutMenuItem.setText("About");
-
-        helpMenu.add(aboutMenuItem);
-        menuBar.add(helpMenu);
-        addWindowListener(new java.awt.event.WindowAdapter() {
-                              public void windowClosing(java.awt.event.WindowEvent evt) {
-                                  exitForm(evt);
-                              }
-                          }
-                         );
-
-        setJMenuBar(menuBar);
-
-        pack();
-    }//GEN-END:initComponents
-
-    private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
-        System.exit(0);
-    }//GEN-LAST:event_exitMenuItemActionPerformed
-
-    /** Exit the Application */
-    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
-        System.exit(0);
-    }//GEN-LAST:event_exitForm
-
-    /**
-    * param args the command line arguments
-    */
-    public static void main(String args[]) {
-        new application().show();
-    }
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JMenuBar menuBar;
-    private javax.swing.JMenu fileMenu;
-    private javax.swing.JMenuItem openMenuItem;
-    private javax.swing.JMenuItem saveMenuItem;
-    private javax.swing.JMenuItem saveAsMenuItem;
-    private javax.swing.JMenuItem exitMenuItem;
-    private javax.swing.JMenu editMenu;
-    private javax.swing.JMenuItem cutMenuItem;
-    private javax.swing.JMenuItem copyMenuItem;
-    private javax.swing.JMenuItem pasteMenuItem;
-    private javax.swing.JMenuItem deleteMenuItem;
-    private javax.swing.JMenu helpMenu;
-    private javax.swing.JMenuItem contentsMenuItem;
-    private javax.swing.JMenuItem aboutMenuItem;
-    // End of variables declaration//GEN-END:variables
-
-}]]>
-		</File>		
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT Application</_Name>
+           <Icon>Java.File.FullFile</Icon>
+           <Category>Java</Category>
+           <LanguageName>Java</LanguageName>
+           <_Description>Creates an AWT application.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="Application">
+
+<![CDATA[
+/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class application extends javax.swing.JFrame {
+
+    /** Creates new form application */
+    public application() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        menuBar = new javax.swing.JMenuBar();
+
+        fileMenu = new javax.swing.JMenu();
+        fileMenu.setText("File");
+
+        openMenuItem = new javax.swing.JMenuItem();
+        openMenuItem.setText("Open");
+
+        fileMenu.add(openMenuItem);
+        saveMenuItem = new javax.swing.JMenuItem();
+        saveMenuItem.setText("Save");
+
+        fileMenu.add(saveMenuItem);
+        saveAsMenuItem = new javax.swing.JMenuItem();
+        saveAsMenuItem.setText("Save As ...");
+
+        fileMenu.add(saveAsMenuItem);
+        exitMenuItem = new javax.swing.JMenuItem();
+        exitMenuItem.setText("Exit");
+        exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
+                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
+                                               exitMenuItemActionPerformed(evt);
+                                           }
+                                       }
+                                      );
+
+        fileMenu.add(exitMenuItem);
+        menuBar.add(fileMenu);
+        editMenu = new javax.swing.JMenu();
+        editMenu.setText("Edit");
+
+        cutMenuItem = new javax.swing.JMenuItem();
+        cutMenuItem.setText("Cut");
+
+        editMenu.add(cutMenuItem);
+        copyMenuItem = new javax.swing.JMenuItem();
+        copyMenuItem.setText("Copy");
+
+        editMenu.add(copyMenuItem);
+        pasteMenuItem = new javax.swing.JMenuItem();
+        pasteMenuItem.setText("Paste");
+
+        editMenu.add(pasteMenuItem);
+        deleteMenuItem = new javax.swing.JMenuItem();
+        deleteMenuItem.setText("Delete");
+
+        editMenu.add(deleteMenuItem);
+        menuBar.add(editMenu);
+        helpMenu = new javax.swing.JMenu();
+        helpMenu.setText("Help");
+
+        contentsMenuItem = new javax.swing.JMenuItem();
+        contentsMenuItem.setText("Contents");
+
+        helpMenu.add(contentsMenuItem);
+        aboutMenuItem = new javax.swing.JMenuItem();
+        aboutMenuItem.setText("About");
+
+        helpMenu.add(aboutMenuItem);
+        menuBar.add(helpMenu);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+                              public void windowClosing(java.awt.event.WindowEvent evt) {
+                                  exitForm(evt);
+                              }
+                          }
+                         );
+
+        setJMenuBar(menuBar);
+
+        pack();
+    }//GEN-END:initComponents
+
+    private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
+        System.exit(0);
+    }//GEN-LAST:event_exitMenuItemActionPerformed
+
+    /** Exit the Application */
+    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
+        System.exit(0);
+    }//GEN-LAST:event_exitForm
+
+    /**
+    * param args the command line arguments
+    */
+    public static void main(String args[]) {
+        new application().show();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JMenuBar menuBar;
+    private javax.swing.JMenu fileMenu;
+    private javax.swing.JMenuItem openMenuItem;
+    private javax.swing.JMenuItem saveMenuItem;
+    private javax.swing.JMenuItem saveAsMenuItem;
+    private javax.swing.JMenuItem exitMenuItem;
+    private javax.swing.JMenu editMenu;
+    private javax.swing.JMenuItem cutMenuItem;
+    private javax.swing.JMenuItem copyMenuItem;
+    private javax.swing.JMenuItem pasteMenuItem;
+    private javax.swing.JMenuItem deleteMenuItem;
+    private javax.swing.JMenu helpMenu;
+    private javax.swing.JMenuItem contentsMenuItem;
+    private javax.swing.JMenuItem aboutMenuItem;
+    // End of variables declaration//GEN-END:variables
+
+}]]>
+		</File>		
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Gary Gray" 
-          created      = "09/05/2001"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>${res:Templates.Project.Java.JavaAWTProject.Name}</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.FullProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>${res:Templates.Project.Java.JavaAWTProject.Description}</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[
-/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class application extends javax.swing.JFrame {
-
-    /** Creates new form application */
-    public application() {
-        initComponents();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        menuBar = new javax.swing.JMenuBar();
-
-        fileMenu = new javax.swing.JMenu();
-        fileMenu.setText("File");
-
-        openMenuItem = new javax.swing.JMenuItem();
-        openMenuItem.setText("Open");
-
-        fileMenu.add(openMenuItem);
-        saveMenuItem = new javax.swing.JMenuItem();
-        saveMenuItem.setText("Save");
-
-        fileMenu.add(saveMenuItem);
-        saveAsMenuItem = new javax.swing.JMenuItem();
-        saveAsMenuItem.setText("Save As ...");
-
-        fileMenu.add(saveAsMenuItem);
-        exitMenuItem = new javax.swing.JMenuItem();
-        exitMenuItem.setText("Exit");
-        exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
-                                               exitMenuItemActionPerformed(evt);
-                                           }
-                                       }
-                                      );
-
-        fileMenu.add(exitMenuItem);
-        menuBar.add(fileMenu);
-        editMenu = new javax.swing.JMenu();
-        editMenu.setText("Edit");
-
-        cutMenuItem = new javax.swing.JMenuItem();
-        cutMenuItem.setText("Cut");
-
-        editMenu.add(cutMenuItem);
-        copyMenuItem = new javax.swing.JMenuItem();
-        copyMenuItem.setText("Copy");
-
-        editMenu.add(copyMenuItem);
-        pasteMenuItem = new javax.swing.JMenuItem();
-        pasteMenuItem.setText("Paste");
-
-        editMenu.add(pasteMenuItem);
-        deleteMenuItem = new javax.swing.JMenuItem();
-        deleteMenuItem.setText("Delete");
-
-        editMenu.add(deleteMenuItem);
-        menuBar.add(editMenu);
-        helpMenu = new javax.swing.JMenu();
-        helpMenu.setText("Help");
-
-        contentsMenuItem = new javax.swing.JMenuItem();
-        contentsMenuItem.setText("Contents");
-
-        helpMenu.add(contentsMenuItem);
-        aboutMenuItem = new javax.swing.JMenuItem();
-        aboutMenuItem.setText("About");
-
-        helpMenu.add(aboutMenuItem);
-        menuBar.add(helpMenu);
-        addWindowListener(new java.awt.event.WindowAdapter() {
-                              public void windowClosing(java.awt.event.WindowEvent evt) {
-                                  exitForm(evt);
-                              }
-                          }
-                         );
-
-        setJMenuBar(menuBar);
-
-        pack();
-    }//GEN-END:initComponents
-
-    private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
-        System.exit(0);
-    }//GEN-LAST:event_exitMenuItemActionPerformed
-
-    /** Exit the Application */
-    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
-        System.exit(0);
-    }//GEN-LAST:event_exitForm
-
-    /**
-    * param args the command line arguments
-    */
-    public static void main(String args[]) {
-        new application().show();
-    }
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JMenuBar menuBar;
-    private javax.swing.JMenu fileMenu;
-    private javax.swing.JMenuItem openMenuItem;
-    private javax.swing.JMenuItem saveMenuItem;
-    private javax.swing.JMenuItem saveAsMenuItem;
-    private javax.swing.JMenuItem exitMenuItem;
-    private javax.swing.JMenu editMenu;
-    private javax.swing.JMenuItem cutMenuItem;
-    private javax.swing.JMenuItem copyMenuItem;
-    private javax.swing.JMenuItem pasteMenuItem;
-    private javax.swing.JMenuItem deleteMenuItem;
-    private javax.swing.JMenu helpMenu;
-    private javax.swing.JMenuItem contentsMenuItem;
-    private javax.swing.JMenuItem aboutMenuItem;
-    // End of variables declaration//GEN-END:variables
-
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<Template originator   = "Gary Gray" 
+          created      = "09/05/2001"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Java AWT Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.FullProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Creates an AWT project.</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[
+/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class application extends javax.swing.JFrame {
+
+    /** Creates new form application */
+    public application() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        menuBar = new javax.swing.JMenuBar();
+
+        fileMenu = new javax.swing.JMenu();
+        fileMenu.setText("File");
+
+        openMenuItem = new javax.swing.JMenuItem();
+        openMenuItem.setText("Open");
+
+        fileMenu.add(openMenuItem);
+        saveMenuItem = new javax.swing.JMenuItem();
+        saveMenuItem.setText("Save");
+
+        fileMenu.add(saveMenuItem);
+        saveAsMenuItem = new javax.swing.JMenuItem();
+        saveAsMenuItem.setText("Save As ...");
+
+        fileMenu.add(saveAsMenuItem);
+        exitMenuItem = new javax.swing.JMenuItem();
+        exitMenuItem.setText("Exit");
+        exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
+                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
+                                               exitMenuItemActionPerformed(evt);
+                                           }
+                                       }
+                                      );
+
+        fileMenu.add(exitMenuItem);
+        menuBar.add(fileMenu);
+        editMenu = new javax.swing.JMenu();
+        editMenu.setText("Edit");
+
+        cutMenuItem = new javax.swing.JMenuItem();
+        cutMenuItem.setText("Cut");
+
+        editMenu.add(cutMenuItem);
+        copyMenuItem = new javax.swing.JMenuItem();
+        copyMenuItem.setText("Copy");
+
+        editMenu.add(copyMenuItem);
+        pasteMenuItem = new javax.swing.JMenuItem();
+        pasteMenuItem.setText("Paste");
+
+        editMenu.add(pasteMenuItem);
+        deleteMenuItem = new javax.swing.JMenuItem();
+        deleteMenuItem.setText("Delete");
+
+        editMenu.add(deleteMenuItem);
+        menuBar.add(editMenu);
+        helpMenu = new javax.swing.JMenu();
+        helpMenu.setText("Help");
+
+        contentsMenuItem = new javax.swing.JMenuItem();
+        contentsMenuItem.setText("Contents");
+
+        helpMenu.add(contentsMenuItem);
+        aboutMenuItem = new javax.swing.JMenuItem();
+        aboutMenuItem.setText("About");
+
+        helpMenu.add(aboutMenuItem);
+        menuBar.add(helpMenu);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+                              public void windowClosing(java.awt.event.WindowEvent evt) {
+                                  exitForm(evt);
+                              }
+                          }
+                         );
+
+        setJMenuBar(menuBar);
+
+        pack();
+    }//GEN-END:initComponents
+
+    private void exitMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitMenuItemActionPerformed
+        System.exit(0);
+    }//GEN-LAST:event_exitMenuItemActionPerformed
+
+    /** Exit the Application */
+    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
+        System.exit(0);
+    }//GEN-LAST:event_exitForm
+
+    /**
+    * param args the command line arguments
+    */
+    public static void main(String args[]) {
+        new application().show();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JMenuBar menuBar;
+    private javax.swing.JMenu fileMenu;
+    private javax.swing.JMenuItem openMenuItem;
+    private javax.swing.JMenuItem saveMenuItem;
+    private javax.swing.JMenuItem saveAsMenuItem;
+    private javax.swing.JMenuItem exitMenuItem;
+    private javax.swing.JMenu editMenu;
+    private javax.swing.JMenuItem cutMenuItem;
+    private javax.swing.JMenuItem copyMenuItem;
+    private javax.swing.JMenuItem pasteMenuItem;
+    private javax.swing.JMenuItem deleteMenuItem;
+    private javax.swing.JMenu helpMenu;
+    private javax.swing.JMenuItem contentsMenuItem;
+    private javax.swing.JMenuItem aboutMenuItem;
+    // End of variables declaration//GEN-END:variables
+
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Shinsaku Nakagawa" 
-          created      = "03/27/2003"
-          lastModified = "04/06/2004">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Java Console Project</Name>
-		<Category>Java</Category>
-		<Icon>Java.Project.DOSProject</Icon>
-		<LanguageName>Java</LanguageName>
-		<Description>Create a console Java project</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "application.java"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
-	
-			<Files>
-				<File name = "application.java">
-<![CDATA[/*
- * application.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class application {
-    public static void main(String[] args) {
-        System.out.println("Hello, World!");
-    }
-}]]></File>		
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<Template originator   = "Shinsaku Nakagawa" 
+          created      = "03/27/2003"
+          lastModified = "04/06/2004">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Java Console Project</_Name>
+		<Category>Java</Category>
+		<Icon>Java.Project.DOSProject</Icon>
+		<LanguageName>Java</LanguageName>
+		<_Description>Create a console Java project</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "application.java"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
+	
+			<Files>
+				<File name = "application.java">
+<![CDATA[/*
+ * application.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class application {
+    public static void main(String[] args) {
+        System.out.println("Hello, World!");
+    }
+}]]></File>		
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTDialog.Name}</Name>
-           <Icon>Java.File.Form</Icon>
-           <Category>Java</Category>
-           <LanguageName>JAVA</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTDialog.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="Dialog">
-
-<![CDATA[
-/*
- * dialog.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class dialog extends java.awt.Dialog {
-
-    /** Creates new form dialog */
-    public dialog(java.awt.Frame parent, boolean modal) {
-        super(parent, modal);
-        initComponents();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        setLayout(new java.awt.BorderLayout());
-        addWindowListener(new java.awt.event.WindowAdapter() {
-                              public void windowClosing(java.awt.event.WindowEvent evt) {
-                                  closeDialog(evt);
-                              }
-                          }
-                         );
-        pack();
-    }//GEN-END:initComponents
-
-    /** Closes the dialog */
-    private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
-        setVisible(false);
-        dispose();
-    }//GEN-LAST:event_closeDialog
-
-    /**
-    * param args the command line arguments
-    */
-    public static void main(String args[]) {
-        new dialog(new java.awt.Frame(), true).show();
-    }
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    // End of variables declaration//GEN-END:variables
-
-}]]>
-		</File>		
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT Dialog</_Name>
+           <Icon>Java.File.Form</Icon>
+           <Category>Java</Category>
+           <LanguageName>JAVA</LanguageName>
+           <_Description>Creates an AWT dialog.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="Dialog">
+
+<![CDATA[
+/*
+ * dialog.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class dialog extends java.awt.Dialog {
+
+    /** Creates new form dialog */
+    public dialog(java.awt.Frame parent, boolean modal) {
+        super(parent, modal);
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        setLayout(new java.awt.BorderLayout());
+        addWindowListener(new java.awt.event.WindowAdapter() {
+                              public void windowClosing(java.awt.event.WindowEvent evt) {
+                                  closeDialog(evt);
+                              }
+                          }
+                         );
+        pack();
+    }//GEN-END:initComponents
+
+    /** Closes the dialog */
+    private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
+        setVisible(false);
+        dispose();
+    }//GEN-LAST:event_closeDialog
+
+    /**
+    * param args the command line arguments
+    */
+    public static void main(String args[]) {
+        new dialog(new java.awt.Frame(), true).show();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+
+}]]>
+		</File>		
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTFrame.Name}</Name>
-           <Icon>Java.File.Form</Icon>
-           <Category>Java</Category>
-           <LanguageName>Java</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTFrame.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="Frame">
-
-<![CDATA[
-/*
- * frame.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class frame extends java.awt.Frame {
-
-    /** Creates new form frame */
-    public frame() {
-        initComponents();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        addWindowListener(new java.awt.event.WindowAdapter() {
-                              public void windowClosing(java.awt.event.WindowEvent evt) {
-                                  exitForm(evt);
-                              }
-                          }
-                         );
-        pack();
-    }//GEN-END:initComponents
-
-    /** Exit the Application */
-    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
-        System.exit(0);
-    }//GEN-LAST:event_exitForm
-
-    /**
-    * param args the command line arguments
-    */
-    public static void main(String args[]) {
-        new frame().show();
-    }
-
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    // End of variables declaration//GEN-END:variables
-
-}
-]]>
-                </File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT Frame</_Name>
+           <Icon>Java.File.Form</Icon>
+           <Category>Java</Category>
+           <LanguageName>Java</LanguageName>
+           <_Description>Creates an AWT Frame</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="Frame">
+
+<![CDATA[
+/*
+ * frame.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class frame extends java.awt.Frame {
+
+    /** Creates new form frame */
+    public frame() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        addWindowListener(new java.awt.event.WindowAdapter() {
+                              public void windowClosing(java.awt.event.WindowEvent evt) {
+                                  exitForm(evt);
+                              }
+                          }
+                         );
+        pack();
+    }//GEN-END:initComponents
+
+    /** Exit the Application */
+    private void exitForm(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_exitForm
+        System.exit(0);
+    }//GEN-LAST:event_exitForm
+
+    /**
+    * param args the command line arguments
+    */
+    public static void main(String args[]) {
+        new frame().show();
+    }
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+
+}
+]]>
+                </File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTOKDialog.Name}</Name>
-           <Icon>Java.File.Form</Icon>
-           <Category>Java</Category>
-           <LanguageName>Java</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTOKDialog.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="OKDialog">
-
-<![CDATA[
-/*
- * OKDialog.java
- *
- * created on ${Date} at ${Time}
- */
-
-public class OKDialog extends javax.swing.JDialog {
-    /** A return status code - returned if Cancel button has been pressed */
-    public static final int RET_CANCEL = 0;
-    /** A return status code - returned if OK button has been pressed */
-    public static final int RET_OK = 1;
-
-    /** Creates new form OKDialog */
-    public OKDialog(java.awt.Frame parent, boolean modal) {
-        super(parent, modal);
-        initComponents();
-    }
-
-    /** return the return status of this dialog - one of RET_OK or RET_CANCEL */
-    public int getReturnStatus() {
-        return returnStatus;
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        addWindowListener(new java.awt.event.WindowAdapter() {
-                              public void windowClosing(java.awt.event.WindowEvent evt) {
-                                  closeDialog(evt);
-                              }
-                          }
-                         );
-
-        buttonPanel = new javax.swing.JPanel();
-        buttonPanel.setLayout(new java.awt.FlowLayout(2, 5, 5));
-
-        okButton = new javax.swing.JButton();
-        okButton.setText("OK");
-        okButton.addActionListener(new java.awt.event.ActionListener() {
-                                       public void actionPerformed(java.awt.event.ActionEvent evt) {
-                                           okButtonActionPerformed(evt);
-                                       }
-                                   }
-                                  );
-
-        buttonPanel.add(okButton);
-
-        cancelButton = new javax.swing.JButton();
-        cancelButton.setText("Cancel");
-        cancelButton.addActionListener(new java.awt.event.ActionListener() {
-                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
-                                               cancelButtonActionPerformed(evt);
-                                           }
-                                       }
-                                      );
-
-        buttonPanel.add(cancelButton);
-
-
-        getContentPane().add(buttonPanel, java.awt.BorderLayout.SOUTH);
-
-         pack();
-    }//GEN-END:initComponents
-
-    private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
-        doClose(RET_OK);
-    }//GEN-LAST:event_okButtonActionPerformed
-
-    private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
-        doClose(RET_CANCEL);
-    }//GEN-LAST:event_cancelButtonActionPerformed
-
-    /** Closes the dialog */
-    private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
-        doClose(RET_CANCEL);
-    }//GEN-LAST:event_closeDialog
-
-    private void doClose(int retStatus) {
-        returnStatus = retStatus;
-        setVisible(false);
-        dispose();
-    }
-
-    /**
-    * param args the command line arguments
-    */
-    public static void main(String args[]) {
-        new OKDialog(new javax.swing.JFrame(), true).show();
-    }
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel buttonPanel;
-    private javax.swing.JButton okButton;
-    private javax.swing.JButton cancelButton;
-    // End of variables declaration//GEN-END:variables
-
-    private int returnStatus = RET_CANCEL;
-}]]>
-                </File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT OK Dialog</_Name>
+           <Icon>Java.File.Form</Icon>
+           <Category>Java</Category>
+           <LanguageName>Java</LanguageName>
+           <_Description>Creates an AWT OK Dialog.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="OKDialog">
+
+<![CDATA[
+/*
+ * OKDialog.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+public class OKDialog extends javax.swing.JDialog {
+    /** A return status code - returned if Cancel button has been pressed */
+    public static final int RET_CANCEL = 0;
+    /** A return status code - returned if OK button has been pressed */
+    public static final int RET_OK = 1;
+
+    /** Creates new form OKDialog */
+    public OKDialog(java.awt.Frame parent, boolean modal) {
+        super(parent, modal);
+        initComponents();
+    }
+
+    /** return the return status of this dialog - one of RET_OK or RET_CANCEL */
+    public int getReturnStatus() {
+        return returnStatus;
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        addWindowListener(new java.awt.event.WindowAdapter() {
+                              public void windowClosing(java.awt.event.WindowEvent evt) {
+                                  closeDialog(evt);
+                              }
+                          }
+                         );
+
+        buttonPanel = new javax.swing.JPanel();
+        buttonPanel.setLayout(new java.awt.FlowLayout(2, 5, 5));
+
+        okButton = new javax.swing.JButton();
+        okButton.setText("OK");
+        okButton.addActionListener(new java.awt.event.ActionListener() {
+                                       public void actionPerformed(java.awt.event.ActionEvent evt) {
+                                           okButtonActionPerformed(evt);
+                                       }
+                                   }
+                                  );
+
+        buttonPanel.add(okButton);
+
+        cancelButton = new javax.swing.JButton();
+        cancelButton.setText("Cancel");
+        cancelButton.addActionListener(new java.awt.event.ActionListener() {
+                                           public void actionPerformed(java.awt.event.ActionEvent evt) {
+                                               cancelButtonActionPerformed(evt);
+                                           }
+                                       }
+                                      );
+
+        buttonPanel.add(cancelButton);
+
+
+        getContentPane().add(buttonPanel, java.awt.BorderLayout.SOUTH);
+
+         pack();
+    }//GEN-END:initComponents
+
+    private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
+        doClose(RET_OK);
+    }//GEN-LAST:event_okButtonActionPerformed
+
+    private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
+        doClose(RET_CANCEL);
+    }//GEN-LAST:event_cancelButtonActionPerformed
+
+    /** Closes the dialog */
+    private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
+        doClose(RET_CANCEL);
+    }//GEN-LAST:event_closeDialog
+
+    private void doClose(int retStatus) {
+        returnStatus = retStatus;
+        setVisible(false);
+        dispose();
+    }
+
+    /**
+    * param args the command line arguments
+    */
+    public static void main(String args[]) {
+        new OKDialog(new javax.swing.JFrame(), true).show();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JPanel buttonPanel;
+    private javax.swing.JButton okButton;
+    private javax.swing.JButton cancelButton;
+    // End of variables declaration//GEN-END:variables
+
+    private int returnStatus = RET_CANCEL;
+}]]>
+                </File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
-	
-	<TemplateConfiguration>
-           <Name>${res:Templates.File.Java.JavaAWTPanel.Name}</Name>
-           <Icon>Java.File.Form</Icon>
-           <Category>Java</Category>
-           <LanguageName>Java</LanguageName>
-           <Description>${res:Templates.File.Java.JavaAWTPanel.Description}</Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-           <File DefaultExtension=".java" DefaultName="Panel">
-
-<![CDATA[
-/*
- * panel.java
- *
- * created on ${Date} at ${Time}
- */
-
-/**
- *
- * author  Administrator
- */
-public class panel extends java.awt.Panel {
-
-    /** Creates new form panel */
-    public panel() {
-        initComponents();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        setLayout(new java.awt.BorderLayout());
-
-    }//GEN-END:initComponents
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    // End of variables declaration//GEN-END:variables
-
-}
-]]>
-                </File>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft.xml (from rev 1861, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft	2004-06-29 19:15:11 UTC (rev 1861)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<Template Originator="Gary Gray" Language="JAVA" Created="09/05/2001" LastModified="09/05/2001">
+	
+	<TemplateConfiguration>
+           <_Name>Java AWT Panel</_Name>
+           <Icon>Java.File.Form</Icon>
+           <Category>Java</Category>
+           <LanguageName>Java</LanguageName>
+           <_Description>Creates an AWT panel.</_Description>
+	</TemplateConfiguration>
+	
+	<TemplateFiles>
+           <File DefaultExtension=".java" DefaultName="Panel">
+
+<![CDATA[
+/*
+ * panel.java
+ *
+ * created on ${Date} at ${Time}
+ */
+
+/**
+ *
+ * author  Administrator
+ */
+public class panel extends java.awt.Panel {
+
+    /** Creates new form panel */
+    public panel() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        setLayout(new java.awt.BorderLayout());
+
+    }//GEN-END:initComponents
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+
+}
+]]>
+                </File>
+	</TemplateFiles>
+	
+	<FileOptions/>
+	
+</Template>

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Mike Krueger"
-          created      = "02/01/2003"
-          lastModified = "02/01/2003">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>C# Library</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.Library</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>Creates an empty C# class library</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "MyClass.cs"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Library" PauseConsoleOutput = "False" />
-
-			<Files>
-				<File name="MyClass.cs"><![CDATA[// project created on ${Date} at ${Time}
-using System;
-
-public class MyClass
-{
-
-}]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Library.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<Template originator   = "Mike Krueger"
+          created      = "02/01/2003"
+          lastModified = "02/01/2003">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>C# Library</_Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Library</Icon>
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates an empty C# class library</_Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "MyClass.cs"/>
+	</Actions>
+	
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options Target = "Library" PauseConsoleOutput = "False" />
+
+			<Files>
+				<File name="MyClass.cs"><![CDATA[// project created on ${Date} at ${Time}
+using System;
+
+public class MyClass
+{
+
+}]]></File>
+		<File name="AssemblyInfo.cs">
+			<![CDATA[using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>

Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,38 +1,38 @@
 monodevelopdir = $(prefix)/lib/monodevelop
 templatedir = $(monodevelopdir)/AddIns/AddIns/BackendBindings/templates
 
-template_DATA = CSharpSessionStateWebService.xft \
-CSharpWebService.xft \
-EmptyCSharpFile.xft \
-EmptyHTMLFile.xft \
-EmptyJavaFile.xft \
-EmptyNemerleFile.xft \
-EmptyResourceFile.xft \
-EmptyTextFile.xft \
-EmptyXMLFile.xft \
-GnomeSharpProgram.xft \
-GtkSharpWindow.xft \
-JavaApplet.xft \
-JavaApplication.xft \
-JavaDialog.xft \
-JavaFrame.xft \
-JavaOKDialog.xft \
-JavaPanel.xft \
-BlankCombine.xpt \
-ConsoleProject.xpt \
-EmptyJavaProject.xpt \
-EmptyProject.xpt \
-GladeSharpProject.xpt \
-GnomeSharpProject.xpt \
-GtkSharpProject.xpt \
-IkvmConsoleApplicationProject.xpt \
-IkvmGladeApplicationProject.xpt \
-IkvmGnomeApplicationProject.xpt \
-IkvmGtkApplicationProject.xpt \
-ILAsmConsoleProject.xpt \
-JavaApplicationProject.xpt \
-JavaConsoleApplicationProject.xpt \
-Library.xpt \
-NemerleEmptyProject.xpt 
+template_DATA = CSharpSessionStateWebService.xft.xml \
+CSharpWebService.xft.xml \
+EmptyCSharpFile.xft.xml \
+EmptyHTMLFile.xft.xml \
+EmptyJavaFile.xft.xml \
+EmptyNemerleFile.xft.xml \
+EmptyResourceFile.xft.xml \
+EmptyTextFile.xft.xml \
+EmptyXMLFile.xft.xml \
+GnomeSharpProgram.xft.xml \
+GtkSharpWindow.xft.xml \
+JavaApplet.xft.xml \
+JavaApplication.xft.xml \
+JavaDialog.xft.xml \
+JavaFrame.xft.xml \
+JavaOKDialog.xft.xml \
+JavaPanel.xft.xml \
+BlankCombine.xpt.xml \
+ConsoleProject.xpt.xml \
+EmptyJavaProject.xpt.xml \
+EmptyProject.xpt.xml \
+GladeSharpProject.xpt.xml \
+GnomeSharpProject.xpt.xml \
+GtkSharpProject.xpt.xml \
+IkvmConsoleApplicationProject.xpt.xml \
+IkvmGladeApplicationProject.xpt.xml \
+IkvmGnomeApplicationProject.xpt.xml \
+IkvmGtkApplicationProject.xpt.xml \
+ILAsmConsoleProject.xpt.xml \
+JavaApplicationProject.xpt.xml \
+JavaConsoleApplicationProject.xpt.xml \
+Library.xpt.xml \
+NemerleEmptyProject.xpt.xml
 
 EXTRA_DIST = $(template_DATA)

Deleted: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Pawel Rozanski"
-          created      = "04/04/2004"
-          lastModified = "05/04/2004">
-
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>Empty Nemerle project</Name>
-		<Category>Nemerle</Category>
-		<Icon>Nemerle.Project.EmptyProject</Icon>
-		<LanguageName>Nemerle</LanguageName>
-		<Description>Empty Nemerle project</Description>
-	</TemplateConfiguration>
-	
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "."/>
-	</Combine>
-</Template>

Copied: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt.xml (from rev 1862, trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt)
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt	2004-06-29 22:11:10 UTC (rev 1862)
+++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<Template originator   = "Pawel Rozanski"
+          created      = "04/04/2004"
+          lastModified = "05/04/2004">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>Empty Nemerle project</_Name>
+		<Category>Nemerle</Category>
+		<Icon>Nemerle.Project.EmptyProject</Icon>
+		<LanguageName>Nemerle</LanguageName>
+		<_Description>Empty Nemerle project</_Description>
+	</TemplateConfiguration>
+	
+	<Combine name = "${ProjectName}" directory = ".">
+		<Project name = "${ProjectName}" directory = "."/>
+	</Combine>
+</Template>

Modified: trunk/MonoDevelop/Core/build/AddIns/MonoDevelopNewEditor.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/MonoDevelopNewEditor.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/MonoDevelopNewEditor.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -120,18 +120,18 @@
 			
 				<ToolbarItem id = "Find"
 				             icon = "Icons.16x16.FindIcon" 
-				             tooltip = "${res:XML.MainMenu.SearchMenu.Find.Description}"
+				             _tooltip = "Find"
 				             class = "MonoDevelop.DefaultEditor.Commands.Find"/>
 				<ToolbarItem id = "FindNext"
 				             icon = "Icons.16x16.FindNextIcon"
-				             tooltip = "${res:XML.MainMenu.SearchMenu.FindNext.Description}"
+				             _tooltip = "Find Next"
 				             class = "MonoDevelop.DefaultEditor.Commands.FindNext"/>
 				<ToolbarItem id = "Replace"
 				             icon = "Icons.16x16.ReplaceIcon" 
-				             tooltip = "${res:XML.MainMenu.SearchMenu.Replace.Description}"
+				             _tooltip = "Replace"
 				             class = "MonoDevelop.DefaultEditor.Commands.Replace"/>	
 			</Conditional>             
-			<ToolbarItem id = "SearchSeparator" tooltip = "-"/>
+			<ToolbarItem id = "SearchSeparator" _tooltip = "-"/>
 			<Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
 <!--				<ToolbarItem id = "Comment"
 				             icon = "Icons.16x16.CommentRegion" 
@@ -145,19 +145,19 @@
 <!--				<ToolbarItem id = "SearchSeparator2" tooltip = "-"/> -->
 				<ToolbarItem id = "ToggleBookmark"
 				             icon = "Icons.16x16.ToggleBookmark"
-				             tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
+				             _tooltip = "Toggle Bookmark"
 				             class = "MonoDevelop.EditorBindings.Commands.ToggleBookmark"/>
 				<ToolbarItem id = "PrevBookmark"
 				             icon = "Icons.16x16.GotoPrevbookmark"
-				             tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
+				             _tooltip = "Previous Bookmark"
 				             class = "MonoDevelop.EditorBindings.Commands.PrevBookmark"/>
 				<ToolbarItem id = "NextBookmark"
 				             icon = "Icons.16x16.GotoNextbookmark"
-				             tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
+				             _tooltip = "Next Bookmark"
 				             class = "MonoDevelop.EditorBindings.Commands.NextBookmark"/>
 				<ToolbarItem id = "ClearBookmarks"
 				             icon = "Icons.16x16.ClearAllBookmarks"
-					     tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
+					     _tooltip = "Clear Bookmarks"
 				             class = "MonoDevelop.EditorBindings.Commands.ClearBookmarks"/>
 			</Conditional>
 	</Extension>

Modified: trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -88,7 +88,7 @@
                           class = "MonoDevelop.Commands.CompileAll"/>
                 <MenuItem id = "CombineBuildGroupSeparator" _label = "-" />
                 
-                <MenuItem id = "CombineAddMenu" _label = "${res:ProjectComponent.ContextMenu.AddMenu}" >
+                <MenuItem id = "CombineAddMenu" _label = "Add" >
 	                <MenuItem id = "AddNewProject"
 		                  _label = "Add New Project..."
 		                  icon  = "Icons.16x16.NewProjectIcon"
@@ -169,7 +169,7 @@
 		          icon  = "Icons.16x16.OpenFileIcon"
 		          class = "MonoDevelop.Commands.ProjectBrowser.OpenFileEvent"/>
 		<MenuItem id = "OpenSeparator" _label = "-" />
-                <MenuItem id = "Add" _label = "${res:ProjectComponent.ContextMenu.AddMenu}">
+                <MenuItem id = "Add" _label = "Add">
         		<MenuItem id = "NewFiles"
 		                  _label = "New _File" 
 		                  icon  = "Icons.16x16.NewDocumentIcon"
@@ -183,7 +183,7 @@
 		                  icon  = "Icons.16x16.NewFolderIcon"
 		                  class = "MonoDevelop.Commands.ProjectBrowser.NewFolderEvent"/>
         	</MenuItem>
-		<MenuItem id = "Include" _label = "${res:ProjectComponent.ContextMenu.IncludeMenu}">
+		<MenuItem id = "Include" _label = "Include">
 			<MenuItem id = "IncludeFileIn" _label = "bogus_label"
 			          class = "MonoDevelop.Commands.IncludeFilesBuilder" />
 			</MenuItem>
@@ -252,8 +252,8 @@
 	                  _label = "_Remove" 
 	                  icon  = "Icons.16x16.DeleteIcon"
 	                  class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
-                <MenuItem id = "Re_name"
-	                  _label    = "${res:ProjectComponent.ContextMenu.Rename}" 
+                <MenuItem id = "Rename"
+	                  _label    = "Re_name" 
 	                  shortcut = "F2"
 	                  class    = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
 		<!-- <MenuItem id = "RemoveRenameSeparator" _label = "-" /> -->
@@ -462,43 +462,43 @@
 		<ToolbarItem id = "Standard">
 			<ToolbarItem id = "New" 
 			             icon = "Icons.16x16.NewDocumentIcon" 
-			             tooltip = "${res:XML.MainMenu.FileMenu.New.File.Description}"
+			             _tooltip = "New File"
 			             class = "MonoDevelop.Commands.CreateNewFile"/>
 			<ToolbarItem id = "Open" 
 			             icon = "Icons.16x16.OpenFileIcon" 
-			             tooltip = "${res:XML.MainMenu.FileMenu.Open.File.Description}"
+			             _tooltip = "Open FIle"
 			             class = "MonoDevelop.Commands.OpenFile"/>
 			<Conditional activewindow="*" action="Disable">
 				<ToolbarItem id = "Save" 
 				             icon = "Icons.16x16.SaveIcon" 
-				             tooltip = "${res:XML.MainMenu.FileMenu.Save.Description}"
+				             _tooltip = "Save"
 				             class = "MonoDevelop.Commands.SaveFile"/>
 				             
 		                <ToolbarItem id = "SaveAll"
 			                     icon = "Icons.16x16.SaveAllIcon" 
-		                             tooltip = "${res:XML.MainMenu.FileMenu.SaveAll.Description}"
+		                             _tooltip = "Save All"
 		                             class = "MonoDevelop.Commands.SaveAllFiles"/>
 			</Conditional>
-			<ToolbarItem id = "Separator1" tooltip = "-"/>
+			<ToolbarItem id = "Separator1" _tooltip = "-"/>
 	                <!-- <Conditional activewindow="*" action="Disable">-->
 				<ToolbarItem id = "Cut" 
 				             icon = "Icons.16x16.CutIcon" 
-				             tooltip = "${res:XML.MainMenu.EditMenu.Cut.Description}"
+				             _tooltip = "Cut"
 				             class = "MonoDevelop.Commands.Cut"/>
 				<ToolbarItem id = "Copy" 
 				             icon = "Icons.16x16.CopyIcon" 
-				             tooltip = "${res:XML.MainMenu.EditMenu.Copy.Description}"
+				             _tooltip = "Copy"
 				             class = "MonoDevelop.Commands.Copy"/>
 				<ToolbarItem id = "Paste" 
 				             icon = "Icons.16x16.PasteIcon" 
-				             tooltip = "${res:XML.MainMenu.EditMenu.Paste.Description}"
+				             _tooltip = "Paste"
 				             class = "MonoDevelop.Commands.Paste"/>
-				<ToolbarItem id = "Delete" 
+				<ToolbarItem id = "Delete"
 				             icon = "Icons.16x16.DeleteIcon" 
-				             tooltip = "${res:XML.MainMenu.EditMenu.Delete.Description}"
+				             _tooltip = "Delete"
 				             class = "MonoDevelop.Commands.Delete"/>
 			<!-- </Conditional>-->
-			<ToolbarItem id = "CutSeparator" insertafter ="Delete" insertbefore ="Find" tooltip = "-"/>
+			<ToolbarItem id = "CutSeparator" insertafter ="Delete" insertbefore ="Find" _tooltip = "-"/>
 	                <!-- <Conditional action="Disable">
 	                	<Or>
 	                		<Condition activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
@@ -506,7 +506,7 @@
 	                	</Or>
 			</Conditional> -->
 			
-			<ToolbarItem id = "CompileSeparator" insertafter = "ClearBookmarks" tooltip = "-"/>
+			<ToolbarItem id = "CompileSeparator" insertafter = "ClearBookmarks" _tooltip = "-"/>
 	                <Conditional action="Disable">
 	                	<Or>
 	                		<Condition activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
@@ -514,16 +514,16 @@
 	                	</Or>
 		                <ToolbarItem id = "Compile"
 				             icon  = "Icons.16x16.BuildCombine"
-				             tooltip = "${res:XML.MainMenu.RunMenu.Compile.Description}"
+				             _tooltip = "Compile"
 				             class = "MonoDevelop.Commands.Compile"/>
 			
 				<ToolbarItem id = "BuildProject"
 				             icon  = "Icons.16x16.BuildCurrentSelectedProject"
-				             tooltip = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
+				             _tooltip = "Build Project"
 				             class = "MonoDevelop.Commands.BuildCurrentProject"/>
 				<ToolbarItem id = "Run"
 				             icon = "Icons.16x16.RunProgramIcon"
-				             tooltip = "${res:XML.MainMenu.RunMenu.Run.Description}"
+				             _tooltip = "Run"
 				             class = "MonoDevelop.Commands.RunCommand"/>
 			</Conditional>
 		</ToolbarItem>

Modified: trunk/MonoDevelop/Core/build/data/options/TipsOfTheDay.xml
===================================================================
--- trunk/MonoDevelop/Core/build/data/options/TipsOfTheDay.xml	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/data/options/TipsOfTheDay.xml	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <TIPS>
-        <TIP>${res:XML.StartupTips.Tip1}</TIP>
-        <TIP>${res:XML.StartupTips.Tip2}</TIP>
+        <TIP>Suggest a tip of the day by emailing monodevelop-list at lists.ximian.com</TIP>
 </TIPS>

Modified: trunk/MonoDevelop/Core/build/data/resources/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/build/data/resources/Makefile.am	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/build/data/resources/Makefile.am	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1 +1 @@
-SUBDIRS = css icons languages
+SUBDIRS = css icons

Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/configure.in	2004-07-01 06:28:55 UTC (rev 1869)
@@ -132,7 +132,6 @@
 build/data/options/Makefile
 build/data/resources/css/Makefile
 build/data/resources/icons/Makefile
-build/data/resources/languages/Makefile
 build/doc/Makefile
 build/AddIns/Makefile
 build/AddIns/AddIns/Makefile

Modified: trunk/MonoDevelop/Core/data/resources/AddIn.xsd
===================================================================
--- trunk/MonoDevelop/Core/data/resources/AddIn.xsd	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/data/resources/AddIn.xsd	2004-07-01 06:28:55 UTC (rev 1869)
@@ -223,7 +223,7 @@
 					<xs:element ref="Conditional"/>
 				</xs:choice>
 				<xs:attribute name="icon" type="xs:string" use="optional"/>
-				<xs:attribute name="tooltip" type="xs:string" use="optional"/>
+				<xs:attribute name="_tooltip" type="xs:string" use="optional"/>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>

Modified: trunk/MonoDevelop/Core/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/Core/po/POTFILES.in	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/po/POTFILES.in	2004-07-01 06:28:55 UTC (rev 1869)
@@ -89,3 +89,36 @@
 src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
 src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
 src/AddIns/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
+build/AddIns/AddIns/BackendBindings/templates/BlankCombine.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/ConsoleProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/CSharpSessionStateWebService.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/CSharpWebService.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyCSharpFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyHTMLFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyJavaFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyJavaProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyNemerleFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft
+build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/GtkSharpProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/GtkSharpWindow.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/IkvmConsoleApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/IkvmGladeApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/IkvmGnomeApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/IkvmGtkApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/ILAsmConsoleProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaApplet.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaApplication.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaConsoleApplicationProject.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaDialog.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaFrame.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaOKDialog.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/JavaPanel.xft.xml
+build/AddIns/AddIns/BackendBindings/templates/Library.xpt.xml
+build/AddIns/AddIns/BackendBindings/templates/NemerleEmptyProject.xpt.xml

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -25,7 +25,6 @@
 	public class JavaNodeBuilder : IProjectNodeBuilder
 	{
 		FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
 		
 		public bool CanBuildProjectTree(IProject project)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -17,6 +17,7 @@
 using MonoDevelop.TextEditor.Document;
 //using MonoDevelop.TextEditor.Util;
 using MonoDevelop.Gui.Widgets;
+using MonoDevelop.Services;
 
 using Gtk;
 
@@ -36,7 +37,6 @@
 		
 		FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService(typeof(FileUtilityService));
 		IconService iconService = (IconService) ServiceManager.GetService(typeof(IconService));
-		ResourceService resourceService = (ResourceService) ServiceManager.GetService(typeof(IResourceService));	
 		
 		IProject project;
 		int filesExported = 0;
@@ -62,7 +62,7 @@
 			PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));	
 			this.project = project;
 			
-			pathLabel.Text = resourceService.GetString ("Dialog.ExportProjectToHtml.FolderLabel");
+			pathLabel.Text = GettextCatalog.GetString ("Folder");
 			
 			//browseButton.Text = "...";
 			//browseButton.Click += new EventHandler(BrowseDirectories);
@@ -75,13 +75,13 @@
 			SetSizeRequest (350, 88 + 6);
 			WindowPosition = WindowPosition.CenterOnParent;
 			
-			Title = resourceService.GetString ("Dialog.ExportProjectToHtml.DialogName");
+			Title = GettextCatalog.GetString ("Export Project to HTML");
 		}
 		
 		void BrowseDirectories (object sender, EventArgs e)
 		{
-			using (FolderDialog fd = new FolderDialog (resourceService.GetString ("Dialog.ExportProjectToHtml.SelectTargetDirInfo"))) {
-				if	(fd.Run () == (int) ResponseType.Ok) {
+			using (FolderDialog fd = new FolderDialog (GettextCatalog.GetString ("Select Target Directory"))) {
+				if (fd.Run () == (int) ResponseType.Ok) {
 					//pathTextBox.Text = fd.Path;
 				}
 				

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -35,7 +35,6 @@
 		StringCollection replaceHistory = new StringCollection();
 		
 		// services
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
 		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 		StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -27,7 +27,6 @@
 {
 	public class ReplaceInFilesDialog
 	{
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		IMessageService messageService  = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
 		StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
 		static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -48,8 +48,6 @@
 				FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 			StringParserService StringParserService = (
 				StringParserService)ServiceManager.GetService (typeof (StringParserService));
-			ResourceService ResourceService = (
-				ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			
 			// Gtk Controls
 			[Glade.Widget] Label markersLabel;

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -32,7 +32,6 @@
 		Gtk.TextView textEditorControl;
 		Gtk.ScrolledWindow scroller;
 		//Panel       myPanel = new Panel();
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 		public Gtk.Widget Control {
 			get {
@@ -70,7 +69,6 @@
 			scroller = new Gtk.ScrolledWindow ();
 			scroller.ShadowType = ShadowType.In;
 			scroller.Add (textEditorControl);
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			
 			TaskService     taskService    = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
 			IProjectService projectService = (IProjectService) ServiceManager.GetService (typeof(IProjectService));

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -173,7 +173,6 @@
 			ISearchResult result = find.FindNext(searchOptions);
 			
 			if (result == null) {
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				MessageService.ShowMessage (GettextCatalog.GetString ("Not Found"));
 				find.Reset();
 			} else {

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am	2004-07-01 06:28:55 UTC (rev 1869)
@@ -14,7 +14,6 @@
 ./Services/PropertyService.cs \
 ./Services/ServiceManager.cs \
 ./Services/IService.cs \
-./Services/IResourceService.cs \
 ./Services/IStringTagProvider.cs \
 ./Services/SaveErrorChooseDialog.cs \
 ./AssemblyInfo.cs \

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -16,6 +16,7 @@
 using System.Diagnostics;
 using System.Xml;
 
+using MonoDevelop.Services;
 using MonoDevelop.Core.Services;
 using MonoDevelop.Core.AddIns;
 using MonoDevelop.Core.AddIns.Codons;
@@ -197,11 +198,8 @@
 		public bool TestFileExists(string filename)
 		{
 			if (!File.Exists(filename)) {
-				IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
-				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-				
 				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-				messageService.ShowWarning(stringParserService.Parse(resourceService.GetString("Fileutility.CantFindFileError"), new string[,] { {"FILE",  filename} }));
+				messageService.ShowWarning(String.Format (GettextCatalog.GetString ("Can't find file {0}"), filename));
 				return false;
 			}
 			return true;
@@ -273,10 +271,9 @@
 		
 		public FileOperationResult ObservedSave(FileOperationDelegate saveFile, string fileName, FileErrorPolicy policy)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			return ObservedSave(saveFile,
 			                    fileName,
-			                    resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantSaveFileStandardText"),
+			                    GettextCatalog.GetString ("Unable to save file."),
 			                    policy);
 		}
 		
@@ -340,10 +337,9 @@
 		
 		public FileOperationResult ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName, FileErrorPolicy policy)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			return ObservedSave(saveFileAs,
 			                    fileName,
-			                    resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantSaveFileStandardText"),
+			                    GettextCatalog.GetString ("Unable to save file."),
 			                    policy);
 		}
 		
@@ -394,10 +390,9 @@
 		
 		public FileOperationResult ObservedLoad(FileOperationDelegate saveFile, string fileName, FileErrorPolicy policy)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			return ObservedLoad(saveFile,
 			                    fileName,
-			                    resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantLoadFileStandardText"),
+			                    GettextCatalog.GetString ("Unable to save file."),
 			                    policy);
 		}
 		
@@ -430,10 +425,9 @@
 		
 		public FileOperationResult ObservedLoad(NamedFileOperationDelegate saveFileAs, string fileName, FileErrorPolicy policy)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			return ObservedLoad(saveFileAs,
 			                    fileName,
-			                    resourceService.GetString("ICSharpCode.Services.FileUtilityService.CantLoadFileStandardText"),
+			                    GettextCatalog.GetString ("Unable to load file."),
 			                    policy);
 		}
 		

Deleted: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/IResourceService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/IResourceService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/IResourceService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,31 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Threading;
-using System.Resources;
-using System.Drawing;
-using System.Diagnostics;
-using System.Reflection;
-using System.Xml;
-
-using MonoDevelop.Core.AddIns;
-using MonoDevelop.Core.Properties;
-
-namespace MonoDevelop.Core.Services
-{
-	/// <summary>
-	/// This interface must be implemented by all services.
-	/// </summary>
-	public interface IResourceService
-	{
-		string GetString(string name);
-		
-	}
-}

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Services/StringParserService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -98,11 +98,7 @@
 						if (k > 0) {
 							switch (propertyName.Substring(0, k).ToUpper()) {
 								case "RES":
-									IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
-									if (resourceService != null) {
-											propertyValue = Parse(resourceService.GetString(propertyName.Substring(k + 1)), customTags);
-									}
-									break;
+									throw new Exception ("This syntax is deprecated and needs to be removed from the offending consumer");
 								case "PROPERTY":
 									PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
 									propertyValue = propertyService.GetProperty(propertyName.Substring(k + 1)).ToString();

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -48,7 +48,6 @@
 		public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
 		{
 			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 			
 			RecentOpen recentOpen = fileService.RecentOpen;
@@ -60,8 +59,6 @@
 					string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
 					items[i] = new RFMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString(), new EventHandler(LoadRecentFile));
 					items[i].Tag = recentOpen.RecentFile[i].ToString();
-					items[i].Description = stringParserService.Parse(resourceService.GetString("Dialog.Componnents.RichMenuItem.LoadFileDescription"),
-					                                          new string[,] { {"FILE", recentOpen.RecentFile[i].ToString()} });
 				}
 				return items;
 			}
@@ -92,7 +89,6 @@
 		public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
 		{
 			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 			
 			RecentOpen recentOpen = fileService.RecentOpen;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -193,7 +193,6 @@
 			
 			if (baseFolderPath != null && baseFolderPath.Length > 0) {
 				FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				
 				string directoryName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + GettextCatalog.GetString("New Folder");
 				int    index         = -1;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -64,8 +64,6 @@
 					}
 				
 					IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-					ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
-				
 					foreach (string fileName in files) {
 						ProjectFile fileInformation = projectService.AddFileToProject(project, fileName, BuildAction.EmbedAsResource);
 					

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -58,7 +58,6 @@
 				
 				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
 				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 				try {
 					if (projectService.CurrentOpenCombine != null) {
@@ -132,7 +131,6 @@
 				CombineEntry.BuildErrors   = 0;
 				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
 				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 				try {
 					
@@ -264,7 +262,6 @@
 			lock (Compile.CompileLockObject) {
 				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
 				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
 				
 				if (projectService.CurrentSelectedProject != null) {
@@ -297,7 +294,6 @@
 			lock (Compile.CompileLockObject) {
 				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
 				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
 				
 				if (projectService.CurrentSelectedProject != null) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenu.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenu.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenu.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -42,17 +42,10 @@
 			this.subMenu             = new Gtk.Menu ();
 			this.Submenu             = subMenu;
 
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
 			
 			
-			if (text.StartsWith("${")) {
-				localizedText = resourceService.GetString (text);
-			} else {
-				localizedText = text;
-			}
+			localizedText = text;
 
-			localizedText = localizedText.Replace ('&', '_');
-
 			Gtk.AccelLabel label = new Gtk.AccelLabel (localizedText);
 			label.Xalign = 0;
 			label.UseUnderline = true;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdToolbarCommand.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdToolbarCommand.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdToolbarCommand.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -20,8 +20,6 @@
 {
 	public class SdToolbarCommand : Gtk.Button, IStatusUpdate
 	{
-		static StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-			
 		object caller;
 		ConditionCollection conditionCollection;
 		string description   = String.Empty;
@@ -55,26 +53,19 @@
 		
 		public SdToolbarCommand (string text) : base ()
 		{
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof(IResourceService));
-			
-			if (text.StartsWith ("${")) {
-				localizedText = resourceService.GetString (text);
-			} else {
-				localizedText = text;
-			}
+			localizedText = text;
 
-			localizedText = localizedText.Replace ('&', '_');
 			Clicked += new EventHandler (ToolbarClicked);
 		}
-			
-		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label) : this(stringParserService.Parse(label))
+		
+		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label) : this(label)
 		{
 			this.caller              = caller;
 			this.conditionCollection = conditionCollection;
 			UpdateStatus();
 		}
 		
-		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label, ICommand menuCommand) : this(stringParserService.Parse(label))
+		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label, ICommand menuCommand) : this(label)
 		{
 			this.caller = caller;
 			this.conditionCollection = conditionCollection;
@@ -82,14 +73,14 @@
 			UpdateStatus();
 		}
 		
-		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label, EventHandler handler) : this(stringParserService.Parse(label))
+		public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label, EventHandler handler) : this(label)
 		{
 			this.caller = caller;
 			this.conditionCollection = conditionCollection;
 			UpdateStatus();
 		}
 		
-		public SdToolbarCommand(object caller, string label, EventHandler handler) : this(stringParserService.Parse(label))
+		public SdToolbarCommand(object caller, string label, EventHandler handler) : this(label)
 		{
 			this.caller = caller;
 			UpdateStatus();

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -19,7 +19,7 @@
 {
 	public class SharpDevelopSideTabItem : AxSideTabItem
 	{
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 		
 		public SharpDevelopSideTabItem(string name) : base(name)
 		{

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -32,8 +32,6 @@
 			// Services
 			StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
 										typeof (StringParserService));
-			static ResourceService resourceService = (ResourceService)ServiceManager.GetService(
-										typeof(IResourceService));
 			static PropertyService propertyService = (PropertyService)ServiceManager.GetService(
 										typeof(PropertyService));
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService (typeof (FileUtilityService));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -10,6 +10,7 @@
 using System.Drawing;
 using MonoDevelop.Core.AddIns.Codons;
 
+using MonoDevelop.Services;
 using MonoDevelop.Core.Properties;
 using MonoDevelop.Core.Services;
 using MonoDevelop.Internal.Project;
@@ -40,8 +41,6 @@
 			// Services
 			StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
 										typeof (StringParserService));
-			static ResourceService resourceService = (ResourceService)ServiceManager.GetService(
-										typeof(IResourceService));
 			static PropertyService propertyService = (PropertyService)ServiceManager.GetService(
 										typeof(PropertyService));
 			Combine combine;
@@ -79,10 +78,8 @@
 				singleOptionMenu.Menu = singleMenu;
 
 				Menu actionMenu = new Menu ();
-				actionMenu.Append( new MenuItem (resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.None")));
-				actionMenu.Append( new MenuItem (resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.Execute")));
+				actionMenu.Append( new MenuItem (GettextCatalog.GetString ("None")));
+				actionMenu.Append( new MenuItem (GettextCatalog.GetString ("Execute")));
 				actionOptionMenu.Menu = actionMenu ;
 				actionOptionMenu.Changed += new EventHandler(OptionsChanged);
 
@@ -104,26 +101,20 @@
 					// add the previously saved execute definitions to the treeview list
 					for (int n = 0; n < combine.CombineExecuteDefinitions.Count; n++) {
 						edef = (CombineExecuteDefinition)combine.CombineExecuteDefinitions[n];
-						string action = edef.Type == EntryExecuteType.None ? resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.None") : resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.Execute");
+						string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
 						iter = store.AppendValues (edef.Entry.Name, action, edef);
 					}
 				} else {
 					// add an empty set of execute definitions
 					for (int n = 0; n < combine.Entries.Count; n++) {
 						edef = new CombineExecuteDefinition ((CombineEntry) combine.Entries[n],EntryExecuteType.None);
-						string action = edef.Type == EntryExecuteType.None ? resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.None") : resourceService.GetString(
-								"Dialog.Options.CombineOptions.Startup.Action.Execute");
+						string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
 						iter = store.AppendValues (edef.Entry.Name, action, edef);
 					}
 					
 					// tell the user we encountered and worked around an issue 
 					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-					// FIXME: il8n this
-					messageService.ShowError(
-						"The Combine Execute Definitions for this Combine were invalid. A new empty set of Execute Definitions has been created.");
+					messageService.ShowError(GettextCatalog.GetString ("The Combine Execute Definitions for this Combine were invalid. A new empty set of Execute Definitions has been created."));
 				}
 					
  				entryTreeView.Selection.Changed += new EventHandler(SelectedEntryChanged);
@@ -206,9 +197,7 @@
 					break;
 				}
 				store.SetValue(selectedItem, 2, edef);
-				string action = edef.Type == EntryExecuteType.None ? resourceService.GetString(
-					"Dialog.Options.CombineOptions.Startup.Action.None") : resourceService.GetString(
-						"Dialog.Options.CombineOptions.Startup.Action.Execute");
+				string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
 				store.SetValue(selectedItem, 1, action);
 
 			}
@@ -227,8 +216,8 @@
 				
 				string txt = (string) store.GetValue(selectedItem,1);
 				
-				if (txt == resourceService.GetString("Dialog.Options.CombineOptions.Startup.Action.None")) {
-				actionOptionMenu.SetHistory (0);
+				if (txt == GettextCatalog.GetString ("None")) {
+					actionOptionMenu.SetHistory (0);
 				} else {
 					actionOptionMenu.SetHistory (1);
 				}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -51,7 +51,7 @@
 			this.Realized += new EventHandler (OnRealized);
 			this.ExposeEvent += new ExposeEventHandler (OnExposed);
 			
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 			image = resourceService.GetBitmap ("Icons.AboutImage");
 			string trans = GettextCatalog.GetString ("translator-credits");
 			
@@ -140,7 +140,6 @@
 		{
 			this.Title = GettextCatalog.GetString ("About MonoDevelop");
 			this.TransientFor = (Gtk.Window) WorkbenchSingleton.Workbench;
-			//ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
 			aboutPictureScrollBox = new ScrollBox ();
 		
 			this.VBox.PackStart (aboutPictureScrollBox, false, false, 0);

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewFileDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewFileDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -43,7 +43,7 @@
 		Button cancelButton;
 		Label infoLabel;
 
-		ResourceService iconService = (ResourceService)ServiceManager.GetService (typeof(IResourceService));
+		ResourceService iconService = (ResourceService)ServiceManager.GetService (typeof(ResourceService));
 		DispatchService dispatcher = (DispatchService)ServiceManager.GetService (typeof (DispatchService));
 		
 		public NewFileDialog () : base ()
@@ -164,12 +164,7 @@
 
 			if (item != null)
 			{
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
-                        	if (item.Description.StartsWith("${")) {
-                                	infoLabel.Text = resourceService.GetString (item.Description);
-                        	} else {
-                                	infoLabel.Text = item.Description;
-                        	}
+                                infoLabel.Text = item.Description;
 				okButton.Sensitive = true;
 			}
 		}
@@ -275,8 +270,7 @@
 			public TemplateItem(FileTemplate template)
 			{
 				this.template = template;
-				StringParserService sps = (StringParserService)ServiceManager.GetService (typeof(StringParserService));
-				this.name = sps.Parse(template.Name);
+				this.name = template.Name;
 			}
 
 			public string Name {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -49,7 +49,6 @@
 		[Glade.Widget] Gtk.TreeView lst_template_types;
 		[Glade.Widget] HBox hbox_template, hbox_for_browser;
 		
-		ResourceService     resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		FileUtilityService  fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 		StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 		PropertyService     propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));

Deleted: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -1,116 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.Drawing;
-
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Core.Properties;
-
-using MonoDevelop.Core.AddIns.Codons;
-
-using MonoDevelop.Core.Services;
-using MonoDevelop.Services;
-
-namespace MonoDevelop.Gui.Dialogs.OptionPanels
-{
-	public class IDEOptionPanel : AbstractOptionPanel
-	{
-		readonly static string uiLanguageProperty = "CoreProperties.UILanguage";
-		Gtk.TreeView listView;
-		Gtk.TreeStore listStore;
-		Gtk.Label newCulture;
-		Gtk.Label culture;
-		Gtk.Label descr;
-		
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
-		PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
-		
-		string SelectedCulture {
-			get {
-				Gtk.TreeModel mdl;
-				Gtk.TreeIter  iter;
-				if (listView.Selection.GetSelected (out mdl, out iter)) {
-					return (string) ((Gtk.TreeStore)mdl).GetValue (iter, 1);
-				}
-				return null;
-			}
-		}
-		
-		string SelectedCountry {
-			get {
-				Gtk.TreeModel mdl;
-				Gtk.TreeIter  iter;
-				if (listView.Selection.GetSelected (out mdl, out iter)) {
-					return (string) ((Gtk.TreeStore)mdl).GetValue (iter, 0);
-				}
-				return null;
-			}
-		}
-		
-		public override bool ReceiveDialogMessage(DialogMessage message)
-		{
-			if (message == DialogMessage.OK) {
-				if (SelectedCulture != null) {
-					propertyService.SetProperty(uiLanguageProperty, SelectedCulture);
-				}
-			}
-			return true;
-		}
-		
-		void ChangeCulture(object sender, EventArgs e)
-		{
-			newCulture.Text = resourceService.GetString("Dialog.Options.IDEOptions.SelectCulture.UILanguageSetToLabel") + " " + SelectedCountry;
-		}
-		
-		string GetCulture(string languageCode)
-		{
-			LanguageService languageService = (LanguageService)ServiceManager.GetService(typeof(LanguageService));
-			foreach (Language language in languageService.Languages) {
-				if (languageCode.StartsWith(language.Code)) {
-					return language.Name;
-				}
-			}
-			return "English";
-		}
-		
-		public IDEOptionPanel() : base ()
-		{
-			LanguageService languageService = (LanguageService)ServiceManager.GetService(typeof(LanguageService));
-			
-			Gtk.VBox mainbox = new Gtk.VBox (false, 2);
-			
-			listStore = new Gtk.TreeStore (typeof (string), typeof (string));
-
-			listView = new Gtk.TreeView (listStore);
-
-			listView.AppendColumn ("lang", new Gtk.CellRendererText (), "text", 0);
-			listView.HeadersVisible = false;
-
-			//listView.LargeImageList = languageService.LanguageImageList;
-			listView.Selection.Changed += new EventHandler(ChangeCulture);
-			foreach (Language language in languageService.Languages) {
-				listStore.AppendValues (language.Name, language.Code);//, language.ImageIndex);
-			}			
-			
-			mainbox.PackStart (listView);
-			
-			culture = new Gtk.Label (resourceService.GetString("Dialog.Options.IDEOptions.SelectCulture.CurrentUILanguageLabel") + " " + GetCulture(propertyService.GetProperty(uiLanguageProperty, "en")));
-			mainbox.PackStart (culture, false, false, 2);
-			
-			descr = new Gtk.Label (resourceService.GetString("Dialog.Options.IDEOptions.SelectCulture.DescriptionText"));
-			
-			mainbox.PackStart (descr, false, false, 2);
-			
-
-			newCulture = new Gtk.Label ("");
-			mainbox.PackStart (newCulture, false, false, 2);
-
-			this.Add (mainbox);
-		}
-	}
-}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -203,7 +203,6 @@
 		}
 		
 		DeployFileOptionsWidget widget;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 		public override void LoadPanelContents()
 		{

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -25,7 +25,6 @@
 	public class GacReferencePanel : Frame, IReferencePanel
 	{
 		SelectReferenceDialog selectDialog;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 
 		TreeStore store;
 		TreeView  treeView;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -19,7 +19,6 @@
 	
 	public class ProjectReferencePanel : VBox, IReferencePanel {
 		SelectReferenceDialog selectDialog;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 
 		TreeStore store;
 		TreeView  treeView;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -35,7 +35,6 @@
 		[Glade.Widget] Gtk.Notebook  mainBook;
 		GacReferencePanel gacRefPanel;
 
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		IProject configureProject;
 		
 		public ArrayList ReferenceInformations {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/WebReference.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -148,7 +148,6 @@
 		
 		public static ArrayList GenerateWebProxyCode(IProject project, ServiceDescription desc) {		
 			ArrayList fileList = null;
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));				 
 			
 			string serviceName = String.Empty;
 			if(desc.Services.Count > 0) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -155,8 +155,6 @@
 
 		public VersionInformationTabPage() : base (GType)
 		{
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
-	
 			TreeView listView = new TreeView ();
 			listView.RulesHint = true;
 			listView.AppendColumn (GettextCatalog.GetString ("Name"), new CellRendererText (), "text", 0);

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,7 +18,6 @@
 {
 	public class TipOfTheDayWindow
 	{
- 		ResourceService resourceService = (ResourceService)ServiceManager.GetService (typeof (IResourceService));
  		PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
 
 		[Glade.Widget] Label categoryLabel;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -29,7 +29,6 @@
 		Pixbuf backGround = null;
 		
 		FontDescription normalFont;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 		public CurrentPanelPanel(WizardDialog wizard)
 		{

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -13,6 +13,7 @@
 using System.ComponentModel;
 using System.Xml;
 
+using MonoDevelop.Services;
 using MonoDevelop.Core.Services;
 using MonoDevelop.Core.AddIns;
 using MonoDevelop.Core.Properties;
@@ -33,7 +34,7 @@
 		Pango.FontDescription smallFont;
 		Pango.FontDescription normalFont;
 		Pango.FontDescription boldFont;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 		
 		public StatusPanel(WizardDialog wizard)
 		{
@@ -65,7 +66,7 @@
 				GdkWindow.DrawPixbuf (gc, bitmap, 0, 0, 0, 0, -1, -1, Gdk.RgbDither.None, 0, 0);
 				smallFont.Weight = Pango.Weight.Normal;
 				ly.FontDescription = smallFont;
-				ly.SetText (resourceService.GetString("SharpDevelop.Gui.Dialogs.WizardDialog.StepsLabel"));
+				ly.SetText (GettextCatalog.GetString ("Steps"));
 				int lyWidth, lyHeight;
 				ly.GetSize (out lyWidth, out lyHeight);
 				int smallFontHeight = (int)(lyHeight/1024.0f);

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -11,6 +11,7 @@
 using System.Collections;
 using System.Xml;
 
+using MonoDevelop.Services;
 using MonoDevelop.Core.Services;
 using MonoDevelop.Core.AddIns;
 using MonoDevelop.Core.Properties;
@@ -280,7 +281,6 @@
 		void InitializeComponents()
 		{
 			PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 			dialogPanel.Shadow = Gtk.ShadowType.None;
 		
@@ -289,13 +289,13 @@
 			this.WindowPosition = WindowPosition.Center;
 			this.SetDefaultSize (640, 440);
 		
-			backButton = new ImageButton(Gtk.Stock.GoBack,resourceService.GetString ("Global.BackButtonText"));
+			backButton = new ImageButton(Gtk.Stock.GoBack, GettextCatalog.GetString("Back"));
 			backButton.Clicked   += new EventHandler(ShowPrevPanelEvent);
 			
-			nextButton = new ImageButton(Gtk.Stock.GoForward,resourceService.GetString("Global.NextButtonText"));
+			nextButton = new ImageButton(Gtk.Stock.GoForward, GettextCatalog.GetString ("Next"));
 			nextButton.Clicked   += new EventHandler(ShowNextPanelEvent);
 			
-			finishButton = new ImageButton(Gtk.Stock.Apply,resourceService.GetString("Dialog.WizardDialog.FinishButton"));
+			finishButton = new ImageButton(Gtk.Stock.Apply, GettextCatalog.GetString ("Finish"));
 			finishButton.Clicked   += new EventHandler(FinishEvent);
 
 			cancelButton = new Button (Gtk.Stock.Cancel);

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -54,7 +54,6 @@
 			
 			public static Report operator+(Report r, Report s)
 			{
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				Report tmpReport = new Report (GettextCatalog.GetString("total"), s.chars, s.words, s.lines);
 				
 				tmpReport.chars += r.chars;
@@ -326,7 +325,7 @@
 			store.AppendValues ("", "", "", "");
 			resultListView.Model = store;
 			
-			ResourceService resourceService = (ResourceService) ServiceManager.GetService(typeof(IResourceService));
+			ResourceService resourceService = (ResourceService) ServiceManager.GetService(typeof(ResourceService));
 			this.Icon = resourceService.GetIcon ("Icons.16x16.FindIcon");
 			this.TransientFor = (Window) WorkbenchSingleton.Workbench;
 			

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -59,7 +59,6 @@
 		//Panel contentPanel = new Panel();
 		Gtk.Frame contentPanel;
 
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		ClassInformationEventHandler changeClassInformationHandler = null;
 		Combine parseCombine;
 		ArrayList ImageList;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/OpenTaskView.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/OpenTaskView.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -22,8 +22,6 @@
 {
 	public class OpenTaskView : IPadContent
 	{
-		ResourceService resourceService = (ResourceService) ServiceManager.GetService (typeof (IResourceService));
-
 		ScrolledWindow sw;
 		Gtk.TreeView view;
 		ListStore store;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -36,7 +36,7 @@
 				return combine;
 			}
 		}
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+		
 		public CombineBrowserNode(Combine combine)
 		{
 			UserData     = combine;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -93,7 +93,6 @@
 				
 				string oldFoldername = folderName;
 				string newFoldername = Path.GetDirectoryName(oldFoldername) + Path.DirectorySeparatorChar + newName;
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				
 				if (oldFoldername != newFoldername) {
 					try {
@@ -125,7 +124,6 @@
 			if (FolderName != null && FolderName.Length == 0) {
 				return false;
 			}
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 			
 			Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you want to remove folder {0} from project {1}?"), Text, Project.Name));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -113,7 +113,6 @@
 				
 				string newname = Path.GetDirectoryName(oldname) + Path.DirectorySeparatorChar + newName;
 				if (oldname != newname) {
-					ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 					try {
 						IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
 						FileUtilityService fileUtilityService = (FileUtilityService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(FileUtilityService));
@@ -140,7 +139,6 @@
 		public override bool RemoveNode()
 		{
 			DateTime old = DateTime.Now;
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
 			
 			using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format (GettextCatalog.GetString ("Are you sure you want to remove file {0} from project {1}?"), Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -27,7 +27,6 @@
 	{
 		readonly static string defaultContextMenuPath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode";
 		IProject project;
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 		public override IProject Project {
 			get {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -50,7 +50,6 @@
 
 		public AbstractBrowserNode BuildProjectTreeNode(IProject project)
 		{
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
 			ProjectBrowserNode projectNode = new ProjectBrowserNode(project);
 
@@ -216,8 +215,6 @@
 			AbstractBrowserNode parentNode = null;
 			string relativeFile = fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory, projectFile.Name);
 			string fileName     = Path.GetFileName(projectFile.Name);
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
-
 			parentNode = projectNode;
 
 			if(projectFile.DependsOn != String.Empty && projectFile.DependsOn != null) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -40,7 +40,6 @@
 		Font               boldFont  = null;
 		//Panel contentPanel = new Panel();
 		Gtk.Frame contentPanel = new Gtk.Frame();
-		static ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 		static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
 

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/SideBarView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/SideBarView.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/SideBarView.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -19,7 +19,6 @@
 {
 	public class SideBarView : IPadContent, IDisposable
 	{
-		ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 		public Gtk.Widget Control {
 			get {
 				return null;
@@ -29,7 +28,7 @@
 		
 		public string Title {
 			get {
-				return resourceService.GetString("MainWindow.Windows.ToolbarLabel");
+				return GettextCatalog.GetString ("Toolbox");
 			}
 		}
 		

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/PixbufList.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/PixbufList.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/PixbufList.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -8,7 +8,7 @@
 	{
 		public PixbufList (params string [] resIcons) : base (resIcons.Length)
 		{
-			ResourceService rs = (ResourceService) ServiceManager.GetService (typeof (IResourceService));
+			ResourceService rs = (ResourceService) ServiceManager.GetService (typeof (ResourceService));
 			
 			foreach (string s in resIcons)
 				Add (rs.GetBitmap (s));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -136,7 +136,7 @@
 		{
 			Title = "MonoDevelop";
 			Console.WriteLine ("Creating DefaultWorkbench");
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 		
 			windowChangeEventHandler = new EventHandler(OnActiveWindowChanged);
 
@@ -524,7 +524,6 @@
 		void SetProjectTitle(object sender, ProjectEventArgs e)
 		{
 			UpdateMenu(null, null);
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 			if (e.Project != null) {
 				Title = String.Concat(e.Project.Name, " - ", "MonoDevelop");
 			} else {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -216,7 +216,6 @@
 		public void CloseWindow(bool force, bool fromMenu, int pageNum)
 		{
 			if (!force && ViewContent != null && ViewContent.IsDirty) {
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
 				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
 				bool response = messageService.AskQuestion (GettextCatalog.GetString ("Do you want to save the current changes"));
 				

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -138,7 +138,7 @@
 			Debug.Assert(newItem != null);
 			
 			if (Icon != null && newItem is SdMenuCommand) {
-				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+				ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 				((SdMenuCommand)newItem).Image = resourceService.GetImage(Icon, Gtk.IconSize.Menu);
 			}
 			

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/Toolbars/ToolbarItemCodon.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/Toolbars/ToolbarItemCodon.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Codons/Toolbars/ToolbarItemCodon.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -25,7 +25,7 @@
 		[XmlMemberAttribute("icon")]
 		string icon        = null;
 		
-		[XmlMemberAttributeAttribute("tooltip")]
+		[XmlMemberAttributeAttribute("_tooltip")]
 		string toolTip     = null;
 		
 		ArrayList subItems = null;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/ExternalTool/ToolLoader.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/ExternalTool/ToolLoader.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -85,8 +85,7 @@
 				if (!LoadToolsFromStream(propertyService.DataDirectory +
 				                         Path.DirectorySeparatorChar + "options" + 
 				                         Path.DirectorySeparatorChar + TOOLFILE)) {
-					IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
-                	IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
+					IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
 					messageService.ShowWarning(GettextCatalog.GetString ("Can't load external tools configuration file"));
 				}
 			}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -56,7 +56,6 @@
 		
 		Hashtable configurations            = new Hashtable();
 		ArrayList combineExecuteDefinitions = new ArrayList();
-		IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 		
 		[LocalizedProperty("${res:MonoDevelop.Internal.Project.Combine.ActiveConfiguration}",
 		                   Description = "${res:MonoDevelop.Internal.Project.Combine.ActiveConfiguration.Description}")]

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -111,7 +111,6 @@
 				IProjectService   projectService   = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 				IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
 				TaskService       taskService      = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IResourceService resourceService   = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 				
 				statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling: {0}"), Project.Name));
 				LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -506,7 +506,6 @@
 			doc.DocumentElement.AppendChild(configurationElement);
 			
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save), 
 			                                fileName, 
                                                         GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."), 
@@ -530,7 +529,6 @@
 				if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
 					string filename = fdiag.Filename;
 					SaveProject(filename);
-					IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
 					messageService.ShowMessage(filename, GettextCatalog.GetString ("Project saved"));
 				}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -23,7 +23,6 @@
 		
 		public void DeployProject(IProject project)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			if (project.DeployInformation.DeployTarget.Length == 0) {
 				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
 				messageService.ShowError(GettextCatalog.GetString ("Can't deploy: no deployment target set"));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,7 +18,6 @@
 	{
 		public void DeployProject(IProject project)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			if (project.DeployInformation.DeployTarget.Length == 0) {
 				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
 				messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,7 +18,6 @@
 	{
 		public void DeployProject(IProject project)
 		{
-			IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 			if (project.DeployInformation.DeployScript.Length == 0) {
 				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
 				messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -42,7 +42,6 @@
 		// regular members
 		StringCollection newFiles;
 		IProject         project;
-		IResourceService resourceService = (IResourceService)ServiceManager.GetService(typeof(IResourceService));
 		FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 		
 		public IncludeFilesDialog(IProject project, StringCollection newFiles)

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/FileTemplate.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/FileTemplate.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/FileTemplate.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -120,12 +120,12 @@
 			created      = doc.DocumentElement.Attributes["Created"].InnerText;
 			lastmodified = doc.DocumentElement.Attributes["LastModified"].InnerText;
 			
-			name         = config["Name"].InnerText;
+			name         = GettextCatalog.GetString (config["_Name"].InnerText);
 			category     = config["Category"].InnerText;
 			languagename = config["LanguageName"].InnerText;
 			
-			if (config["Description"] != null) {
-				description  = config["Description"].InnerText;
+			if (config["_Description"] != null) {
+				description  = GettextCatalog.GetString (config["_Description"].InnerText);
 			}
 			
 			if (config["Icon"] != null) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -141,12 +141,12 @@
 				wizardpath = config["Wizard"].InnerText;
 			}
 			
-			name         = config["Name"].InnerText;
+			name         = GettextCatalog.GetString (config["_Name"].InnerText);
 			category     = config["Category"].InnerText;
 			languagename = config["LanguageName"].InnerText;
 			
-			if (config["Description"] != null) {
-				description  = config["Description"].InnerText;
+			if (config["_Description"] != null) {
+				description  = GettextCatalog.GetString (config["_Description"].InnerText);
 			}
 			
 			if (config["Icon"] != null) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-07-01 06:28:55 UTC (rev 1869)
@@ -73,7 +73,6 @@
 ./Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs \
 ./Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs \
 ./Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs \
-./Gui/Dialogs/OptionPanels/IDEOptions/SelectCulturePanel.cs \
 ./Gui/Dialogs/OptionPanels/EditTemplateDialog.cs \
 ./Gui/Dialogs/OptionPanels/ExternalToolPanel.cs \
 ./Gui/Dialogs/OptionPanels/PropertyGridPanel.cs \

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/IconService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/IconService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/IconService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -34,11 +34,6 @@
 			InitializeIcons(AddInTreeSingleton.AddInTree.GetTreeNode("/Workspace/Icons"));
 		}
 		
-		public override void UnloadService()
-		{
-			base.UnloadService();
-		}
-		
 		public string GetImageForProjectType (string projectType)
 		{
 			if (projectFileHashtable [projectType] != null)

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -35,7 +35,7 @@
 		}
 	}
 	
-	public class ResourceService : AbstractService, IResourceService
+	public class ResourceService : AbstractService
 	{
 		readonly static string uiLanguageProperty = "CoreProperties.UILanguage";
 		
@@ -199,41 +199,6 @@
 			
 		}
 		
-		/// <summary>
-		/// Returns a string from the resource database, it handles localization
-		/// transparent for the user.
-		/// </summary>
-		/// <returns>
-		/// The string in the (localized) resource database.
-		/// </returns>
-		/// <param name="name">
-		/// The name of the requested resource.
-		/// </param>
-		/// <exception cref="ResourceNotFoundException">
-		/// Is thrown when the GlobalResource manager can't find a requested resource.
-		/// </exception>
-		public string GetString(string name)
-		{
-			if (name.StartsWith ("${")) {
-				name = name.Substring (6);
-				name = name.Substring (0, name.Length - 1);
-			}
-			if (this.userStrings != null && this.userStrings[name] != null) {
-				return userStrings[name].ToString();
-			}
-			if (localStrings != null && localStrings[name] != null) {
-				return localStrings[name].ToString();
-			}
-			
-			string s = strings.GetString(name);
-			
-			if (s == null) {
-				throw new ResourceNotFoundException("string >" + name + "<");
-			}
-			
-			return s.Replace (@"\&", "||!|").Replace ("&", "_").Replace ("||!|", "&");
-		}
-		
 		// use P/Invoke to be able to pass some NULL parameters
 		[DllImport("libgtk-x11-2.0.so.0")]
 		static extern IntPtr

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/Toolbar/ToolbarService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/Toolbar/ToolbarService.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/Toolbar/ToolbarService.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -18,6 +18,7 @@
 using MonoDevelop.Core.AddIns;
 
 using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
 
 using Gtk;
 
@@ -26,7 +27,6 @@
 	public class ToolbarService : AbstractService
 	{
 		readonly static string toolBarPath     = "/SharpDevelop/Workbench/ToolBar";
-		
 		IAddInTreeNode node;
 		
 		public ToolbarService()
@@ -51,7 +51,7 @@
 			Gtk.Toolbar bar = new Gtk.Toolbar();
 			bar.ToolbarStyle = Gtk.ToolbarStyle.Icons;
 			
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 			foreach (ToolbarItemCodon childCodon in codon.SubItems) {
 				SdToolbarCommand item = null;
 				
@@ -60,7 +60,7 @@
 						bar.AppendSpace();
 						continue;
 					} else {
-						item = new SdToolbarCommand(childCodon.Conditions, owner, childCodon.ToolTip);
+						item = new SdToolbarCommand(childCodon.Conditions, owner, GettextCatalog.GetString (childCodon.ToolTip));
 						Gtk.Image img = resourceService.GetImage(childCodon.Icon, Gtk.IconSize.LargeToolbar);
 						item.Add (img);
 						item.Relief = ReliefStyle.None;
@@ -74,12 +74,12 @@
 						item.ShowAll();
 					}
 				} else {
+					Console.WriteLine ("Tooltip was null");
 					continue;
 				}
 				if (childCodon.Class != null) {
 					((SdToolbarCommand)item).Command = (ICommand)childCodon.AddIn.CreateObject(childCodon.Class);
 				}
-				//bar.AppendItem(item.Text, item.Text, item.Text, item, new Gtk.SignalFunc(item.ToolbarClicked));
 				bar.AppendWidget (item, item.Text, item.Text);
 			}
 			return bar;

Modified: trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs	2004-07-01 01:38:02 UTC (rev 1868)
+++ trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs	2004-07-01 06:28:55 UTC (rev 1869)
@@ -104,7 +104,7 @@
 		}
 	
 		public void InitializeComponent() {
-			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(IResourceService));
+			ResourceService resourceService = (ResourceService)ServiceManager.GetService(typeof(ResourceService));
 
 			this.fixedcontainer = new Gtk.Fixed();
 			this.continueButton = new Gtk.Button();




More information about the Monodevelop-patches-list mailing list