diff --git a/platform/dvcs-impl/src/META-INF/dvcs.xml b/platform/dvcs-impl/src/META-INF/dvcs.xml index 965605c871f6..87ad7662553a 100644 --- a/platform/dvcs-impl/src/META-INF/dvcs.xml +++ b/platform/dvcs-impl/src/META-INF/dvcs.xml @@ -12,10 +12,10 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index f80db2b7813d..7279a10499b9 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -1515,6 +1515,41 @@ action.Diff.HighlightMode.text=Toggle Diff Highlight Mode action.ShelvedChanges.Restore.text=Restore Applied Shelved Change action.Graph.Current.Node.Dependencies.Filter.text=Show selected nodes with dependencies group.VcsToobarActions.text=VCS Actions +action.ChangesView.GroupBy.Repository.text=Repository +action.Vcs.Force.Push.text=_Force Push +action.Vcs.Push.text=Push... +group.Log.KeymapGroup.text=Log +group.Vcs.FileHistory.PresentationSettings.text=Presentation Settings +group.Vcs.FileHistory.PresentationSettings.description=Configure presentation of the File History +group.Vcs.Log.LayoutConfiguration.text=Configure Layout +group.Vcs.Log.LayoutConfiguration.description=Configure window layout +group.Vcs.Log.TextFilterSettings.text=Text Filter Settings +group.Vcs.Log.TextFilterSettings.description=Select text filter options +group.Vcs.Log.PresentationSettings.text=Presentation Settings +group.Vcs.Log.PresentationSettings.description=Configure presentation of the Log +action.Vcs.Log.ResumeIndexing.text=Resume Indexing +action.Vcs.Log.ResumeIndexing.description=Indexing was paused as it took longer than expected. Resume. +action.Vcs.Log.CompareRevisions.text=Compare Versions +action.Vcs.Log.CompareRevisions.description=Compare selected versions +action.Vcs.Log.ShowAllAffected.text=Show All Affected Files +action.Vcs.Log.ShowAllAffected.description=Show all changes made in the chosen revision +action.Vcs.Log.AnnotateRevisionAction.text=Annotate +action.Vcs.Log.AnnotateRevisionAction.description=Annotate selected revision +action.Vcs.Log.GetVersion.text=Get +action.Vcs.Log.GetVersion.description=Get version from repository +action.Vcs.Log.OpenRepositoryVersion.text=Show File at Revision +action.Vcs.Log.OpenRepositoryVersion.description=Open editor with selected revision of the file +action.Vcs.Log.MatchCaseAction.text=Match Case +action.Vcs.Log.EnableFilterByRegexAction.text=Regex +action.Vcs.Log.ShowTooltip.text=Show Commit Tooltip +action.Vcs.Log.ShowTooltip.description=Show tooltip for currently selected commit in the Log +action.Vcs.Show.Log.text=Show VCS Log +action.Vcs.Log.GoToChild.text=Go to Child Commit +action.Vcs.Log.GoToChild.description=Navigate to the child row in the commit graph +action.Vcs.Log.GoToParent.text=Go to Parent Commit +action.Vcs.Log.GoToParent.description=Navigate to the parent row in the commit graph +action.Vcs.Log.GoToRef.text=Go To Hash/Branch/Tag +action.Vcs.Log.GoToRef.description=Specify hash or name of a branch or a tag to navigate to the commit it points action.StartupWizard.text=Initial Configuration Wizard... action.StartupWizard.description=Run a wizard for selecting the set of enabled plugins action.PopupHector.text=Configure Current File Analysis... diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml index f9d43e27e7b8..30cc3e659ebb 100644 --- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml +++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml @@ -83,18 +83,15 @@ - + use-shortcut-of="Find"/> + - + - + @@ -118,34 +115,27 @@ - - + + + use-shortcut-of="Vcs.OpenRepositoryVersion"/> + icon="AllIcons.Actions.Download"/> + icon="AllIcons.Actions.Annotate"/> + use-shortcut-of="VcsHistory.ShowAllAffected" icon="AllIcons.Actions.ListChanges"/> + icon="AllIcons.Process.ProgressResumeSmall"/> + icon="AllIcons.Actions.Show" popup="true"> @@ -160,7 +150,7 @@ + icon="AllIcons.General.GearPlain" popup="true"> @@ -187,7 +177,7 @@ + icon="AllIcons.Debugger.RestoreLayout" popup="true"> @@ -216,8 +206,8 @@ + icon="AllIcons.Actions.Show" + popup="true"> @@ -235,7 +225,7 @@ - +