qfz9527 · qfz9527 · Oct 15, 2018 · Apr 3, 2018 · May 8, 2018 · Jul 30, 2018
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-1024-b11 (JetBrains s.r.o)
+Created-By: 1.8.0_152-release-1248-b8 (JetBrains s.r.o)
 
diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle.properties
@@ -1,24 +1,34 @@
-clone.button=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:
-clone.invalid.url=Repository URL is a malformed URL or non-existent directory.
-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 {0} was established successfully.</html>
-clone.test.connection.title=Test Connection
-clone.test=&Test
-clone.testing=Testing {0}
 clone.title=Clone Repository
-clone.url.is.not.directory.error=Repository URL is not a directory.
+clone.button=Clone
+clone.destination.directory.label=Directory:
+clone.destination.directory.browser.title=Destination Directory
+clone.destination.directory.browser.description=Select a parent directory for the clone
+clone.destination.directory.error.not.directory=Destination is not a directory
+clone.destination.directory.error.invalid=Invalid directory path
+clone.destination.directory.error.exists=The directory already exists and it is not empty
+clone.destination.directory.error.access=Couldn't create destination directory<br/>Check your access rights
+clone.repository.url.label=URL:
+clone.repository.url.error.invalid=Repository URL is a malformed URL or non-existent directory
+clone.repository.url.error.empty=Empty repository URL
+clone.repository.url.error.not.directory=Repository URL is not a directory
+clone.repository.url.test.label=Test
+clone.repository.url.test.title=Testing {0}
+clone.repository.url.test.success.message=Connection successful
+clone.repository.url.test.failed.message=Repository test failed<br/>{0}
+clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
+clone.repository.url.autocomplete.login.text=Log in to {0}...
+clone.repository.url.autocomplete.login.tooltip=Log in to see your repositories in the URL list
 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?
-
+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.
+executable.path.project.override=Set this path only for current project
+# poor naming, remove when there's no external usages
+clone.test.success.message=Connection successful
+clone.destination.exists.error=The directory {0} already exists. Please choose another directory.
+clone.parent.dir=&Parent Directory:
+clone.parent.missing.error=The parent path {0} must exist.
+clone.testing=Testing {0}
diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_CN.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_CN.properties
@@ -1,23 +1,33 @@
+clone.title=\u514b\u9686\u4ed3\u5e93
 clone.button=\u514b\u9686
-clone.destination.directory.description=\u9009\u62e9\u514b\u9686\u7684\u7236\u76ee\u5f55
-clone.destination.directory.title=\u7236\u76ee\u5f55
-clone.destination.exists.error=\u76ee\u5f55{0}\u5df2\u7ecf\u5b58\u5728\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u76ee\u5f55\u3002
-clone.dir.name=\u76ee\u5f55\u540d\u79f0(&N):
-clone.invalid.url=\u5b58\u50a8\u5e93URL\u662f\u683c\u5f0f\u4e0d\u6b63\u786e\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u5f55\u3002
-clone.parent.dir=\u7236\u76ee\u5f55(&P):
-clone.parent.missing.error=\u7236\u8def\u5f84{0}\u5fc5\u987b\u5b58\u5728\u3002
-clone.repository.url={0}\u8d44\u6599\u5e93\u7f51\u5740:
-clone.test.failed.error=\u7248\u672c\u5e93\u6d4b\u8bd5\u5931\u8d25\u3002
-clone.test.success.message=<html>\u4e0e{0}\u7684\u8fde\u63a5\u5df2\u6210\u529f\u5efa\u7acb\u3002</html>
-clone.test.connection.title=\u6d4b\u8bd5\u8fde\u63a5
-clone.test=\u6d4b\u8bd5(&T)
-clone.testing=\u6d4b\u8bd5{0}
-clone.title=\u514b\u9686\u5b58\u50a8\u5e93
-clone.url.is.not.directory.error=\u5b58\u50a8\u5e93URL\u4e0d\u662f\u4e00\u4e2a\u76ee\u5f55\u3002
-cloning.repository=\u514b\u9686\u6e90\u5b58\u50a8\u5e93{0}
+clone.destination.directory.label=\u76ee\u5f55:
+clone.destination.directory.browser.title=\u76ee\u6807\u76ee\u5f55
+clone.destination.directory.browser.description=\u9009\u62e9\u7236\u76ee\u5f55\u514b\u9686
+clone.destination.directory.error.not.directory=\u76ee\u7684\u5730\u5740\u4e0d\u662f\u4e00\u4e2a\u76ee\u5f55
+clone.destination.directory.error.invalid=\u65e0\u6548\u7684\u76ee\u5f55\u8def\u5f84
+clone.destination.directory.error.exists=\u76ee\u5f55\u5df2\u7ecf\u5b58\u5728\uff0c\u4f46\u4e0d\u662f\u7a7a\u7684
+clone.destination.directory.error.access=\u65e0\u6cd5\u521b\u5efa\u76ee\u6807\u76ee\u5f55<br/>\u68c0\u67e5\u4f60\u7684\u8bbf\u95ee\u6743\u9650
+clone.repository.url.label=URL:
+clone.repository.url.error.invalid=\u5b58\u50a8\u5e93URL\u662f\u4e00\u4e2a\u9519\u8bef\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u5f55
+clone.repository.url.error.empty=\u7a7a\u7684\u4ed3\u5e93URL
+clone.repository.url.error.not.directory=\u4ed3\u5e93URL\u4e0d\u662f\u76ee\u5f55
+clone.repository.url.test.label=\u6d4b\u8bd5
+clone.repository.url.test.title=\u6d4b\u8bd5 {0}
+clone.repository.url.test.success.message=\u8fde\u63a5\u6210\u529f
+clone.repository.url.test.failed.message=\u4ed3\u5e93\u6d4b\u8bd5\u5931\u8d25<br/>{0}
+clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
+clone.repository.url.autocomplete.login.text=\u767b\u5f55\u5230 {0}...
+clone.repository.url.autocomplete.login.tooltip=\u767b\u5f55\u5230URL\u5217\u8868\u4e2d\u67e5\u770b\u4f60\u7684\u4ed3\u5e93
+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
-
+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
+# 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
+clone.parent.dir=\u7236\u76ee\u5f55(&P):
+clone.parent.missing.error=\u7236\u8def\u5f84{0}\u5fc5\u987b\u5b58\u5728\u3002
+clone.testing=\u6d4b\u8bd5{0}
diff --git a/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_TW.properties b/resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_TW.properties
@@ -1,23 +1,33 @@
+clone.title=\u514b\u9686\u5009\u5eab
 clone.button=\u514b\u9686
