更新到2018.3

ewen0930 · Nov 27, 2018 · c3ac484 · c3ac484
1 parent 3283449
commit c3ac484
Show file tree

Hide file tree

Showing 90 changed files with 5,743 additions and 1,546 deletions.
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.9.4
-Created-By: 1.8.0_152-release-1248-b8 (JetBrains s.r.o)
+Created-By: 1.8.0_152-release-1343-b15 (JetBrains s.r.o)
 
diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle.properties
@@ -21,7 +21,6 @@ clone.repository.url.autocomplete.login.tooltip=Log in to see your repositories
 cloning.repository=Cloning source repository {0}
 commit.amend=Amend commit
 commit.amend.tooltip=<html>Merge this commit with the previous one</html>
-push.force.confirmation.text=You''re going to force push{0}. It may overwrite commits at the remote. Are you sure you want to proceed?
 sync.setting=Execute branch operations on all roots
 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.

diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_CN.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_CN.properties
@@ -21,10 +21,9 @@ clone.repository.url.autocomplete.login.tooltip=\u767b\u5f55\u5230URL\u5217\u886
 cloning.repository=\u514b\u9686\u6e90\u4ed3\u5e93{0}
 commit.amend=\u4fee\u6539\u63d0\u4ea4
 commit.amend.tooltip=<html>\u5c06\u6b64\u63d0\u4ea4\u4e0e\u524d\u4e00\u4e2a</html>\u5408\u5e76
-push.force.confirmation.text=\u60a8\u5c06\u5f3a\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u4f1a\u8986\u76d6\u8fdc\u7a0b\u7684\u63d0\u4ea4\u3002\u4f60\u786e\u5b9a\u8981\u7ee7\u7eed\u5417\uff1f
 sync.setting=\u5728\u6240\u6709\u6839\u4e0a\u6267\u884c\u5206\u652f\u64cd\u4f5c
 sync.setting.description=\u5982\u679c\u9009\u4e2d\uff0c\u60a8\u5c06\u53ef\u4ee5\u901a\u8fc7\u4e00\u4e2a\u64cd\u4f5c\u68c0\u51fa\uff0c\u6bd4\u8f83\uff0c\u5220\u9664\u548c\u521b\u5efa\u6240\u6709{0}\u6839\u76ee\u5f55\u4e2d\u7684\u65b0\u5206\u652f\u3002\u8fd9\u4e5f\u4f1a\u5f71\u54cd\u63a8\u9001\u5bf9\u8bdd\u6846\u7684\u884c\u4e3a\u3002
-executable.path.project.override=\u8bbe\u7f6e\u6b64\u8def\u5f84\u4e3a\u5f53\u524d\u9879\u76ee
+executable.path.project.override=Set this path only for current project
 # poor naming, remove when there's no external usages
 clone.test.success.message=\u8fde\u63a5\u6210\u529f
 clone.destination.exists.error=\u76ee\u5f55{0}\u5df2\u7ecf\u5b58\u5728\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u76ee\u5f55\u3002

diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_TW.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_TW.properties
@@ -21,10 +21,9 @@ clone.repository.url.autocomplete.login.tooltip=\u767b\u5165\u5230URL\u6e05\u55a
 cloning.repository=\u514b\u9686\u6e90\u5009\u5eab{0}
 commit.amend=\u4fee\u6539\u63d0\u4ea4
 commit.amend.tooltip=<html>\u5c07\u6b64\u63d0\u4ea4\u8207\u524d\u4e00\u500b</html>\u5408\u4f75
-push.force.confirmation.text=\u60a8\u5c07\u5f37\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u6703\u8986\u5beb\u9060\u7aef\u7684\u63d0\u4ea4\u3002\u4f60\u78ba\u5b9a\u8981\u7e7c\u7e8c\u55ce\uff1f
 sync.setting=\u5728\u6240\u6709\u6839\u4e0a\u57f7\u884c\u5206\u652f\u64cd\u4f5c
 sync.setting.description=\u5982\u679c\u9078\u53d6\uff0c\u60a8\u5c07\u53ef\u4ee5\u900f\u904e\u4e00\u500b\u64cd\u4f5c\u6aa2\u51fa\uff0c\u6bd4\u8f03\uff0c\u522a\u9664\u548c\u5efa\u7acb\u6240\u6709{0}\u6839\u76ee\u9304\u4e2d\u7684\u65b0\u5206\u652f\u3002\u9019\u4e5f\u6703\u5f71\u97ff\u63a8\u9001\u5c0d\u8a71\u65b9\u584a\u7684\u884c\u70ba\u3002
