更新到2017.1.1

ewen0930 · Apr 6, 2017 · c4c3071 · c4c3071
1 parent 00e75fe
commit c4c3071
Show file tree

Hide file tree

Showing 19 changed files with 134 additions and 88 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_112-release-736-b13 (JetBrains s.r.o)
+Created-By: 1.8.0_112-release-736-b16 (JetBrains s.r.o)
 
diff --git a/resources_en/messages/ActionsBundle.properties b/resources_en/messages/ActionsBundle.properties
@@ -1504,7 +1504,7 @@ action.EditorGutterToggleGlobalIndentLines.text=Show Indent Guides
 action.ExcludeFromProject.text=Exclude From Project...
 group.MarkFileAs.text=Mark File as
 action.MarkAsPlainTextAction.text=Mark as Plain Text
-action.MarkAsOriginalTypeAction.text=Mark as
+action.MarkAsOriginalTypeAction.text=Mark as Original File Type
 
 action.Console.Open.text=Open Console
 action.Console.Open.description=Open console for selected entity

diff --git a/resources_en/messages/ActionsBundle_zh_CN.properties b/resources_en/messages/ActionsBundle_zh_CN.properties
@@ -229,15 +229,15 @@ action.NextDiff.text=\u4e0b\u4e00\u4e2a\u5dee\u5f02
 action.NextDiff.description=\u79fb\u52a8\u5230\u4e0b\u4e00\u4e2a\u5dee\u5f02
 action.PreviousDiff.text=\u4e0a\u4e00\u4e2a\u5dee\u5f02
 action.PreviousDiff.description=\u79fb\u52a8\u5230\u4e0a\u4e00\u4e2a\u5dee\u5f02
-action.Diff.NextConflict.text=Next Conflict
-action.Diff.NextConflict.description=Move to the next unresolved conflict
-action.Diff.PreviousConflict.text=Previous Conflict
-action.Diff.PreviousConflict.description=Move to the previous unresolved conflict
+action.Diff.NextConflict.text=\u4e0b\u4e00\u4e2a\u51b2\u7a81
+action.Diff.NextConflict.description=\u79fb\u52a8\u5230\u4e0b\u4e00\u4e2a\u672a\u89e3\u51b3\u7684\u51b2\u7a81
+action.Diff.PreviousConflict.text=\u4e0a\u4e00\u4e2a\u51b2\u7a81
+action.Diff.PreviousConflict.description=\u79fb\u52a8\u5230\u4e0a\u4e00\u4e2a\u672a\u89e3\u51b3\u7684\u51b2\u7a81
 action.GotoChangedFile.text=\u6253\u5f00\u4fee\u6539\u8fc7\u7684\u6587\u4ef6...
 action.GotoChangedFile.description=\u5feb\u901f\u5bfc\u822a\u5230\u66f4\u540d\u8fc7\u7684\u6587\u4ef6
 action.Refresh.text=\u5237\u65b0
-action.CheckinProject.text=Comm_it Project
-action.CheckinFiles.text=Comm_it File
+action.CheckinProject.text=\u63d0\u4ea4\u9879\u76ee(_I)
+action.CheckinFiles.text=\u63d0\u4ea4\u6587\u4ef6(_I)
 action.UpdateFiles.text=\u66f4\u65b0
 action.CheckStatusForFiles.text=\u68c0\u67e5\u72b6\u6001(_K)
 action.Annotate.text=\u6ce8\u91ca(_N)
@@ -494,8 +494,8 @@ action.GotoSymbol.description=\u5feb\u901f\u5bfc\u822a\u5230\u540d\u79f0\u7684\u
 action.GotoCustomRegion.text=\u81ea\u5b9a\u4e49\u6298\u53e0...
 action.GotoAction.text=\u67e5\u627e\u52a8\u4f5c...
 action.GotoAction.description=\u5feb\u901f\u5bfc\u822a\u5230\u901a\u8fc7\u540d\u79f0\u64cd\u4f5c
