Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2014-06-05 11:31:14 -0400
committerMatthias Sohn2014-07-08 19:40:03 -0400
commit32c24955597ab4c41c34672cc3db05fb9bfeefb6 (patch)
tree48006f1a8c7bd5177af4e9ea200cf7872e68dbf8 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent1c852c25df52476b73aa6f6da7330f0cbf8e7753 (diff)
downloadegit-32c24955597ab4c41c34672cc3db05fb9bfeefb6.tar.gz
egit-32c24955597ab4c41c34672cc3db05fb9bfeefb6.tar.xz
egit-32c24955597ab4c41c34672cc3db05fb9bfeefb6.zip
Improve simple push dialog
This dialog now shows which commit, from which branch is about to be pushed. It fits both use cases of pushing HEAD from resource, or pushing a single branch. Bug: 436669 Change-Id: Ibd8d75d6cece181657210fba73c9f2be90ea077b Signed-off-by: Mickael Istria <mistria@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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.properties22
1 files changed, 13 insertions, 9 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 8f99fd033..c67e9d2b8 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
@@ -15,6 +15,7 @@
# Gunnar Wagenknecht <gunnar@wagenknecht.org>
# Marc Khouzam <marc.khouzam@ericsson.com> - Added CompareTreeView Compare Mode tooltip
# Marc Khouzam <marc.khouzam@ericsson.com> - Add option not to checkout new branch from Gerrit
+# Mickael Istria (Red Hat Inc.) - 463339 Simple push wizard improvements
###############################################################################
AbortRebaseCommand_CancelDialogMessage=The abort operation was canceled
AbortRebaseCommand_JobName=Aborting Rebase
@@ -682,16 +683,20 @@ PullResultDialog_MergeAlreadyUpToDateMessage=Nothing to update - everything up t
PullResultDialog_MergeResultGroupHeader=Update Result
PushAction_wrongURIDescription=Remote repositories URIs configuration is corrupted.
PushAction_wrongURITitle=Corrupted Configuration
-PushBranchPage_BranchNameLabel=&Branch name:
-PushBranchPage_ChooseBranchNameError=Please choose a name for the new branch.
+PushBranchPage_CannotAccessCommitDescription=<<<Cannot access commit description. See log for details.>>>
+PushBranchPage_LocalBranchLabel=Branch:
+PushBranchPage_Source=Source:
+PushBranchPage_Destination=Destination:
+PushBranchPage_RemoteLabel=Remote:
PushBranchPage_ChooseRemoteError=Please choose or add a remote.
+PushBranchPage_RemoteBranchNameLabel=Branch:
+PushBranchPage_ChooseBranchNameError=Please choose a name for the new branch.
PushBranchPage_ForceUpdateButton=&Force overwrite of branch on remote if it exists and has diverged
PushBranchPage_InvalidBranchNameError=Invalid branch name.
PushBranchPage_NewRemoteButton=&New Remote...
PushBranchPage_PageMessage=Select a remote and the name the branch should have on the remote.
-PushBranchPage_PageName=Push Branch
-PushBranchPage_PageTitle=Push Branch to Remote
-PushBranchPage_RemoteLabel=R&emote:
+PushBranchPage_PageName=Simple Push
+PushBranchPage_PageTitle=Push to branch on remote
PushBranchPage_UpstreamConfigOverwriteWarning=The existing upstream configuration for the branch will be overwritten.
PushBranchWizard_WindowTitle=Push Branch {0}
PushCommand_pushBranchTitle=Push Branch
@@ -1656,10 +1661,6 @@ SimpleFetchActionHandler_NothingToFetchDialogTitle=Nothing to Fetch
SimpleFetchRefSpecWizard_WizardTitle=Adding a Refspec for Fetch
SimplePushActionHandler_NothingToPushDialogMessage=Cannot push anything: the currently checked-out branch is based on a local branch
SimplePushActionHandler_NothingToPushDialogTitle=Nothing to Push
-SimplePushSpecPage_message=Select target to push {0} to
-SimplePushSpecPage_pushAheadInfo={0} is {1} commits ahead of {2}
-SimplePushSpecPage_TargetRefName=Target Ref Name:
-SimplePushSpecPage_title=Select push destination
SquashHandler_CommitsNotOnCurrentBranch=The selected commits cannot be squashed because they are not on the currently checked-out branch.
SquashHandler_Error_Title=Error Squashing Commits
SquashHandler_ErrorCheckingIfCommitsAreOnCurrentBranch=Error checking if commits are on current branch
@@ -1811,3 +1812,6 @@ GitScmUrlImportWizardPage_counter=Total: {0}
BranchEditDialog_Title=Edit branches
CancelAfterSaveDialog_Title=Cancel Confirmation
+
+PushMenu_PushHEAD=Push &HEAD...
+PushMenu_PushBranch=Push &Branch ''{0}''...

Back to the top