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 c6bf376..e1e7d3f 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
@@ -39,14 +39,14 @@ AddMethodStubAction.OverridesFinalDialog.message=This will override the final me
 AddMethodStubAction.OverridesPrivateDialog.message=This will override the private method ''{0}'' from ''{1}''\nOK to continue?
 AddMethodStubAction.ReplaceExistingDialog.message=This will replace the existing method ''{0}''.\nOK to continue?
 
-AddJavaDocStubAction.label=Add &Javadoc Comment
-AddJavaDocStubAction.description=Add a Javadoc comment stub to the member element
-AddJavaDocStubAction.tooltip=Add a Javadoc comment stub to the member element
+AddJavaDocStubAction.label=Add &PHPDoc Comment
+AddJavaDocStubAction.description=Add a PHPDoc comment stub to the member element
+AddJavaDocStubAction.tooltip=Add a PHPDoc comment stub to the member element
 
-AddJavaDocStubsAction.error.dialogTitle=Add Javadoc Comment
+AddJavaDocStubsAction.error.dialogTitle=Add PHPDoc Comment
 AddJavaDocStubsAction.error.noWorkingCopy=Could not find working copy.
 AddJavaDocStubsAction.error.memberNotExisting=Member has been removed in editor.
-AddJavaDocStubsAction.error.actionFailed=Error while adding Javadoc comment
+AddJavaDocStubsAction.error.actionFailed=Error while adding PHPDoc comment
 
 AddUnimplementedMethodsAction.label=&Override Methods...
 AddUnimplementedMethodsAction.description=Override Methods from super types.
@@ -235,74 +235,92 @@ NewJavaProjectPreferencePage.folders.error.invalidbinname=Invalid output folder
 
 NewJavaProjectPreferencePage.error.decode=Error while decoding JRE entry
 
