更新到 phpStorm 8.0.2资源包

ewen0930 · Dec 26, 2014 · aca3b0d · aca3b0d
1 parent 4679b34
commit aca3b0d
Show file tree

Hide file tree

Showing 411 changed files with 8,614 additions and 7,710 deletions.
diff --git a/resources_en/META-INF/IdeTipsAndTricks.xml b/resources_en/META-INF/IdeTipsAndTricks.xml
@@ -123,13 +123,16 @@
     <tipAndTrick file="HorizontalScrolling.html"/>
     <tipAndTrick file="TagNameCompletion.html"/>
     <tipAndTrick file="ViewInBrowser.html"/>
-
     <tipAndTrick file="LiveTemplatesRestore.html"/>
     <tipAndTrick file="Multicursor.html"/>
     <tipAndTrick file="Multicursor1.html"/>
     <tipAndTrick file="NamedBreakpoints.html"/>
     <tipAndTrick file="RemoteInterpreter.html"/>
     <tipAndTrick file="Scratches.html"/>
+    <tipAndTrick file="DDDisable.html"/>
+    <tipAndTrick file="Multiselection.html"/>
+    <tipAndTrick file="MultiselectionInSearch.html"/>
+    <tipAndTrick file="MultiselectionInSearch1.html"/>
 
   </extensions>
 </idea-plugin>

diff --git a/resources_en/META-INF/MANIFEST.MF b/resources_en/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_35-b10 (Sun Microsystems Inc.)
+Ant-Version: Apache Ant 1.9.4
+Created-By: 1.6.0_45-b06 (Sun Microsystems Inc.)
 
diff --git a/resources_en/META-INF/PhpStormPlugin.xml b/resources_en/META-INF/PhpStormPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
 
   <application-components>
     <component>
@@ -9,6 +9,7 @@
   <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/JsonPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/SpellCheckerPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -32,7 +33,7 @@
 
     <projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>
     <!--<projectAttachProcessor implementation="com.intellij.platform.ModuleAttachProcessor"/>-->
-    <applicationConfigurable groupId="project" instance="com.intellij.application.options.pathMacros.PathMacroConfigurable"/>
+    <applicationConfigurable groupId="build" instance="com.intellij.application.options.pathMacros.PathMacroConfigurable"/>
     <projectConfigurable groupId="language" instance="com.intellij.psi.templateLanguages.TemplateDataLanguageConfigurable"/>
     <projectConfigurable groupId="project" dynamic="true" instance="com.intellij.webcore.resourceRoots.WebIdeProjectStructureWithSourceConfigurable" order="first" nonDefaultProject="true"/>
     <iconProvider implementation="com.intellij.webcore.resourceRoots.ResourceRootIconProvider"/>
@@ -103,6 +104,13 @@
       <add-to-group group-id="PlatformOpenProjectGroup" anchor="after" relative-to-action="NewDirectoryProject"/>
     </action>
 
+    <action id="PhpStormTutorials" class="com.jetbrains.php.actions.PhpOpenTutorialsAction" text="Tutorials" description="Open PhpStorm tutorials">
+      <add-to-group group-id="HelpMenu" anchor="after" relative-to-action="HelpTopics"/>
+    </action>
+    <action id="PhpStormNewIssue" class="com.jetbrains.php.actions.PhpReportIssueAction" text="Report an issue">
+      <add-to-group group-id="HelpMenu" anchor="after" relative-to-action="TechnicalSupport"/>
+    </action>
+
     <group id="WelcomeScreen.Platform.NewProject">
       <action id="WelcomeScreen.CreateDirectoryProject" class="com.intellij.platform.NewDirectoryProjectAction" icon="AllIcons.General.CreateNewProject"/>
       <action id="WelcomeScreen.OpenDirectoryProject" class="com.intellij.ide.actions.OpenFileAction" icon="AllIcons.General.OpenProject"/>

