Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2016-07-09 13:06:13 -0400
committerMatthias Sohn2016-09-05 17:33:48 -0400
commit5369c472551e573c7756abe5f7c72748ba4f8541 (patch)
treea70ad4ad8de70a4b360349e2795a4afe828c34ab /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parentc01903674b8d1a2f25bc133a2fe5ce4e228632a7 (diff)
downloadegit-5369c472551e573c7756abe5f7c72748ba4f8541.tar.gz
egit-5369c472551e573c7756abe5f7c72748ba4f8541.tar.xz
egit-5369c472551e573c7756abe5f7c72748ba4f8541.zip
Check for running launches before modifying the workspace
Check before: * any checkout * any pull * any rebase, including when an interactive rebase is started * any merge * reset --hard * replace with ... * cherry-pick Bug: 495777 Change-Id: Ie7e325f363f4497f873694c419d5352fe269a89e Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties13
1 files changed, 7 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index b4ba05a3d..98c424580 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -652,7 +652,7 @@ ResetTargetSelectionDialog_DetachedHeadState=You are in the 'detached HEAD' stat
ResetTargetSelectionDialog_ExpressionLabel=Reset to (expression):
ResetTargetSelectionDialog_ExpressionTooltip=Any Git expression resolving to a commit
ResetTargetSelectionDialog_ResetButton=&Reset
-ResetTargetSelectionDialog_ResetConfirmQuestion=Resetting will overwrite any changes in your working tree.\n\nDo you want to continue?
+ResetTargetSelectionDialog_ResetConfirmQuestion=Resetting will overwrite any changes in your working tree.{0}\n\nDo you want to continue?
ResetTargetSelectionDialog_ResetQuestion=Confirm Reset
ResetTargetSelectionDialog_ResetTitle=Reset: {0}
ResetTargetSelectionDialog_ResetTypeGroup=Reset type
@@ -1103,10 +1103,11 @@ BranchOperationUI_CheckoutRemoteTrackingTitle=Check out remote-tracking branch
BranchOperationUI_Continue=Continue
BranchOperationUI_DetachedHeadTitle=Detached HEAD
BranchOperationUI_DetachedHeadMessage=You are in the 'detached HEAD' state. This means that you don't have a local branch checked out.\n\nYou can look around, but it's not recommended to commit changes. The reason is that these commits would not be on any branch and would not be visible after checking out another branch.\n\nIf you want to make changes, create or checkout a local branch first.
-BranchOperationUI_RunningLaunchDontShowAgain=Don't show this warning again
-BranchOperationUI_RunningLaunchMessage=The launch configuration ''{0}'' is currently running and uses a project of this repository. Continue branch switch?
-BranchOperationUI_RunningLaunchTitle=Running Launch
-BranchOperationUI_SearchLaunchConfiguration=Search running launch configuration
+LaunchFinder_RunningLaunchDontShowAgain=Don't show this warning again
+LaunchFinder_RunningLaunchMessage=The launch configuration ''{0}'' is currently running and uses a project of this repository.
+LaunchFinder_RunningLaunchTitle=Running Launch
+LaunchFinder_SearchLaunchConfiguration=Search running launch configuration
+LaunchFinder_ContinueQuestion=Continue all the same?
BranchRenameDialog_Message=Please enter a new name for branch {0}
BranchRenameDialog_NewNameLabel=New Branch &name:
BranchRenameDialog_RenameExceptionMessage=Could not rename branch
@@ -1288,7 +1289,7 @@ DiffEditorPage_TaskGeneratingDiff=Generating diff
DiffEditorPage_TaskUpdatingViewer=Updating diff viewer
DiffEditorPage_Title=Diff
DiscardChangesAction_confirmActionTitle=Discard Local Changes
-DiscardChangesAction_confirmActionMessage=This will discard all local changes for the selected resources. Untracked files will be ignored. Are you sure you want to do this?
+DiscardChangesAction_confirmActionMessage=This will discard all local changes for the selected resources. Untracked files will be ignored.{0}\n\nAre you sure you want to do this?
DiscardChangesAction_discardChanges=Discard Changes
Disconnect_disconnect=Disconnect

Back to the top