-executable.path.project.override=\u8a2d\u5b9a\u6b64\u8def\u5f91\u70ba\u76ee\u524d\u9805\u76ee
+executable.path.project.override=Set this path only for current project
 # poor naming, remove when there's no external usages
 clone.test.success.message=\u9023\u63a5\u6210\u529f
 clone.destination.exists.error=\u76ee\u9304{0}\u5df2\u7d93\u5b58\u5728\u3002\u8acb\u9078\u53d6\u53e6\u4e00\u500b\u76ee\u9304\u3002

diff --git a/resources_en/com/intellij/json/JsonBundle.properties b/resources_en/com/intellij/json/JsonBundle.properties
@@ -6,6 +6,7 @@ syntax.error.missing.closing.quote=Missing closing quote
 syntax.error.illegal.escape.sequence=Illegal escape sequence
 syntax.error.illegal.unicode.escape.sequence=Illegal unicode escape sequence
 syntax.error.illegal.floating.point.literal=Illegal floating point literal
+syntax.error.control.char.in.string=Control character ''{0}'' is not allowed in string literals
 
 # Inspections
 json.inspection.group=JSON and JSON5
@@ -25,7 +26,7 @@ inspection.compliance.option.trailing.comma=Warn about trailing commas
 inspection.compliance.option.nan.infinity=Warn about NaN and Infinity/-Infinity numeric values
 
 inspection.duplicate.keys.name=Duplicate keys in object literals
-inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys "{0}"
+inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys ''{0}''
 
 # Formatter
 formatter.align.properties.caption=Align
@@ -38,6 +39,8 @@ formatter.align.properties.on.value=On value
 quickfix.add.double.quotes.desc=Wrap with double quotes
 
 surround.with.object.literal.desc=object literal
+surround.with.array.literal.desc=array literal
+surround.with.quotes.desc=quotes
 json.template.context.type=JSON
 
 json.copy.to.clipboard=Copy {0} to clipboard
@@ -49,6 +52,14 @@ json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show
 json.schema.file.selector.title=Schema file or URL:
 json.schema.file.not.found=File not found
 json.schema.inspection.compliance.name=Compliance with JSON schema
+json.schema.inspection.case.insensitive.enum=Case insensitive matching for enum values
+
+json.schema.ref.refs.inspection.name=Unresolved '$ref' and '$schema' references
+json.schema.ref.file.not.found=File ''{0}'' not found
+json.schema.ref.cannot.resolve.path=Cannot resolve path ''{0}''
+json.schema.ref.cannot.resolve.id=Cannot resolve id ''{0}''
+json.schema.ref.no.array.element=Array doesn''t contain element with index '{0}'
+json.schema.ref.no.property=Property ''{0}'' not found
 
 settings.json.schema.add.mapping=Add mapping
 settings.json.schema.edit.mapping=Edit mapping

diff --git a/resources_en/com/intellij/json/JsonBundle_zh_CN.properties b/resources_en/com/intellij/json/JsonBundle_zh_CN.properties
@@ -6,6 +6,7 @@ syntax.error.missing.closing.quote=\u7f3a\u5c11\u7ed3\u675f\u62a5\u4ef7
 syntax.error.illegal.escape.sequence=\u975e\u6cd5\u8f6c\u4e49\u5e8f\u5217
 syntax.error.illegal.unicode.escape.sequence=\u975e\u6cd5unicode\u8f6c\u4e49\u5e8f\u5217
 syntax.error.illegal.floating.point.literal=\u975e\u6cd5\u7684\u6d6e\u70b9\u6587\u5b57
+syntax.error.control.char.in.string=Control character ''{0}'' is not allowed in string literals
 
 # Inspections
 json.inspection.group=JSON and JSON5
@@ -25,7 +26,7 @@ inspection.compliance.option.trailing.comma=\u5173\u4e8e\u9017\u53f7\u7684\u8b66
 inspection.compliance.option.nan.infinity=Warn about NaN and Infinity/-Infinity numeric values
 
 inspection.duplicate.keys.name=\u5bf9\u8c61\u6587\u5b57\u4e2d\u91cd\u590d\u7684\u952e
