Signed-off-by: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> --- .../components/RepositorySelectionPage.java | 12 +++++-- .../src/org/spearce/egit/ui/uitext.properties | 30 ++++++++++---------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java index 4f02c95..95df71e 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/components/RepositorySelectionPage.java @@ -536,7 +536,7 @@ private void checkPage() { if (uri.getPath() == null) { selectionIncomplete(NLS.bind( UIText.RepositorySelectionPage_fieldRequired, - UIText.RepositorySelectionPage_promptPath, proto)); + unamp(UIText.RepositorySelectionPage_promptPath), proto)); return; } @@ -552,7 +552,7 @@ else if (uri.getPass() != null) selectionIncomplete(NLS .bind( UIText.RepositorySelectionPage_fieldNotSupported, - badField, proto)); + unamp(badField), proto)); return; } @@ -571,7 +571,7 @@ selectionIncomplete(NLS.bind( if (uri.getHost() == null) { selectionIncomplete(NLS.bind( UIText.RepositorySelectionPage_fieldRequired, - UIText.RepositorySelectionPage_promptHost, proto)); + unamp(UIText.RepositorySelectionPage_promptHost), proto)); return; } @@ -585,7 +585,7 @@ else if (uri.getPass() != null) selectionIncomplete(NLS .bind( UIText.RepositorySelectionPage_fieldNotSupported, - badField, proto)); + unamp(badField), proto)); return; } } @@ -608,6 +608,10 @@ selectionIncomplete(NLS } } + private String unamp(String s) { + return s.replace("&",""); + } + private void selectionIncomplete(final String errorMessage) { setExposedSelection(null, null); setErrorMessage(errorMessage); diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties index 7f2e4b0..3819047 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties @@ -28,7 +28,7 @@ WizardProjectsImportPage_CheckingMessage = Checking: {0} WizardProjectsImportPage_SelectDialogTitle = Select root directory of the projects to import WizardProjectImportPage_errorMessage = Creation Problems WizardProjectsImportPage_CreateProjectsTask = Creating Projects -WizardProjectsImportPage_enableGit = Enable Git Team operations on imported projects +WizardProjectsImportPage_enableGit = Enable &Git Team operations on imported projects SharingWizard_windowTitle=Configure Git Repository SharingWizard_failed=Failed to initialize Git team provider. @@ -56,13 +56,13 @@ RepositorySelectionPage_uriChoice=Custom URI RepositorySelectionPage_groupLocation=Location RepositorySelectionPage_groupAuthentication=Authentication RepositorySelectionPage_groupConnection=Connection -RepositorySelectionPage_promptURI=URI -RepositorySelectionPage_promptHost=Host -RepositorySelectionPage_promptPath=Repository path -RepositorySelectionPage_promptUser=User -RepositorySelectionPage_promptPassword=Password -RepositorySelectionPage_promptScheme=Protocol -RepositorySelectionPage_promptPort=Port +RepositorySelectionPage_promptURI=UR&I +RepositorySelectionPage_promptHost=&Host +RepositorySelectionPage_promptPath=&Repository path +RepositorySelectionPage_promptUser=&User +RepositorySelectionPage_promptPassword=&Password +RepositorySelectionPage_promptScheme=Protoco&l +RepositorySelectionPage_promptPort=Por&t RepositorySelectionPage_fieldRequired={0} required for {1} protocol. RepositorySelectionPage_fieldNotSupported={0} not supported on {1} protocol. RepositorySelectionPage_fileNotFound={0} does not exist. @@ -70,9 +70,9 @@ RepositorySelectionPage_internalError=Internal error; consult Eclipse error log. SourceBranchPage_title=Source Git Repository SourceBranchPage_description=Select branches to clone from remote repository. -SourceBranchPage_branchList=Branches of {0}: -SourceBranchPage_selectAll=Select All -SourceBranchPage_selectNone=Deselect All +SourceBranchPage_branchList=Branches &of {0}: +SourceBranchPage_selectAll=&Select All +SourceBranchPage_selectNone=&Deselect All SourceBranchPage_errorBranchRequired=At least one branch must be selected. SourceBranchPage_transportError=Transport Error SourceBranchPage_cannotListBranches=Cannot list the available branches. @@ -84,11 +84,11 @@ CloneDestinationPage_title=Local Destination CloneDestinationPage_description=Configure the local storage location for {0}. CloneDestinationPage_groupDestination=Destination CloneDestinationPage_groupConfiguration=Configuration -CloneDestinationPage_promptDirectory=Directory -CloneDestinationPage_promptInitialBranch=Initial branch -CloneDestinationPage_promptRemoteName=Remote name +CloneDestinationPage_promptDirectory=&Directory +CloneDestinationPage_promptInitialBranch=Initial &branch +CloneDestinationPage_promptRemoteName=Remote na&me CloneDestinationPage_fieldRequired={0} is required. -CloneDestinationPage_browseButton=Browse +CloneDestinationPage_browseButton=Bro&wse CloneDestinationPage_errorNotEmptyDir={0} is not an empty directory. CloneDestinationPage_importProjectsAfterClone=&Import projects after clone CloneDestinationPage_workspaceImport=Workspace import -- 1.6.1.rc3.56.gd0306 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html