diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties index edfa9a4e7e0..0ba1a5d717f 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.properties +++ b/build/org.eclipse.cdt.make.ui/plugin.properties @@ -31,9 +31,6 @@ ViewMake.name=Make Targets ActionSetMake.label=Make Actions ActionSetUpdateMake.label=Update Make Projects -# Scope and Key Commands -scope.makefileEditor.name=Makefile Editor -makefileEditor.description=Editor for Makefile Files category.source.name=Makefile Source category.source.description= Makefile Source Actions diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index 14ecd8cd9a5..b7394167c68 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -224,12 +224,6 @@ description="%category.source.description" id="org.eclipse.cdt.make.ui.category.source"> - - 0) { @@ -239,7 +239,7 @@ public class SettingsBlock extends AbstractCOptionPage { if (fBuildInfo == null) { ControlFactory.createEmptySpace(composite); - ControlFactory.createLabel(composite, "Missing builder information on project."); + ControlFactory.createLabel(composite, MakeUIPlugin.getResourceString("SettingsBlock.label.missingBuilderInformation")); //$NON-NLS-1$ return; } @@ -270,7 +270,7 @@ public class SettingsBlock extends AbstractCOptionPage { // To avoid multi-build IWorkspaceRunnable operation = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - monitor.beginTask("Applying Settings...", 1); + monitor.beginTask(MakeUIPlugin.getResourceString("SettingsBlock.monitor.applyingSettings"), 1); //$NON-NLS-1$ IMakeBuilderInfo info; if (getContainer().getProject() != null) { info = MakeCorePlugin.createBuildInfo(getContainer().getProject(), fBuilderID); @@ -387,7 +387,7 @@ public class SettingsBlock extends AbstractCOptionPage { if (!useDefaultBuildCmd()) { String cmd = getBuildLine(); if (cmd == null || cmd.length() == 0) { - return "Must enter a build command"; + return MakeUIPlugin.getResourceString("SettingsBlock.message.mustEnterBuildCommand"); //$NON-NLS-1$ } } return null; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java index b92844256c7..a7e12232ac2 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java @@ -23,10 +23,10 @@ public class AddTargetAction extends SelectionListenerAction { IResource resource; public AddTargetAction(Shell shell) { - super("Add Build Target"); + super(MakeUIPlugin.getResourceString("AddTargetAction.label")); //$NON-NLS-1$ this.shell = shell; - setToolTipText("Add Build Target"); + setToolTipText(MakeUIPlugin.getResourceString("AddTargetAction.tooltip")); //$NON-NLS-1$ MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_ADD); //$NON-NLS-1$ } @@ -36,7 +36,7 @@ public class AddTargetAction extends SelectionListenerAction { MakeTargetDialog dialog = new MakeTargetDialog(shell, (IContainer) getStructuredSelection().getFirstElement()); dialog.open(); } catch (CoreException e) { - MakeUIPlugin.errorDialog(shell, "Internal Error", "Internal Error", e); + MakeUIPlugin.errorDialog(shell, MakeUIPlugin.getResourceString("AddTargetAction.exception.internalError"), e.toString(), e); //$NON-NLS-1$ } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java index f59427f8f4c..934cf8545ab 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java @@ -10,6 +10,7 @@ import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; import org.eclipse.cdt.make.internal.ui.MakeUIImages; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.TargetBuild; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.IStructuredSelection; @@ -22,10 +23,10 @@ public class BuildTargetAction extends SelectionListenerAction { IResource resource; public BuildTargetAction(Shell shell) { - super("Build Target"); + super(MakeUIPlugin.getResourceString("BuildTargetAction.label")); //$NON-NLS-1$ this.shell = shell; - setToolTipText("Build Target"); + setToolTipText(MakeUIPlugin.getResourceString("BuildTargetAction.tooltip")); //$NON-NLS-1$ MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_BUILD); //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java index a18f50e9bc7..efa09be1d47 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java @@ -27,10 +27,10 @@ public class DeleteTargetAction extends SelectionListenerAction { IResource resource; public DeleteTargetAction(Shell shell) { - super("Delete Build Target"); + super(MakeUIPlugin.getResourceString("DeleteTargetAction.label")); //$NON-NLS-1$ this.shell = shell; - setToolTipText("Delete Build Target"); + setToolTipText(MakeUIPlugin.getResourceString("DeleteTargetAction.tooltip")); //$NON-NLS-1$ MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_DELETE); //$NON-NLS-1$ } @@ -45,14 +45,14 @@ public class DeleteTargetAction extends SelectionListenerAction { String title; String msg; if (targets.size() == 1) { - title = "Confirm Target Deletion"; + title = MakeUIPlugin.getResourceString("DeleteTargetAction.title.confirmDeletion"); //$NON-NLS-1$ IMakeTarget target = (IMakeTarget) targets.get(0); - msg = MessageFormat.format("Are you sure you want to delete ''{0}''?", new Object[] { target.getName()}); + msg = MessageFormat.format(MakeUIPlugin.getResourceString("DeleteTargetAction.message.confirmDeleteion"), new Object[] { target.getName()}); //$NON-NLS-1$ } else { - title = "Confirm Multiple Target Deletion"; + title = MakeUIPlugin.getResourceString("DeleteTargetAction.title.confirmMultipleDeletion"); //$NON-NLS-1$ msg = MessageFormat.format( - "Are you sure you want to delete these {0} targets?", + MakeUIPlugin.getResourceString("DeleteTargetAction.message.confirmMultipleDeletion"), //$NON-NLS-1$ new Object[] { new Integer(targets.size())}); } return MessageDialog.openQuestion(shell, title, msg); @@ -69,7 +69,7 @@ public class DeleteTargetAction extends SelectionListenerAction { manager.removeTarget((IMakeTarget) iter.next()); } } catch (CoreException e) { - MakeUIPlugin.errorDialog(shell, "Target Remove Error", "Error deleting build target", e); + MakeUIPlugin.errorDialog(shell, MakeUIPlugin.getResourceString("DeleteTargetAction.exception.removeError"), MakeUIPlugin.getResourceString("DeleteTargetAction.exception.errorDeletingBuildTarget"), e); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java index 00ce925e197..c28167291db 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java @@ -23,10 +23,10 @@ public class EditTargetAction extends SelectionListenerAction { IResource resource; public EditTargetAction(Shell shell) { - super("Edit Build Target"); + super(MakeUIPlugin.getResourceString("EditTargetAction.label")); //$NON-NLS-1$ this.shell = shell; - setToolTipText("Edit Build Target"); + setToolTipText(MakeUIPlugin.getResourceString("EditTargetAction.tooltip")); //$NON-NLS-1$ MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_EDIT); //$NON-NLS-1$ } @@ -37,7 +37,7 @@ public class EditTargetAction extends SelectionListenerAction { dialog = new MakeTargetDialog(shell, (IMakeTarget) getStructuredSelection().getFirstElement()); dialog.open(); } catch (CoreException e) { - MakeUIPlugin.errorDialog(shell, "Internal Error", "Error editing target.", e); + MakeUIPlugin.errorDialog(shell, MakeUIPlugin.getResourceString("EditTargetAction.exception.internalError"), MakeUIPlugin.getResourceString("EditTargetAction.exception.errorEditingTarget"), e); //$NON-NLS-1$ //$NON-NLS-2$ } } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizard.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizard.java index e42817f83d1..e15f10dda4e 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizard.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizard.java @@ -92,7 +92,7 @@ public class ConvertToMakeProjectWizard extends ConversionWizard { } protected void doRun(IProgressMonitor monitor) throws CoreException { - monitor.beginTask("Converting to Make Project...", 2); + monitor.beginTask(MakeUIPlugin.getResourceString("WizardMakeProjectConversion.monitor.convertingToMakeProject"), 2); //$NON-NLS-1$ try { super.doRun(new SubProgressMonitor(monitor, 1)); } finally { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizardPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizardPage.java index 377139beafd..2bff5329fad 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizardPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/ConvertToMakeProjectWizardPage.java @@ -74,7 +74,7 @@ public class ConvertToMakeProjectWizardPage extends ConvertProjectWizardPage { } public void convertProject(IProject project, IProgressMonitor monitor, String projectID) throws CoreException { - monitor.beginTask("Converting Make project...", 3); + monitor.beginTask(MakeUIPlugin.getResourceString("WizardMakeProjectConversion.monitor.convertingToMakeProject"), 3); //$NON-NLS-1$ try { super.convertProject(project, new SubProgressMonitor(monitor, 1), projectID); MakeProjectNature.addNature(project, new SubProgressMonitor(monitor, 1)); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizardPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizardPage.java index 497fb0b8e0d..0d282b40e20 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizardPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizardPage.java @@ -65,7 +65,7 @@ public class UpdateMakeProjectWizardPage extends StatusWizardPage { setTitle(MakeUIPlugin.getResourceString(MAKE_UPDATE_TITLE)); setDescription(MakeUIPlugin.getResourceString(MAKE_UPDATE_DESCRIPTION)); this.selected = selected; - tablePart = new TablePart("Project list"); + tablePart = new TablePart(MakeUIPlugin.getResourceString("MakeWizardUpdatePage.projectList")); //$NON-NLS-1$ } public void dispose() { @@ -111,10 +111,10 @@ public class UpdateMakeProjectWizardPage extends StatusWizardPage { private IStatus validatePlugins() { Object[] allModels = UpdateMakeProjectAction.getOldProjects(); if (allModels == null || allModels.length == 0) { - return createStatus(IStatus.ERROR, "No projects to update"); + return createStatus(IStatus.ERROR, MakeUIPlugin.getResourceString("MakeWizardUpdatePage.status.noProjectsToUpdate")); //$NON-NLS-1$ } if (tablePart.getSelectionCount() == 0) { - return createStatus(IStatus.ERROR, "No projects selected"); + return createStatus(IStatus.ERROR, MakeUIPlugin.getResourceString("MakeWizardUpdatePage.status.noProjectsSelected")); //$NON-NLS-1$ } return createStatus(IStatus.OK, ""); //$NON-NLS-1$ }