fix for bug 234951

2 files changed, 8 insertions, 3 deletions

diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties
index 42995d630ad..c8a74fe1df7 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2002, 2007 QNX Software Systems and others.
+# Copyright (c) 2002, 2008 QNX Software Systems 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
@@ -10,6 +10,7 @@
 # 		Monta Vista - Joanne Woo - Bug 87556
 #       Nokia - Ken Ryall - Bug 118894
 #       Carlos O'Donnel (CodeSourcery) - Bug 218366
+#		IBM Corporation
 ###############################################################################
 
 AbstractCLaunchDelegate.Debugger_not_installed=CDT Debugger not installed
@@ -94,6 +95,8 @@ CMainTab.Choose_program_to_run=Choose a &program to run:
 CMainTab.Choose_program_to_run_from_NAME=Choose a program to run from {0}:
 CMainTab.UseTerminal=Connect process input & output to a terminal.
 CMainTab.Program_is_not_a_recongnized_executable=Program is not a recognized executable.
+#For CMainTab.Configuration_name: {0} - project name; {1} - configuration name
+CMainTab.Configuration_name={0} {1}
 
 CDebuggerTab.Advanced_Options_Dialog_Title=Advanced Options
 CDebuggerTab.Stop_at_main_on_startup=Stop on startup at:
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 8b34a794d5c..4160cfdab93 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 QNX Software Systems and others.
+ * Copyright (c) 2005, 2008 QNX Software Systems 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
@@ -8,6 +8,7 @@
  * Contributors:
  *     QNX Software Systems - initial API and implementation
  *     Ken Ryall (Nokia) - bug 178731
+ *	   IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.launch.ui;
 
@@ -647,7 +648,8 @@ public class CMainTab extends CLaunchConfigurationTab {
 			ICProjectDescription projDes = CCorePlugin.getDefault().getProjectDescription(project);
 			if (projDes != null) {
 				String buildConfigName = projDes.getActiveConfiguration().getName();
-				name = name + " " + buildConfigName; //$NON-NLS-1$
+				//bug 234951
+				name = LaunchMessages.getFormattedString("CMainTab.Configuration_name", new String[]{name, buildConfigName}); //$NON-NLS-1$
 			}
 			name = getLaunchConfigurationDialog().generateName(name);
 			config.rename(name);