-clone.destination.directory.description=\u9078\u53d6\u514b\u9686\u7684\u7236\u76ee\u9304
-clone.destination.directory.title=\u7236\u76ee\u9304
-clone.destination.exists.error=\u76ee\u9304{0}\u5df2\u7d93\u5b58\u5728\u3002\u8acb\u9078\u53d6\u53e6\u4e00\u500b\u76ee\u9304\u3002
-clone.dir.name=\u76ee\u9304\u540d\u7a31(&N):
-clone.invalid.url=\u5b58\u5132\u5eabURL\u662f\u683c\u5f0f\u4e0d\u6b63\u78ba\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u9304\u3002
-clone.parent.dir=\u7236\u76ee\u9304(&P):
-clone.parent.missing.error=\u7236\u8def\u5f91{0}\u5fc5\u9808\u5b58\u5728\u3002
-clone.repository.url={0}\u8cc7\u6599\u5eab\u7db2\u5740:
-clone.test.failed.error=\u7248\u672c\u5eab\u6e2c\u8a66\u5931\u6557\u3002
-clone.test.success.message=<html>\u8207{0}\u7684\u9023\u63a5\u5df2\u6210\u529f\u5efa\u7acb\u3002</html>
-clone.test.connection.title=\u6e2c\u8a66\u9023\u63a5
-clone.test=\u6e2c\u8a66(&T)
-clone.testing=\u6e2c\u8a66{0}
-clone.title=\u514b\u9686\u5b58\u5132\u5eab
-clone.url.is.not.directory.error=\u5b58\u5132\u5eabURL\u4e0d\u662f\u4e00\u500b\u76ee\u9304\u3002
-cloning.repository=\u514b\u9686\u6e90\u5b58\u5132\u5eab{0}
+clone.destination.directory.label=\u76ee\u9304:
+clone.destination.directory.browser.title=\u76ee\u6a19\u76ee\u9304
+clone.destination.directory.browser.description=\u9078\u53d6\u7236\u76ee\u9304\u514b\u9686
+clone.destination.directory.error.not.directory=\u76ee\u7684\u4f4d\u5740\u4e0d\u662f\u4e00\u500b\u76ee\u9304
+clone.destination.directory.error.invalid=\u7121\u6548\u7684\u76ee\u9304\u8def\u5f91
+clone.destination.directory.error.exists=\u76ee\u9304\u5df2\u7d93\u5b58\u5728\uff0c\u4f46\u4e0d\u662f\u7a7a\u7684
+clone.destination.directory.error.access=\u7121\u6cd5\u5efa\u7acb\u76ee\u6a19\u76ee\u9304<br/>\u6aa2\u67e5\u4f60\u7684\u5b58\u53d6\u6b0a\u9650
+clone.repository.url.label=URL:
+clone.repository.url.error.invalid=\u5b58\u5132\u5eabURL\u662f\u4e00\u500b\u932f\u8aa4\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u9304
+clone.repository.url.error.empty=\u7a7a\u7684\u5009\u5eabURL
+clone.repository.url.error.not.directory=\u5009\u5eabURL\u4e0d\u662f\u76ee\u9304
+clone.repository.url.test.label=\u6e2c\u8a66
+clone.repository.url.test.title=\u6e2c\u8a66 {0}
+clone.repository.url.test.success.message=\u9023\u63a5\u6210\u529f
+clone.repository.url.test.failed.message=\u5009\u5eab\u6e2c\u8a66\u5931\u6557<br/>{0}
+clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
+clone.repository.url.autocomplete.login.text=\u767b\u5165\u5230 {0}...
+clone.repository.url.autocomplete.login.tooltip=\u767b\u5165\u5230URL\u6e05\u55ae\u4e2d\u6aa2\u8996\u4f60\u7684\u5009\u5eab
+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
-
+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
+# 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
+clone.parent.dir=\u7236\u76ee\u9304(&P):
+clone.parent.missing.error=\u7236\u8def\u5f91{0}\u5fc5\u9808\u5b58\u5728\u3002
+clone.testing=\u6e2c\u8a66{0}
diff --git a/resources_en/com/intellij/json/JsonBundle.properties b/resources_en/com/intellij/json/JsonBundle.properties
@@ -8,9 +8,10 @@ syntax.error.illegal.unicode.escape.sequence=Illegal unicode escape sequence
 syntax.error.illegal.floating.point.literal=Illegal floating point literal
 
 # Inspections