-action.GotoLine.text=_Line/Column...
-action.GotoLine.description=Navigate to a line (and/or column) in editor by its number
+action.GotoLine.text=\u884c/\u5217...
+action.GotoLine.description=\u5bfc\u822a\u5230\u7f16\u8f91\u5668\u4e2d\u7684\u884c\uff08\u6216\u5217\uff09
 action.GotoDeclaration.text=\u58f0\u660e
 action.GotoDeclaration.description=\u5bfc\u822a\u5230\u8be5\u7b26\u53f7\u5728\u63d2\u5165\u7b26\u7684\u58f0\u660e
 action.GotoImplementation.text=\u5b9e\u73b0
@@ -617,7 +617,7 @@ action.Unscramble.text=\u5206\u6790\u5806\u6808\u8e2a\u8ff9...
 action.Unscramble.description=\u6253\u5f00\u63a7\u5236\u53f0\u7684\u5806\u6808\u8ddf\u8e2a\u5bfc\u822a
 action.IdeScriptingConsole.text=IDE \u811a\u672c\u63a7\u5236\u53f0
 action.IdeScriptingConsole.description=\u6253\u5f00 IDE \u811a\u672c\u63a7\u5236\u53f0
-action.NewScratchFile.text=Scratch File
+action.NewScratchFile.text=\u4e34\u65f6\u6587\u4ef6
 action.NewScratchFile.description=\u521b\u5efa\u6240\u9009\u8bed\u8a00\u7684\u65b0\u4e34\u65f6\u6587\u4ef6
 action.NewScratchBuffer.text=\u65b0\u5efa\u4e34\u65f6\u7f13\u51b2\u533a
 action.NewScratchBuffer.description=\u521b\u5efa\u65b0\u7684\u6216\u91cd\u65b0\u4f7f\u7528\u73b0\u6709\u7684\u4e34\u65f6\u7f13\u51b2\u533a
@@ -706,13 +706,13 @@ action.ExtractInclude.description=\u6253\u5f00\u6240\u9009\u7684\u4ee3\u7801\u72
 group.BuildMenu.text=\u5185\u90e8\u7248\u672c\u53f7
 action.CompileProject.text=\u91cd\u5efa\u9879\u76ee
 action.CompileProject.description=\u91cd\u65b0\u7f16\u8bd1\u9879\u76ee\u4e2d\u7684\u6240\u6709\u6587\u4ef6
-action.CompileDirty.text=Build _Project
+action.CompileDirty.text=\u6784\u5efa\u9879\u76ee
 action.CompileDirty.description=\u7f16\u8bd1\u9879\u76ee\u4e2d\u7684\u6240\u6709\u4fee\u6539\u548c\u76f8\u5173\u6587\u4ef6
-action.MakeModule.text=Build _Module
+action.MakeModule.text=\u6784\u5efa\u65b9\u6cd5
 action.MakeModule.description=\u7f16\u8bd1\u8be5\u6a21\u5757\u4e2d\u7684\u6240\u6709\u4fee\u6539\u548c\u76f8\u5173\u6587\u4ef6
-action.Compile.text=R_ebuild
-action.CompileFile.text=R_ecompile
-action.Compile.description=Force recompilation for selected module, file or package
+action.Compile.text=\u91cd\u65b0\u6784\u5efa
+action.CompileFile.text=\u91cd\u65b0\u7f16\u8bd1
+action.Compile.description=\u5f3a\u5236\u91cd\u65b0\u7f16\u8bd1\u9009\u5b9a\u7684\u6a21\u5757\uff0c\u6587\u4ef6\u6216\u7a0b\u5e8f\u5305
 action.RunAPT.text=\u8fc7\u7a0b\u7684\u6ce8\u91ca
 action.RunAPT.1.text=\u8fc7\u7a0b{0} \u6ce8\u91ca
 action.RunAPT.description=\u5728\u9009\u5b9a\u7684\u8303\u56f4\u5185\u8fd0\u884c\u7684\u6807\u6ce8\u5904\u7406\u7a0b\u5e8f
