Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2013-04-14 18:08:10 -0400
committerRobin Rosenberg2013-04-14 18:08:10 -0400
commit732735c141dab4db62f9512bc5a02bbf21cbe1cd (patch)
tree4b9f8e42d1a2ecba7ad63f14bc18ca5a007624a8 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parent3665d1d0ce1d07082e37fcd5e6978b05ed93419c (diff)
downloadegit-732735c141dab4db62f9512bc5a02bbf21cbe1cd.tar.gz
egit-732735c141dab4db62f9512bc5a02bbf21cbe1cd.tar.xz
egit-732735c141dab4db62f9512bc5a02bbf21cbe1cd.zip
Rename Rebase>Skip menu to Rebase->Skip commit and continue
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.properties4
1 files changed, 2 insertions, 2 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 9ce96ac64..05336ca27 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
@@ -309,7 +309,7 @@ RebaseResultDialog_Failed=Rebase failed
RebaseResultDialog_NextSteps=Next steps
RebaseResultDialog_NextStepsAfterResolveConflicts=When you have resolved the conflicts run:\n- "Rebase > Continue"\n- or "Rebase > Abort"
RebaseResultDialog_NextStepsDoNothing=- resolve the conflicts\n- then run "Rebase > Continue"\n- or "Rebase > Abort"
-RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip".
+RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip commit and continue".
RebaseResultDialog_notInWorkspace=<not in workspace>
RebaseResultDialog_notInWorkspaceMessage=Some conflicting files are not part of the workspace. Open Staging View and launch a text editor to edit each conflicting file.
RebaseResultDialog_notShared=<not shared>
@@ -1650,7 +1650,7 @@ FetchChangeFromGerritCommand_noRepositorySelectedTitle=No Git project was select
FetchChangeFromGerritCommand_noRepositorySelectedMessage=To be able to fetch changes from Gerrit you need to select a project which is shared with a Git repository and which is configured with Gerrit as a remote repository
RebasePulldownAction_Continue=&Continue
-RebasePulldownAction_Skip=&Skip
+RebasePulldownAction_Skip=&Skip commit and continue
RebasePulldownAction_Abort=&Abort
SynchronizeCommand_jobName=Synchronizing {0} ...

Back to the top