同步到2017.3

package.cmd

@@ -1,2 +1,90 @@
 cd resources_en
+
+native2ascii  -encoding utf8 messages\ActionsBundle_zh_CN.properties messages\ActionsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\AnalysisScopeBundle_zh_CN.properties messages\AnalysisScopeBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\ApplicationBundle_zh_CN.properties messages\ApplicationBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\CodeEditorBundle_zh_CN.properties messages\CodeEditorBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\CodeInsightBundle_zh_CN.properties messages\CodeInsightBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\CommonBundle_zh_CN.properties messages\CommonBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DaemonBundle_zh_CN.properties messages\DaemonBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DesignerBundle_zh_CN.properties messages\DesignerBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DiagnosticBundle_zh_CN.properties messages\DiagnosticBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DiffBundle_zh_CN.properties messages\DiffBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DomBundle_zh_CN.properties messages\DomBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\DupLocatorBundle_zh_CN.properties messages\DupLocatorBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\EditorBundle_zh_CN.properties messages\EditorBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\ExecutionBundle_zh_CN.properties messages\ExecutionBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\FeatureStatisticsBundle_zh_CN.properties messages\FeatureStatisticsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\FileTypesBundle_zh_CN.properties messages\FileTypesBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\FindBundle_zh_CN.properties messages\FindBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\GraphBundle_zh_CN.properties messages\GraphBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\IdeBundle_zh_CN.properties messages\IdeBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\InspectionsBundle_zh_CN.properties messages\InspectionsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\KeyMapBundle_zh_CN.properties messages\KeyMapBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\LangBundle_zh_CN.properties messages\LangBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\LicenseCommonBundle_zh_CN.properties messages\LicenseCommonBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\LocalHistoryBundle_zh_CN.properties messages\LocalHistoryBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\OptionsBundle_zh_CN.properties messages\OptionsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\ProjectBundle_zh_CN.properties messages\ProjectBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\PsiBundle_zh_CN.properties messages\PsiBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\RefactoringBundle_zh_CN.properties messages\RefactoringBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\SMTestsRunnerBundle_zh_CN.properties messages\SMTestsRunnerBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\SSRBundle_zh_CN.properties messages\SSRBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\StatisticsBundle_zh_CN.properties messages\StatisticsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\ToolsBundle_zh_CN.properties messages\ToolsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\UIBundle_zh_CN.properties messages\UIBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\UsageView_zh_CN.properties messages\UsageView_zh_CN.properties
+native2ascii  -encoding utf8 messages\VcsBundle_zh_CN.properties messages\VcsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\VfsBundle_zh_CN.properties messages\VfsBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\XDebuggerBundle_zh_CN.properties messages\XDebuggerBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\XmlBundle_zh_CN.properties messages\XmlBundle_zh_CN.properties
+native2ascii  -encoding utf8 messages\XmlErrorMessages_zh_CN.properties messages\XmlErrorMessages_zh_CN.properties
+native2ascii  -encoding utf8 i18n/ExternalSystemBundle_zh_CN.properties i18n/ExternalSystemBundle_zh_CN.properties
+native2ascii  -encoding utf8 RuntimeBundle_zh_CN.properties RuntimeBundle_zh_CN.properties
+
+
+native2ascii  -encoding utf8 messages\ActionsBundle_zh_TW.properties messages\ActionsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\AnalysisScopeBundle_zh_TW.properties messages\AnalysisScopeBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\ApplicationBundle_zh_TW.properties messages\ApplicationBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\CodeEditorBundle_zh_TW.properties messages\CodeEditorBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\CodeInsightBundle_zh_TW.properties messages\CodeInsightBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\CommonBundle_zh_TW.properties messages\CommonBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DaemonBundle_zh_TW.properties messages\DaemonBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DesignerBundle_zh_TW.properties messages\DesignerBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DiagnosticBundle_zh_TW.properties messages\DiagnosticBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DiffBundle_zh_TW.properties messages\DiffBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DomBundle_zh_TW.properties messages\DomBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\DupLocatorBundle_zh_TW.properties messages\DupLocatorBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\EditorBundle_zh_TW.properties messages\EditorBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\ExecutionBundle_zh_TW.properties messages\ExecutionBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\FeatureStatisticsBundle_zh_TW.properties messages\FeatureStatisticsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\FileTypesBundle_zh_TW.properties messages\FileTypesBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\FindBundle_zh_TW.properties messages\FindBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\GraphBundle_zh_TW.properties messages\GraphBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\IdeBundle_zh_TW.properties messages\IdeBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\InspectionsBundle_zh_TW.properties messages\InspectionsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\KeyMapBundle_zh_TW.properties messages\KeyMapBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\LangBundle_zh_TW.properties messages\LangBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\LicenseCommonBundle_zh_TW.properties messages\LicenseCommonBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\LocalHistoryBundle_zh_TW.properties messages\LocalHistoryBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\OptionsBundle_zh_TW.properties messages\OptionsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\ProjectBundle_zh_TW.properties messages\ProjectBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\PsiBundle_zh_TW.properties messages\PsiBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\RefactoringBundle_zh_TW.properties messages\RefactoringBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\SMTestsRunnerBundle_zh_TW.properties messages\SMTestsRunnerBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\SSRBundle_zh_TW.properties messages\SSRBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\StatisticsBundle_zh_TW.properties messages\StatisticsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\ToolsBundle_zh_TW.properties messages\ToolsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\UIBundle_zh_TW.properties messages\UIBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\UsageView_zh_TW.properties messages\UsageView_zh_TW.properties
+native2ascii  -encoding utf8 messages\VcsBundle_zh_TW.properties messages\VcsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\VfsBundle_zh_TW.properties messages\VfsBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\XDebuggerBundle_zh_TW.properties messages\XDebuggerBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\XmlBundle_zh_TW.properties messages\XmlBundle_zh_TW.properties
+native2ascii  -encoding utf8 messages\XmlErrorMessages_zh_TW.properties messages\XmlErrorMessages_zh_TW.properties
+native2ascii  -encoding utf8 i18n/ExternalSystemBundle_zh_TW.properties i18n/ExternalSystemBundle_zh_TW.properties
+native2ascii  -encoding utf8 RuntimeBundle_zh_TW.properties RuntimeBundle_zh_TW.properties
+
+
+
 jar cvf ../resources_zh.jar ./*

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-915-b5 (JetBrains s.r.o)
+Created-By: 1.8.0_152-release-1024-b6 (JetBrains s.r.o)
 

resources_en/RuntimeBundle_zh_CN.properties

@@ -0,0 +1,17 @@
+form.preview.title=Form Preview
+form.menu.preview=\u9884\u89c8
+form.menu.preview.mnemonic=\u5bc6\u7801
+form.menu.file.exit=\u9000\u51fa
+form.menu.laf=\u754c\u9762\u5916\u89c2
+form.menu.laf.mnemonic=L
+form.menu.view.pack=Pack
+error.cannot.change.look.feel=Cannot change LookAndFeel.\nReason: {0}
+error.title=\u9519\u8bef
+junit.runner.error=\u9519\u8bef: {0}
+junit.class.not.found=Class not found: "{0}"
+junit.cannot.instantiate.tests=Cannot instantiate test(s): {0}
+junit.class.not.derived={0} is not derived from TestCase. Do not provide method name.
+junit.suite.must.be.static=''{0}.suite()'' method must be static
+junit.failed.to.invoke.suite=Failed to invoke suite(): {0}
+junit.method.not.found=Method ''{0}'' not found
+tests.found.in.package={0} test {0, choice, 0#classes|1#class|2#classes} found in package ''{1}''

resources_en/RuntimeBundle_zh_TW.properties

@@ -0,0 +1,17 @@
+form.preview.title=Form Preview
+form.menu.preview=\u9810\u89bd
+form.menu.preview.mnemonic=\u5bc6\u78bc
+form.menu.file.exit=\u7d50\u675f
+form.menu.laf=\u4ecb\u9762\u5916\u89c0
+form.menu.laf.mnemonic=L
+form.menu.view.pack=Pack
+error.cannot.change.look.feel=Cannot change LookAndFeel.\nReason: {0}
+error.title=\u932f\u8aa4
+junit.runner.error=\u932f\u8aa4: {0}
+junit.class.not.found=Class not found: "{0}"
+junit.cannot.instantiate.tests=Cannot instantiate test(s): {0}
+junit.class.not.derived={0} is not derived from TestCase. Do not provide method name.
+junit.suite.must.be.static=''{0}.suite()'' method must be static
+junit.failed.to.invoke.suite=Failed to invoke suite(): {0}
+junit.method.not.found=Method ''{0}'' not found
+tests.found.in.package={0} test {0, choice, 0#classes|1#class|2#classes} found in package ''{1}''

resources_en/com/intellij/dvcs/ui/DvcsBundle.properties

@@ -19,6 +19,6 @@ 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=Control repositories &synchronously
+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.

resources_en/com/intellij/util/UltimateFeaturesBundle.properties

@@ -10,3 +10,4 @@ db.table.editor.wrapper=SQL/CSV/TSV File Table Editor
 db.console=Database Console
 db.console.execute=Execute SQL Statement
 db.console.run.intention=Run Query in Console
+codeassist.locate.duplicates=Locate Duplicates

resources_en/i18n/ExternalSystemBundle.properties

@@ -16,6 +16,9 @@ settings.label.select.project={0} project:
 settings.label.project.format=Project format:
 settings.label.use.auto.import=Use auto-import
 settings.label.create.empty.content.root.directories=Create directories for empty content roots automatically
+settings.label.group.modules=Group modules:
+settings.radio.button.use.module.groups=using explicit module &groups
+settings.radio.button.use.qualified.name=using &qualified names
 settings.title.linked.projects=Linked {0} projects
 settings.title.project.settings=Project-level settings
 settings.title.system.settings=Global {0} settings
@@ -91,10 +94,10 @@ run.configuration.settings.label.project={0} project:
 run.configuration.settings.label.tasks=Tasks:
 run.configuration.settings.label.vmoptions=VM options:
 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.text.starting.multiple.task={0}: Executing tasks ''{1}''...
+run.text.starting.single.task={0}: Executing task ''{1}''...
+run.text.ended.multiple.task={0}: Tasks execution finished ''{1}''.
+run.text.ended.single.task={0}: Task execution finished ''{1}''.
 run.error.undefined.task=No task to execute is specified
 run.invalid.jvm.agent.configuration=Invalid JVM agent configuration used ''{0}''
 

resources_en/i18n/ExternalSystemBundle_zh_CN.properties

@@ -0,0 +1,114 @@
+# Import.
+import.title=Import {0} Projects
+import.needed={0} projects need to be imported
+import.importChanged=Import Changes
+import.enableAutoImport=Enable Auto-Import
+module.type.title={0} Module
+module.type.description={0} modules are used for developing <b>JVM-based</b> applications with dependencies managed by <b>{0}</b>
+orphan.modules.text=<html>The modules below are not imported from {0} anymore.<br/>Check those to be removed from the ide project too:
+
+# Settings.
+setting.type.location.deduced={0} location is deduced
+setting.type.location.unknown={0} location is unknown
+setting.type.location.explicit.correct={0} location is defined
+setting.type.location.explicit.incorrect={0} location is incorrect
+settings.label.select.project={0} project:
+settings.label.project.format=Project format:
+settings.label.use.auto.import=Use auto-import
+settings.label.create.empty.content.root.directories=Create directories for empty content roots automatically
+settings.label.group.modules=Group modules:
+settings.radio.button.use.module.groups=using explicit module &groups
+settings.radio.button.use.qualified.name=using &qualified names
+settings.title.linked.projects=Linked {0} projects
+settings.title.project.settings=Project-level settings
+settings.title.system.settings=Global {0} settings
+
+# Progress.
+progress.import.text=Building ''{0}'' {1} project info
+progress.refresh.text=Refreshing ''{0}'' {1} project
+progress.resolve.libraries=Resolving {0} libraries
+progress.update.text={0}: {1}
+
+# Errors.
+error.project.undefined=No external project config file is defined
+error.project.already.registered=The project is already registered
+error.cannot.parse.project=Can not parse {0} project
+error.resolve.with.reason={0}\n\nConsult IDE log for more details (Help | Show Log)
+error.resolve.with.log_link=<html>{0}<br><br>Consult IDE log for more details (Help | <a href="{1}">Show Log</a>)<html>
+error.resolve.generic=Resolve Error
+error.resolve.already.running=Another ''refresh project'' task is currently running for the project:  {0}
+
+# Tool window
+tool.window.title.projects=\u9879\u76ee
+tool.window.title.tasks=\u4efb\u52a1
+external.system.view.nodes.run_configurations.name = \u8fd0\u884c\u914d\u7f6e
+
+# Action.
+action.refresh.all.projects.text=Refresh all {0} projects
+action.refresh.all.projects.description=Force refresh all linked {0} projects
+action.refresh.project.text=Refresh {0} project
+action.refresh.project.description=Force refresh selected linked {0} project
+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.open.config.text=Open {0} config
+action.open.config.description=Allows to open project file of the linked {0} project at the editor
+
+action.refresh.project.auto.text=Auto-import
+action.refresh.project.auto.description=Enable/disable project auto-import
+
+action.open.settings.text={0} Settings
+action.open.settings.description=Edit {0} settings for the current project
+
+# Notification
+notification.project.refresh.fail.title={0} ''{1}'' project refresh failed
+notification.messages.project.sync.tab.name={0} Sync
+notification.messages.task.execution.tab.name={0} Task
+
+# Tasks.
+tasks.recent.title=Recent tasks
+tasks.all.title=\u5168\u90e8\u4efb\u52a1
+
+external.system.keymap.group=External Build Systems
+external.system.task.before.sync=Before Sync
+external.system.task.after.sync=After Sync
+external.system.task.before.compile=Before Build
+external.system.task.after.compile=After Build
+external.system.task.before.rebuild=Before Rebuild
+external.system.task.after.rebuild=After Rebuild
+external.system.task.before.run=Before Run
+## Tasks UI
+external.system.task.activation.title=Tasks Activation
+external.system.task.activation.description=Edit {0} tasks activation settings
+
+# Execution
+run.configuration.description={0} build
+run.configuration.tooltip.choose.registered.project=Choose one of registered {0} projects
+run.configuration.title.choose.registered.project=Choose {0} project
+run.configuration.settings.label.project={0} project:
+run.configuration.settings.label.tasks=\u4efb\u52a1:
+run.configuration.settings.label.vmoptions=VM options:
+run.configuration.settings.label.arguments=\u53c2\u6570:
+run.text.starting.multiple.task={0}: Executing tasks ''{1}''...
+run.text.starting.single.task={0}: Executing task ''{1}''...
+run.text.ended.multiple.task={0}: Tasks execution finished ''{1}''.
+run.text.ended.single.task={0}: Task execution finished ''{1}''.
+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
+external.system.project_jdk.not_specified=Project JDK is not specified. <a href=''{0}''>Open Project SDK Configuration</a>
+external.system.java.home.undefined=JAVA_HOME environment variable not defined
+external.system.java.home.invalid=JAVA_HOME environment variable does not point to valid JDK or JRE ({0})
+external.system.platform.sdk.invalid=Platform SDK does not point to valid JDK ({0})
+
+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}''