diff options
| author | Dani Megert | 2013-11-01 11:42:19 +0000 |
|---|---|---|
| committer | Dani Megert | 2013-11-01 11:42:19 +0000 |
| commit | 6f4841d49a9f06f229311130309585bc53fe186e (patch) | |
| tree | 695f33e25452df4313e170e87722efd843bd0a34 | |
| parent | 4340ee4c895638a1c486b2428bb42f36298921cd (diff) | |
| download | eclipse.platform.ui-6f4841d49a9f06f229311130309585bc53fe186e.tar.gz eclipse.platform.ui-6f4841d49a9f06f229311130309585bc53fe186e.tar.xz eclipse.platform.ui-6f4841d49a9f06f229311130309585bc53fe186e.zip | |
Polished fix for bug 407418
3 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java index 2ddbe84412f..2d9fdfbeff3 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,8 +7,7 @@ * * Contributors: * IBM - Initial API and implementation - * Red Hat, Inc - WizardProjectsImportPage[_ArchiveSelectTitle, - * _SelectArchiveDialogTitle] + * Red Hat, Inc - WizardProjectsImportPage[_ArchiveSelectTitle, _SelectArchiveDialogTitle] *******************************************************************************/ package org.eclipse.ui.internal.wizards.datatransfer; @@ -102,7 +101,7 @@ public class DataTransferMessages extends NLS { public static String WizardProjectsImportPage_projectsInWorkspace; public static String WizardProjectsImportPage_noProjectsToImport; public static String WizardProjectsImportPage_projectLabel; - public static String WizardProjectsImportPage_hideConflictingProjects; + public static String WizardProjectsImportPage_hideExistingProjects; // --- Export Wizards --- public static String DataTransfer_export; diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java index 00980d737a4..724a40041da 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java @@ -474,7 +474,7 @@ public class WizardProjectsImportPage extends WizardDataTransferPage { hideConflictingProjects = new Button(optionsGroup, SWT.CHECK); hideConflictingProjects - .setText(DataTransferMessages.WizardProjectsImportPage_hideConflictingProjects); + .setText(DataTransferMessages.WizardProjectsImportPage_hideExistingProjects); hideConflictingProjects.setLayoutData(new GridData( GridData.FILL_HORIZONTAL)); hideConflictingProjects.addSelectionListener(new SelectionAdapter() { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties index f5a324793a3..5e84f304625 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties @@ -103,7 +103,7 @@ WizardProjectsImportPage_SearchForNestedProjects=Searc&h for nested projects WizardProjectsImportPage_CopyProjectsIntoWorkspace=&Copy projects into workspace # The first parameter is the project folder name and the second is the name from the project description WizardProjectsImportPage_projectLabel={0} ({1}) -WizardProjectsImportPage_hideConflictingProjects=Hide conflicting projects +WizardProjectsImportPage_hideExistingProjects=H&ide projects that already exist in the workspace # --- Export Wizards --- DataTransfer_export = Export |
