diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java
index 780e3975dcf..ac3749803a4 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java
@@ -198,6 +198,6 @@ public class WordPartDetector {
 	}
 
 	private boolean isMakefileLetter(char c) {
-		return Character.isLetterOrDigit(c) || "_-.@%<?^+|*".indexOf(c) >= 0;
+		return Character.isLetterOrDigit(c) || "_-.@%<?^+|*".indexOf(c) >= 0; //$NON-NLS-1$
 	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
index 4def2747bbd..7db978de0cb 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
@@ -176,7 +176,7 @@ public class ScannerConfigBuilder extends ACBuilder {
 			if (vars[i] != null
 			 && vars[i].getName() != null) {
 				String value = vars[i].getValue();
-				envProps.setProperty(vars[i].getName(), value == null ? "" : value);
+				envProps.setProperty(vars[i].getName(), value == null ? "" : value); //$NON-NLS-1$
 			}
 		}
 
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/AbstractCodanProblemDetailsProvider.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/AbstractCodanProblemDetailsProvider.java
index 6350530d997..03eeb3a64ff 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/AbstractCodanProblemDetailsProvider.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/AbstractCodanProblemDetailsProvider.java
@@ -112,7 +112,7 @@ public abstract class AbstractCodanProblemDetailsProvider {
 		String message = escapeForLink(getProblemMessage());
 		String href = getLocationHRef();
 		String link = getLocation();
-		return "<a href=\"" + href + "\">" + link + "</a> \n" + message + "\n"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+		return "<a href=\"" + href + "\">" + link + "</a> \n" + message + "\n"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 	}
 
 	protected String getLocationHRef() {
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
index ca52c713c25..07d5679c1c8 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
@@ -853,7 +853,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 		}
 		Status status = new Status(IStatus.ERROR,getPluginID(), 
 				ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_BINARY, 
-				LaunchMessages.AbstractCLaunchDelegate_Program_is_not_a_recognized_executable + " " + exePath.toOSString(),  
+				LaunchMessages.AbstractCLaunchDelegate_Program_is_not_a_recognized_executable + " " + exePath.toOSString(),   //$NON-NLS-1$
 				exception); 
 		throw new CoreException(status);
 	}
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
index c10fdf98598..ba00724bd58 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
@@ -213,7 +213,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		if (selection.equals("")) { //$NON-NLS-1$
 			ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration();
 			if (dc == null) {
-				CDebugCorePlugin.getDefault().saveDefaultDebugConfiguration("org.eclipse.cdt.debug.mi.core.CDebuggerNew");
+				CDebugCorePlugin.getDefault().saveDefaultDebugConfiguration("org.eclipse.cdt.debug.mi.core.CDebuggerNew"); //$NON-NLS-1$
 				dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration();
 			}
 			if (dc != null)
@@ -263,7 +263,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		// Set the default debugger based on the active toolchain on the project (if possible)
 		String defaultDebugger = null;
 		try {
-			String projectName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
+			String projectName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
 			if (projectName.length() > 0) {
 				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
             	ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);