X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/PHPUIMessages.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/PHPUIMessages.properties
index 71fee91..bd91eae 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/PHPUIMessages.properties
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/PHPUIMessages.properties
@@ -236,12 +236,13 @@ NewJavaProjectPreferencePage.folders.error.invalidbinname=Invalid output folder
 NewJavaProjectPreferencePage.error.decode=Error while decoding JRE entry
 
 PHPEditorPreferencePage.updatesOnNextChangeIinEditor.label=Note: Updates on next change in the editor
-PHPEditorPreferencePage.problemIndicationTab.title=Problem Indi&cation
+PHPEditorPreferencePage.annotationsTab.title= Annotation&s
 PHPEditorPreferencePage.showQuickFixables=&Indicate problems solvable with Quick Fix in vertical ruler
 PHPEditorPreferencePage.description=PHP Editor settings:
 PHPEditorPreferencePage.font=Text Font:
 PHPEditorPreferencePage.multiLineComment=Multi-line comment
 PHPEditorPreferencePage.singleLineComment=Single-line comment
+PHPEditorPreferencePage.tags=PHP tags
 PHPEditorPreferencePage.keywords=Keywords
 PHPEditorPreferencePage.functionNames=Predefined function names
 PHPEditorPreferencePage.variables=Variables
@@ -284,6 +285,7 @@ PHPEditorPreferencePage.guessArgumentNamesOnMethodCompletion=&Guess filled argum
 PHPEditorPreferencePage.autoActivationDelay=Auto activation dela&y:
 PHPEditorPreferencePage.autoActivationTriggersForPHP=Auto activation &triggers for PHP:
 PHPEditorPreferencePage.autoActivationTriggersForPHPDoc=Auto activation triggers for &PHPDoc:
+PHPEditorPreferencePage.autoActivationTriggersForHTML=Auto activation triggers for &HTML:
 PHPEditorPreferencePage.backgroundForCompletionProposals=&Background for completion proposals:
 PHPEditorPreferencePage.foregroundForCompletionProposals=&Foreground for completion proposals:
 PHPEditorPreferencePage.backgroundForMethodParameters=Bac&kground for method parameters:
@@ -308,15 +310,18 @@ PHPEditorPreferencePage.linkColor2=Link
 PHPEditorPreferencePage.synchronizeOnCursor=Synchroni&ze outline selection on cursor move (editor must be reopened)
 PHPEditorPreferencePage.appearanceOptions=Appearance co&lor options:
 PHPEditorPreferencePage.behaviourTab.title=Be&havior
-PHPEditorPreferencePage.closeStrings=Automatically close str&ings
-PHPEditorPreferencePage.closeBrackets=Automatically close &brackets and parenthesis
+PHPEditorPreferencePage.closeStringsPHP=Automatically close str&ings in PHP mode
+PHPEditorPreferencePage.closeBracketsPHP=Automatically close &brackets and parenthesis in PHP mode
 PHPEditorPreferencePage.closeBraces=Automatically close bra&ces
-PHPEditorPreferencePage.closeJavaDocs=Automatically close Java&Docs and comments
-PHPEditorPreferencePage.wrapStrings=Smart Java stri&ng wrapping
-PHPEditorPreferencePage.addJavaDocTags=Automatically add JavaDoc &tags
-PHPEditorPreferencePage.formatJavaDocs=Automatically format &JavaDocs and multi-line comments
+PHPEditorPreferencePage.closePHPDocs=Automatically close PHP&Docs and comments
+PHPEditorPreferencePage.wrapStrings=Smart PHP stri&ng wrapping
+PHPEditorPreferencePage.addPHPDocTags=Automatically add PHPDoc &tags
+PHPEditorPreferencePage.formatPHPDocs=Automatically format &PHPDocs and multi-line comments
 PHPEditorPreferencePage.smartPaste= Sma&rt pasting for correct indentation
 PHPEditorPreferencePage.smartHomeEnd= S&mart cursor positioning at line start and end
+PHPEditorPreferencePage.closeStringsHTML=Automatically close str&ings in HTML mode
+PHPEditorPreferencePage.closeBracketsHTML=Automatically close &brackets and parenthesis in HTML mode
+
 PHPEditorPreferencePage.hoverTab.title= Ho&vers
 
 
@@ -491,7 +496,7 @@ CodeGenerationPreferencePage.gettersetter.error.invalidsuffix={0} is not a valid
 JavaImageLabelprovider.assert.wrongImage=no image for this JavaElement Type
 
 JavaTextLabelProvider.default_package=(default package)
-JavaTextLabelProvider.import_declarations=import declarations
+JavaTextLabelProvider.import_declarations=include declarations
 JavaTextLabelProvider.initializer=\{...\}
 
 JavaElementLabels.default_package=(default package)