Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2012-05-07 18:44:18 -0400
committerMatthias Sohn2012-05-07 18:44:18 -0400
commit3629c92cc5a767b091a9a32f1605e0aa350ca946 (patch)
tree01d20bd7ea546d76f15ff79cc4b633c7fb5a1806 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parente733d2086f20d222876bf88c0320bcd647643a55 (diff)
downloadegit-3629c92cc5a767b091a9a32f1605e0aa350ca946.tar.gz
egit-3629c92cc5a767b091a9a32f1605e0aa350ca946.tar.xz
egit-3629c92cc5a767b091a9a32f1605e0aa350ca946.zip
[historyView] Add reset descriptions to context menu labels
Use consistent text to describe the different reset types between the reset dialog and the context menu options displayed in the History view reset sub-menu. Bug: 377942 Change-Id: I70919998a3a7fbad264d7dd8f37761b206a38417 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties12
1 files changed, 6 insertions, 6 deletions
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 8e2116a32..2e7a1c868 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
@@ -179,10 +179,10 @@ GitHistoryPage_RefreshMenuLabel=&Refresh
GitHistoryPage_RepositoryNamePattern=Repository: {0}
GitHistoryPage_ResetBaselineToHeadMenuLabel=Reset Baseline to &HEAD
GitHistoryPage_ResetBaselineToParentOfHeadMenuLabel=Reset Baseline to First &Parent of HEAD
-GitHistoryPage_ResetHardMenuLabel=&Hard
+GitHistoryPage_ResetHardMenuLabel=&Hard (HEAD, Index, and Working Directory)
GitHistoryPage_ResetMenuLabel=&Reset
-GitHistoryPage_ResetMixedMenuLabel=&Mixed
-GitHistoryPage_ResetSoftMenuLabel=&Soft
+GitHistoryPage_ResetMixedMenuLabel=&Mixed (HEAD and Index)
+GitHistoryPage_ResetSoftMenuLabel=&Soft (HEAD Only)
GitHistoryPage_revertMenuItem=Revert Commit
GitHistoryPage_mergeMenuItem=Merge
GitHistoryPage_rebaseMenuItem=Rebase on Top of
@@ -543,9 +543,9 @@ ResetTargetSelectionDialog_ResetConfirmQuestion=Resetting will overwrite any cha
ResetTargetSelectionDialog_ResetQuestion=Confirm Reset
ResetTargetSelectionDialog_ResetTitle=Reset: {0}
ResetTargetSelectionDialog_ResetTypeGroup=Reset type
-ResetTargetSelectionDialog_ResetTypeHardButton=&Hard
-ResetTargetSelectionDialog_ResetTypeMixedButton=&Mixed (working directory unmodified)
-ResetTargetSelectionDialog_ResetTypeSoftButton=&Soft (index and working directory unmodified)
+ResetTargetSelectionDialog_ResetTypeHardButton=&Hard (HEAD, index, and working directory updated)
+ResetTargetSelectionDialog_ResetTypeMixedButton=&Mixed (HEAD and index updated)
+ResetTargetSelectionDialog_ResetTypeSoftButton=&Soft (HEAD updated)
ResetTargetSelectionDialog_SelectBranchForResetMessage=Select a branch to reset the current branch to
ResetTargetSelectionDialog_WindowTitle=Reset
ResourceHistory_MaxNumCommitsInList=Maximum number of commits to &show:

Back to the top