diff --git a/resources_en/inspectionDescriptions/Annotator.html b/resources_en/inspectionDescriptions/Annotator.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<font face="verdana" size="-1">Allows you to see problems reported by language annotators in the results of batch code inspection.
+Allows you to see problems reported by language annotators in the results of batch code inspection.
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/InconsistentLineSeparators.html b/resources_en/inspectionDescriptions/InconsistentLineSeparators.html
@@ -1,10 +1,8 @@
 <html>
 <body>
-<font face="verdana" size="-1">
   This inspection detects files with line separators different from the project default.
   E.g. you set the line separator to "\n" in the Settings|Code Style|Line separator,
   and the file you are editing uses '\r\n' as a line separator.
-</font>
 
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/LossyEncoding.html b/resources_en/inspectionDescriptions/LossyEncoding.html
@@ -1,18 +1,17 @@
 <html>
 <body>
-<font face="verdana" size="-1">
-  This inspection warns you of characters that the current document encoding is incapable to represent.<br>
 
-  For example, when you are<br>
-  <ul>
-    <li>typing international characters in a document configured to <b>US-ASCII</b> charset. Some characters will be lost on save.</li>
-    <li>or loading <b>UTF-8</b>-encoded file using <b>ISO-8859-1</b> one-byte charset. Some characters will be displayed incorrectly.</li>
-  </ul>
+This inspection warns you of characters that the current document encoding is incapable to represent. <br>
 
-  You fix this by changing the file encoding,
-  either by specifying the encoding directly in the file, e.g. by editing <b>encoding=</b> attribute in the XML prolog of XML file,
-  or configuring the <b>Settings|Project Settings|File Encodings</b>.
-</font>
+For example, when you are <br>
+<ul>
+  <li>typing international characters in a document configured to <b>US-ASCII</b> charset. Some characters will be lost on save.</li>
+  <li>or loading <b>UTF-8</b>-encoded file using <b>ISO-8859-1</b> one-byte charset. Some characters will be displayed incorrectly.</li>
+</ul>
+
+You fix this by changing the file encoding,
+either by specifying the encoding directly in the file, e.g. by editing <b>encoding=</b> attribute in the XML prolog of XML file,
+or configuring the <b>Settings|Project Settings|File Encodings</b> .
 
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/SyntaxError.html b/resources_en/inspectionDescriptions/SyntaxError.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-<font face="verdana" size="-1">Allows you to see syntax errors in the results of batch code inspection.
+Allows you to see syntax errors in the results of batch code inspection.
 </body>
 </html>
diff --git a/resources_en/messages/ActionsBundle.properties b/resources_en/messages/ActionsBundle.properties
@@ -57,6 +57,7 @@ group.EditorActions.text=Editor Actions
 action.EditorChooseLookupItem.text=Choose Lookup Item
 action.EditorChooseLookupItemReplace.text=Choose Lookup Item Replace
 action.EditorChooseLookupItemCompleteStatement.text=Choose Lookup Item and Invoke Complete Statement
+action.EditorChooseLookupItemDot.text=Choose Lookup Item and Insert Dot
 action.NextTemplateVariable.text=Next Template Variable or Finish In-Place Refactoring
 action.PreviousTemplateVariable.text=Previous Template Variable
 action.NextParameter.text=Next Parameter
@@ -108,6 +109,7 @@ action.EditorMoveDownAndScroll.text=Move Down and Scroll
 action.EditorMoveUpAndScrollWithSelection.text=Move Up and Scroll with Selection
 action.EditorMoveDownAndScrollWithSelection.text=Move Down and Scroll with Selection
 action.EditorAddOrRemoveCaret.text=Add or Remove Caret
+action.EditorCreateRectangularSelection.text=Create Rectangular Selection
 action.EditorCloneCaretBelow.text=Clone Caret Below
 action.EditorCloneCaretAbove.text=Clone Caret Above
 action.SelectNextOccurrence.text=Add Selection for Next Occurrence