@@ -755,7 +755,7 @@ action.Pause.text=\u6682\u505c\u7a0b\u5e8f
 action.Pause.description=\u6682\u505c\u7a0b\u5e8f\u6267\u884c\uff0c\u5e76\u542f\u7528\u8c03\u8bd5
 action.Resume.text=\u6062\u590d\u7a0b\u5e8f
 action.Resume.description=\u6062\u590d\u6267\u884c\u7a0b\u5e8f
-action.EvaluateExpression.text=Evaluate E_xpression...
+action.EvaluateExpression.text=\u8bc4\u4f30\u8868\u8fbe\u5f0f...
 action.EvaluateExpression.description=\u8ba1\u7b97\u4efb\u610f\u8868\u8fbe\u5f0f
 action.QuickEvaluateExpression.text=\u5feb\u901f\u8bc4\u4f30\u8868\u8fbe\u5f0f
 action.QuickEvaluateExpression.description=\u8bc4\u4f30\u9009\u62e9\u7684\u8868\u8fbe
@@ -864,14 +864,14 @@ action.MinimizeCurrentWindow.text=\u6700\u5c0f\u5316
 action.MinimizeCurrentWindow.description=\u6700\u5c0f\u5316\u5f53\u524d\u7a97\u53e3
 action.ZoomCurrentWindow.text=\u7f29\u653e
 action.ZoomCurrentWindow.description=\u7f29\u653e\u5f53\u524d\u7a97\u53e3
-action.TogglePresentationMode.text.enter=\u8fdb\u5165\u6f14\u793a\u6a21\u5f0f
+action.TogglePresentationMode.text.enter=\u6f14\u793a\u6a21\u5f0f
 action.TogglePresentationMode.text.exit=\u9000\u51fa\u6f14\u793a\u6a21\u5f0f
 action.TogglePresentationMode.text=\u5207\u6362\u6f14\u793a\u6a21\u5f0f
 action.TogglePresentationMode.description=\u5207\u6362\u6f14\u793a\u6a21\u5f0f
-action.ToggleDistractionFreeMode.text=\u5207\u6362\u514d\u6253\u6270\u6a21\u5f0f
-action.ToggleDistractionFreeMode.description=\u5207\u6362\u514d\u6253\u6270\u6a21\u5f0f
-action.ToggleFullScreen.text.enter=\u8fdb\u5165\u5168\u5c4f
-action.ToggleFullScreen.text.exit=\u9000\u51fa\u5168\u5c4f
+action.ToggleDistractionFreeMode.text=\u5207\u6362\u65e0\u5e72\u6270\u6a21\u5f0f
+action.ToggleDistractionFreeMode.description=\u5207\u6362\u65e0\u5e72\u6270\u6a21\u5f0f
+action.ToggleFullScreen.text.enter=\u5168\u5c4f\u6a21\u5f0f
+action.ToggleFullScreen.text.exit=\u9000\u51fa\u5168\u5c4f\u6a21\u5f0f
 action.ToggleFullScreen.text=\u5207\u6362\u5168\u5c4f\u6a21\u5f0f
 action.ToggleFullScreen.description=\u5207\u6362\u5168\u5c4f\u6a21\u5f0f
 action.RestoreDefaultLayout.text=\u6062\u590d\u9ed8\u8ba4\u5e03\u5c40
@@ -944,9 +944,9 @@ action.CloseAllUnpinnedEditors.description=\u5173\u95ed\u8fd9\u4e9b\u4e0d\u56fa\
 action.CloseContent.text=\u5173\u95ed
 action.CloseContent.description=\u5173\u95ed\u5f53\u524d\u7126\u70b9\u5185\u5bb9
 group.EditorTabsGroup.text=\u7f16\u8f91\u5668\u9009\u9879\u5361
