更新到版本2017.1

resources_en/messages/ActionsBundle.properties

@@ -1,4 +1,4 @@
-# suppress inspection "UnusedProperty" for whole file
+# suppress inspection "UnusedProperty" for whole file
 # IDEA core action texts and descriptions go here.
 # The key patterns are "action." + id + ".text" and "action." + id + ".description"
 
@@ -236,8 +236,8 @@ 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=Check _In Project
-action.CheckinFiles.text=Check _In
+action.CheckinProject.text=Comm_it Project
+action.CheckinFiles.text=Comm_it File
 action.UpdateFiles.text=_Update
 action.CheckStatusForFiles.text=Chec_k Status
 action.Annotate.text=A_nnotate
@@ -259,6 +259,8 @@ action.CompareFileWithEditor.text=Co_mpare File with Editor
 action.CompareFileWithEditor.description=Compare selected file with editor
 action.ShowQuickDocAtPinnedWindowFromTooltip.text=Full documentation in a pinned window
 action.ShowQuickDocAtPinnedWindowFromTooltip.description=Show full documentation in a pinned window
+action.JumpToColorsAndFonts.text=Jump to Colors and Fonts
+action.JumpToColorsAndFonts.description=Jump to Colors and Fonts option at caret
 
 group.LocalHistory.text=Local _History
 action.LocalHistory.ShowHistory.text=Show _History
@@ -492,8 +494,8 @@ action.GotoSymbol.description=Quickly navigate to any symbol by name
 action.GotoCustomRegion.text=Custom Folding...
 action.GotoAction.text=_Find Action...
 action.GotoAction.description=Quickly navigate to action by name
-action.GotoLine.text=_Line...
-action.GotoLine.description=Navigate to a line in editor by its number
+action.GotoLine.text=_Line/Column...
+action.GotoLine.description=Navigate to a line (and/or column) in editor by its number
 action.GotoDeclaration.text=_Declaration
 action.GotoDeclaration.description=Navigate to the declaration of the symbol at caret
 action.GotoImplementation.text=I_mplementation(s)
@@ -615,7 +617,7 @@ action.Unscramble.text=Analyze _Stacktrace...
 action.Unscramble.description=Open console with the navigatable stacktrace
 action.IdeScriptingConsole.text=IDE Scripting Console
 action.IdeScriptingConsole.description=Open IDE scripting console
-action.NewScratchFile.text=New Scratch File...
+action.NewScratchFile.text=Scratch File
 action.NewScratchFile.description=Creates new scratch file with chosen language
 action.NewScratchBuffer.text=New Scratch Buffer
 action.NewScratchBuffer.description=Creates new or reuses existing scratch buffer
@@ -753,7 +755,7 @@ action.Pause.text=_Pause Program
 action.Pause.description=Suspend program execution and enable debugging
 action.Resume.text=Resume Pro_gram
 action.Resume.description=Resume program execution
-action.EvaluateExpression.text=_Evaluate Expression...
+action.EvaluateExpression.text=Evaluate E_xpression...
 action.EvaluateExpression.description=Evaluate arbitrary expression
 action.QuickEvaluateExpression.text=_Quick Evaluate Expression
 action.QuickEvaluateExpression.description=Evaluate selected expression
@@ -844,7 +846,7 @@ action.LocalVcs.ShowStatistics.description=Show Local VCS statistics
 action.LocalVcs.ShowRepHistory.text=Repository History
 action.DropAnError.text=Drop An Error
 action.DropAnOutOfMemoryError.text=Drop An OutOfMemoryError
-action.DropAnOutOfPermGenMemoryError.text=Drop An PermGen OutOfMemoryError
+action.DropAnOutOfMetaspaceError.text=Drop an OutOfMemoryError in Metaspace
 action.DumpInspectionDescriptions.text=Dump Inspection Descriptions
 action.DumpIntentionsDescriptions.text=Dump Intentions Descriptions
 action.ShowUserActivities.text=Show Activities
