diff options
| -rw-r--r-- | org.eclipse.egit.ui/plugin.properties | 17 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 28 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 4 |
3 files changed, 34 insertions, 15 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties index fdf95d2d49..6f0759644f 100644 --- a/org.eclipse.egit.ui/plugin.properties +++ b/org.eclipse.egit.ui/plugin.properties @@ -45,7 +45,7 @@ CompareWithRevisionAction_tooltip=Compare with the resource history CompareWithIndexAction_label=Git Index CompareWithIndexAction_tooltip=Compare with Git's index version -CompareWithHeadAction_label=HEAD revision +CompareWithHeadAction_label=HEAD Revision CompareWithHeadAction_tooltip=Compare with Git's HEAD version IgnoreAction_label=Add to .git&ignore @@ -101,18 +101,21 @@ GitPreferences_DecoratorPreferencePage_name=Label Decorations ShareProjectCommand_name=Share with Git ShareProjectCommand_desc=Share the project using Git -Soft_Reset_label = Soft Reset +Soft_Reset_label = Soft Soft_Reset_tooltip = Resets HEAD but not working directory nor index -Mixed_Reset_label = Mixed Reset +Mixed_Reset_label = Mixed Mixed_Reset_tooltip = Resets HEAD and index, but not working directory -Hard_Reset_label = Hard Reset +Hard_Reset_label = Hard Hard_Reset_tooltip = Resets HEAD and index, and working directory (changes in tracked files will be lost) -Set_As_Quickdiff_Baseline_label = Set as quickdiff baseline -Reset_Quickdiff_Baseline_To_HEAD_label = Reset quickdiff baseline to HEAD -Reset_Quickdiff_Baseline_To_First_Parent_label = Reset quickdiff baseline to first parent of HEAD +ResetMenuName = Reset + +Set_As_Quickdiff_Baseline_label = Set as Baseline +Reset_Quickdiff_Baseline_To_HEAD_label = Reset Baseline to HEAD +Reset_Quickdiff_Baseline_To_First_Parent_label = Reset Baseline to first Parent of HEAD +QuickDiffMenuName = Quick Diff ShareProjectCommandParameter_name = Project GitRepositoriesView_name = Git Repositories diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index ed36ab33f0..9d721485b5 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -140,7 +140,7 @@ class="org.eclipse.egit.ui.internal.actions.SoftResetToRevisionAction" id="org.eclipse.egit.ui.softresettorevision" label="%Soft_Reset_label" - menubarPath="additions" + menubarPath="org.eclipse.egit.ui.reset/reset" enablesFor="1" tooltip="%Soft_Reset_tooltip"> </action> @@ -148,7 +148,7 @@ class="org.eclipse.egit.ui.internal.actions.MixedResetToRevisionAction" id="org.eclipse.egit.ui.mixedresettorevision" label="%Mixed_Reset_label" - menubarPath="additions" + menubarPath="org.eclipse.egit.ui.reset/reset" enablesFor="1" tooltip="%Mixed_Reset_tooltip"> </action> @@ -156,7 +156,7 @@ class="org.eclipse.egit.ui.internal.actions.HardResetToRevisionAction" id="org.eclipse.egit.ui.hardresettorevision" label="%Hard_Reset_label" - menubarPath="additions" + menubarPath="org.eclipse.egit.ui.reset/reset" enablesFor="1" tooltip="%Hard_Reset_tooltip"> </action> @@ -165,22 +165,38 @@ enablesFor="1" id="org.eclipse.egit.ui.setquickdiffbaseline" label="%Set_As_Quickdiff_Baseline_label" - menubarPath="additions"> + menubarPath="org.eclipse.egit.ui.quickdiffbaseline/quickdiff"> </action> <action class="org.eclipse.egit.ui.internal.actions.ResetQuickdiffBaselineAction" enablesFor="*" id="org.eclipse.egit.ui.resetquickdiffbaseline" label="%Reset_Quickdiff_Baseline_To_HEAD_label" - menubarPath="additions"> + menubarPath="org.eclipse.egit.ui.quickdiffbaseline/quickdiff"> </action> <action class="org.eclipse.egit.ui.internal.actions.ResetQuickdiffBaselineHeadParentAction" enablesFor="*" id="org.eclipse.egit.ui.resetquickdiffheadparentbaseline" label="%Reset_Quickdiff_Baseline_To_First_Parent_label" - menubarPath="additions"> + menubarPath="org.eclipse.egit.ui.quickdiffbaseline/quickdiff"> </action> + <menu + id="org.eclipse.egit.ui.quickdiffbaseline" + label="%QuickDiffMenuName" + path="additions"> + <groupMarker + name="quickdiff"> + </groupMarker> + </menu> + <menu + id="org.eclipse.egit.ui.reset" + label="%ResetMenuName" + path="additions"> + <groupMarker + name="reset"> + </groupMarker> + </menu> </objectContribution> <objectContribution adaptable="true" diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index 00ceee7b1f..f655b52efd 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -74,7 +74,7 @@ GitDocument_errorRefreshQuickdiff=Failed to refresh quickdiff GitDocument_errorResolveQuickdiff=Could not resolve quickdiff baseline {0} corresponding to {1} in {2} GitHistoryPage_compareMode=Compare Mode GitHistoryPage_CompareVersions=Compare with each other -GitHistoryPage_CompareWithWorking=Compare with working tree +GitHistoryPage_CompareWithWorking=Compare with Working Tree GitHistoryPage_errorLookingUpPath=IO error looking up path {0} in {1}. GitHistoryPage_errorParsingHead=Cannot parse HEAD in: {0} GitHistoryPage_errorReadingHeadCommit=Cannot read HEAD commit {0} in: {1} @@ -274,7 +274,7 @@ ResetAction_resetFailed=Reset failed ResetQuickdiffBaselineAction_resetQuickdiffBaseline=Reset Quickdiff Baseline ResetQuickdiffBaselineHeadParentAction_0=Reset Quickdiff Baseline ResourceHistory_toggleCommentWrap=Wrap Comments -ResourceHistory_toggleCommentFill=Fill paragraphs +ResourceHistory_toggleCommentFill=Fill Paragraphs ResourceHistory_toggleRevDetail=Show Revision Details ResourceHistory_toggleRevComment=Show Revision Comment ResourceHistory_toggleTooltips=Show Revision Tooltip |