-JavaEditorPreferencePage.updatesOnNextChangeIinEditor.label=Note: Updates on next change in the editor
-JavaEditorPreferencePage.problemIndicationTab.title=Problem Indi&cation
-
-JavaEditorPreferencePage.description=Java Editor settings:
-JavaEditorPreferencePage.font=Text Font:
-JavaEditorPreferencePage.multiLineComment=Multi-line comment
-JavaEditorPreferencePage.singleLineComment=Single-line comment
-JavaEditorPreferencePage.keywords=Keywords
-JavaEditorPreferencePage.strings=Strings
-JavaEditorPreferencePage.others=Others
-JavaEditorPreferencePage.javaDocKeywords=Javadoc keywords
-JavaEditorPreferencePage.javaDocHtmlTags=Javadoc HTML tags
-JavaEditorPreferencePage.javaDocLinks=Javadoc links
-JavaEditorPreferencePage.javaDocOthers=Javadoc others
-JavaEditorPreferencePage.backgroundColor=Background color
-JavaEditorPreferencePage.systemDefault=S&ystem Default
-JavaEditorPreferencePage.custom=C&ustom:
-JavaEditorPreferencePage.foreground=Fo&reground:
-JavaEditorPreferencePage.color=C&olor:
-JavaEditorPreferencePage.bold=&Bold
-JavaEditorPreferencePage.preview=Preview:
-JavaEditorPreferencePage.textFont=Text &font:
-JavaEditorPreferencePage.displayedTabWidth=Displayed &tab width:
-JavaEditorPreferencePage.insertSpaceForTabs=&Insert space for tabs (see Formatting preferences)
-JavaEditorPreferencePage.showProblemsBeforeCompiling=Show problems before c&ompiling
-JavaEditorPreferencePage.showOverviewRuler=Show overview &ruler
-JavaEditorPreferencePage.highlightMatchingBrackets=Highlight &matching brackets
-JavaEditorPreferencePage.matchingBracketsHighlightColor=Matching &brackets highlight color:
-JavaEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
-JavaEditorPreferencePage.currentLineHighlightColor=Current &line highlight color:
-JavaEditorPreferencePage.highlightProblems=Highlight &problems
-JavaEditorPreferencePage.problemHighlightColor=Prob&lem highlight color:
-JavaEditorPreferencePage.showPrintMargin=Sho&w print margin
-JavaEditorPreferencePage.printMarginColor=Print m&argin color:
-JavaEditorPreferencePage.printMarginColumn=Print margin col&umn:
-JavaEditorPreferencePage.findScopeColor=F&ind Scope Color:
-JavaEditorPreferencePage.linkedPositionColor=Lin&ked Position Color:
-JavaEditorPreferencePage.insertSingleProposalsAutomatically=Insert single &proposals automatically
-JavaEditorPreferencePage.showOnlyProposalsVisibleInTheInvocationContext=Show only proposals &visible in the invocation context
-JavaEditorPreferencePage.presentProposalsInAlphabeticalOrder=Present proposals in a&lphabetical order
-JavaEditorPreferencePage.enableAutoActivation=&Enable auto activation
-JavaEditorPreferencePage.automaticallyAddImportInsteadOfQualifiedName=Automatically add &import instead of qualified name
-JavaEditorPreferencePage.fillArgumentNamesOnMethodCompletion=&Fill argument names on method completion
-JavaEditorPreferencePage.autoActivationDelay=Auto activation dela&y:
-JavaEditorPreferencePage.autoActivationTriggersForJava=Auto activation &triggers for Java:
-JavaEditorPreferencePage.autoActivationTriggersForJavaDoc=Auto activation triggers for &Javadoc:
-JavaEditorPreferencePage.backgroundForCompletionProposals=&Background for completion proposals:
-JavaEditorPreferencePage.foregroundForCompletionProposals=&Foreground for completion proposals:
-JavaEditorPreferencePage.backgroundForMethodParameters=Bac&kground for method parameters:
-JavaEditorPreferencePage.foregroundForMethodParameters=Fo&reground for method parameters:
-JavaEditorPreferencePage.general=Appeara&nce
-JavaEditorPreferencePage.colors=Synta&x
-JavaEditorPreferencePage.codeAssist=Code A&ssist
-JavaEditorPreferencePage.change=C&hange...
-JavaEditorPreferencePage.empty_input=Empty input
-JavaEditorPreferencePage.invalid_input=''{0}'' is not a valid input.
-JavaEditorPreferencePage.showLineNumbers=Show &line numbers
-JavaEditorPreferencePage.lineNumberColor=Line number foreground color:
-JavaEditorPreferencePage.lineNumberForegroundColor=Line number foreground
-JavaEditorPreferencePage.matchingBracketsHighlightColor2=Matching brackets highlight
-JavaEditorPreferencePage.currentLineHighlighColor=Current line highlight
-JavaEditorPreferencePage.problemsHighlightColor=Problems highlight
-JavaEditorPreferencePage.printMarginColor2=Print margin
-JavaEditorPreferencePage.findScopeColor2=Find scope
-JavaEditorPreferencePage.linkedPositionColor2=Linked position
-JavaEditorPreferencePage.showQuickFixables=&Indicate problems solvable with Quick Fix in vertical ruler
-JavaEditorPreferencePage.synchronizeOnCursor=Synchroni&ze outline selection on cursor move (editor must be reopened)
-JavaEditorPreferencePage.appearanceOptions=Appearance co&lor options:
+PHPEditorPreferencePage.updatesOnNextChangeIinEditor.label=Note: Updates on next change in the editor
+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
+PHPEditorPreferencePage.constants=Constants
+PHPEditorPreferencePage.types=Types
+PHPEditorPreferencePage.strings=Strings
+PHPEditorPreferencePage.others=Others
+PHPEditorPreferencePage.phpDocKeywords=PHPDoc keywords
+PHPEditorPreferencePage.phpDocHtmlTags=PHPDoc HTML tags
+PHPEditorPreferencePage.phpDocLinks=PHPDoc links
+PHPEditorPreferencePage.phpDocOthers=PHPDoc others
+PHPEditorPreferencePage.backgroundColor=Background color
+PHPEditorPreferencePage.systemDefault=S&ystem Default
+PHPEditorPreferencePage.custom=C&ustom:
+PHPEditorPreferencePage.foreground=Fo&reground:
+PHPEditorPreferencePage.color=C&olor:
+PHPEditorPreferencePage.bold=&Bold
+PHPEditorPreferencePage.preview=Preview:
+PHPEditorPreferencePage.textFont=Text &font:
+PHPEditorPreferencePage.displayedTabWidth=Displayed &tab width:
+PHPEditorPreferencePage.insertSpaceForTabs=Ins&ert space for tabs (see Code Formatter preference page)
+PHPEditorPreferencePage.showOverviewRuler=Show overview &ruler
+PHPEditorPreferencePage.highlightMatchingBrackets=Highlight &matching brackets
+PHPEditorPreferencePage.matchingBracketsHighlightColor=Matching &brackets highlight color:
+PHPEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
+PHPEditorPreferencePage.currentLineHighlightColor=Current &line highlight color:
+PHPEditorPreferencePage.showPrintMargin=Sho&w print margin
+PHPEditorPreferencePage.printMarginColor=Print m&argin color:
+PHPEditorPreferencePage.printMarginColumn=Print margin col&umn:
+PHPEditorPreferencePage.findScopeColor=F&ind Scope Color:
+PHPEditorPreferencePage.linkedPositionColor=Lin&ked Position Color:
+PHPEditorPreferencePage.insertSingleProposalsAutomatically=Insert single &proposals automatically
+PHPEditorPreferencePage.showOnlyProposalsVisibleInTheInvocationContext=Show only proposals &visible in the invocation context
+PHPEditorPreferencePage.presentProposalsInAlphabeticalOrder=Present proposals in a&lphabetical order
+PHPEditorPreferencePage.enableAutoActivation=&Enable auto activation
+PHPEditorPreferencePage.automaticallyAddImportInsteadOfQualifiedName=Automatically add &import instead of qualified name
+PHPEditorPreferencePage.insertCompletion=&Insert completion
+PHPEditorPreferencePage.fillArgumentNamesOnMethodCompletion=&Fill argument names on method completion
+PHPEditorPreferencePage.guessArgumentNamesOnMethodCompletion=&Guess filled argument names
+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:
+PHPEditorPreferencePage.foregroundForMethodParameters=Fo&reground for method parameters:
+PHPEditorPreferencePage.backgroundForCompletionReplacement=Back&ground for completion replacement:
+PHPEditorPreferencePage.foregroundForCompletionReplacement=Foregr&ound for completion replacement:
+PHPEditorPreferencePage.general=Appeara&nce
+PHPEditorPreferencePage.colors=Synta&x
+PHPEditorPreferencePage.codeAssist=Code A&ssist
+PHPEditorPreferencePage.change=C&hange...
+PHPEditorPreferencePage.empty_input=Empty input
+PHPEditorPreferencePage.invalid_input=''{0}'' is not a valid input.
+PHPEditorPreferencePage.lineNumberColor=Line number foreground color:
+PHPEditorPreferencePage.matchingBracketsHighlightColor2=Matching brackets highlight
+PHPEditorPreferencePage.currentLineHighlighColor=Current line highlight
+PHPEditorPreferencePage.printMarginColor2=Print margin
+PHPEditorPreferencePage.findScopeColor2=Find scope
+PHPEditorPreferencePage.linkedPositionColor2=Linked position
+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.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.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
 
 
 JavaElementInfoPage.binary=binary
