diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java index e84ba7babdc4..e98fc5d1311c 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java +++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java @@ -265,7 +265,7 @@ public abstract class JavaTestFrameworkRunnableState" + "Please specify single working directory, or change test scope to single module."); } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java index 43141f05302a..a369cceeb6d7 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java @@ -1123,7 +1123,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { if (new EditConfigurationsDialog(project) { @Override protected void init() { - setOKButtonText(executor.getStartActionText()); + setOKButtonText(executor.getActionName()); setOKButtonIcon(executor.getIcon()); myExecutor = executor; super.init(); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java index 50c6daaddddf..926a091e0621 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java @@ -37,7 +37,7 @@ public class RunDialog extends DialogWrapper implements RunDialogBase { setTitle(executor.getId()); - setOKButtonText(executor.getStartActionText()); + setOKButtonText(executor.getActionName()); setOKButtonIcon(executor.getIcon()); myConfigurable = new ProjectRunConfigurationConfigurable(project, this); diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index 6213a46a4b9f..3d96da4c89dd 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -318,7 +318,7 @@ show.swing.inspector=&Enable capturing form snapshots show.swing.inspector.disabled=&Enable capturing form snapshots (requires JRE 5.0 or higher) before.run.property.make=Make run.configuration.store.place.option=&Share -run.configuration.allow.running.parallel=Allow ¶llel run +run.configuration.allow.running.parallel=Allow parallel r&un run.configuration.default.type.description=configuration #GeneralCommandLine diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index 3633f5f81a62..72e5c287be3c 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -30,7 +30,6 @@ import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.ui.UIUtil; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -185,7 +184,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction boolean cellHasFocus) { final Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value instanceof Executor) { - setText(UIUtil.removeMnemonic(((Executor)value).getStartActionText())); + setText(((Executor)value).getActionName()); setIcon(((Executor)value).getIcon()); } return component;