-json.inspection.group=JSON
+json.inspection.group=JSON and JSON5
 
 inspection.compliance.name=Compliance with JSON standard
+inspection.compliance5.name=Compliance with JSON5 standard
 inspection.compliance.msg.comments=JSON standard does not allow comments. Use JSMin or similar tool to remove comments before parsing.
 inspection.compliance.msg.single.quoted.strings=JSON standard does not allow single quoted strings
 inspection.compliance.msg.bad.token=JSON standard does not allow such tokens
@@ -20,6 +21,8 @@ inspection.compliance.msg.multiple.top.level.values=JSON standard allows only on
 
 inspection.compliance.option.comments=Warn about comments
 inspection.compliance.option.multiple.top.level.values=Warn about multiple top-level values
+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}"
@@ -37,6 +40,16 @@ quickfix.add.double.quotes.desc=Wrap with double quotes
 surround.with.object.literal.desc=object literal
 json.template.context.type=JSON
 
+json.copy.to.clipboard=Copy {0} to clipboard
+
 #json schema
 json.schema.add.schema.chooser.title=Select JSON Schema File
-json.schema.annotation.not.allowed.property=Property ''{0}'' is not allowed
+json.schema.annotation.not.allowed.property=Property ''{0}'' is not allowed
+json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show details</a>
+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
+
+settings.json.schema.add.mapping=Add mapping
+settings.json.schema.edit.mapping=Edit mapping
+settings.json.schema.remove.mapping=Remove mapping
diff --git a/resources_en/com/intellij/json/JsonBundle_zh_CN.properties b/resources_en/com/intellij/json/JsonBundle_zh_CN.properties
@@ -8,9 +8,10 @@ syntax.error.illegal.unicode.escape.sequence=\u975e\u6cd5unicode\u8f6c\u4e49\u5e
 syntax.error.illegal.floating.point.literal=\u975e\u6cd5\u7684\u6d6e\u70b9\u6587\u5b57
 
 # Inspections
-json.inspection.group=JSON
+json.inspection.group=JSON and JSON5
 
 inspection.compliance.name=\u7b26\u5408JSON\u6807\u51c6
+inspection.compliance5.name=\u9075\u5b88JSON5\u6807\u51c6
 inspection.compliance.msg.comments=JSON\u6807\u51c6\u4e0d\u5141\u8bb8\u8bc4\u8bba\u3002\u5728\u89e3\u6790\u4e4b\u524d\u4f7f\u7528JSMin\u6216\u7c7b\u4f3c\u7684\u5de5\u5177\u6765\u5220\u9664\u6ce8\u91ca\u3002
 inspection.compliance.msg.single.quoted.strings=JSON\u6807\u51c6\u4e0d\u5141\u8bb8\u5355\u5f15\u53f7\u5b57\u7b26\u4e32
 inspection.compliance.msg.bad.token=JSON\u6807\u51c6\u4e0d\u5141\u8bb8\u8fd9\u6837\u7684\u6807\u8bb0
