Skip to content

Commit

Permalink
更新到2017.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ewen0930 committed Jul 24, 2017
1 parent c4c3071 commit 15d9783
Show file tree
Hide file tree
Showing 68 changed files with 4,517 additions and 3,687 deletions.
2 changes: 1 addition & 1 deletion resources_en/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.9.4
Created-By: 1.8.0_112-release-736-b16 (JetBrains s.r.o)
Created-By: 1.8.0_152-release-915-b5 (JetBrains s.r.o)

6 changes: 3 additions & 3 deletions resources_en/com/intellij/dvcs/ui/DvcsBundle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
clone.button=Clone
clone.destination.directory.description=Select a parent directory destination directory for clone
clone.destination.directory.description=Select a parent directory for the clone
clone.destination.directory.title=Parent Directory
clone.destination.exists.error=The directory {0} already exists. Please choose another directory.
clone.dir.name=Directory &Name:
Expand All @@ -8,7 +8,7 @@ clone.parent.dir=&Parent Directory:
clone.parent.missing.error=The parent path {0} must exist.
clone.repository.url={0} Repository URL:
clone.test.failed.error=Repository test has failed.
clone.test.success.message=<html>Connection to repository {0} has been successful.</html>
clone.test.success.message=<html>Connection to {0} was established successfully.</html>
clone.test.connection.title=Test Connection
clone.test=&Test
clone.testing=Testing {0}
Expand All @@ -21,4 +21,4 @@ push.force.confirmation.text = You''re going to force push{0}. It may overwrite

sync.setting=Control repositories &synchronously
sync.setting.description=If selected, you would be able to checkout, compare, delete and create new branches in all {0} \
roots with a single action. It will also affect behavior of the push dialog.
roots with a single action. It will also affect behavior of the push dialog.
7 changes: 3 additions & 4 deletions resources_en/com/intellij/json/JsonBundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ inspection.duplicate.keys.name=Duplicate keys in object literals
inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys "{0}"

# Formatter
formatter.other.tab.group.title=Formatting options
formatter.other.tab.label.align.properties=Align object &properties:
formatter.other.tab.remove.trailing.comma=Remove trailing &comma
formatter.align.properties.caption=Align

formatter.align.properties.none=Do not align
formatter.align.properties.on.colon=On colon
Expand All @@ -40,4 +38,5 @@ surround.with.object.literal.desc=object literal
json.template.context.type=JSON

#json schema
json.schema.add.schema.chooser.title=Select JSON Schema File
json.schema.add.schema.chooser.title=Select JSON Schema File
json.schema.annotation.not.allowed.property=Property ''{0}'' is not allowed
27 changes: 27 additions & 0 deletions resources_en/com/intellij/tasks/TaskBundle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
failure.login=Login failed. Check your credentials.
failure.permissions=Request failed. Check your permissions.
failure.server.message=Request failed. Reason: {0}
failure.http.error=Request failed with HTTP error: {0,number} {1}.
failure.configuration=Not configured.

## JIRA
jira.default.query=assignee = currentUser() and resolution = Unresolved order by updated

# Missing features
jira.failure.no.REST=JIRA below 4.2.0 doesn't have REST API and is no longer supported.
# actually JQL support was first added to SOAP API for JIRA 4.0
jira.failure.no.JQL=JQL search cannot be used in JIRA versions prior 4.2.
jira.failure.no.state.update=Task state cannot be updated in JIRA versions prior 4.2.
jira.failure.no.time.spent=Time spent cannot be updated in JIRA versions prior 5.0.

jira.failure.captcha=Login failed. Enter captcha in web-interface.

## YouTrack
youtrack.default.query=for: me sort by: updated #Unresolved

## Bugzilla
bugzilla.failure.malformed.response=Cannot decode server response. Check that XML-RPC plugin is enabled.
bugzilla.failure.no.version=Cannot find Bugzilla version. Check that URL ends with "xmlrpc.cgi".

## Trello
trello.failure.write.access.required=This action requires write access to your account. Please update authorization token in settings.
3 changes: 2 additions & 1 deletion resources_en/i18n/ExternalSystemBundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ run.configuration.title.choose.registered.project=Choose {0} project
run.configuration.settings.label.project={0} project:
run.configuration.settings.label.tasks=Tasks:
run.configuration.settings.label.vmoptions=VM options:
run.configuration.settings.label.script.parameters=Script parameters:
run.configuration.settings.label.arguments=Arguments:
run.text.starting.multiple.task={0}: Executing external tasks ''{1}''...\n
run.text.starting.single.task={0}: Executing external task ''{1}''...\n
run.text.ended.multiple.task={0}: External tasks execution finished ''{1}''.\n
run.text.ended.single.task={0}: External task execution finished ''{1}''.\n
run.error.undefined.task=No task to execute is specified
run.invalid.jvm.agent.configuration=Invalid JVM agent configuration used ''{0}''