@@ -319,19 +337,19 @@ JavaElementInfoPage.variable=variable
 JavaElementInfoPage.variable_path=Variable path:
 JavaElementInfoPage.location=Location:
 
-JavadocConfigurationPropertyPage.IsPackageFragmentRoot.description=Specify the location (URL) of the documentation generated by Javadoc. The Javadoc location will contain a file called 'package-list'. For example: \'http://www.sample-url.org/doc/\'
-JavadocConfigurationPropertyPage.IsIncorrectElement.description=Javadoc location can only be attached to JAR files in projects or Java projects
-JavadocConfigurationPropertyPage.IsJavaProject.description=Specify the location (URL) of the project\'s Javadoc documentation. This location is used by the Javadoc export wizard as default value and by the \'Open External Javadoc\' action. For example: \'file://c:/myworkspace/myproject/doc/\'.
+JavadocConfigurationPropertyPage.IsPackageFragmentRoot.description=Specify the location (URL) of the documentation generated by PHPDoc. The Javadoc location will contain a file called 'package-list'. For example: \'http://www.sample-url.org/doc/\'
+JavadocConfigurationPropertyPage.IsIncorrectElement.description=PHPDoc location can only be attached to JAR files in projects or Java projects
+JavadocConfigurationPropertyPage.IsJavaProject.description=Specify the location (URL) of the project\'s PHPDoc documentation. This location is used by the PHPDoc export wizard as default value and by the \'Open External PHPDoc\' action. For example: \'file://c:/myworkspace/myproject/doc/\'.
 