@@ -20,6 +21,8 @@ inspection.compliance.msg.multiple.top.level.values=JSON\u6807\u51c6\u53ea\u5141
 
 inspection.compliance.option.comments=\u8b66\u544a\u5173\u4e8e\u8bc4\u8bba
 inspection.compliance.option.multiple.top.level.values=\u8b66\u544a\u591a\u4e2a\u9876\u7ea7\u503c
+inspection.compliance.option.trailing.comma=\u5173\u4e8e\u9017\u53f7\u7684\u8b66\u544a
+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
@@ -37,6 +40,16 @@ quickfix.add.double.quotes.desc=\u7528\u53cc\u5f15\u53f7\u5305\u8d77\u6765
 surround.with.object.literal.desc=\u5bf9\u8c61\u6587\u5b57
 json.template.context.type=JSON
 
+json.copy.to.clipboard=Copy {0} to clipboard
+
 #json schema
 json.schema.add.schema.chooser.title=\u9009\u62e9JSON\u6a21\u5f0f\u6587\u4ef6
-json.schema.annotation.not.allowed.property=\u5c5e\u6027\u201c{0}\u201d\u662f\u4e0d\u5141\u8bb8\u7684
+json.schema.annotation.not.allowed.property=\u5c5e\u6027\u201c{0}\u201d\u662f\u4e0d\u5141\u8bb8\u7684
+json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show details</a>
+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
+
+settings.json.schema.add.mapping=\u6dfb\u52a0\u6620\u5c04
+settings.json.schema.edit.mapping=\u4fee\u6539\u6620\u5c04
+settings.json.schema.remove.mapping=\u5220\u9664\u6620\u5c04
diff --git a/resources_en/com/intellij/json/JsonBundle_zh_TW.properties b/resources_en/com/intellij/json/JsonBundle_zh_TW.properties
@@ -8,9 +8,10 @@ syntax.error.illegal.unicode.escape.sequence=\u975e\u6cd5unicode\u8f49\u7fa9\u5e
 syntax.error.illegal.floating.point.literal=\u975e\u6cd5\u7684\u6d6e\u9ede\u6587\u5b57
 
 # Inspections
-json.inspection.group=JSON
+json.inspection.group=JSON \u548c JSON5
 
 inspection.compliance.name=\u7b26\u5408JSON\u6a19\u6e96
+inspection.compliance5.name=\u9075\u5b88JSON5\u6a19\u6e96
 inspection.compliance.msg.comments=JSON\u6a19\u6e96\u4e0d\u5141\u8a31\u8a55\u8ad6\u3002\u5728\u5256\u6790\u4e4b\u524d\u4f7f\u7528JSMin\u6216\u985e\u4f3c\u7684\u5de5\u5177\u4f86\u522a\u9664\u8a3b\u89e3\u3002
 inspection.compliance.msg.single.quoted.strings=JSON\u6a19\u6e96\u4e0d\u5141\u8a31\u55ae\u5f15\u865f\u5b57\u4e32
 inspection.compliance.msg.bad.token=JSON\u6a19\u6e96\u4e0d\u5141\u8a31\u9019\u6a23\u7684\u6a19\u8a18
@@ -20,6 +21,8 @@ inspection.compliance.msg.multiple.top.level.values=JSON\u6a19\u6e96\u53ea\u5141
 
 inspection.compliance.option.comments=\u8b66\u544a\u95dc\u65bc\u8a55\u8ad6
 inspection.compliance.option.multiple.top.level.values=\u8b66\u544a\u591a\u500b\u9802\u7d1a\u503c
+inspection.compliance.option.trailing.comma=\u95dc\u65bc\u9017\u865f\u7684\u8b66\u544a
+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
@@ -37,6 +40,16 @@ quickfix.add.double.quotes.desc=\u7528\u96d9\u5f15\u865f\u5305\u8d77\u4f86
 surround.with.object.literal.desc=\u7269\u4ef6\u6587\u5b57
 json.template.context.type=JSON
 
+json.copy.to.clipboard=Copy {0} to clipboard
+
 #json schema
 json.schema.add.schema.chooser.title=\u9078\u53d6JSON\u6a21\u5f0f\u6a94\u6848
-json.schema.annotation.not.allowed.property=\u5c6c\u6027\u300c{0}\u300d\u662f\u4e0d\u5141\u8a31\u7684
+json.schema.annotation.not.allowed.property=\u5c6c\u6027\u300c{0}\u300d\u662f\u4e0d\u5141\u8a31\u7684
+json.schema.conflicting.mappings=Warning: conflicting mappings. <a href="#">Show details</a>
+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
+
+settings.json.schema.add.mapping=\u65b0\u589e\u6620\u5c04
+settings.json.schema.edit.mapping=\u4fee\u6539\u6620\u5c04
+settings.json.schema.remove.mapping=\u522a\u9664\u6620\u5c04