--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties	Mon Sep 20 16:41:18 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties	Mon Sep 20 17:55:28 2010 -0500
@@ -1,7 +1,5 @@
 AbstractSymbianLaunchShortcut.ChooseConfigLabel=Select the launch configuration:
 AbstractSymbianLaunchShortcut.ChooseConfigTitle=Choose configuration
-LaunchPlugin.0=Carbide_Sys_TRK
-LaunchPlugin.1=System TCF TRK Debugging
 LaunchPlugin.17=No binaries found for project. Unable to launch.
 LaunchPlugin.ErrorTitle=Launch Error
 LaunchPlugin.noTCPIPConnectionType=Unable to locate a TCP/IP connection type.

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Mon Sep 20 16:41:18 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Mon Sep 20 17:55:28 2010 -0500
@@ -119,16 +119,14 @@
 RomLogFileTab.7=Symbian Rom Log files
 RomLogFileTab.8=All files
 RomLogFileTab.9=Symbian Epoc32 Directory\:
-RunModeDebuggerTab.10=Message retry delay (ms)\:
-RunModeDebuggerTab.11=This is the time the debugger will wait for a response from TRK before resending the message.  Most users will not need to change this value.
 RunModeDebuggerTab.12=Debugger
 RunModeDebuggerTab.13=No break at entry symbol specified.
 RunModeDebuggerTab.4=Break at entry point\:
 RunModeDebuggerTab.5=When enabled the debugger will automatically set a breakpoint at the function specified.
 RunModeDebuggerTab.6=View program output
-RunModeDebuggerTab.7=Create a console view to display any data from the communications port that TRK does not understand, such as the output of the executable being debugged
+RunModeDebuggerTab.7=Create a console view to display the output of the executable being debugged
 RunModeDebuggerTab.8=View messages between Carbide and debug agent
