Pass to cleanup message properties files

5 files changed, 4 insertions, 20 deletions

diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java
index ee2f4a8a3..79ec024f0 100644
--- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java
+++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -261,9 +261,8 @@ public class StringSubstitutionEngine {
 				return valueVariable.getValue();
 			} else {
 				// error - an argument specified for a value variable
-				throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format("Variable {0} does not accept arguments.", new String[]{valueVariable.getName()}), null)); //$NON-NLS-1$
+				throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.getString("StringSubstitutionEngine.4"), new String[]{valueVariable.getName()}), null)); //$NON-NLS-1$
 			}
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/VariablesMessages.properties b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/VariablesMessages.properties
index 5a510a6c5..35e75ac06 100644
--- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/VariablesMessages.properties
+++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/VariablesMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
+# Copyright (c) 2000, 2004 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Common Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
 ###############################################################################
 
 StringSubstitutionEngine.3=Reference to undefined variable {0}
-StringSubstitutionEngine.4=Variables cannot be resolved due to a cycle in the following variables: {0}
+StringSubstitutionEngine.4=Variable {0} does not accept arguments
 
 StringVariableManager.26=Variables with the specified names are already registered.
 StringVariableManager.27=Variable named {0} already registered
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
index 0ecb0e9ad..b52097404 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
@@ -86,8 +86,3 @@ ExpressionManager.An_exception_occurred_during_expression_change_notification._1
 LaunchConfigurationType.Launch_delegate_for_{0}_does_not_implement_required_interface_ILaunchConfigurationDelegate._1=Launch delegate for {0} does not implement required interface ILaunchConfigurationDelegate.
 LaunchConfigurationType.9=Launch mode {0} not supported for configuration type {1}
 LaunchConfigurationType.10=Launch delegate not registered for configuration type {0}, mode {1}
-
-VariableUtil.4=Invalid variable format: {0}
-VariableUtil.5=The variable named \"{0}\" does not exist.
-VariableUtil.6=Could not resolve environment.
-
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
index 3a8caeb93..18732cdd3 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceLookupMessages.properties
@@ -23,7 +23,6 @@ ArchiveSourceContainerType.12=Invalid archive memento
 
 DefaultSourceContainer.0=Default
 DefaultSourceContainer.1=Error creating source path computer.
-DefaultSourceContainerType.5=Unable to restore default source lookup path - missing launchConfiguration attribute.
 DefaultSourceContainerType.6=Unable to restore default source lookup path - expecting default element.
 DefaultSourceContainerType.7=Unable to restore default source lookup path - invalid memento.
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index 598373152..e11dcc6d7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -108,11 +108,6 @@ PerspectivesTab.2={0}:
 PerspectivesTab.3=R&estore Defaults
 PerspectivesTab.7=Perspectives
 
-LaunchHistoryPreferencePage.The_size_of_the_launch_history_should_be_between_{0}_and_{1}_1=The size of the launch history should be between {0} and {1}
-LaunchHistoryPreferenceTab.Fa&vorites__1=Fa&vorites:
-LaunchHistoryPreferenceTab.Ma&ke_Recent_2=Ma&ke Recent
-LaunchHistoryPreferenceTab.&Launch_History__3=&Launch History:
-
 FavoritesDialog.1=Organize {0} Favorites
 FavoritesDialog.2=Fa&vorites:
 FavoritesDialog.3=Ad&d...
@@ -126,7 +121,3 @@ LaunchShortcutExtension.21=no label
 PerspectiveManager.12=Confirm Perspective Switch
 PerspectiveManager.13=This kind of launch is configured to switch to the {0} perspective when it suspends. Do you want to switch to this perspective now?
 PerspectiveManager.15=This kind of launch is associated with the {0} perspective. Do you want to switch to this perspective now?
-PerspectivesTab.8=Switch to associated perspective when a {0} configuration suspends
-PerspectivesTab.9=Alwa&ys
-PerspectivesTab.10=&Never
-PerspectivesTab.11=&Prompt