@@ -942,6 +944,9 @@ action.CloseAllUnpinnedEditors.description=Close all editors which are not pinne
 action.CloseContent.text=_Close
 action.CloseContent.description=Close currently focused content
 group.EditorTabsGroup.text=Editor _Tabs
+action.CloseFirstNotification.text=Close First
+action.CloseAllNotifications.text=Close All
+group.Notifications.text=Notifications
 action.SplitVertically.text=Split _Vertically
 action.SplitVertically.description=Split editor area into 2 tab groups and move the current tab to the right group
 action.SplitHorizontally.text=Split _Horizontally
@@ -1302,12 +1307,17 @@ action.Diff.AppendLeftSide.text=Append Left Side
 action.Diff.AppendRightSide.text=Append Right Side
 action.Diff.IgnoreLeftSide.text=Ignore Left Side
 action.Diff.IgnoreRightSide.text=Ignore Right Side
+action.Diff.ResolveConflict.text=Resolve Automatically
 action.Diff.ApplyNonConflicts.text=Apply All Non-Conflicting Changes
 action.Diff.ApplyNonConflicts.Left.text=Apply Non-Conflicting Changes from the Left Side
 action.Diff.ApplyNonConflicts.Right.text=Apply Non-Conflicting Changes from the Right Side
 action.Diff.ComparePartial.Base.Left.text=Compare Left and Middle Contents
 action.Diff.ComparePartial.Base.Right.text=Compare Middle and Right Contents
 action.Diff.ComparePartial.Left.Right.text=Compare Left and Right Contents
