Allow to edit branches while fetching from Gerrit

Reuse the same dialog when fetching from Gerrit and checking out a
branch.

Change-Id: I282c748ffbc21fd4fc3fe2fa955c8dee4ffe3524
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 17 insertions, 13 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 9029cc08ac..817f9e06d2 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
@@ -243,11 +243,9 @@ ClearCredentialsCommand_clearingCredentialsFailed=Clearing credentials failed.
 CheckoutCommand_CheckoutLabel=&Checkout
 CheckoutCommand_CheckoutLabelWithQuestion=&Checkout...
 CheckoutConflictDialog_conflictMessage=The files shown below have uncommitted changes which would be lost by the selected operation.\n\nEither commit the changes to the repository or discard the changes by resetting the current branch.
-CheckoutDialog_Message=Select a ref and choose action to execute
+CheckoutDialog_Title=Checkout a ref or work with branches
 CheckoutDialog_OkCheckout=&Checkout
 CheckoutDialog_OkCheckoutWithQuestion=&Checkout...
-CheckoutDialog_Title=Checkout a ref or work with branches
-CheckoutDialog_WindowTitle=Branches
 CheckoutHandler_SelectBranchMessage=There is more than one branch for this commit. Please select the branch you want to check out.
 CheckoutHandler_SelectBranchTitle=Select a Branch for Checkout
 CherryPickHandler_NoCherryPickPerformedMessage=The change has already been included
@@ -829,6 +827,7 @@ FetchDestinationPage_TrackingBranchNotFoundMessage=Remote tracking branch ''{0}'
 FetchGerritChangePage_ActivateAdditionalRefsButton=Make FETCH_HEAD visible in &History View
 FetchGerritChangePage_ActivateAdditionalRefsTooltip=The History View is currently configured not to show FETCH_HEAD; if you check this, the History View settings will be changed so that FETCH_HEAD becomes visible
 FetchGerritChangePage_AfterFetchGroup=Action to perform after fetch
+FetchGerritChangePage_BranchEditButton=Edit branches...
 FetchGerritChangePage_BranchNameText=Branch &name:
 FetchGerritChangePage_ChangeLabel=&Change:
 FetchGerritChangePage_CheckingOutTaskName=Checking out change
@@ -840,7 +839,7 @@ FetchGerritChangePage_CreatingTagTaskName=Creating tag
 FetchGerritChangePage_FetchingTaskName=Fetching change {0}
 FetchGerritChangePage_GeneratedTagMessage=Generated for Gerrit change {0}
 FetchGerritChangePage_GetChangeTaskName=Get change from Gerrit
-FetchGerritChangePage_LocalBranchRadio=Create and checkout a local &branch
+FetchGerritChangePage_LocalBranchRadio=Create and checkout a &local branch
 FetchGerritChangePage_MissingChangeMessage=Please provide a change
 FetchGerritChangePage_PageMessage=Please select a Gerrit URI and change to fetch
 FetchGerritChangePage_PageTitle=Fetch a change from Gerrit into repository {0}
@@ -954,15 +953,18 @@ BranchResultDialog_buttonStash=Stash...
 BranchResultDialog_CheckoutConflictsMessage=The files shown below have uncommitted changes which would be lost by checking out ''{0}''.\n\nEither commit the changes, stash the changes, or discard the changes by resetting the current branch.
 BranchResultDialog_CheckoutConflictsTitle=Checkout Conflicts
 BranchResultDialog_DetachedHeadWarningDontShowAgain=Don't show any dialogs about this again
-CheckoutDialog_ErrorCouldNotCreateNewRef=Could not create new ref {0}
-CheckoutDialog_ErrorCouldNotDeleteRef=Could not delete ref {0}
-CheckoutDialog_ErrorCouldNotRenameRef=Failed to rename branch {0} -> {1}, status={2}
-
-CheckoutDialog_NewBranch=&New Branch...
-CheckoutDialog_QuestionNewBranchNameMessage=Enter new name of the {0} branch. {1} will be prepended to the name you type
-CheckoutDialog_QuestionNewBranchTitle=New branch
-CheckoutDialog_Rename=&Rename...
-CheckoutDialog_Delete=&Delete
+BranchSelectionAndEditDialog_Message=Select a ref and choose action to execute
+BranchSelectionAndEditDialog_Title=Select a branch or work with branches
+BranchSelectionAndEditDialog_WindowTitle=Branches
+BranchSelectionAndEditDialog_OkClose=&Close
+BranchSelectionAndEditDialog_ErrorCouldNotCreateNewRef=Could not create new ref {0}
+BranchSelectionAndEditDialog_ErrorCouldNotDeleteRef=Could not delete ref {0}
+BranchSelectionAndEditDialog_ErrorCouldNotRenameRef=Failed to rename branch {0} -> {1}, status={2}
+BranchSelectionAndEditDialog_NewBranch=&New Branch...
+BranchSelectionAndEditDialog_QuestionNewBranchNameMessage=Enter new name of the {0} branch. {1} will be prepended to the name you type
+BranchSelectionAndEditDialog_QuestionNewBranchTitle=New branch
+BranchSelectionAndEditDialog_Rename=&Rename...
+BranchSelectionAndEditDialog_Delete=&Delete
 MergeAction_CannotMerge=Cannot merge now
 MergeAction_HeadIsNoBranch=HEAD is not pointing to a branch
 MergeAction_JobNameMerge=Merging with {0}
@@ -1691,3 +1693,5 @@ GitScmUrlImportWizardPage_description=Import Git projects corresponding to plug-
 GitScmUrlImportWizardPage_importMaster=Import from &master
 GitScmUrlImportWizardPage_importVersion=Import the indicated &version
 GitScmUrlImportWizardPage_counter=Total: {0}
+
+BranchEditDialog_Title=Work with branches