-action.CloseFirstNotification.text=Close First
-action.CloseAllNotifications.text=Close All
-group.Notifications.text=Notifications
+action.CloseFirstNotification.text=\u5173\u95ed\u7b2c\u4e00\u4e2a
+action.CloseAllNotifications.text=\u5173\u95ed\u5168\u90e8
+group.Notifications.text=\u901a\u77e5
 action.SplitVertically.text=\u5782\u76f4\u62c6\u5206
 action.SplitVertically.description=\u62c6\u5206\u7f16\u8f91\u5668\u533a\u57df\u5206\u4e3a2\u7ec4\u9009\u9879\u5361\uff0c\u7136\u540e\u79fb\u52a8\u5f53\u524d\u6807\u7b7e\u5230\u53f3\u8fb9\u7684\u7ec4
 action.SplitHorizontally.text=\u6a2a\u5411\u62c6\u5206
@@ -1058,7 +1058,7 @@ action.Debugger.ViewText.description=\u5728\u4e00\u4e2a\u5355\u72ec\u7684\u9762\
 action.Debugger.EditCustomField.text=Edit...
 action.Debugger.NewCustomField.text=New Class Level Watch...
 action.Debugger.RemoveCustomField.text=Remove Watch
-action.Debugger.ShowReferring.text=Show Referring Objects...
+action.Debugger.ShowReferring.text=\u663e\u793a\u5f15\u7528\u5bf9\u8c61...
 action.Debugger.CompareValueWithClipboard.text=\u6bd4\u8f83\u503c\u4e0e\u526a\u8d34\u677f
 action.Debugger.CompareValueWithClipboard.description=\u7528\u526a\u8d34\u677f\u4e2d\u7684\u6587\u672c\u4e0e\u9009\u4e2d\u7684\u8282\u70b9\u7684\u503c\u8fdb\u884c\u6bd4\u8f83
 action.Debugger.CustomizeContextView.text=\u81ea\u5b9a\u4e49\u6570\u636e\u89c6\u56fe...
@@ -1209,10 +1209,10 @@ action.Graph.print.preview=\u6253\u5370\u9884\u89c8
 
 action.SendFeedback.text=\u63d0\u4ea4\u53cd\u9988...
 action.SendFeedback.description=\u63d0\u4ea4\u53cd\u9988\u5230JetBrains\u516c\u53f8\u7f51\u7ad9
-action.ShowLog.text=Show _Log in File Manager
+action.ShowLog.text=\u6253\u5f00\u65e5\u5fd7\u6587\u4ef6
 action.ShowLog.description=\u6253\u5f00\u6587\u4ef6\u5939\u4e2d\u7684\u65e5\u5fd7\u6587\u4ef6
 action.EditCustomProperties.text=\u7f16\u8f91\u81ea\u5b9a\u4e49\u5c5e\u6027...
-action.EditCustomProperties.description=Opens an editor tab with a custom properties file
+action.EditCustomProperties.description=\u7f16\u8f91\u5668\u4e2d\u6253\u5f00\u4e00\u4e2a\u5b9a\u5236\u7684\u5c5e\u6027\u6587\u4ef6
 action.EditCustomVmOptions.text=Edit Custom VM Options...
 action.EditCustomVmOptions.description=Opens an editor tab with a custom VM options file
 action.LogDebugConfigure.text=\u914d\u7f6e\u8c03\u8bd5\u65e5\u5fd7\u8bbe\u7f6e...
@@ -1332,7 +1332,7 @@ action.FileChooser.NewFile.description=\u521b\u5efa\u65b0\u6587\u4ef6
 action.FileChooser.GotoHome.text=\u4e3b\u76ee\u5f55
 action.FileChooser.GotoHome.description=\u8f6c\u5230\u4e3b\u76ee\u5f55
 action.FileChooser.GotoDesktop.text=\u684c\u9762\u76ee\u5f55
-action.FileChooser.GotoDesktop.description=Go to Desktop directory
+action.FileChooser.GotoDesktop.description=\u53bb\u684c\u9762\u76ee\u5f55
 action.FileChooser.GotoProject.text=\u9879\u76ee\u76ee\u5f55
 action.FileChooser.GotoProject.description=\u8f6c\u5230\u9879\u76ee\u76ee\u5f55
 action.FileChooser.GotoModule.text=\u6a21\u5757\u76ee\u5f55
