diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanUIMessages.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanUIMessages.java
index bfa213fed57..cb698f3cf4a 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanUIMessages.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanUIMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009,2010 Alena Laskavaia 
+ * Copyright (c) 2009, 2011 Alena Laskavaia 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
+ *    IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.codan.internal.ui;
 
@@ -30,6 +31,7 @@ public class CodanUIMessages extends NLS {
 	public static String ProblemsTreeEditor_NameColumn;
 	public static String ProblemsTreeEditor_Problems;
 	public static String ProblemsTreeEditor_SeverityColumn;
+	public static String ProblemsTreeEditor_ToolTip;
 	public static String OverlayPage_Use_Workspace_Settings;
 	public static String OverlayPage_Use_Project_Settings;
 	public static String OverlayPage_Configure_Workspace_Settings;
@@ -80,6 +82,10 @@ public class CodanUIMessages extends NLS {
 	public static String ExclusionInclusionEntryDialog_ChooseExclusionPattern_description;
 	public static String ExclusionInclusionEntryDialog_ChooseInclusionPattern_title;
 	public static String ExclusionInclusionEntryDialog_ChooseInclusionPattern_description;
+	public static String LaunchModesPropertyPage_RunAsYouType;
+	public static String LaunchModesPropertyPage_RunOnDemand;
+	public static String LaunchModesPropertyPage_RunOnFullBuild;
+	public static String LaunchModesPropertyPage_RunOnIncrementalBuild;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, CodanUIMessages.class);
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties
index 5b5b6e4dce0..50306301edc 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/messages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 Alena Laskavaia and others.
+# Copyright (c) 2010, 2011 Alena Laskavaia 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
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     Alena Laskavaia - initial API and implementation
+#	  IBM Corporation
 ###############################################################################
 BuildPropertyPage_RunAsYouType=Run as you &type (selected checkers)
 BuildPropertyPage_RunWithBuild=&Run with build
@@ -33,6 +34,7 @@ ParametersComposite_Severity=Severity
 ProblemsTreeEditor_NameColumn=Name
 ProblemsTreeEditor_Problems=Problems
 ProblemsTreeEditor_SeverityColumn=Severity
+ProblemsTreeEditor_ToolTip=Sample Message:
 OverlayPage_Use_Workspace_Settings=Use &workspace settings
 OverlayPage_Use_Project_Settings=Use pr&oject settings
 OverlayPage_Configure_Workspace_Settings=&Configure Workspace Settings...
@@ -87,4 +89,8 @@ ExclusionInclusionEntryDialog_ChooseExclusionPattern_title=Exclusion Pattern Sel
 ExclusionInclusionEntryDialog_ChooseExclusionPattern_description=&Choose a folder or file to exclude:
 
 ExclusionInclusionEntryDialog_ChooseInclusionPattern_title=Inclusion Pattern Selection
-ExclusionInclusionEntryDialog_ChooseInclusionPattern_description=&Choose a folder or file to include:
\ No newline at end of file
+ExclusionInclusionEntryDialog_ChooseInclusionPattern_description=&Choose a folder or file to include:
+LaunchModesPropertyPage_RunAsYouType=Run as you type
+LaunchModesPropertyPage_RunOnDemand=Run on demand
+LaunchModesPropertyPage_RunOnFullBuild=Run on full build
+LaunchModesPropertyPage_RunOnIncrementalBuild=Run on incremental build
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/LaunchModesPropertyPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/LaunchModesPropertyPage.java
index b010f6c5306..380862d445d 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/LaunchModesPropertyPage.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/LaunchModesPropertyPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Alena Laskavaia and others.
+ * Copyright (c) 2010, 2011 Alena Laskavaia 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Alena Laskavaia - initial API and implementation
+ *     IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.codan.internal.ui.preferences;
 
@@ -18,6 +19,7 @@ import org.eclipse.cdt.codan.core.model.Checkers;
 import org.eclipse.cdt.codan.core.model.IChecker;
 import org.eclipse.cdt.codan.core.model.IProblem;
 import org.eclipse.cdt.codan.internal.core.CheckersRegistry;
+import org.eclipse.cdt.codan.internal.ui.CodanUIMessages;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -54,11 +56,11 @@ public class LaunchModesPropertyPage extends FieldEditorPreferencePage {
 	 */
 	@Override
 	protected void createFieldEditors() {
-		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_FULL_BUILD.name(), "Run on full build", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_INC_BUILD.name(), "Run on incremental build", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_DEMAND.name(), "Run on demand", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_FULL_BUILD.name(), CodanUIMessages.LaunchModesPropertyPage_RunOnFullBuild, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_INC_BUILD.name(), CodanUIMessages.LaunchModesPropertyPage_RunOnIncrementalBuild, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_ON_DEMAND.name(), CodanUIMessages.LaunchModesPropertyPage_RunOnDemand, getFieldEditorParent()));
 		if (runInEditor) {
-			addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_AS_YOU_TYPE.name(), "Run as you type", getFieldEditorParent()));
+			addField(new BooleanFieldEditor(CheckerLaunchMode.RUN_AS_YOU_TYPE.name(), CodanUIMessages.LaunchModesPropertyPage_RunAsYouType, getFieldEditorParent()));
 		}
 	}
 
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java
index b46b3bd2282..164ca8ea8bb 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Alena Laskavaia 
+ * Copyright (c) 2009, 2011 Alena Laskavaia 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
+ *    IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.codan.internal.ui.preferences;
 
@@ -225,7 +226,7 @@ public class ProblemsTreeEditor extends CheckedTreeEditor {
 						toolTip = wrapText(description, wrapLen);
 						toolTip += "\n\n"; //$NON-NLS-1$
 					}
-					toolTip += "Sample Message:";
+					toolTip += CodanUIMessages.ProblemsTreeEditor_ToolTip;
 					toolTip += "\n  "; //$NON-NLS-1$
 					toolTip += wrapText(sampleMessage, wrapLen);
 					return toolTip;