-inspection.duplicate.keys.msg.duplicate.keys=\u5bf9\u8c61\u5305\u542b\u91cd\u590d\u952e\u201c{0}\u201d
+inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys ''{0}''
 
 # Formatter
 formatter.align.properties.caption=\u5bf9\u9f50
@@ -38,9 +39,11 @@ formatter.align.properties.on.value=\u4ef7\u503c
 quickfix.add.double.quotes.desc=\u7528\u53cc\u5f15\u53f7\u5305\u8d77\u6765
 
 surround.with.object.literal.desc=\u5bf9\u8c61\u6587\u5b57
+surround.with.array.literal.desc=array literal
+surround.with.quotes.desc=\u5f15\u7528
 json.template.context.type=JSON
 
-json.copy.to.clipboard=Copy {0} to clipboard
+json.copy.to.clipboard=\u62f7\u8d1d {0} \u5230\u526a\u8d34\u677f
 
 #json schema
 json.schema.add.schema.chooser.title=\u9009\u62e9JSON\u6a21\u5f0f\u6587\u4ef6
@@ -49,6 +52,14 @@ json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show
 json.schema.file.selector.title=Schema file or URL:
 json.schema.file.not.found=\u6587\u4ef6\u672a\u627e\u5230
 json.schema.inspection.compliance.name=\u7b26\u5408JSON\u6a21\u5f0f
+json.schema.inspection.case.insensitive.enum=\u679a\u4e3e\u503c\u4e0d\u533a\u5206\u5927\u5c0f\u5199\u7684\u5339\u914d
+
+json.schema.ref.refs.inspection.name=Unresolved '$ref' and '$schema' references
+json.schema.ref.file.not.found=\u672a\u627e\u5230\u6587\u4ef6 ''{0}''
+json.schema.ref.cannot.resolve.path=Cannot resolve path ''{0}''
+json.schema.ref.cannot.resolve.id=Cannot resolve id ''{0}''
+json.schema.ref.no.array.element=\u6570\u7ec4\u4e0d\u5305\u542b\u7d22\u5f15\u5143\u7d20 '{0}'
+json.schema.ref.no.property=\u672a\u627e\u5230\u5c5e\u6027 ''{0}''
 
 settings.json.schema.add.mapping=\u6dfb\u52a0\u6620\u5c04
 settings.json.schema.edit.mapping=\u4fee\u6539\u6620\u5c04

diff --git a/resources_en/com/intellij/json/JsonBundle_zh_TW.properties b/resources_en/com/intellij/json/JsonBundle_zh_TW.properties
@@ -6,6 +6,7 @@ syntax.error.missing.closing.quote=\u7f3a\u5c11\u7d50\u675f\u5831\u50f9
 syntax.error.illegal.escape.sequence=\u975e\u6cd5\u8f49\u7fa9\u5e8f\u5217
 syntax.error.illegal.unicode.escape.sequence=\u975e\u6cd5unicode\u8f49\u7fa9\u5e8f\u5217
 syntax.error.illegal.floating.point.literal=\u975e\u6cd5\u7684\u6d6e\u9ede\u6587\u5b57
+syntax.error.control.char.in.string=Control character ''{0}'' is not allowed in string literals
 
 # Inspections
 json.inspection.group=JSON \u548c JSON5
@@ -25,7 +26,7 @@ inspection.compliance.option.trailing.comma=\u95dc\u65bc\u9017\u865f\u7684\u8b66
 inspection.compliance.option.nan.infinity=Warn about NaN and Infinity/-Infinity numeric values
 
 inspection.duplicate.keys.name=\u7269\u4ef6\u6587\u5b57\u4e2d\u91cd\u8907\u7684\u9375
-inspection.duplicate.keys.msg.duplicate.keys=\u7269\u4ef6\u5305\u542b\u91cd\u8907\u9375\u300c{0}\u300d
+inspection.duplicate.keys.msg.duplicate.keys=Object contains duplicate keys ''{0}''
 
 # Formatter
 formatter.align.properties.caption=\u5c0d\u9f4a