external.system.java.internal.jre=Use Internal JRE
external.system.java.home.env=Use JAVA_HOME
Expand Down
11 changes: 11 additions & 0 deletions resources_en/inspectionDescriptions/AnonymousGroup.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<html>
<body>
Reports anonymous capturing groups and numeric back references in a RegExp.
These are only reported when the RegExp dialect supports named group and named group references.
Named groups and named back references improve code readability and are recommended to use instead.
When a capture is not needed, matching can be more performant and use less memory by using a non-capturing group,
i.e. <b>(?:xxx)</b> instead of <b>(xxx)</b>.
<!-- tooltip end -->
<p><small>New in 2017.2</small>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<html>
<body>
Reports empty branches in a RegExp alternation. For example:<br> <code>a<b>|</b></code>
<!-- tooltip end -->
<p><small>New in 2017.2</small>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<body>
Reports HTML elements without a closing tag.
Some coding styles require a closing tag on HTML elements even where this is optional.
<!-- tooltip end -->
<p><small>New in 2017.2</small>
</body>
</html>
18 changes: 18 additions & 0 deletions resources_en/inspectionDescriptions/NonAsciiCharacters.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<html>
<body>

This inspection warns you of the code accidentally written in the wrong encoding.<br>

For example, <br>
<ul>
<li>Non-ASCII characters used in the names/strings/comments or</li>
<li>Identifiers written in different languages
(e.g. when in the variable "<code>my<span color="red">C</span>ollection</code>"
the letter <code><span color="red">C</span></code> written in Cyrillic) or</li>
<li>Unicode symbols used in comments or strings
(e.g. long dashes and arrows in the comment
"<code>// a <span color="red"></span> !a <span color="red"></span> please note</code>")</li>
</ul>