@@ -404,14 +406,30 @@ action.MethodHierarchy.description=Browse method hierarchy for the selected meth
 action.CallHierarchy.text=Call Hierarch_y
 action.CallHierarchy.description=Browse call hierarchy for the selected method
 group.FoldingGroup.text=Folding
+group.ExpandToLevel.text=Expand to l_evel
+action.ExpandToLevel1.text=_1
+action.ExpandToLevel2.text=_2
+action.ExpandToLevel3.text=_3
+action.ExpandToLevel4.text=_4
+action.ExpandToLevel5.text=_5
+group.ExpandAllToLevel.text=Expand all to _level
+action.ExpandAllToLevel1.text=_1
+action.ExpandAllToLevel2.text=_2
+action.ExpandAllToLevel3.text=_3
+action.ExpandAllToLevel4.text=_4
+action.ExpandAllToLevel5.text=_5
 action.ExpandRegion.text=E_xpand
 action.ExpandRegion.description=Expand folding region at caret
+action.ExpandRegionRecursively.text=Expand _Recursively
+action.ExpandRegionRecursively.description=Expand block at caret recursively
 action.CollapseRegion.text=_Collapse
 action.CollapseRegion.description=Collapse folding region at caret
+action.CollapseRegionRecursively.text=Coll_apse Recursively
+action.CollapseRegionRecursively.description=Collapse block at caret recursively
 action.ExpandAllRegions.text=_Expand All
-action.ExpandAllRegions.description=Expand all folding regions
+action.ExpandAllRegions.description=Expand all folding regions (in selection)
 action.CollapseAllRegions.text=Collapse _All
-action.CollapseAllRegions.description=Collapse all folding regions
+action.CollapseAllRegions.description=Collapse all folding regions (in selection)
 action.ExpandDocComments.text=Expand _doc comments
 action.ExpandDocComments.description=Expand all documentation comments
 action.CollapseDocComments.text=Collapse d_oc comments
@@ -468,6 +486,8 @@ action.Forward.text=For_ward
 action.Forward.description=Redo last undone navigation operation
 action.JumpToLastChange.text=Last Edit L_ocation
 action.JumpToLastChange.description=Move through the most recent change points
+action.JumpToNextChange.text=Next Edit Location
+action.JumpToNextChange.description=Move through the most recent change points
 action.PreviousOccurence.text=Previ_ous Occurrence
 action.PreviousOccurence.description=Navigate to the previous occurrence
 action.NextOccurence.text=Ne_xt Occurrence
@@ -497,6 +517,8 @@ action.ClassNameCompletion.text=Class _Name Completion
 action.ClassNameCompletion.description=Complete class name and add import for it
 action.InsertLiveTemplate.text=Insert Live _Template...
 action.InsertLiveTemplate.description=Show popup list of live templates starting with the specified prefix
+action.ExpandLiveTemplateCustom.text=Expand Live Template
+action.ExpandLiveTemplateCustom.description=Invoke the live template with the prefix typed in the editor
 action.SurroundWithLiveTemplate.text=Surround with Live Tem_plate...
 action.SurroundWithLiveTemplate.description=Surrounds the selection with one of the template
 action.CommentByLineComment.text=Comment with _Line Comment
@@ -926,8 +948,12 @@ action.XDebugger.RemoveWatch.text=Remove Watch
 action.XDebugger.RemoveAllWatches.text=Remove All Watches
 action.XDebugger.NewWatch.text=New Watch...
 action.XDebugger.EditWatch.text=Edit...
-action.XDebugger.AutoTooltip.text=Value Auto Tooltip
+action.XDebugger.AutoTooltip.text=Value auto tooltip
 action.XDebugger.AutoTooltip.description=Toggles if value tooltip is shown automatically on mouse over
