Git Repositories View: remote configuration handling

Remote configuration handling in the Git Repositories view must
behave like the standard: it is possible to push to a remote repository
if only a "url" is present in the config, but no "pushurl". If both
url and pushurl or pushurls exist, they are all used.
Accordingly, the "configure push" UI must show the (fetch-) URL
if it is present and make addition of "pushurl"s optional in this case.
Also the Repo View content and label providers had to be adjusted in 
order to show the "push" node if only a "url" and a "push" but no 
"pushurl" is defined.

Change-Id: Ia1e44002c2949a243326798c182a26c4caad56d2
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 17 insertions, 8 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 c5571b89e8..a9a1452f20 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
@@ -41,13 +41,13 @@ WizardProjectImportPage_errorMessage = Creation Problems
 WizardProjectsImportPage_CreateProjectsTask = Creating Projects
 WizardProjectsImportPage_filterText = type filter text to filter unselected projects
 
-SelectRemoteNamePage_ConfigureFetch_button=Configure Fetch
-SelectRemoteNamePage_ConfigurePush_button=Configure Push
+SelectRemoteNamePage_ConfigureFetch_button=Configure &Fetch
+SelectRemoteNamePage_ConfigurePush_button=Configure &Push
 SelectRemoteNamePage_MustConfigureSomething_message=You must configure either puth, fetch, or both, please select the corresponding check box
 SelectRemoteNamePage_NameInUseMessage=Remote name already in use
 SelectRemoteNamePage_NameMustNotBeEmptyMessage=The remote name must not be empty
-SelectRemoteNamePage_RemoteNameLabel=Remote name
-SelectRemoteNamePage_RemoteNameMessage=Please select a remote name
+SelectRemoteNamePage_RemoteNameLabel=&Remote name:
+SelectRemoteNamePage_RemoteNameMessage=Please select a remote name and indicate whether to configure fetch, push, or both
 SelectRemoteNamePage_RemoteNameTitle=Remote Name
 SelectRemoteNamePage_SelectRemoteNameMessage=Select a remote name
 SelectResetTypePage_PageMessage=The content of {0} will be replaced with the content of {1}
@@ -436,15 +436,22 @@ ConfigureKeysDialog_NewButton=New...
 ConfigureKeysDialog_NewKeyLabel=New key
 ConfigureRemoteWizard_WizardTitle_Change=Change remote configuration {0}
 ConfigureRemoteWizard_WizardTitle_New=Create a new remote configuration
-ConfigureUriPage_Add_button=Add...
-ConfigureUriPage_Change_button=Change...
+ConfigureUriPage_Add_button=&Add...
+ConfigureUriPage_Change_button=&Change...
 ConfigureUriPage_ConfigureFetch_pagetitle=Configure Fetch URI
 ConfigureUriPage_ConfigurePush_pagetitle=Configure Push URIs
-ConfigureUriPage_FetchUri_label=Fetch URI
+ConfigureUriPage_DuplicateUriMessage=URI {0} is already defined as Fetch or Push URI
+ConfigureUriPage_DuplicateUriTitle=Duplicate URI
+ConfigureUriPage_FetchPageMessage=Please select a Fetch URI
+ConfigureUriPage_FetchUri_label=&Fetch URI:
 ConfigureUriPage_MissingUri_message=Please provide a URI
 ConfigureUriPage_MissingUris_message=No URIs specified
 ConfigureUriPage_ParsingProblem_message=Can not parse this
-ConfigureUriPage_Remove_button=Remove
+ConfigureUriPage_PushPageMessage=Please define Push URIs; this step is optional if a Fetch URI exists
+ConfigureUriPage_PushUriLabel=&Push URIs:
+ConfigureUriPage_PushUriTooltip=If a URI is already defined, these URIs are optional and will override the URI
+ConfigureUriPage_Remove_button=&Remove
+ConfigureUriPage_UriTooltip=If no push URIs are defined, this URI will be used for push
 
 CommitMessageArea_copy=&Copy
 CommitMessageArea_cut=C&ut
@@ -837,6 +844,7 @@ GitBranchSynchronizeWizardPage_selectAll=Select All
 GitBranchSynchronizeWizardPage_deselectAll=Deselect All
 LocalFileRevision_CurrentVersion=*({0})
 LocalFileRevision_currentVersionTag=<current version>
+NewRemoteWizard_CheckingUriTaskName=Checking URI {0}
 NewRepositoryWizard_WizardTitle=Create a Git Repository
 
 RemoteSelectionCombo_remoteName=Remote Repository:
@@ -851,6 +859,7 @@ SelectSynchronizeResourceDialog_header=Select which branch or tag to synchronize
 SelectSynchronizeResourceDialog_srcRef=Select which branch or tag should be treated as source:
 SelectSynchronizeResourceDialog_dstRef=Select which branch or tag should be treated as destination:
 SelectSynchronizeResourceDialog_includeUncommitedChnages=Include local uncommited changes in comparison
+SelectUriWiazrd_Title=Select a URI
 
 SynchronizeWithAction_localRepoName=<local .git>
 ValidationUtils_InvalidTagName=Invalid Tag name