-JavadocConfigurationBlock.location.label=Javadoc &Location:
+JavadocConfigurationBlock.location.label=PHPDoc &Location:
 JavadocConfigurationBlock.location.button=Bro&wse...
 
 JavadocConfigurationBlock.error.invalidurl=Not a valid URL: {0}
 JavadocConfigurationBlock.error.notafolder=Location does not exist.
 JavadocConfigurationBlock.warning.packagelistnotfound=Location does not contain file 'package-list'.
 
-JavadocConfigurationBlock.javadocLocationDialog.label=Javadoc Location Selection
-JavadocConfigurationBlock.javadocLocationDialog.message=&Select Javadoc location:
+JavadocConfigurationBlock.javadocLocationDialog.label=PHPDoc Location Selection
+JavadocConfigurationBlock.javadocLocationDialog.message=&Select PHPDoc location:
 
 JavadocConfigurationBlock.MalformedURL.error=Invalid URL
 
@@ -339,16 +357,16 @@ JavadocConfigurationBlock.ValidateButton.label=&Validate...
 JavadocConfigurationBlock.InvalidLocation.message= Location is invalid. Location contains neither the file \'package-list\' nor \'index.html'.
 JavadocConfigurationBlock.ValidLocation.message= Location is valid. Files \'package-list\' and \'index.html\' found. Click OK to open in browser.
 JavadocConfigurationBlock.UnableToValidateLocation.message=Unable to validate location
-JavadocConfigurationBlock.MessageDialog.title=Validating Javadoc Location
+JavadocConfigurationBlock.MessageDialog.title=Validating PHPDoc Location
 JavadocConfigurationBlock.EmptyJavadocLocation.warning=Enter a javadoc location
 
-JavadocPreferencePage.description=Specify the location of the Javadoc command to be used by the Javadoc export wizard. Location must be an absolute path.
-JavadocPreferencePage.command.label=&Javadoc command:
+JavadocPreferencePage.description=Specify the location of the PHPDoc command to be used by the PHPDoc export wizard. Location must be an absolute path.
+JavadocPreferencePage.command.label=&PHPDoc command:
 JavadocPreferencePage.command.button=Bro&wse...
 
-JavadocPreferencePage.error.notexists=Javadoc command does not exist
+JavadocPreferencePage.error.notexists=PHPDoc command does not exist
 
-JavadocPreferencePage.browsedialog.title=Javadoc Command Selection
+JavadocPreferencePage.browsedialog.title=PHPDoc Command Selection
 
 SourceAttachmentPropertyPage.error.title=Error Attaching Source
 SourceAttachmentPropertyPage.error.message=An error occurred while associating the source
@@ -360,14 +378,14 @@ AppearancePreferencePage.description= Appearance of Java elements in viewers:
 AppearancePreferencePage.methodreturntype.label= Show &method return types
 AppearancePreferencePage.overrideindicator.label= Show &override indicators in outline and hierarchy
 AppearancePreferencePage.pkgNamePatternEnable.label= &Compress package name segments (except for the last one)
-AppearancePreferencePage.pkgNamePattern.label= Com&pression pattern (e.g. given package name 'org.eclipse.jdt' pattern '.' will compress it to '..jdt',  '0' to 'jdt', '1~.' to 'o~.e~.jdt'):
+AppearancePreferencePage.pkgNamePattern.label= Com&pression pattern (e.g. given package name 'net.sourceforge.phpdt' pattern '.' will compress it to '..jdt',  '0' to 'jdt', '1~.' to 'o~.e~.jdt'):
 
 AppearancePreferencePage.showMembersInPackagesView=S&how members in Package Explorer
 AppearancePreferencePage.stackViewsVerticallyInTheJavaBrowsingPerspective=&Stack views vertically in the Java Browsing perspective
 AppearancePreferencePage.preferenceOnlyEffectiveForNewPerspectives=Note: This preference will only take effect on new perspectives
 AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty=Enter a package name compression pattern
 
-CodeFormatterPreferencePage.description=Options for the Java Code Formatter:
+CodeFormatterPreferencePage.description=Options for the PHP Code Formatter:
 
 CodeFormatterPreferencePage.empty_input=Empty input
 CodeFormatterPreferencePage.invalid_input=''{0}'' is not a valid input.