@@ -38,9 +39,11 @@ formatter.align.properties.on.value=\u50f9\u503c
 quickfix.add.double.quotes.desc=\u7528\u96d9\u5f15\u865f\u5305\u8d77\u4f86
 
 surround.with.object.literal.desc=\u7269\u4ef6\u6587\u5b57
+surround.with.array.literal.desc=array literal
+surround.with.quotes.desc=\u53c3\u7167
 json.template.context.type=JSON
 
-json.copy.to.clipboard=Copy {0} to clipboard
+json.copy.to.clipboard=\u62f7\u8c9d {0} \u5230\u526a\u8cbc\u7c3f
 
 #json schema
 json.schema.add.schema.chooser.title=\u9078\u53d6JSON\u6a21\u5f0f\u6a94\u6848
@@ -49,6 +52,14 @@ json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show
 json.schema.file.selector.title=Schema file or URL:
 json.schema.file.not.found=\u6a94\u6848\u672a\u627e\u5230
 json.schema.inspection.compliance.name=\u7b26\u5408JSON\u6a21\u5f0f
+json.schema.inspection.case.insensitive.enum=\u679a\u8209\u503c\u4e0d\u5340\u5206\u5927\u5c0f\u5beb\u7684\u7b26\u5408
+
+json.schema.ref.refs.inspection.name=Unresolved '$ref' and '$schema' references
+json.schema.ref.file.not.found=\u672a\u627e\u5230\u6a94\u6848 ''{0}''
+json.schema.ref.cannot.resolve.path=Cannot resolve path ''{0}''
+json.schema.ref.cannot.resolve.id=Cannot resolve id ''{0}''
+json.schema.ref.no.array.element=\u9663\u5217\u4e0d\u5305\u542b\u7d22\u5f15\u5143\u7d20 '{0}'
+json.schema.ref.no.property=\u672a\u627e\u5230\u5c6c\u6027 ''{0}''
 
 settings.json.schema.add.mapping=\u65b0\u589e\u6620\u5c04
 settings.json.schema.edit.mapping=\u4fee\u6539\u6620\u5c04

diff --git a/resources_en/com/intellij/spellchecker/util/SpellCheckerBundle_zh_CN.properties b/resources_en/com/intellij/spellchecker/util/SpellCheckerBundle_zh_CN.properties
@@ -37,14 +37,14 @@ add.custom.dictionaries=\u6dfb\u52a0\u81ea\u5b9a\u4e49\u5b57\u5178
 edit.custom.dictionary=\u7f16\u8f91\u81ea\u5b9a\u4e49\u5b57\u5178
 custom.dictionary.not.found.title=Custom Dictionary Is Not Found
 custom.dictionary.not.found=Custom dictionary is not found at path {0}
-dictionary.not.found.title=Dictionary Is Not Found
+dictionary.not.found.title=\u5b57\u5178\u6ca1\u6709\u627e\u5230
 dictionary.not.found=\u5728\u8def\u5f84 {0} \u4e2d\u627e\u4e0d\u5230\u5b57\u5178
 remove.custom.dictionaries=\u5220\u9664\u81ea\u5b9a\u4e49\u5b57\u5178
 no.words=\u6ca1\u6709\u989d\u5916\u7684\u5355\u8bcd
 no.custom.dictionaries=\u6ca1\u6709\u81ea\u5b9a\u4e49\u8bcd\u5178
 no.dictionaries=\u6ca1\u6709\u5b57\u5178\u53d1\u73b0
 dictionary.filetype.name=\u5b57\u5178
-dictionary.filetype.description=Spell Checker Dictionary
+dictionary.filetype.description=\u62fc\u5199\u68c0\u67e5\u5668\u5b57\u5178
 spellchecker=\u62fc\u5199\u68c0\u67e5
 changed.dict.title={0} \u5b57\u5178\u5df2\u7ecf\u6539\u53d8
 new.word.description=''{0}'' \u6dfb\u52a0\u5230\u5b57\u5178 {1}
@@ -56,6 +56,6 @@ app.dictionary=\u5e94\u7528\u7ea7\u5b57\u5178
 built.in.dictionary=\u5185\u7f6e\u7684
 words.list.dictionary=\u5355\u8bcd\u5217\u8868
 select.dictionary.title=\u9009\u62e9\u5b57\u5178