</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<html>
<body>
This inspection checks for redundant default XML attribute value assignment.
</body>
</html>
55 changes: 38 additions & 17 deletions resources_en/messages/ActionsBundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ action.EditorToggleShowWhitespaces.text=Sh_ow Whitespaces
action.EditorToggleShowWhitespaces.description=Toggle display whitespaces in current editor
action.EditorToggleShowIndentLines.text=Sh_ow Indent Guides
action.EditorToggleShowIndentLines.description=Toggle display indent guides in current editor
action.EditorToggleShowBreadcrumbs.text=Show Breadcrumbs
action.EditorToggleShowBreadcrumbs.description=Toggle display the breadcrumbs bar in current editor
action.EditorToggleShowLineNumbers.text=Show L_ine Numbers
action.EditorToggleShowLineNumbers.description=Toggle display line numbers in current editor
action.EditorToggleShowGutterIcons.text=Show Gutter Ic_ons
Expand Down Expand Up @@ -213,18 +215,25 @@ action.GenerateSetUpMethod.text=SetUp Method
action.GenerateTearDownMethod.text=TearDown Method
action.GenerateDataMethod.text=Parameters Method
action.GenerateConstructor.text=Constructor
action.GenerateConstructor.description=Generate constructor
action.GenerateCreateUI.text=createUI(...)
action.GenerateCreateUI.description=Generate createUI(...)
action.GenerateGetter.text=Getter
action.GenerateGetter.description=Generate getter
action.GenerateSetter.text=Setter
action.GenerateSetter.description=Generate setter
action.GenerateGetterAndSetter.text=Getter and Setter
action.GenerateGetterAndSetter.description=Generate getter and setter
action.GenerateEquals.text=equals() and hashCode()
action.GenerateEquals.description=Generate equals() and hashCode()
action.OverrideMethods.text=_Override Methods...
action.OverrideMethods.description=Override base class methods in the current class
action.ImplementMethods.text=_Implement Methods...
action.ImplementMethods.description=Implement base interface/class methods in the current class
action.DelegateMethods.text=_Delegate Methods...
action.DelegateMethods.description=Generate delegate method to a field/getter
action.GenerateSuperMethodCall.text=Super Method Call
action.GenerateSuperMethodCall.description=Generate super method call
action.NextDiff.text=Next Difference
action.NextDiff.description=Move to the next difference
action.PreviousDiff.text=Previous Difference
Expand All @@ -236,7 +245,7 @@ action.Diff.PreviousConflict.description=Move to the previous unresolved conflic
action.GotoChangedFile.text=Go To Changed File...
action.GotoChangedFile.description=Quickly navigate to changed file by name
action.Refresh.text=R_efresh
action.CheckinProject.text=Comm_it Project
action.CheckinProject.text=Comm_it
action.CheckinFiles.text=Comm_it File
action.UpdateFiles.text=_Update
action.CheckStatusForFiles.text=Chec_k Status
Expand Down Expand Up @@ -665,7 +674,9 @@ action.IntroduceConstant.description=Replace selected expression with a constant
action.IntroduceParameter.text=_Parameter...
action.IntroduceParameter.description=Turn the selected expression into method parameter
action.IntroduceFunctionalParameter.text=Functiona_l Parameter...
action.IntroduceFunctionalParameter.description=Replace selected statements with a call to new functional method parameter
action.IntroduceFunctionalParameter.description=Replace selected statements with a call to a new functional method parameter
action.IntroduceFunctionalVariable.text=Functional Variable...
action.IntroduceFunctionalVariable.description=Replace selected statements with a call to a new functional variable
action.ExtractInterface.text=_Interface...
action.ExtractInterface.description=Extract interface from the selected class
action.ExtractModule.text=_Module...
Expand Down Expand Up @@ -986,7 +997,8 @@ action.Help.KeymapReference.description=Open PDF file with the default keymap re
action.Help.JetBrainsTV.text=_Demos and Screencasts
action.Help.JetBrainsTV.description=View short live demos introducing features of JetBrains products.
action.CheckForUpdate.text=_Check for Updates...
action.CheckForUpdate.description=Check for available update
action.CheckForUpdate.description=Checks for available IDE and plugin updates
action.CheckForUpdate.description.plugins=Checks for available plugin updates
action.About.text=_About
action.About.description=Show information about the IDE
group.OtherMenu.text=Other
Expand Down Expand Up @@ -1028,7 +1040,6 @@ action.XDebugger.JumpToTypeSource.text=Jump To Type Source
action.XDebugger.JumpToTypeSource.description=Open source of the selected value's type
action.XDebugger.Inspect.text=Inspect...

action.Debugger.Tree.AddToWatches.text=Add to Watches
action.Debugger.Tree.EvaluateInConsole.text=Evaluate In Console

action.XDebugger.RemoveWatch.text=Remove Watch
Expand All @@ -1050,6 +1061,7 @@ action.XDebugger.ToggleSortValues.description=Sort values alphabetically in debu
group.XDebugger.settings.text=Settings