+action.XDebugger.Inline.text=Show values in editor
+action.XDebugger.Inline.description=Show available debugger session values inside editor
+action.XDebugger.AutoTooltipOnSelection.text=Show value on selection change
+action.XDebugger.AutoTooltipOnSelection.description=Toggles if value tooltip is shown automatically on selection change in editor
 action.XDebugger.ToggleSortValues.text=Sort values alphabetically
 action.XDebugger.ToggleSortValues.description=Sort values alphabetically in debugger views
 group.XDebugger.settings.text=Settings
@@ -972,13 +998,13 @@ group.EditorPopupMenu.GoTo.text=Go To
 group.EditorPopupMenu.GoTo.description=Go To Editor Popup Menu Group
 action.CompareClipboardWithSelection.text=Compare with Clip_board
 action.CompareClipboardWithSelection.description=Compare current selection with clipboard
-action.ChangeColorScheme.text=Switch Color Scheme
+action.ChangeColorScheme.text=Color Scheme
 action.ChangeColorScheme.description=Change current color scheme
-action.ChangeCodeStyleScheme.text=Switch Code Style Scheme
+action.ChangeCodeStyleScheme.text=Code Style Scheme
 action.ChangeCodeStyleScheme.description=Change current code style scheme
-action.ChangeKeymap.text=Switch Keymap
+action.ChangeKeymap.text=Keymap
 action.ChangeKeymap.description=Change current keymap
-action.ChangeLaf.text=Switch Look and Feel
+action.ChangeLaf.text=Look and Feel
 action.ChangeLaf.description=Change current Look\\&Feel
 action.ChangeInspectionProfile.text=Switch Error Highlighting
 action.ChangeInspectionProfile.description=Change current editor inspection profile
@@ -1024,6 +1050,8 @@ action.Vcs.ExcludeAction.description=Exclude from commit
 action.Vcs.IncludeAction.text=Include into Commit
 action.Vcs.IncludeAction.description=Include into commit
 action.openAssertEqualsDiff.text=View assertEquals Difference
+action.UsageView.Rerun.text=Rerun
+action.UsageView.Rerun.description=Rerun search
 action.UsageView.Include.text=Include
 action.UsageView.Include.description=Include this usage(s) into processing
 action.UsageView.Exclude.text=Exclude
@@ -1100,8 +1128,8 @@ action.ChangesView.NewChangeList.text=New Changelist
 action.ChangesView.NewChangeList.description=Create new changelist
 action.ChangesView.Commit.text=Comm_it Changes
 action.ChangesView.Commit.description=Commit the changes in selected changelist
-action.ChangesView.Rollback.text=Rollback
-action.ChangesView.Rollback.description=Rollback selected changes
+action.ChangesView.Revert.text=_Revert
+action.ChangesView.Revert.description=Revert selected changes
 action.ChangesView.RemoveChangeList.text=Delete Changelist
 action.ChangesView.RemoveChangeList.description=Remove changelist and move all changes to default
 action.ChangesView.SetDefault.text=Set Active Changelist
@@ -1349,16 +1377,15 @@ action.MarkAsOriginalTypeAction.text=Mark as
 
 action.Console.Execute.text=Execute Current Statement
 action.Console.Execute.description=Execute current statement in console
-action.Console.History.Previous.text=Previous
+action.Console.History.Previous.text=Previous history entry
 action.Console.History.Previous.description=Previous console history entry
-action.Console.History.Next.text=Next
+action.Console.History.Next.text=Next history entry
 action.Console.History.Next.description=Next console history entry
 action.Console.History.Browse.text=Browse History
 action.Console.History.Browse.description=Browse console history
-action.RevealIn.text=Show/Reveal in Explorer/Finder/Konqueror/Nautilus
 action.RevealIn.description=Highlights the file in platform's file manager
 action.GoToLinkTarget.text=Go to Link Target
-action.GoToLinkTarget.description=Opens a target ot this symlink in the Project View
+action.GoToLinkTarget.description=Opens a target of this symlink in the Project View
 
 action.Images.EditExternally.text=Jump to External Editor
 action.Images.EditExternally.description=Open image in external editor