+action.Diff.CompareWithBase.Left.text=Compare Base and Left Contents
+action.Diff.CompareWithBase.Result.text=Compare Base and Middle Contents
+action.Diff.CompareWithBase.Right.text=Compare Base and Right Contents
+action.Diff.ComparePartial.Generic=Compare {0,choice,0#Left|1#Middle|2#Right} and {1,choice,0#Left|1#Middle|2#Right} Contents
 
 action.FileChooser.ShowHiddens.text=Show Hidden Files and Directories
 action.FileChooser.ShowHiddens.description=Show hidden files and directories
@@ -1322,7 +1332,7 @@ action.FileChooser.NewFile.description=Create new file
 action.FileChooser.GotoHome.text=Home Directory
 action.FileChooser.GotoHome.description=Go to home directory
 action.FileChooser.GotoDesktop.text=Desktop Directory
-action.FileChooser.GotoDesktop.description=Go to Desktop directory directory
+action.FileChooser.GotoDesktop.description=Go to Desktop directory
 action.FileChooser.GotoProject.text=Project Directory
 action.FileChooser.GotoProject.description=Go to project directory
 action.FileChooser.GotoModule.text=Module Directory
@@ -1554,4 +1564,18 @@ action.StructuralSearchPlugin.StructuralReplaceAction.text=Repla_ce Structurally
 action.StructuralSearchPlugin.StructuralReplaceAction.description=Structural Replace
 
 action.ModuleSettings.navigate=Open Module Settings
-action.LibrarySettings.navigate=Open Library Settings
+action.LibrarySettings.navigate=Open Library Settings
+
+group.TabsPlacementGroup.text=Tabs Placement
+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.EmojiAndSymbols.description=Input special characters using macOS system palette

resources_en/messages/ActionsBundle_zh_CN.properties

@@ -1,4 +1,4 @@
-# suppress inspection "UnusedProperty" for whole file
+# suppress inspection "UnusedProperty" for whole file
 # IDEA core action texts and descriptions go here.
 # The key patterns are "action." + id + ".text" and "action." + id + ".description"
 
@@ -186,8 +186,8 @@ action.EditorToggleShowGutterIcons.text=\u663e\u793a\u88c5\u8ba2\u7ebf\u56fe\u68
 action.EditorToggleShowGutterIcons.description=\u5728\u5f53\u524d\u7f16\u8f91\u5668\u4e2d\u5207\u6362\u663e\u793a\u88c5\u8ba2\u7ebf\u56fe\u6807
 action.EditorToggleUseSoftWraps.text=\u4f7f\u7528\u81ea\u52a8\u6362\u884c
 action.EditorToggleUseSoftWraps.description=\u5728\u5f53\u524d\u7f16\u8f91\u5668\u5207\u6362\u662f\u5426\u81ea\u52a8\u6362\u884c
-action.EditorToggleUseSoftWrapsInPreview.text=Use Soft Wraps in Preview Editor
-action.EditorToggleUseSoftWrapsInPreview.description=Toggle using soft wraps in preview editors
+action.EditorToggleUseSoftWrapsInPreview.text=\u5728\u9884\u89c8\u7f16\u8f91\u5668\u91cc\u4f7f\u7528\u81ea\u52a8\u6362\u884c
+action.EditorToggleUseSoftWrapsInPreview.description=\u5728\u9884\u89c8\u7f16\u8f91\u5668\u4f7f\u7528\u81ea\u52a8\u6362\u884c\u5207\u6362
 action.EditorConsoleScrollToTheEnd.text=\u6eda\u52a8\u5230\u672b\u5c3e
 action.EditorIncreaseFontSize.text=\u589e\u52a0\u5b57\u4f53\u5927\u5c0f
 action.EditorDecreaseFontSize.text=\u7f29\u5c0f\u5b57\u4f53
@@ -236,8 +236,8 @@ action.Diff.PreviousConflict.description=Move to the previous unresolved conflic
 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=\u68c0\u67e5\u9879\u76ee(_I)
-action.CheckinFiles.text=\u68c0\u67e5(_I)
+action.CheckinProject.text=Comm_it Project
+action.CheckinFiles.text=Comm_it File
 action.UpdateFiles.text=\u66f4\u65b0
 action.CheckStatusForFiles.text=\u68c0\u67e5\u72b6\u6001(_K)
 action.Annotate.text=\u6ce8\u91ca(_N)
@@ -259,6 +259,8 @@ action.CompareFileWithEditor.text=\u7f16\u8f91\u5668\u4e2d\u6bd4\u8f83\u6587\u4e
 action.CompareFileWithEditor.description=\u7528\u7f16\u8f91\u5668\u6bd4\u8f83\u6240\u9009\u6587\u4ef6
 action.ShowQuickDocAtPinnedWindowFromTooltip.text=\u5728\u4e00\u4e2a\u56fa\u5b9a\u7684\u7a97\u53e3\u5b8c\u6574\u7684\u6587\u6863
 action.ShowQuickDocAtPinnedWindowFromTooltip.description=\u663e\u793a\u5728\u4e00\u4e2a\u56fa\u5b9a\u7684\u7a97\u53e3\u5b8c\u6574\u7684\u6587\u6863
+action.JumpToColorsAndFonts.text=Jump to Colors and Fonts
+action.JumpToColorsAndFonts.description=Jump to Colors and Fonts option at caret
 
 group.LocalHistory.text=\u672c\u5730\u5386\u53f2\u8bb0\u5f55
 action.LocalHistory.ShowHistory.text=\u663e\u793a\u5386\u53f2\u8bb0\u5f55
@@ -492,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=_Find Action...
 action.GotoAction.description=\u5feb\u901f\u5bfc\u822a\u5230\u901a\u8fc7\u540d\u79f0\u64cd\u4f5c
-action.GotoLine.text=\u884c...
-action.GotoLine.description=\u5bfc\u822a\u5230\u7f16\u8f91\u5668\u4e2d\u7684\u884c
+action.GotoLine.text=_Line/Column...
+action.GotoLine.description=Navigate to a line (and/or column) in editor by its number
 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
@@ -615,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=\u65b0\u4e34\u65f6\u6587\u4ef6...
+action.NewScratchFile.text=Scratch File
 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
@@ -753,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=\u8bc4\u4f30\u8868\u8fbe\u5f0f...
+action.EvaluateExpression.text=Evaluate E_xpression...
 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
@@ -844,7 +846,7 @@ action.LocalVcs.ShowStatistics.description=\u663e\u793a\u672c\u5730VCS\u7edf\u8b
 action.LocalVcs.ShowRepHistory.text=\u7248\u672c\u5e93\u5386\u53f2
 action.DropAnError.text=Drop An Error
 action.DropAnOutOfMemoryError.text=Drop An OutOfMemoryError
-action.DropAnOutOfPermGenMemoryError.text=Drop An PermGen OutOfMemoryError
+action.DropAnOutOfMetaspaceError.text=Drop an OutOfMemoryError in Metaspace
 action.DumpInspectionDescriptions.text=Dump Inspection Descriptions
 action.DumpIntentionsDescriptions.text=Dump Intentions Descriptions
 action.ShowUserActivities.text=\u663e\u793a\u6d3b\u52a8\u7684
@@ -942,6 +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.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
@@ -1302,12 +1307,17 @@ action.Diff.AppendLeftSide.text=\u9644\u52a0\u5de6\u4fa7
 action.Diff.AppendRightSide.text=\u9644\u52a0\u53f3\u4fa7
 action.Diff.IgnoreLeftSide.text=\u5ffd\u7565\u5de6\u4fa7
 action.Diff.IgnoreRightSide.text=\u5ffd\u7565\u53f3\u4fa7
+action.Diff.ResolveConflict.text=Resolve Automatically
 action.Diff.ApplyNonConflicts.text=Apply All Non-Conflicting Changes
 action.Diff.ApplyNonConflicts.Left.text=Apply Non-Conflicting Changes from the Left Side
 action.Diff.ApplyNonConflicts.Right.text=Apply Non-Conflicting Changes from the Right Side
 action.Diff.ComparePartial.Base.Left.text=Compare Left and Middle Contents
 action.Diff.ComparePartial.Base.Right.text=Compare Middle and Right Contents
 action.Diff.ComparePartial.Left.Right.text=Compare Left and Right Contents
+action.Diff.CompareWithBase.Left.text=Compare Base and Left Contents
+action.Diff.CompareWithBase.Result.text=Compare Base and Middle Contents
+action.Diff.CompareWithBase.Right.text=Compare Base and Right Contents
+action.Diff.ComparePartial.Generic=Compare {0,choice,0#Left|1#Middle|2#Right} and {1,choice,0#Left|1#Middle|2#Right} Contents
 
 action.FileChooser.ShowHiddens.text=\u663e\u793a\u9690\u85cf\u7684\u6587\u4ef6\u548c\u76ee\u5f55
 action.FileChooser.ShowHiddens.description=\u663e\u793a\u9690\u85cf\u7684\u6587\u4ef6\u548c\u76ee\u5f55
@@ -1322,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=\u53bb\u684c\u9762\u76ee\u5f55
+action.FileChooser.GotoDesktop.description=Go to Desktop directory
 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
@@ -1554,4 +1564,18 @@ action.StructuralSearchPlugin.StructuralReplaceAction.text=\u66ff\u6362\u7ed3\u6
 action.StructuralSearchPlugin.StructuralReplaceAction.description=\u66ff\u6362\u7ed3\u6784
 
 action.ModuleSettings.navigate=\u6253\u5f00\u6a21\u5757\u8bbe\u7f6e
-action.LibrarySettings.navigate=\u6253\u5f00\u5e93\u8bbe\u7f6e
+action.LibrarySettings.navigate=\u6253\u5f00\u5e93\u8bbe\u7f6e
+
+group.TabsPlacementGroup.text=Tabs Placement
+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.EmojiAndSymbols.description=Input special characters using macOS system palette