@@ -379,6 +397,8 @@ CodeFormatterPreferencePage.newline_else_if.label=&Insert new line between 'else
 CodeFormatterPreferencePage.newline_empty_block.label=In&sert a new line inside an empty block
 CodeFormatterPreferencePage.split_line.label=Ma&ximum line length:
 CodeFormatterPreferencePage.style_compact_assignement.label=&Compact assignment
+CodeFormatterPreferencePage.style_compact_arrays.label=Compact &arrays
+CodeFormatterPreferencePage.style_compact_string_concatenation.label=Compact &string concatenation
 CodeFormatterPreferencePage.tab_char.label=Indentation is represented by a &tab
 CodeFormatterPreferencePage.tab_size.label=&Number of spaces representing a tab:
 
@@ -411,7 +431,7 @@ CompilerPreferencePage.pb_overriding_pkg_dflt.label=&Methods overridden but not
 CompilerPreferencePage.pb_method_naming.label=Me&thods with a constructor name:
 CompilerPreferencePage.pb_deprecation.label=Usage of de&precated API:
 CompilerPreferencePage.pb_hidden_catchblock.label=&Hidden catch blocks:
-CompilerPreferencePage.pb_unused_imports.label=Unu&sed imports:
+CompilerPreferencePage.pb_unused_imports.label=Unu&sed includes:
 CompilerPreferencePage.pb_unused_local.label=Unused &local variables (i.e. never read):
 CompilerPreferencePage.pb_unused_parameter.label=U&nused parameters (i.e. never read):
 CompilerPreferencePage.pb_synth_access_emul.label=A&ccess to a non-accessible member of an enclosing type:
@@ -461,8 +481,8 @@ CodeGenerationPreferencePage.gettersetter.suffix.checkbox=Remove &suffix from fi
 CodeGenerationPreferencePage.gettersetter.suffix.list=S&uffix list (comma separated):
 
 CodeGenerationPreferencePage.comments.label=Comments Creation:
-CodeGenerationPreferencePage.javadoc_comment.label=Create &Javadoc comments for methods and types (template 'typecomment')
-CodeGenerationPreferencePage.see_comment.label=Create &non-Javadoc comments for overridden methods
+CodeGenerationPreferencePage.javadoc_comment.label=Create &PHPDoc comments for methods and types (template 'typecomment')
+CodeGenerationPreferencePage.see_comment.label=Create &non-PHPDoc comments for overridden methods
 CodeGenerationPreferencePage.file_comment.label=Create &file comments for new files (template 'filecomment')
 
 CodeGenerationPreferencePage.gettersetter.error.emptyprefix=Prefix strings can not contain an empty entry.
@@ -476,11 +496,11 @@ 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)
-JavaElementLabels.import_container=import declarations
+JavaElementLabels.default_package=(default package) 
+JavaElementLabels.import_container=include declarations
 JavaElementLabels.initializer=\{...\}
 JavaElementLabels.concat_string=\ -\ 
 JavaElementLabels.comma_string=,\ 
@@ -510,7 +530,7 @@ OpenTypeHierarchyUtil.selectionDialog.message=&Select the type to be shown in th
 TypeInfoLabelProvider.default_package=(default package)
 TypeInfoLabelProvider.dash=\ - 
 
-JavaUIHelp.link.label=Javadoc for {0}
+JavaUIHelp.link.label=PHPDoc for {0}
 
 #########
 # DnD
@@ -520,6 +540,20 @@ ResourceTransferDragAdapter.moving_resource=Moving Resources via DND
 ResourceTransferDragAdapter.cannot_delete_files=Cannot delete the following file(s)
 
 #########
+# Spelling
+#########
+
+Spelling.dictionary.file.extension=dictionary
+Spelling.error.label=The word ''{0}'' is not correctly spelled
+Spelling.correct.label=Change to ''{0}''
+Spelling.add.info=Adds the word ''{0}'' to the dictionary
+Spelling.add.label=Add ''{0}'' to dictionary
+Spelling.ignore.info=Always ignores ''{0}'' during the current session
+Spelling.ignore.label=Always ignore ''{0}''
+Spelling.case.label=Change to upper case
+Spelling.error.case.label= The word ''{0}'' should have an initial upper case letter
+
+#########
 # misc
 #########