@@ -1497,14 +1497,14 @@ action.CreateLauncherScript.description=\u5bf9\u4e8e\u547d\u4ee4\u884c\u6253\u5f
 action.CreateDesktopEntry.text=\u521b\u5efa\u684c\u9762\u9879...
 action.CreateDesktopEntry.description=\u4e0e\u7cfb\u7edf\u5e94\u7528\u7a0b\u5e8f\u83dc\u5355\u4e2d\u96c6\u6210\u521b\u5efa\u4e00\u4e2a\u684c\u9762\u9879
 group.EditorGutterPopupMenu.text=\u7f16\u8f91\u5de6\u8fb9\u7a7a\u9699\u5f39\u51fa\u83dc\u5355
-action.EditorGutterToggleGlobalSoftWraps.text=Soft-Wrap All Files
-action.EditorGutterToggleLocalSoftWraps.gutterText=Soft-Wrap Current File
+action.EditorGutterToggleGlobalSoftWraps.text=\u6240\u6709\u6587\u4ef6\u81ea\u52a8\u6362\u884c
+action.EditorGutterToggleLocalSoftWraps.gutterText=\u5f53\u524d\u6587\u4ef6\u81ea\u52a8\u6362\u884c
 action.EditorGutterToggleGlobalLineNumbers.text=\u663e\u793a\u884c\u53f7
 action.EditorGutterToggleGlobalIndentLines.text=\u663e\u793a\u7f29\u8fdb\u6307\u5357
 action.ExcludeFromProject.text=\u4ece\u9879\u76ee\u4e2d\u6392\u9664...
 group.MarkFileAs.text=\u6807\u8bb0\u6587\u4ef6\u4e3a
 action.MarkAsPlainTextAction.text=\u6807\u8bb0\u4e3a\u7eaf\u6587\u672c
-action.MarkAsOriginalTypeAction.text=\u6807\u8bb0\u4e3a
+action.MarkAsOriginalTypeAction.text=\u6807\u8bb0\u4e3a\u539f\u59cb\u6587\u4ef6\u7c7b\u578b
 
 action.Console.Open.text=\u5f00\u542f\u63a7\u5236\u53f0
 action.Console.Open.description=\u9009\u5b9a\u5b9e\u4f53\u6253\u5f00\u63a7\u5236\u53f0
@@ -1566,16 +1566,16 @@ action.StructuralSearchPlugin.StructuralReplaceAction.description=\u66ff\u6362\u
 action.ModuleSettings.navigate=\u6253\u5f00\u6a21\u5757\u8bbe\u7f6e
 action.LibrarySettings.navigate=\u6253\u5f00\u5e93\u8bbe\u7f6e
 
-group.TabsPlacementGroup.text=Tabs Placement
+group.TabsPlacementGroup.text=\u6807\u7b7e\u5e03\u7f6e
 action.TabsPlacementTop.text=Top
 action.TabsPlacementLeft.text=Left
 action.TabsPlacementRight.text=Right
 action.TabsPlacementBottom.text=Bottom
 action.TabsPlacementNone.text=None
 
-action.ToggleDistractionFreeMode.enter=Enter Distraction Free Mode
-action.ToggleDistractionFreeMode.exit=Exit Distraction Free Mode
-action.TogglePresentationMode.exit=Exit Presentation Mode
-action.TogglePresentationMode.enter=Enter Presentation Mode
+action.ToggleDistractionFreeMode.enter=\u65e0\u5e72\u6270\u6a21\u5f0f
+action.ToggleDistractionFreeMode.exit=\u9000\u51fa\u65e0\u5e72\u6270\u6a21\u5f0f
+action.TogglePresentationMode.exit=\u9000\u51fa\u6f14\u793a\u6a21\u5f0f
+action.TogglePresentationMode.enter=\u6f14\u793a\u6a21\u5f0f
 
 action.EmojiAndSymbols.description=Input special characters using macOS system palette