-max.number.of.corrections=Maximum number of suggestions
-use.single.dictionary=Use single dictionary for saving words
+max.number.of.corrections=\u6700\u5927\u5efa\u8bae\u6570
+use.single.dictionary=\u4f7f\u7528\u5355\u4e00\u5b57\u5178\u6765\u4fdd\u5b58\u5355\u8bcd
 advanced.settings=\u9ad8\u7ea7\u8bbe\u7f6e
diff --git a/resources_en/i18n/ExternalSystemBundle.properties b/resources_en/i18n/ExternalSystemBundle.properties
@@ -55,10 +55,10 @@ action.attach.external.project.text=Attach {0} project
 action.attach.external.project.description=Attach {0} project to the current ide project
 action.detach.external.project.text=Detach {0} project
 action.detach.external.project.description=Detach selected external project
-action.ignore.external.project.text=Ignore {0} project
-action.ignore.external.project.description=Ignore selected {0} project
-action.unignore.external.project.text=Unignore {0} project
-action.unignore.external.project.description=Unignore selected {0} project
+action.ignore.external.projects.text=Ignore {0} {1}
+action.ignore.external.projects.description=Ignore selected {0} {1}
+action.unignore.external.projects.text=Unignore {0} {1}
+action.unignore.external.projects.description=Unignore selected {0} {1}
 action.open.config.text=Open {0} config
 action.open.config.description=Allows to open project file of the linked {0} project at the editor
 