-RunModeDebuggerTab.9=Create a console view to display all communications between the Carbide debugger and TRK on the phone (this can be useful in debugging communications problems)
+RunModeDebuggerTab.9=Opens the EDC TCF Trace view which will display communications between the host debugger and the debug agent on the device (CODA)
 RunModeMainTab.0=Executable\:
 RunModeMainTab.1=The symbolics file (.sym) generated when the project was built
 RunModeMainTab.2=Remote process to launch\:

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java	Mon Sep 20 16:41:18 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
-import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import java.util.List;
-
-public class AppTRKLaunchWizard extends AbstractLaunchWizard {
-    private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-    private TRKConnectionWizardPage fMainPage;
-    private TRKSISSelectionWizardPage fSISSelectionPage;
-	private boolean hasFinished = false;
-    
-    public AppTRKLaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-    	super(project, configurationName, mmps, exes, defaultExecutable, exes.size() > 1, true);
-		setWindowTitle(Messages.getString("AppTRKLaunchWizard.1")); //$NON-NLS-1$
-    }
-
-	@Override
-	public String getLaunchTypeID() {
-		return SettingsData.APP_TRK_LAUNCH_TYPE_ID;
-	}
-
-	@Override
-	public boolean supportsCategory(String categoryId) {
-		return categoryId.equals(PHONE_CATEGORY_ID);
-	}
-
-	public boolean performFinish() {
-    	hasFinished = true;
-    	return true;
-    }
- 
-    public void addPages() {
-    	super.addPages();
-        fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this,
-        		LaunchPlugin.getDebugServiceId());
-        fSISSelectionPage = new TRKSISSelectionWizardPage(this);
-        addPage(fBuildOptionsSelectionPage);
-        addPage(fMainPage);
-        addPage(fSISSelectionPage);
-	    addPage(getSummaryPage());
-	    MainExecutableSelectionWizardPage binarySelectionPage = getBinarySelectionPage();
-	    if (binarySelectionPage != null) {
-			binarySelectionPage.setPathValidator(new IPathValidator() {
-				public String isValidPath(IPath path) {
-					return RunModeMainTab.isRemoteTextValid(path.toOSString());
-				}
-		    });
-	    }
-   }
-
-    public String toString() {
-    	return Messages.getString("AppTRKLaunchWizard.2"); //$NON-NLS-1$
-    }
-    
-    public String getDescription() {
-    	return Messages.getString("AppTRKLaunchWizard.3"); //$NON-NLS-1$
-    }
-    
-    public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) {
-    	// if we haven't finished then don't create anything
-    	if (!hasFinished) {
-    		return null;
-    	}
-
-    	ILaunchConfigurationWorkingCopy config = null;
-    	try {
-    		// create our config
-    		config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.APP_TRK_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-    		
-    		// set the default values
-    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_AppTRK, getProject(), mmpPath, exePath);
-    		if (processToLaunchTargetPath != null)
-    			SettingsData.setProcessToLaunch(config, processToLaunchTargetPath);
-    		
-    		// now let the wizard pages update values 
-    		fBuildOptionsSelectionPage.updateConfiguration(config);
-    		fMainPage.updateConfiguration(config);
-    		fSISSelectionPage.updateConfiguration(config);
-
-    	} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return config;
-    }
-}

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java	Mon Sep 20 16:41:18 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import java.util.List;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-public class AttachTRKLaunchWizard extends AbstractLaunchWizard {
-    private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-    private TRKConnectionWizardPage fMainPage;
-	private boolean hasFinished = false;
-    
-    public AttachTRKLaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-    	super(project, configurationName, mmps, exes, defaultExecutable, false, false);
-		setWindowTitle(Messages.getString("AttachTRKLaunchWizard.1")); //$NON-NLS-1$
-    }
-
-	@Override
-	public String getLaunchTypeID() {
-		return SettingsData.ATTACH_LAUNCH_TYPE_ID;
-	}
-
-	@Override
-	public boolean supportsCategory(String categoryId) {
-		return categoryId.equals(PHONE_CATEGORY_ID);
-	}
-
-    public boolean performFinish() {
-    	hasFinished = true;
-    	return true;
-    }
- 
-    public void addPages() {
-    	super.addPages();
-        fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this,
-        		LaunchPlugin.getDebugServiceId());
-        addPage(fBuildOptionsSelectionPage);
-        addPage(fMainPage);
-	    addPage(getSummaryPage());
-   }
-
-    public String toString() {
-    	return Messages.getString("AttachTRKLaunchWizard.2"); //$NON-NLS-1$
-    }
-    
-    public String getDescription() {
-    	return Messages.getString("AttachTRKLaunchWizard.3"); //$NON-NLS-1$
-    }
-    
-    public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) {
-    	// if we haven't finished then don't create anything
-    	if (!hasFinished) {
-    		return null;
-    	}
-
-    	ILaunchConfigurationWorkingCopy config = null;
-    	try {
-    		// create our config
-    		config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.ATTACH_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-    		
-    		// set the default values
-    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_AppTRK, getProject(), mmpPath, exePath);
-    		
-    		// now let the wizard pages update values 
-    		fBuildOptionsSelectionPage.updateConfiguration(config);
-    		fMainPage.updateConfiguration(config);
-
-    	} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return config;
-    }
-}

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java	Mon Sep 20 16:41:18 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
-import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import java.util.List;
-
-public class SystemTRKLaunchWizard extends AbstractLaunchWizard {
-    private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-    private TRKConnectionWizardPage fMainPage;
-	private boolean hasFinished = false;
-
-	public SystemTRKLaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-		super(project, configurationName, mmps, exes, defaultExecutable, true, true);
-		setWindowTitle(Messages.getString("SystemTRKLaunchWizard.1")); //$NON-NLS-1$
-    }
-
-	@Override
-	public String getLaunchTypeID() {
-		return SettingsData.SYS_TRK_LAUNCH_TYPE_ID;
-	}
-
-	@Override
-	public boolean supportsCategory(String categoryId) {
-		return categoryId.equals(PHONE_CATEGORY_ID);
-	}
-
-    public boolean performFinish() {
-    	hasFinished = true;
-    	return true;
-    }
- 
-    public void addPages() {
-    	super.addPages();
-        fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-        fMainPage = new TRKConnectionWizardPage(this,
-        		LaunchPlugin.getDebugServiceId());
-        addPage(fBuildOptionsSelectionPage);
-        addPage(fMainPage);
-        addPage(getSummaryPage());
-	    getBinarySelectionPage().setPathValidator(new IPathValidator() {
-			public String isValidPath(IPath path) {
-				return RunModeMainTab.isRemoteTextValid(path.toOSString());
-			}
-	    });
-    }
-
-    public String toString() {
-    	return Messages.getString("SystemTRKLaunchWizard.2"); //$NON-NLS-1$
-    }
-    
-    public String getDescription() {
-    	return Messages.getString("SystemTRKLaunchWizard.3"); //$NON-NLS-1$
-    }
-    
-    public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) {
-    	// if we haven't finished then don't create anything
-    	if (!hasFinished) {
-    		return null;
-    	}
-
-    	ILaunchConfigurationWorkingCopy config = null;
-    	try {
-    		// create our config
-    		config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.SYS_TRK_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-    		
-    		// set the default values
-    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_SysTRK, getProject(), mmpPath, exePath);
-    		if (processToLaunchTargetPath != null)
-    			SettingsData.setProcessToLaunch(config, processToLaunchTargetPath);
-    		
-    		// now let the wizard pages update values 
-    		fBuildOptionsSelectionPage.updateConfiguration(config);
-    		fMainPage.updateConfiguration(config);
-    		
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return config;
-    }
-
-}

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java	Mon Sep 20 16:41:18 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cdt.builder.project.*;
-import com.nokia.cpp.internal.api.utils.core.Check;
-import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
-
-import cwdbg.PreferenceConstants;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
-import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-public class TRKSISSelectionWizardPage extends WizardPage implements ICProjectDescriptionListener {
-    
-    private boolean isDisposed = false;
-	private Combo sisFile;
-	private String sisPath = ""; //$NON-NLS-1$
-	private Text sisEdit;
-	private Button sisBrowse;
-	private final ISummaryTextItemContainer summaryTextItemContainer;
-	
-    
-    public TRKSISSelectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
-        super(Messages.getString("TRKSISSelectionWizardPage.0")); //$NON-NLS-1$
-		Check.checkArg(summaryTextItemContainer);
-		this.summaryTextItemContainer = summaryTextItemContainer;
-        setPageComplete(false);
-        setTitle(Messages.getString("TRKSISSelectionWizardPage.0")); //$NON-NLS-1$
-        setDescription(Messages.getString("TRKSISSelectionWizardPage.1")); //$NON-NLS-1$
-    }
-    
-    public void dispose() {
-    	isDisposed = true;
-    	setSisPath();
-    	
-		CoreModel.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(this);
-
-    	super.dispose();
-    }
-    
-	/*
-     * @see IDialogPage#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2;
-        composite.setLayout(layout);
-        
-        GridData data = new GridData();
-        composite.setLayoutData(data);
-            
-		AbstractLaunchWizard wizard = (AbstractLaunchWizard) getWizard();
-		final IProject project = wizard.getProject();
-		ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
-		if (cpi != null) {
-			final Label sisLabel = new Label(composite, SWT.NONE);
-			sisLabel.setText(Messages.getString("TRKSISSelectionWizardPage.2")); //$NON-NLS-1$
-			data = new GridData();
-			data.horizontalSpan = 1;
-			sisLabel.setLayoutData(data);
-			sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$
-			sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel");
-
-			sisFile = new Combo(composite, SWT.READ_ONLY);
-			data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			data.horizontalSpan = 1;
-			sisFile.setLayoutData(data);
-			sisFile.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$
-			sisFile.add(Messages.getString("TRKSISSelectionWizardPage.5")); //$NON-NLS-1$
-			sisFile.setData(".uid", "TRKSISSelectionWizard.sisFile");
-			
-			ICarbideBuildConfiguration config = cpi.getDefaultConfiguration();
-			for (ISISBuilderInfo info : config.getSISBuilderInfoList()) {
-				IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath();
-				sisFile.add(sisPath.toOSString());
-			}
-			
-			// select the first sis file if any, otherwise select none
-			if (sisFile.getItemCount() > 1) {
-				sisFile.select(1);
-			} else {
-				sisFile.select(0);
-			}
-
-			// listen for events so we can detect if they click on the link below and add new sis info.
-			CoreModel.getDefault().getProjectDescriptionManager().addCProjectDescriptionListener(this, CProjectDescriptionEvent.APPLIED);
-
-			Link link = new Link(composite, SWT.NONE);
-			link.setText("<a>" + Messages.getString("TRKSISSelectionWizardPage.4") + "...</a>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-			link.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					PreferencesUtil.createPropertyDialogOn(getShell(), project, "com.nokia.carbide.cdt.internal.builder.ui.CarbideBuildConfigurationsPage", null, null).open(); //$NON-NLS-1$
-				}
-			});
-			link.setData(".uid", "TRKSISSelectionWizard.link");
-		} else {
-			// not a Carbide project, just an executable.  show a browse/edit combo
-			// to let them select a sis file if they want to.
-			final Label sisLabel = new Label(composite, SWT.NONE);
-			sisLabel.setText(Messages.getString("TRKSISSelectionWizardPage.2")); //$NON-NLS-1$
-			data = new GridData();
-			data.horizontalSpan = 2;
-			sisLabel.setLayoutData(data);
-			sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$
-			sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel");
-
-			sisEdit = new Text(composite, SWT.BORDER);
-			sisEdit.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-			sisEdit.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$
-			sisEdit.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					checkValid();
-				}
-			});
-			sisEdit.setData(".uid", "TRKSISSelectionWizard.sisEdit");
-
-			sisBrowse = new Button(composite, SWT.NONE);
-			sisBrowse.setText(Messages.getString("TRKSISSelectionWizardPage.9")); //$NON-NLS-1$
-			sisBrowse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-			sisBrowse.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-					dialog.setText(Messages.getString("TRKSISSelectionWizardPage.6")); //$NON-NLS-1$
-					dialog.setFilterExtensions(new String[] {"*.sis*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-					dialog.setFilterNames(new String[] {Messages.getString("TRKSISSelectionWizardPage.7"), Messages.getString("TRKSISSelectionWizardPage.8")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-					BrowseDialogUtils.initializeFrom(dialog, sisEdit);
-
-					String result = dialog.open();
-					if (result != null && new File(result).exists()) {
-						sisEdit.setText(result);
-						checkValid();
-					}
-				}
-			});
-			sisBrowse.setData(".uid", "TRKSISSelectionWizard.sisBrowse");
-		}
-
-		setControl(composite);
-        Dialog.applyDialogFont(parent);
-        setPageComplete(true);
-    }
-    
-    private void checkValid() {
-    	setErrorMessage(null);
-    	
-    	if (sisEdit != null) {
-    		String text = sisEdit.getText().trim();
-    		if (text.length() > 0) {
-    			// empty is allowed, but if they specify something, make sure
-    			// it exists
-    			File file = new File(text);
-    			if (!file.exists()) {
-    				setErrorMessage(Messages.getString("TRKSISSelectionWizardPage.10")); //$NON-NLS-1$
-    			}
-    		}
-    	}
-    }
-    
-    private void setSisPath() {
-    	if (sisFile != null) {
-        	sisPath = sisFile.getSelectionIndex() == 0 ? "" : sisFile.getText(); //$NON-NLS-1$
-    	} else if (sisEdit != null) {
-    		sisPath = sisEdit.getText();
-    	}
-    }
-    
-    void updateConfiguration(ILaunchConfigurationWorkingCopy config) {
-    	if (!isDisposed)
-    		setSisPath();
-    		
-   		config.setAttribute(PreferenceConstants.J_PN_SisFileHostPath, sisPath);
-    }
-
-    @Override
-    public void performHelp() {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_TRK_SIS_SELECTION_PAGE);
-    }
-
-	public void handleEvent(CProjectDescriptionEvent event) {
-		if (isDisposed || !isCurrentPage()) {
-			return;
-		}
-		
-		IProject project = event.getProject() ;
-		AbstractLaunchWizard wizard = (AbstractLaunchWizard) getWizard();
-		
-		if (project != wizard.getProject()) {
-			return;
-		}
-		
-		if (sisFile != null) {
-			ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
-			if (cpi != null) {
-				sisFile.removeAll();
-
-				sisFile.add(Messages.getString("TRKSISSelectionWizardPage.5")); //$NON-NLS-1$
-				
-				ICarbideBuildConfiguration config = cpi.getDefaultConfiguration();
-				for (ISISBuilderInfo info : config.getSISBuilderInfoList()) {
-					IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath();
-					sisFile.add(sisPath.toOSString());
-				}
-				
-				// select the first sis file if any, otherwise select none
-				if (sisFile.getItemCount() > 1) {
-					sisFile.select(1);
-				} else {
-					sisFile.select(0);
-				}
-			}
-		}
-	}
-
-    public void setVisible(boolean visible) {
-    	super.setVisible(visible);
-    	if (!visible) {
-    		setSisPath();
-    		summaryTextItemContainer.putSummaryTextItem("SisFile",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("TRKSISSelectionWizardPage.2"), //$NON-NLS-1$
-    						sisPath.length() == 0 ? Messages.getString("TRKSISSelectionWizardPage.5") : sisPath})); //$NON-NLS-1$
-    	}
-    }
-    
-}
\ No newline at end of file

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Mon Sep 20 16:41:18 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Mon Sep 20 17:55:28 2010 -0500
@@ -1,9 +1,3 @@
-AppTRKLaunchWizard.1=New Application TCF Debugger Launch Configuration
-AppTRKLaunchWizard.2=Application TCF Debugger Launch Configuration
-AppTRKLaunchWizard.3=Application TCF Debugger is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching.
-AttachTRKLaunchWizard.1=New Attach to Process Launch Configuration
-AttachTRKLaunchWizard.2=Attach to Process Launch Configuration
-AttachTRKLaunchWizard.3=The debugger attempts to debug a process already running on the phone.
 BuildOptionsSelectionPage.Title=Build Options Selection
 BuildOptionsSelectionPage.Description=Select build options before launching
 BuildOptionsSelectionPage.OptionsGroupLabel=Build (if required) before launching
@@ -19,7 +13,7 @@
 LaunchCategorySelectionPage.title=Launch Categories
 LaunchCategorySelectionPage.description=Select a launch category.
 LaunchCategorySelectionPage.phone=Phone
-LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System or Application TCF TRK.
+LaunchCategorySelectionPage.phoneDesc=Launches on a phone using CODA.
 LaunchCategorySelectionPage.categoryLabel=Select where you want to launch
 LaunchWizardSelectionPage.0=Launch Wizard
 LaunchWizardSelectionPage.1=Launch Types
@@ -46,23 +40,7 @@
 MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch
 MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch
 MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone
-SystemTRKLaunchWizard.1=New System TCF TRK Launch Configuration
-SystemTRKLaunchWizard.2=System TCF TRK Launch Configuration
-SystemTRKLaunchWizard.3=System TCF TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With the System TCF TRK, you can also debug the binaries included in the ROM image.
 TRKConnectionWizardPage.0=Connection Settings
 TRKConnectionWizardPage.1=Select the remote connection to use to connect for debugging
-TRKConnectionWizardPage.2=Serial Port\:
-TRKConnectionWizardPage.3=Specify which serial port on your PC to use for TRK connection
 TRKConnectionWizardPage.ConnectionSummaryLabel=Connection
 TRKConnectionWizardPage.NoConnectionError=A valid remote connection must be selected. If none exist, create a new one.
-TRKSISSelectionWizardPage.0=TRK SIS Selection
-TRKSISSelectionWizardPage.1=Select the SIS file to install
-TRKSISSelectionWizardPage.10=The file specified does not exist.
-TRKSISSelectionWizardPage.2=SIS File to Install\:
-TRKSISSelectionWizardPage.3=Specify which SIS file to install on the phone prior to launching
-TRKSISSelectionWizardPage.4=Modify SIS builder settings for build configuration
-TRKSISSelectionWizardPage.5=None
-TRKSISSelectionWizardPage.6=Select installation file
-TRKSISSelectionWizardPage.7=Installation Files
-TRKSISSelectionWizardPage.8=All Files
-TRKSISSelectionWizardPage.9=Browse...