Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2010-12-08 02:33:10 -0500
committerMathias Kinzler2010-12-08 02:33:10 -0500
commitbfc439fe900dd036aa97a36b9a0dea18b5e9df20 (patch)
treec370bcb6d480c015542cdcb068ae7bd7a4571bb0 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parent90da7ba7b9fb3c4db61ddfa60b1e13abc25d8b43 (diff)
downloadegit-bfc439fe900dd036aa97a36b9a0dea18b5e9df20.tar.gz
egit-bfc439fe900dd036aa97a36b9a0dea18b5e9df20.tar.xz
egit-bfc439fe900dd036aa97a36b9a0dea18b5e9df20.zip
Rebase Interoperability: do not auto-abort upon conflict
EGit now stops when a conflict is found during rebase and allows the user to manipulate the content; they can then switch to the command line to continue the rebase. The rebase result dialog also offers the options to abort the current rebase altogether or to open the merge tool to work out the conflicts. Change-Id: Ie694e09b45c43ee82254231d4f619fbe5510d5eb Signed-off-by: Mathias Kinzler <mathias.kinzler@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.properties21
1 files changed, 15 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 0aa7bd871..8ecc1e284 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
@@ -6,7 +6,6 @@
# http://www.eclipse.org/legal/epl-v10.html
#
###############################################################################
-
AbortRebaseCommand_CancelDialogMessage=The Abort operation was canceled
AbortRebaseCommand_CancelDialogTitle=Abort of Rebase was canceled
AbortRebaseCommand_JobName=Aborting Rebase
@@ -142,12 +141,14 @@ GitHistoryPage_ShowAllBranchesMenuLabel=Show all &Branches
GitPreferenceRoot_CloningRepoGroupHeader=Cloning Repositories
GitPreferenceRoot_DefaultRepoFolderLabel=Default Repository &folder:
GitPreferenceRoot_DefaultRepoFolderTooltip=This folder will be suggested as parent folder when cloning a Remote Repository
+GitPreferenceRoot_HideConfirmationGroup=Hide confirmation dialogs
+GitPreferenceRoot_HideRebaseConfirmationField=R&ebase
GitPreferenceRoot_HistoryGroupHeader=History View
GitPreferenceRoot_MergeGroupHeader=Merge
GitPreferenceRoot_MergeMode_0_Label=Ask the user when the tool is started
GitPreferenceRoot_MergeMode_1_Label=Workspace (pre-merged by Git)
GitPreferenceRoot_MergeMode_2_Label=Last HEAD (unmerged)
-GitPreferenceRoot_MergeModeLabel=Merge Tool Content
+GitPreferenceRoot_MergeModeLabel=&Merge Tool Content
GitPreferenceRoot_MergeModeTooltip=Determines which content to be displayed on the left side of the merge tool
GitPreferenceRoot_RemoteConnectionsGroupHeader=Remote Connections
GitPreferenceRoot_RepoChangeScannerGroupHeader=Automatic Refresh
@@ -171,14 +172,22 @@ RebaseCurrentRefCommand_AbortedDialogTitle=Rebase aborted
RebaseCurrentRefCommand_RebaseCanceledMessage=The Rebase operation was canceled
RebaseCurrentRefCommand_RebaseCanceledTitle=Rebase canceled
RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing branch {0}
-RebaseResultDialog_CommitIdLabel=Id:
-RebaseResultDialog_CommitMessageLabel=Message:
+RebaseResultDialog_AbortButton=Abort
+RebaseResultDialog_AbortRebaseRadioText=&Abort the Rebase
+RebaseResultDialog_ActionGroupTitle=Action to perform
+RebaseResultDialog_CommitIdLabel=&Id:
+RebaseResultDialog_CommitMessageLabel=&Message:
+RebaseResultDialog_ConflictListFailureMessage=Error getting the list of conflicts
RebaseResultDialog_DetailsGroup=Commit details
RebaseResultDialog_DialogTitle=Rebase Result
RebaseResultDialog_DiffCalculationErrorDisplay=An Exception occured while calculating the Diff, please check the Error Log for details
RebaseResultDialog_DiffCalculationErrorMessage=Could not calculate Diff of current commit
-RebaseResultDialog_DiffDetailsLabel=Diff details:
-RebaseResultDialog_StatusLabel=Result status:
+RebaseResultDialog_DiffDetailsLabel=&Files with rebase conflicts:
+RebaseResultDialog_DoNothingRadioText=Do nothing (return to the &workbench)
+RebaseResultDialog_MergeButton=Merge
+RebaseResultDialog_StartMergeRadioText=Start Merge &Tool to resolve conflicts
+RebaseResultDialog_StatusLabel=Result status: {0}
+RebaseResultDialog_ToggleShowButton=Don't show this confirmation dialog again
RebaseTargetSelectionDialog_DialogMessage=Select a branch other than the currently checked out branch
RebaseTargetSelectionDialog_DialogTitle=Rebase the currently checked out branch onto another branch
RebaseTargetSelectionDialog_RebaseButton=&Rebase

Back to the top