@@ -115,4 +115,7 @@ external.system.platform.sdk.invalid=Platform SDK does not point to valid JDK ({
 tasks.select.task.title=Select {0} Task
 tasks.edit.task.title=Edit {0} Task
 tasks.before.run.empty=Run {0} task
-tasks.before.run=Run {0} task ''{1}''
+tasks.before.run=Run {0} task ''{1}''
+# Debugger
+debugger.status.connected=Connected to the VM started by ''{0}'' {1}
+debugger.open.session.tab=Open the debugger session tab
diff --git a/resources_en/i18n/ExternalSystemBundle_zh_CN.properties b/resources_en/i18n/ExternalSystemBundle_zh_CN.properties
@@ -55,10 +55,10 @@ action.attach.external.project.text=\u9644\u52a0 {0} \u9879\u76ee
 action.attach.external.project.description=\u5c06 {0} \u9879\u76ee\u9644\u52a0\u5230\u5f53\u524d\u7684ide\u9879\u76ee
 action.detach.external.project.text=\u5206\u79bb {0} \u9879\u76ee
 action.detach.external.project.description=\u5206\u79bb\u9009\u5b9a\u7684\u5916\u90e8\u9879\u76ee
-action.ignore.external.project.text=\u5ffd\u7565 {0} \u9879\u76ee
-action.ignore.external.project.description=\u5ffd\u7565\u9009\u5b9a\u7684 {0} \u9879\u76ee
-action.unignore.external.project.text=Unignore {0} \u9879\u76ee
-action.unignore.external.project.description=\u53d6\u6d88\u5bf9\u9009\u5b9a\u7684 {0} \u9879\u76ee\u8fdb\u884c\u53d6\u6d88
+action.ignore.external.projects.text=\u5ffd\u7565 {0} {1}
+action.ignore.external.projects.description=\u5ffd\u7565\u9009\u5b9a\u7684 {0} {1}
+action.unignore.external.projects.text=\u89e3\u9664\u5ffd\u7565 {0} {1}
+action.unignore.external.projects.description=\u89e3\u9664\u5ffd\u7565\u9009\u5b9a\u7684 {0} {1}
 action.open.config.text=\u6253\u5f00 {0} \u914d\u7f6e
 action.open.config.description=\u5141\u8bb8\u5728\u7f16\u8f91\u5668\u4e2d\u6253\u5f00\u94fe\u63a5\u7684 {0} \u9879\u76ee\u7684\u9879\u76ee\u6587\u4ef6
 
@@ -115,4 +115,7 @@ external.system.platform.sdk.invalid=\u5e73\u53f0SDK\u4e0d\u6307\u5411\u6709\u65
 tasks.select.task.title=\u9009\u62e9 {0} \u4efb\u52a1
 tasks.edit.task.title=\u7f16\u8f91 {0} \u4efb\u52a1
 tasks.before.run.empty=\u8fd0\u884c {0} \u4efb\u52a1
-tasks.before.run=\u8fd0\u884c {0} \u4efb\u52a1 ''{1}''
+tasks.before.run=\u8fd0\u884c {0} \u4efb\u52a1 ''{1}''
+# Debugger
+debugger.status.connected=\u8fde\u63a5\u5230VM\u542f\u52a8 ''{0}'' {1}
+debugger.open.session.tab=\u6253\u5f00\u8c03\u8bd5\u5668\u4f1a\u8bdd\u9009\u9879\u5361
diff --git a/resources_en/i18n/ExternalSystemBundle_zh_TW.properties b/resources_en/i18n/ExternalSystemBundle_zh_TW.properties
@@ -55,10 +55,10 @@ action.attach.external.project.text=\u9644\u52a0 {0} \u9805\u76ee
 action.attach.external.project.description=\u5c07 {0} \u9805\u76ee\u9644\u52a0\u5230\u76ee\u524d\u7684ide\u9805\u76ee
 action.detach.external.project.text=\u5206\u96e2 {0} \u9805\u76ee
 action.detach.external.project.description=\u5206\u96e2\u9078\u64c7\u7684\u5916\u90e8\u9805\u76ee
-action.ignore.external.project.text=\u5ffd\u7565 {0} \u9805\u76ee
-action.ignore.external.project.description=\u5ffd\u7565\u9078\u64c7\u7684 {0} \u9805\u76ee
-action.unignore.external.project.text=Unignore {0} \u9805\u76ee
-action.unignore.external.project.description=\u53d6\u6d88\u5c0d\u9078\u64c7\u7684 {0} \u9805\u76ee\u9032\u884c\u53d6\u6d88
+action.ignore.external.projects.text=\u5ffd\u7565 {0} {1}
+action.ignore.external.projects.description=\u5ffd\u7565\u9078\u64c7\u7684 {0} {1}
+action.unignore.external.projects.text=\u89e3\u9664\u5ffd\u7565 {0} {1}
+action.unignore.external.projects.description=\u89e3\u9664\u5ffd\u7565\u9078\u64c7\u7684 {0} {1}
 action.open.config.text=\u958b\u555f {0} \u8a2d\u5b9a
 action.open.config.description=\u5141\u8a31\u5728\u7de8\u8f2f\u5668\u4e2d\u958b\u555f\u9023\u7d50\u7684 {0} \u9805\u76ee\u7684\u9805\u76ee\u6a94\u6848
 
@@ -115,4 +115,7 @@ external.system.platform.sdk.invalid=\u5e73\u53f0SDK\u4e0d\u6307\u5411\u6709\u65
 tasks.select.task.title=\u9078\u53d6 {0} \u5de5\u4f5c
 tasks.edit.task.title=\u7de8\u8f2f {0} \u5de5\u4f5c
 tasks.before.run.empty=\u57f7\u884c {0} \u5de5\u4f5c
-tasks.before.run=\u57f7\u884c {0} \u5de5\u4f5c ''{1}''
+tasks.before.run=\u57f7\u884c {0} \u5de5\u4f5c ''{1}''
+# Debugger
+debugger.status.connected=\u9023\u63a5\u5230VM\u555f\u52d5 ''{0}'' {1}
+debugger.open.session.tab=\u958b\u555f\u8a3a\u65b7\u5668\u6703\u8a71\u9078\u9805\u5361
diff --git a/resources_en/inspectionDescriptions/AlphaUnsortedPropertiesFile.html b/resources_en/inspectionDescriptions/AlphaUnsortedPropertiesFile.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-This inspection reports on alphabetically unsorted resource bundles or properties files.
+Reports on alphabetically unsorted resource bundles or properties files.
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/BlockingMethodInNonBlockingContext.html b/resources_en/inspectionDescriptions/BlockingMethodInNonBlockingContext.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+Reports thread-blocking method calls found in a code fragment where a thread should not be blocked
+<!-- tooltip end -->
+(e.g. Reactive frameworks, Kotlin coroutines)
+</body>
+</html>
diff --git a/resources_en/inspectionDescriptions/JsonSchemaRefReference.html b/resources_en/inspectionDescriptions/JsonSchemaRefReference.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This inspection checks that '$ref' and '$schema' paths are valid<br>
+</body>
+</html>
diff --git a/resources_en/inspectionDescriptions/ObjectsEqualsCanBeSimplified.html b/resources_en/inspectionDescriptions/ObjectsEqualsCanBeSimplified.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+Reports calls to <b>Objects.equals(a, b)</b> where the first argument is statically known to be non-null.
+  Such a call can be safely replaced with <b>a.equals(b)</b> or <b>a == b</b> if both arguments are primitives.
+<!-- tooltip end -->
+<p><small>New in 2018.3</small></p>
+</body>
+</html>
diff --git a/resources_en/inspectionDescriptions/RedundantSuppression.html b/resources_en/inspectionDescriptions/RedundantSuppression.html
@@ -0,0 +1,27 @@
+<html>
+<body>
+Reports usages of
+<ul>
+  <li><code>@SuppressWarning</code> annotation, or</li>
+  <li><code>// noinspection</code> line comment, or</li>
+  <li><code>/** noinspection */</code> JavaDoc comment</li>
+</ul>
+
+which can be safely removed because inspection they affect is no longer applicable in this context.
+<p>
+  For example:
+  <code><pre>
+<b><font color="#000080">public class</font></b> C {
+ // symbol is already private,
+ // but annotation is still around
+  @SuppressWarnings({"WeakerAccess"})
+ <b><font color="#000080">private boolean</font></b> CONST = <b><font color="#000080">true</font></b>;
+ <b><font color="#000080">void</font></b> f() {
+    CONST = <b><font color="#000080">false</font></b>;
+  }
+}
+</pre>
+  </code>
+
+</body>
+</html>
diff --git a/resources_en/inspectionDescriptions/RequiredAttributes.html b/resources_en/inspectionDescriptions/RequiredAttributes.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-This inspection reports XML/HTML tags with missing mandatory attributes.
+Reports XML/HTML tags with missing mandatory attributes.
 You can specify attribute names that should not be reported.
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/WrongPropertyKeyValueDelimiter.html b/resources_en/inspectionDescriptions/WrongPropertyKeyValueDelimiter.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-This inspection reports on properties in which key/value delimiter doesn't match code style settings.
+Reports on properties in which key/value delimiter doesn't match code style settings.
 </body>
 </html>
diff --git a/resources_en/inspectionDescriptions/XmlDeprecatedElement.html b/resources_en/inspectionDescriptions/XmlDeprecatedElement.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+This inspection checks for deprecated XML elements.
+<p>The elements can be marked by XML comment or documentation tag with text "deprecated".
+</body>
+</html>
diff --git a/resources_en/intentionDescriptions/CDataToTextIntention/after.xml.template b/resources_en/intentionDescriptions/CDataToTextIntention/after.xml.template
@@ -0,0 +1 @@
+<tag><spot> foo bar </spot></tag>
diff --git a/resources_en/intentionDescriptions/CDataToTextIntention/before.xml.template b/resources_en/intentionDescriptions/CDataToTextIntention/before.xml.template
@@ -0,0 +1 @@
+<tag><spot><![CDATA[ foo bar ]]></spot></tag>
diff --git a/resources_en/intentionDescriptions/CDataToTextIntention/description.html b/resources_en/intentionDescriptions/CDataToTextIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Surrounds the text with the CDATA section and, if necessary, removes the escaping from it
+</body>
+</html>
diff --git a/resources_en/intentionDescriptions/RearrangeAttributesIntention/after.xml.template b/resources_en/intentionDescriptions/RearrangeAttributesIntention/after.xml.template
@@ -0,0 +1 @@
+<tag <spot>a="a" b="value"</spot>></tag>
diff --git a/resources_en/intentionDescriptions/RearrangeAttributesIntention/before.xml.template b/resources_en/intentionDescriptions/RearrangeAttributesIntention/before.xml.template
@@ -0,0 +1 @@
+<tag <spot>b="value" a="a"</spot>></tag>
diff --git a/resources_en/intentionDescriptions/RearrangeAttributesIntention/description.html b/resources_en/intentionDescriptions/RearrangeAttributesIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Rearranges tag attributes according to Code Style Arrangement settings
+</body>
+</html>