action.Debugger.AdjustArrayRange.text=Adjust Range...
action.Debugger.FilterArray.text=Filter...
action.Debugger.Inspect.text=Inspect
action.Debugger.CopyValue.text=Copy Value
action.Debugger.ViewEditText.text=View/Edit Text
Expand All @@ -1058,6 +1070,8 @@ action.Debugger.ViewText.description=View text value of selected node in a separ
action.Debugger.EditCustomField.text=Edit...
action.Debugger.NewCustomField.text=New Class Level Watch...
action.Debugger.RemoveCustomField.text=Remove Watch
action.Debugger.EditArrayFilter.text=Edit...
action.Debugger.RemoveArrayFilter.text=Remove Filter
action.Debugger.ShowReferring.text=Show Referring Objects...
action.Debugger.CompareValueWithClipboard.text=Compare Value with Clipboard
action.Debugger.CompareValueWithClipboard.description=Compare value of selected node with clipboard text
Expand Down Expand Up @@ -1211,6 +1225,8 @@ action.SendFeedback.text=Submit _Feedback...
action.SendFeedback.description=Submit feedback to the JetBrains Web site
action.ShowLog.text=Show _Log in File Manager
action.ShowLog.description=Opens folder with log file
action.CollectZippedLogs.text=Collect and Show Logs in File Manager
action.CollectZippedLogs.description=Collect and Zip logs and settings into file
action.EditCustomProperties.text=Edit Custom Properties...
action.EditCustomProperties.description=Opens an editor tab with a custom properties file
action.EditCustomVmOptions.text=Edit Custom VM Options...
Expand All @@ -1230,18 +1246,16 @@ action.ChangesView.Refresh.text=Refresh
action.ChangesView.Refresh.description=Refresh VCS changes
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.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.RemoveChangeList.text=Delete Changelists
action.ChangesView.RemoveChangeList.description=Remove changelists and move all changes to {0}
action.ChangesView.SetDefault.text=Set Active Changelist
action.ChangesView.SetDefault.description=Set changelist to which new changes are placed by default
action.ChangesView.Move.text=Move to Another Changelist...
action.ChangesView.Move.description=Move selected changes to another changelist
action.ChangesView.Diff.text=Show Diff
action.ChangesView.Diff.description=Show diff for selected change
action.ChangesView.Diff.description=Compare files or revisions
action.ChangesView.DeleteUnversioned.text=Delete
action.ChangesView.DeleteUnversioned.description=
action.ChangesView.AddUnversioned.text=Add to VCS
Expand All @@ -1252,7 +1266,7 @@ action.ChangesView.RemoveDeleted.text=Remove from VCS
action.ChangesView.RemoveDeleted.description=Schedule selected files to be removed from VCS
action.ChangesView.Rename.text=Edit Changelist...
action.ChangesView.Rename.description=Edit name and description of selected changelist
action.ChangesView.CreatePatch.text=Create Patch...
action.ChangesView.CreatePatch.text=Create Patch from Local Changes...
action.ChangesView.CreatePatch.description=Create a patch from the selected changes
action.ChangesView.ApplyPatch.text=Apply Patch...
action.ChangesView.ApplyPatch.description=Apply a patch to the sources of the project
Expand Down Expand Up @@ -1376,9 +1390,6 @@ action.SliceBackward.description=Search for values which can be assigned to sele
action.SliceForward.text=Analyze Data Flow _from Here
action.SliceSliceForward.description=Search for values escaped from this location

action.ShelvedChanges.Diff.text=Show Diff
action.ShelvedChanges.Diff.description=Show diff for selected change

action.ChangeTemplateDataLanguage.text=Change Template Data Language

group.FileOpenGroup.text=File Open Actions
Expand Down Expand Up @@ -1501,6 +1512,16 @@ action.EditorGutterToggleGlobalSoftWraps.text=Soft-Wrap All Files
action.EditorGutterToggleLocalSoftWraps.gutterText=Soft-Wrap Current File
action.EditorGutterToggleGlobalLineNumbers.text=Show Line Numbers
action.EditorGutterToggleGlobalIndentLines.text=Show Indent Guides

group.EditorBreadcrumbsSettings.text=Breadcrumbs
group.EditorBreadcrumbsSettings.description=Toggle the breadcrumbs bar settings
action.EditorBreadcrumbsShowAbove.text=Top
action.EditorBreadcrumbsShowAbove.description=Show the breadcrumbs bar above the text editor
action.EditorBreadcrumbsShowBelow.text=Bottom
action.EditorBreadcrumbsShowBelow.description=Show the breadcrumbs bar below the text editor
action.EditorBreadcrumbsHideBoth.text=Don't Show
action.EditorBreadcrumbsHideBoth.description=Hide the breadcrumbs bar

action.ExcludeFromProject.text=Exclude From Project...
group.MarkFileAs.text=Mark File as
action.MarkAsPlainTextAction.text=Mark as Plain Text
Expand Down Expand Up @@ -1546,9 +1567,6 @@ action.Images.Thumbnails.Hide.description=Close thumbnails window
action.Images.ShowThumbnails.text=Show Image Thumbnails
action.Images.ShowThumbnails.description=Show thumbnails view for current directory

action.Diff.UpdatedFiles.text=Show Diff
action.Diff.UpdatedFiles.description=Show diff with version before update

action.TabList.text=Show Hidden Tabs
action.TabList.description=Show dropdown with the list of tabs that don't fit on the screen in single-row tab layout

Expand Down Expand Up @@ -1578,4 +1596,7 @@ action.ToggleDistractionFreeMode.exit=Exit Distraction Free Mode
action.TogglePresentationMode.exit=Exit Presentation Mode
action.TogglePresentationMode.enter=Enter Presentation Mode

action.EmojiAndSymbols.description=Input special characters using macOS system palette
action.EmojiAndSymbols.description=Input special characters using macOS system palette

action.MethodOverloadSwitchUp.text=Previous Method Overload
action.MethodOverloadSwitchDown.text=Next Method Overload
Loading

0 comments on commit 15d9783

Please sign in to comment.