fixed update conflict and outline update bug

[phpeclipse.git] / net.sourceforge.phpeclipse / plugin.properties

diff --git a/net.sourceforge.phpeclipse/plugin.properties b/net.sourceforge.phpeclipse/plugin.properties
index 796b959..7cddd75 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.properties
+++ b/net.sourceforge.phpeclipse/plugin.properties
@@ -7,8 +7,8 @@ naturePHP.name=PHP Project
 phpProblemName=PHP Problem
 transientPHPProblemName=Transient PHP Problem
 phpTaskName=PHP Task
-viewCategoryName=PHP
 
+viewCategoryName = PHPeclipse Web Development
 phpEditorTextHoversName=PHP Editor Text Hovers
 
 perspectivePHP.name=PHP
@@ -18,6 +18,7 @@ viewPHPResources.name=PHP Resources
 newWizardCategory.name=PHP
 newWizardPHPProject.name=PHP Project
 newWizardPHPFile.name=PHP File
+newWizardHTMLFile.name=HTML file
 NewPHPClass.label= Class
 NewPHPClass.description=Create a PHP class
 
@@ -40,11 +41,11 @@ codeAssistPageName= Code Assist
 #
 phpEditorName=PHP Editor
 phpConsoleView=PHP Console
-phpBrowserView=PHP Browser
 phpFileExtension=php
 php3FileExtension=php3
 php4FileExtension=php4
 php5FileExtension=php5
+moduleFileExtension=module
 incFileExtension=inc
 phtmlFileExtension=phtml
 htmlFileExtension=html
@@ -405,6 +406,11 @@ OccurrenceAnnotation.label= PHP Marker Occurrences
 phpEditorFontDefiniton.label= Java Editor Text Font
 phpEditorFontDefintion.description= The Java editor text font is used by Java editors.
 
+#--- templates
+templates.php.contextType.name= php
+templates.phpdoc.contextType.name= phpdoc
+templates.html.contextType.name= html
+
 #--- folding
 foldingStructureProvidersExtensionPoint= Folding Structure Providers
 defaultFoldingStructureProviderName= Default PHP Folding