bug 318802: UIMessages should extend NLS class

core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF

@@ -29,6 +29,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true,
  org.eclipse.cdt.internal.ui.indexview;x-internal:=true,
  org.eclipse.cdt.internal.ui.language;x-internal:=true,
  org.eclipse.cdt.internal.ui.navigator;x-internal:=true,
+ org.eclipse.cdt.internal.ui.newui;x-internal:=true,
  org.eclipse.cdt.internal.ui.preferences;x-internal:=true,
  org.eclipse.cdt.internal.ui.preferences.formatter;x-internal:=true,
  org.eclipse.cdt.internal.ui.refactoring;x-friends:="org.eclipse.cdt.ui.tests",

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java

@@ -51,7 +51,8 @@ import org.eclipse.cdt.core.settings.model.ICSourceEntry;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.AbstractPage;
-import org.eclipse.cdt.ui.newui.UIMessages;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 
 /**
@@ -242,7 +243,7 @@ public class ExcludeFromBuildHandler extends AbstractHandler {
 				try {
 					CoreModel.getDefault().setProjectDescription(p, prjd);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(UIMessages.getString("AbstractPage.11") + e.getLocalizedMessage()); //$NON-NLS-1$
+					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				AbstractPage.updateViews(res);
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java

@@ -0,0 +1,277 @@
+/*******************************************************************************
+ *  Copyright (c) 2010, 2010 Andrew Gvozdev 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
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *  Andrew Gvozdev - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.newui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	public static String AbstractCPropertyTab_0;
+	public static String AbstractCPropertyTab_1;
+	public static String AbstractCPropertyTab_2;
+	public static String AbstractExportTab_0;
+	public static String AbstractExportTab_1;
+	public static String AbstractExportTab_2;
+	public static String AbstractExportTab_3;
+	public static String AbstractLangsListTab_0;
+	public static String AbstractLangsListTab_1;
+	public static String AbstractLangsListTab_2;
+	public static String AbstractLangsListTab_3;
+	public static String AbstractLangsListTab_4;
+	public static String AbstractPage_0;
+	public static String AbstractPage_10;
+	public static String AbstractPage_11;
+	public static String AbstractPage_12;
+	public static String AbstractPage_13;
+	public static String AbstractPage_14;
+	public static String AbstractPage_15;
+	public static String AbstractPage_16;
+	public static String AbstractPage_2;
+	public static String AbstractPage_3;
+	public static String AbstractPage_4;
+	public static String AbstractPage_5;
+	public static String AbstractPage_6;
+	public static String AbstractPage_7;
+	public static String AbstractPage_8;
+	public static String AbstractPage_9;
+	public static String AbstractPage_rebuildIndex_question;
+	public static String BinaryParsTab_0;
+	public static String BrowseEntryDialog_dir_title_add;
+	public static String BrowseEntryDialog_dir_title_edit;
+	public static String BrowseEntryDialog_dir;
+	public static String BrowseEntryDialog_file_title_add;
+	public static String BrowseEntryDialog_file_title_edit;
+	public static String BrowseEntryDialog_file;
+	public static String BrowseEntryDialog_fs_dir_dlg_msg;
+	public static String BrowseEntryDialog_fs;
+	public static String BrowseEntryDialog_message_directory;
+	public static String BrowseEntryDialog_message_file;
+	public static String BrowseEntryDialog_message;
+	public static String BrowseEntryDialog_wsp_dir_dlg_err;
+	public static String BrowseEntryDialog_wsp_dir_dlg_msg;
+	public static String BrowseEntryDialog_wsp_dir_dlg_title;
+	public static String BrowseEntryDialog_wsp_file_dlg_err;
+	public static String BrowseEntryDialog_wsp_file_dlg_msg;
+	public static String BrowseEntryDialog_wsp_file_dlg_title;
+	public static String BrowseEntryDialog_wsp;
+	public static String BuildPropertyCommon_label_new;
+	public static String BuildPropertyCommon_label_remove;
+	public static String BuildPropertyCommon_label_title;
+	public static String BuildPropertyCommon_label;
+	public static String BuildVarListDialog_0;
+	public static String BuildVarListDialog_1;
+	public static String BuildVarListDialog_2;
+	public static String BuildVarListDialog_3;
+	public static String BuildVarListDialog_4;
+	public static String BuildVarListDialog_5;
+	public static String BuildVarListDialog_6;
+	public static String BuildVarListDialog_7;
+	public static String BuildVarListDialog_8;
+	public static String CCProjectWizard_0;
+	public static String CDTCommonProjectWizard_0;
+	public static String CDTCommonProjectWizard_1;
+	public static String CDTCommonProjectWizard_creatingProject;
+	public static String CDTMainWizardPage_0;
+	public static String CDTMainWizardPage_1;
+	public static String CLocationOutputTab_0;
+	public static String CLocationSourceTab_0;
+	public static String CLocationTab_0;
+	public static String CLocationTab_1;
+	public static String CLocationTab_2;
+	public static String CLocationTab_3;
+	public static String CLocationTab_4;
+	public static String CLocationTab_5;
+	public static String CLocationTab_6;
+	public static String CLocationTab_7;
+	public static String CLocationTab_8;
+	public static String CMainWizardPage_0;
+	public static String CMainWizardPage_1;
+	public static String CMainWizardPage_10;
+	public static String CMainWizardPage_3;
+	public static String CMainWizardPage_5;
+	public static String CMainWizardPage_6;
+	public static String CMainWizardPage_7;
+	public static String ConfigDescriptionTab_0;
+	public static String ConfigDescriptionTab_1;
+	public static String ConfigDescriptionTab_2;
+	public static String ConfigMultiSelectionDialog_0;
+	public static String ConfigMultiSelectionDialog_1;
+	public static String CProjectWizard_0;
+	public static String EnvDialog_0;
+	public static String EnvDialog_1;
+	public static String EnvDialog_2;
+	public static String EnvDialog_3;
+	public static String EnvironmentTab_0;
+	public static String EnvironmentTab_1;
+	public static String EnvironmentTab_10;
+	public static String EnvironmentTab_11;
+	public static String EnvironmentTab_12;
+	public static String EnvironmentTab_13;
+	public static String EnvironmentTab_14;
+	public static String EnvironmentTab_15;
+	public static String EnvironmentTab_16;
+	public static String EnvironmentTab_17;
+	public static String EnvironmentTab_18;
+	public static String EnvironmentTab_19;
+	public static String EnvironmentTab_2;
+	public static String EnvironmentTab_20;
+	public static String EnvironmentTab_21;
+	public static String EnvironmentTab_22;
+	public static String EnvironmentTab_23;
+	public static String EnvironmentTab_24;
+	public static String EnvironmentTab_3;
+	public static String EnvironmentTab_4;
+	public static String EnvironmentTab_5;
+	public static String EnvironmentTab_6;
+	public static String EnvironmentTab_7;
+	public static String EnvironmentTab_8;
+	public static String EnvironmentTab_9;
+	public static String ErrorParsTab_error_IllegalCharacter;
+	public static String ErrorParsTab_error_NonAccessibleID;
+	public static String ErrorParsTab_error_NonEmptyName;
+	public static String ErrorParsTab_error_NonUniqueID;
+	public static String ErrorParsTab_error_OnApplyingSettings;
+	public static String ErrorParsTab_error_OnRestoring;
+	public static String ErrorParsTab_error;
+	public static String ErrorParsTab_label_DefaultRegexErrorParserName;
+	public static String ErrorParsTab_label_EnterName;
+	public static String ErrorParsTab_label;
+	public static String ErrorParsTab_message_ConfirmReset;
+	public static String ErrorParsTab_message;
+	public static String ErrorParsTab_title_Add;
+	public static String ErrorParsTab_title_ConfirmReset;
+	public static String ErrorParsTab_title_Edit;
+	public static String ErrorParsTab_title;
+	public static String ExpDialog_0;
+	public static String ExpDialog_1;
+	public static String ExpDialog_10;
+	public static String ExpDialog_2;
+	public static String ExpDialog_3;
+	public static String ExpDialog_4;
+	public static String ExpDialog_5;
+	public static String ExpDialog_6;
+	public static String ExpDialog_7;
+	public static String ExpDialog_8;
+	public static String ExpDialog_9;
+	public static String FileListControl_add;
+	public static String FileListControl_BrowseEntryDialog_wsp_dir_dlg_msg;
+	public static String FileListControl_BrowseEntryDialog_wsp_file_dlg_err;
+	public static String FileListControl_BrowseEntryDialog_wsp_file_dlg_msg;
+	public static String FileListControl_BrowseEntryDialog;
+	public static String FileListControl_button_fs;
+	public static String FileListControl_button_workspace;
+	public static String FileListControl_button;
+	public static String FileListControl_delete;
+	public static String FileListControl_deletedialog_message;
+	public static String FileListControl_deletedialog_title;
+	public static String FileListControl_deletedialog;
+	public static String FileListControl_edit;
+	public static String FileListControl_editdialog_title;
+	public static String FileListControl_editdialog;
+	public static String FileListControl_movedown;
+	public static String FileListControl_moveup;
+	public static String IncludeDialog_0;
+	public static String IncludeDialog_1;
+	public static String IncludeDialog_2;
+	public static String IncludeDialog_3;
+	public static String IncludeFileTab_0;
+	public static String IncludeFileTab_1;
+	public static String IncludeFileTab_2;
+	public static String IncludeTab_0;
+	public static String IncludeTab_1;
+	public static String IncludeTab_2;
+	public static String IncludeTab_export;
+	public static String IncludeTab_import;
+	public static String LanguagesTab_0;
+	public static String LanguagesTab_1;
+	public static String LibraryPathTab_1;
+	public static String LibraryPathTab_2;
+	public static String LibraryTab_1;
+	public static String LibraryTab_2;
+	public static String ManageConfig_deletedialog_message;
+	public static String ManageConfig_deletedialog_title;
+	public static String ManageConfig_deletedialog;
+	public static String ManageConfig_label_new_config_dialog;
+	public static String ManageConfig_label_rename_config_dialog;
+	public static String ManageConfig_label_rename;
+	public static String ManageConfigDialog_0;
+	public static String ManageConfigDialog_1;
+	public static String ManageConfigDialog_2;
+	public static String ManageConfigDialog_3;
+	public static String ManageConfigDialog_4;
+	public static String ManageConfigDialog_5;
+	public static String Multiline_error_message;
+	public static String NewConfiguration_error_caseName;
+	public static String NewConfiguration_error_duplicateName;
+	public static String NewConfiguration_error_invalidName;
+	public static String NewConfiguration_label_description;
+	public static String NewConfiguration_label_group;
+	public static String NewConfiguration_label_name;
+	public static String NewConfiguration_label_warning;
+	public static String NewConfiguration_label;
+	public static String NewModelProjectWizard_0;
+	public static String NewModelProjectWizard_1;
+	public static String NewModelProjectWizard_2;
+	public static String NewModelProjectWizard_3;
+	public static String NewModelProjectWizard_4;
+	public static String NewModelProjectWizard_5;
+	public static String ProjectContentsArea_0;
+	public static String ProjectContentsArea_1;
+	public static String ProjectContentsArea_2;
+	public static String ProjectContentsArea_3;
+	public static String ProjectContentsArea_4;
+	public static String ProjectContentsArea_5;
+	public static String ProjectContentsArea_6;
+	public static String ProjectContentsArea_7;
+	public static String ProjectContentsArea_8;
+	public static String ProjectContentsArea_9;
+	public static String RefsTab_0;
+	public static String RefsTab_2;
+	public static String RefsTab_3;
+	public static String RefsTab_4;
+	public static String RenameConfiguration_error_caseName;
+	public static String RenameConfiguration_error_duplicateName;
+	public static String RenameConfiguration_error_invalidName;
+	public static String RenameConfiguration_label_description;
+	public static String RenameConfiguration_label_name;
+	public static String RenameConfiguration_label_warning;
+	public static String RenameConfiguration_label;
+	public static String StringVariableSelectionDialog_columnDescription;
+	public static String StringVariableSelectionDialog_message;
+	public static String StructureTreeTab_0;
+	public static String StructureTreeTab_1;
+	public static String StructureTreeTab_10;
+	public static String StructureTreeTab_11;
+	public static String StructureTreeTab_2;
+	public static String StructureTreeTab_3;
+	public static String StructureTreeTab_4;
+	public static String StructureTreeTab_5;
+	public static String StructureTreeTab_6;
+	public static String StructureTreeTab_7;
+	public static String StructureTreeTab_8;
+	public static String StructureTreeTab_9;
+	public static String SymbolDialog_0;
+	public static String SymbolDialog_1;
+	public static String SymbolTab_0;
+	public static String SymbolTab_1;
+	public static String SymbolTab_2;
+	public static String SymbolTab_3;
+	public static String WorkingSetConfigAction_21;
+	public static String WorkingSetConfigAction_22;
+
+	static {
+		// Initialize resource bundle.
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+
+	private Messages() {
+	}
+
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties

@@ -0,0 +1,554 @@
+###############################################################################
+# Copyright (c) 2000, 2010 IBM Corporation, 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM - Initial API and implementation
+# QNX Software Systems - [272416] Rework the working set configurations
+# Andrew Gvozdev (Quoin Inc.) - Converted to NLS message format, bug 318802
+###############################################################################
+
+# ----------- Configuration Selection Page -----------
+BuildPropertyPage_label_Platform=Project Type:
+BuildPropertyPage_label_Configuration=Configuration:
+BuildPropertyPage_label_Active=Active configuration
+BuildPropertyPage_label_Settings=Configuration Settings
+BuildPropertyPage_label_AddConfButton=Manage...
+BuildPropertyPage_selection_configuration_all=All configurations
+BuildPropertyPage_tip_platform=Select a platform for the project
+BuildPropertyPage_tip_config=Select the configuration to edit
+BuildPropertyPage_tip_manageconf=Manage configurations of the project
+BuildPropertyPage_tip_remconf=Remove configurations for the platform
+BuildPropertyPage_manage_title=Manage
+BuildPropertyPage_error_Unknown_tree_element=Unknown type of element in tree of type {0}
+BuildPropertyPage_error_version_low=The Managed Make project settings for this project are not available.
+BuildPropertyPage_defaults_title=Reset Configuration Tools
+BuildPropertyPage_defaults_message=This action will reset all of the tools in the selected configuration to their default settings.\n\nDo you want to proceed? 
+BuildPropertyPage_changes_save_title=Apply Configuration Changes
+BuildPropertyPage_changes_save_question=You have made changes to the {0} configuration.\n\nDo you want to apply these changes before switching to the {1} configuration? 
+BuildPropertyPage_changes_save_error=The configuration changes could not be applied.
+BuildPropertyPage_unsupported_proj=The project support is not installed on the system
+BuildPropertyPage_unsupported_config=The configuration support is not installed on the system
+BuildPropertyPage_config_notselected=No configurations selected
+
+# ----------- Managed Build Custom Wizard Page Manager Error Strings -----------
+MBSCustomPageManager_error0=Unknown element type 
+MBSCustomPageManager_error1=\ for extension point 
+MBSCustomPageManager_error2=Unknown child element type 
+MBSCustomPageManager_error3=\ for wizardPage element in extension point 
+MBSCustomPageManager_error4=Missing projectType ID
+MBSCustomPageManager_error5=Missing toolchain ID
+MBSCustomPageManager_error6=Missing nature ID
+
+
+# ----------- Managed Build Preference Page -----------
+BuildPreferencePage_label_Settings=Workspace Settings
+BuildPreferencePage_job_rebuild=Rebuilding the Managed Projects
+BuildPreferencePage_apply_internal_error=An Internal error has occurred. Please check error log.
+
+#--------------- Resource Configuration Selection Page --------------
+ResourceBuildPropertyPage_defaults_title=Reset Resource Configuration Tool
+ResourceBuildPropertyPage_defaults_message=This action will reset all options of the tool in the current resource configuration to their default settings.\n\nDo you want to proceed? 
+
+# ----------- New Env Var Dialog -----------
+NewEnvVarDialog_label_name=Name
+NewEnvVarDialog_label_value=Value
+NewEnvVarDialog_label_delimiter=Delimiter
+NewEnvVarDialog_label_operation=Operation
+NewEnvVarDialog_label_operation_replace=Replace
+NewEnvVarDialog_label_operation_prepend=Prepend
+NewEnvVarDialog_label_operation_append=Append
+NewEnvVarDialog_label_operation_remove=Delete
+NewEnvVarDialog_label_value_prepend=Prepended Value
+NewEnvVarDialog_label_value_append=Appended Value
+NewEnvVarDialog_label_value_undef=<UNDEFINED>
+NewEnvVarDialog_label_title_new=Define a new variable
+NewEnvVarDialog_label_title_edit=Edit existing variable
+NewEnvVarDialog_label_status_cannot_create=The "{0}" Variable can not be created by user
+
+# ----------- Macros Block -----------
+MacrosBlock_label_header_name=Name
+MacrosBlock_label_header_type=Type
+MacrosBlock_label_header_value=Value
+MacrosBlock_label_button_new=New
+MacrosBlock_label_button_edit=Edit
+MacrosBlock_label_button_delete=Delete
+MacrosBlock_label_button_check_chow_parent=Show parent context Build Variables
+MacrosBlock_label_user_macros=User Build Variables
+MacrosBlock_label_system_macros=System Build Variables
+MacrosBlock_label_delete_confirm_title=Build Variable Deletion Confirmation
+MacrosBlock_label_delete_confirm_message=Are you sure you want to delete the selected user Build Variable(s)? 
+MacrosBlock_label_delete_all_confirm_title=Build Variables Deletion Confirmation
+MacrosBlock_label_delete_all_confirm_message=Are you sure you want to delete all user Build Variables?
+MacrosBlock_label_value_eclipse_dynamic=<ECLIPSE DYNAMIC VARIABLE>
+MacrosBlock_label_type_text=String
+MacrosBlock_label_type_text_list=String List
+MacrosBlock_label_type_path_file=File
+MacrosBlock_label_type_path_dir=Directory
+MacrosBlock_label_type_path_file_list=File List
+MacrosBlock_label_type_path_dir_list=Directory List
+MacrosBlock_label_type_path_any=Path
+MacrosBlock_label_type_path_any_list=Path List
+
+# ----------- New Build Macro Dialog -----------
+NewBuildMacroDialog_label_value=Value:
+NewBuildMacroDialog_label_type=Type:
+NewBuildMacroDialog_label_type_text=String
+NewBuildMacroDialog_label_type_text_list=String List
+NewBuildMacroDialog_label_type_path_file=File
+NewBuildMacroDialog_label_type_path_dir=Directory
+NewBuildMacroDialog_label_type_path_file_list=File List
+NewBuildMacroDialog_label_type_path_dir_list=Directory List
+NewBuildMacroDialog_label_type_path_any=Path
+NewBuildMacroDialog_label_type_path_any_list=Path List
+NewBuildMacroDialog_label_browse=Browse
+NewBuildMacroDialog_label_title_new=Define a New Build Variable
+NewBuildMacroDialog_label_title_edit=Edit Existing Build Variable
+NewBuildMacroDialog_label_list_title=Value of Build Variable
+NewBuildMacroDialog_label_status_cannot_create=The "{0}" Variable can not be created by user
+
+# ------------Resource Configuration Selection Page
+ResourceBuildPropertyPage_label_ActiveResource=Active Resource configuration
+ResourceBuildPropertyPage_label_ResourceSettings=Resource Configuration settings
+ResourceBuildPropertyPage_label_Configuration=Configuration:
+ResourceBuildPropertyPage_label_ExcludeCheckBox= Exclude from build
+ResourceBuildPropertyPage_selection_configuration_all=All configurations
+ResourceBuildPropertyPage_label_ToolTree=Tools
+ResourceBuildPropertyPage_label_ToolOptions=Options
+ResourceBuildPropertyPage_label_NotMBSFile=The project is closed or the file is not contained within a Managed Make project.
+ResourceBuildPropertyPage_error_version_low=The Managed Make project settings for this project are not available.
+ResourceBuildPropertyPage_tip_excludecheck=Exclude the file from building in the selected configuration
+ResourceBuildPropertyPage_tip_config=Select the configuration to edit
+ResourceBuildPropertyPage_unsupported_proj=The project support is not installed on the system
+ResourceBuildPropertyPage_unsupported_config=The configuration support is not installed on the system
+ResourceBuildPropertyPage_config_notselected=No configurations selected
+ResourceBuildPropertyPage_rc_non_build=Managed Build settings for this resource are not available
+ResourceBuildPropertyPage_rc_generated=The selected resource is created by the buildfile generator
+
+# ----------- Languages Page
+
+CLanguagesPropertyPage_label_ActiveResource=Active Resource configuration
+CLanguagesPropertyPage_label_ResourceSettings=Known languages
+CLanguagesPropertyPage_label_ApplyToAllCheckBox=Apply changes to all configurations
+CLanguagesPropertyPage_label_Configuration=Configuration:
+
+# ----------- Resource Custom Build Step Block -----------
+ResourceCustomBuildStepBlock_label_settings=Custom Build Steps
+ResourceCustomBuildStepBlock_label_tool_group=Resource Custom Build Step
+ResourceCustomBuildStepBlock_label_applicability=Custom Build Step Applicability
+ResourceCustomBuildStepBlock_label_applicability_rule_before=Apply Custom Build Step Before Other Tools
+ResourceCustomBuildStepBlock_label_applicability_rule_after=Apply Custom Build Step After Other Tools
+ResourceCustomBuildStepBlock_label_applicability_rule_override=Apply Custom Build Step Overriding Other Tools
+ResourceCustomBuildStepBlock_label_applicability_rule_disable=Disable Custom Build Step
+ResourceCustomBuildStepBlock_label_input_filenames=Additional Input file name(s):
+ResourceCustomBuildStepBlock_label_output_filenames=Output file name(s):
+ResourceCustomBuildStepBlock_label_command_cmd=Command:
+ResourceCustomBuildStepBlock_label_description_desc=Description:
+ResourceCustomBuildStepBlock_tip_applicability=specifies how to apply the custom build step with respect to other resource configuration tools
+ResourceCustomBuildStepBlock_tip_inputs=a semicolon separated list of additional input files for this build step.  Paths are interpreted as relative to the Project directory.
+ResourceCustomBuildStepBlock_tip_outputs=a semicolon separated list of the output files produced by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock_tip_command=a semicolon separated list of commands or a single command to be executed by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock_tip_announcement=a message to be output in the build log upon execution of this build step
+ResourceCustomBuildStepBlock_defaults_title=Reset Resource Custom Build Step
+ResourceCustomBuildStepBlock_defaults_message=This action will reset the resource custom build step to the default settings.\n\nDo you want to proceed?
+
+# ----------- Entry Dialog -----------
+BrowseEntryDialog_error_Folder_name_invalid = Folder name invalid
+BrowseEntryDialog_message_file = File:
+BrowseEntryDialog_message_directory = Directory:
+BrowseEntryDialog_file_title_add=Add file path
+BrowseEntryDialog_dir_title_add=Add directory path
+BrowseEntryDialog_file_title_edit=Edit file path
+BrowseEntryDialog_dir_title_edit=Edit directory path
+BrowseEntryDialog_wsp_dir_dlg_title=Folder selection
+BrowseEntryDialog_wsp_file_dlg_title=File selection
+BrowseEntryDialog_wsp_dir_dlg_msg=Select a folder from workspace:
+BrowseEntryDialog_wsp_file_dlg_msg=Select a file from workspace:
+BrowseEntryDialog_wsp_file_dlg_err=The selected element is not a file.
+BrowseEntryDialog_wsp_dir_dlg_err=The selected element is not a directory.
+BrowseEntryDialog_fs_dir_dlg_msg=Select a folder from file system:
+
+# ----------- New Configuration -----------
+NewConfiguration_label_name=Name:
+NewConfiguration_label_description=Description:
+NewConfiguration_label_group=Copy settings from
+NewConfiguration_label_copy=Default configuration:
+NewConfiguration_label_clone=Existing configuration:
+NewConfiguration_label_showall=Show unsupported configurations 
+NewConfiguration_label_warning=Note: The configuration name will be used as a directory name in the file system.  Please ensure that it is valid for your platform. 
+NewConfiguration_error_duplicateName=A configuration named "{0}" already exists.
+NewConfiguration_error_caseName=A configuration name that differs only in case to "{0}" exists.
+NewConfiguration_error_invalidName=The name "{0}" is invalid.
+
+# ----------- Rename Configuration -----------
+RenameConfiguration_label_name=Name:
+RenameConfiguration_label_description=Description:
+RenameConfiguration_label_warning=Note: The configuration name will be used as a directory name in the file system.  Please ensure that it is valid for your platform. 
+RenameConfiguration_error_duplicateName=A configuration named "{0}" already exists.
+RenameConfiguration_error_caseName=A configuration name that differs only in case to "{0}" exists.
+RenameConfiguration_error_invalidName=The name "{0}" is invalid.
+
+# ----------- Target/Config management dialog -----------------
+ManageConfig_label_configs=Manage Configurations
+ManageConfig_label_rename=Rename...
+ManageConfig_label_conversionTargetLabel=Tool chain conversion targets:
+ManageConfig_label_convertTarget=Convert
+ManageConfig_label_new_config_dialog=Create Configuration
+ManageConfig_label_rename_config_dialog=Rename Configuration
+ManageConfig_deletedialog_message=Are you sure you want to delete the "{0}" configuration?
+ManageConfig_deletedialog_title=Confirm Delete
+ManageConfig_tip_convert=Converts the selected configuration to use a tool chain selected in the conversion target list
+ManageConfigDialog_1=Configuration
+ManageConfigDialog_2=Description
+ManageConfigDialog_3=Status
+ManageConfigDialog_4=Set Active
+ManageConfigDialog_5=Active
+ManageConfigDialog_0=Manage Configurations
+ManageConfig_tip_conversionTarget=A list of conversion targets available for the selected configuration 
+
+# Toolchain Conversion Target confirmation Dialog
+ConfigurationConvert_confirmdialog_message=Currently the "{0}" Configuration uses "{1}" toolchain. After conversion it will use "{2}" toolchain. Do you want to proceed?
+ConfigurationConvert_confirmdialog_title=Confirm Configuration Conversion
+
+# ----------- Build Property Common -----------
+BuildPropertyCommon_label_title=Enter Value
+BuildPropertyCommon_label_new=New...
+BuildPropertyCommon_label_remove=Delete
+BuildPropertyCommon_label_up=Up
+BuildPropertyCommon_label_down=Down
+BuildPropertyCommon_label_editVar=Edit...
+BuildPropertyCommon_label_addVar=Add
+BuildPropertyCommon_label_message=Value:
+BuildPropertyCommon_label_browse=Browse...
+BuildPropertyCommon_label_configs=Defined configurations:
+
+# ----------- Field Editors -----------
+Multiline_error_message=Please give correct input
+
+# ----------- Build Tool Settings -----------
+BuildToolSettingsPage_alloptions=All options:
+BuildToolSettingsPage_tool_command=Command:
+BuildToolSettingsPage_tool_commandLinePattern=Command\nline pattern:
+BuildToolSettingsPage_tool_advancedSettings=Expert settings:
+
+# ----------- File List Control -----------
+FileListControl_add=Add...
+FileListControl_delete=Delete
+FileListControl_edit=Edit...
+FileListControl_moveup=Move Up
+FileListControl_movedown=Move Down
+FileListControl_filedialog_title=Select File
+FileListControl_dirdialog_title=Select Include Directory
+FileListControl_dirdialog_desc=Select Include Paths
+FileListControl_deletedialog_message=Are you sure you want to remove the selected entries?
+FileListControl_deletedialog_title=Confirm Remove
+FileListControl_editdialog_title=Edit Dialog
+FileListControl_newdialog_title=New Dialog
+FileListControl_button_workspace=Workspace...
+FileListControl_button_fs=File system...
+FileListControl_BrowseEntryDialog_wsp_dir_dlg_msg=Select one or more Workspace Folders
+FileListControl_BrowseEntryDialog_wsp_file_dlg_msg=Select one or more Workspace Files
+FileListControl_BrowseEntryDialog_wsp_file_dlg_err=One of the elements selected isn't a file
+# ----------- Property Page ----------
+MngMakeProjectPropertyPage_closedproject=Project Closed
+MngMakeProjectPropertyPage_internalError=An Internal error has occurred. Please check error log.
+
+# Copies from org.eclipse.ui.workbench
+showAdvanced = &Advanced >>
+hideAdvanced = << &Advanced
+NewFolderDialog_folderNameEmpty = Folder name must be specified
+
+# Project Conversion Dialog messages
+ProjectConvert_confirmdialog_title=Confirm Project Conversion
+ProjectConvert_confirmdialog_message=The selected project {0} will be converted. Do you want to proceed ?
+
+ProjectConvert_conversionErrordialog_title=Project Conversion Error
+ProjectConvert_conversionErrordialog_message=Error has occurred during the conversion of the project {0} .
+
+ProjectConvert_noConverterErrordialog_title=Project Conversion Error
+ProjectConvert_noConverterErrordialog_message=There are no converters available to convert the project {0} .
+
+ProjectConvert_title=Project Converters for {0}
+PropertyMultiCfgTab_0=* This functionality is experimental *
+PropertyMultiCfgTab_1=Enable multiple configurations setting
+PropertyMultiCfgTab_10=Add/remove/change affected elements, do not touch others
+PropertyMultiCfgTab_11=Replace existing string lists with string list shown to user
+PropertyMultiCfgTab_3=String List Display Mode
+PropertyMultiCfgTab_4=Define how string lists from different configurations should be combined for display when lists are not equal:
+PropertyMultiCfgTab_6=Show common elements (conjunction)
+PropertyMultiCfgTab_7=Show all elements except doubles (disjunction)
+PropertyMultiCfgTab_8=String List Write Mode
+PropertyMultiCfgTab_9=Define how to save changes in string lists for different configurations:
+PropertyPageDefsTab_0=Show "Manage Configurations..." button
+PropertyPageDefsTab_1=Display "Data Hierarchy" tab
+PropertyPageDefsTab_10=Display "Export Settings" tab
+PropertyPageDefsTab_11=Save Property Dialog Bounds
+PropertyPageDefsTab_12=Save size and position
+PropertyPageDefsTab_13=Save size only
+PropertyPageDefsTab_14=Do not save at all
+PropertyPageDefsTab_15=Center dialogs on screen
+PropertyPageDefsTab_16=Display tool option tips of "Tool Settings" tab at fixed location
+PropertyPageDefsTab_4=Display "Tool Chain Editor" tab
+PropertyPageDefsTab_5=Discovery Profiles Naming Rule
+PropertyPageDefsTab_6=Show disc. page names if they are unique. Else names + profile IDs.
+PropertyPageDefsTab_7=Show disc. page names if they are unique. Else show profile IDs.
+PropertyPageDefsTab_8=Always show names + profile IDs
+PropertyPageDefsTab_9=Always show profile IDs only
+PropertyPageDefsTab_showIncludeFileTab=Display "Include Files" tab
+ProjectConvert_convertersList=Converters List
+
+ScannerConfigOptionsDialog_title=Discovery Options
+ScannerConfigOptionsDialog_description=Set the scanner configuration discovery options for this project
+ScannerConfigOptionsDialog_scGroup_label=Automated discovery of paths and symbols
+ScannerConfigOptionsDialog_scGroup_enabled_button=Automate discovery of paths and symbols
+ScannerConfigOptionsDialog_scGroup_problemReporting_enabled_button=Report path detection problems
+ScannerConfigOptionsDialog_scGroup_selectedProfile_combo=Discovery profile:
+ScannerConfigOptionsDialog_profile_group_label=Discovery profile options
+ScannerConfigOptionsDialog_boProvider_parser_enabled_button=Enable build output scanner info discovery
+ScannerConfigOptionsDialog_boProvider_open_label=Load build output from file
+ScannerConfigOptionsDialog_boProvider_browse_button=Browse...
+ScannerConfigOptionsDialog_boProvider_browse_openFileDialog=Build output file:
+ScannerConfigOptionsDialog_boProvider_load_button=Load
+ScannerConfigOptionsDialog_siProvider_parser_enabled_button=Enable generate scanner info command
+ScannerConfigOptionsDialog_siProvider_command_label=Compiler invocation command  
+ScannerConfigOptionsDialog_siProvider_browse_button=Browse...
+ScannerConfigOptionsDialog_siProvider_browse_runCommandDialog='gcc' command:
+ScannerConfigOptionsDialog_siProvider_command_errorMessage=Must enter compiler invocation command
+ScannerConfigOptionsDialog_apply_progressMessage=Setting scanner configuration discovery options...
+ScannerConfigOptionsDialog_common_variables_button=Variables...
+
+ScannerConfigOptionsDialog_unsavedchanges_title=Setting C/C++ Make Project Discovery Options 
+ScannerConfigOptionsDialog_unsavedchanges_message=The C/C++ Make Project Discovery Options property page contains unsaved modifications. Do you want to save changes so that other discovery related settings can be updated?
+ScannerConfigOptionsDialog_unsavedchanges_button_save=Apply
+ScannerConfigOptionsDialog_unsavedchanges_button_cancel=Cancel
+
+ScannerConfigOptionsDialog_error_title=Error Setting Project Discovery options
+ScannerConfigOptionsDialog_error_message=An error occurred while setting the project discovery options
+
+# --- DiscoveredScannerConfigurationContainerPage ---
+DiscoveredScannerConfigurationContainerPage_title=Edit container
+DiscoveredScannerConfigurationContainerPage_description=Manage discovered scanner configuration
+DiscoveredScannerConfigurationContainerPage_list_title=Discovered include paths and symbol definitions
+DiscoveredScannerConfigurationContainerPage_initialization_error_message=Error initializing Discovered paths container
+
+# new strings
+
+AbstractCPropertyTab_0=Select build variable
+AbstractCPropertyTab_1=Variables...
+AbstractCPropertyTab_2=This tab is not supported in multi-configuration mode
+AbstractPage_0=Unknown element selected
+AbstractPage_12=Manage Configurations...
+AbstractPage_11=setProjectDescription: 
+AbstractPage_10=Cannot create resource configuration for 
+AbstractPage_13=Cannot load 
+AbstractPage_14=Cannot create page: 
+AbstractPage_15=element not initialized.
+AbstractPage_16=[ Active ]
+AbstractPage_2=This project is not a CDT project
+AbstractPage_3=Error while accessing new configuration. <Apply> cannot work. Use <OK>.
+AbstractPage_4=[ All configurations ]
+AbstractPage_5=[ Multiple configurations...]
+AbstractPage_6=Configuration: 
+AbstractPage_7=Exclude resource from build
+AbstractPage_8=Cannot apply
+AbstractPage_9=Internal error
+AbstractPage_rebuildIndex_question=Changes to the include search paths or defined symbols will not be reflected in the index until it is rebuilt. Do you wish to rebuild it now?
+
+AbstractLangsListTab_0=Show built-in values
+AbstractLangsListTab_1=Languages
+AbstractLangsListTab_2=Export
+AbstractLangsListTab_3=\ [exp]
+AbstractLangsListTab_4=Unexport
+AbstractPrefPage_0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected.
+AbstractExportTab_0=[All]
+AbstractExportTab_1=[List]
+AbstractExportTab_2=Create...
+AbstractExportTab_3=Edit...
+CLocationTab_0=Filter (empty)
+CLocationTab_1=Filter (
+CLocationTab_2=, 
+CLocationTab_3=)
+CLocationTab_4=Add Folder...
+CLocationTab_5=Link Folder...
+CLocationTab_6=Edit Filter...
+CLocationTab_7=Delete
+CLocationTab_8=<root folder>
+CLocationSourceTab_0=Source folders on build path:
+CLocationOutputTab_0=Output folders on build path:
+EnvDialog_0=Name:
+EnvDialog_1=Value:
+EnvDialog_2=Variables
+EnvDialog_3=Add to all configurations
+EnvironmentTab_0=Environment variables to set
+EnvironmentTab_1=Variable
+EnvironmentTab_10=New variable
+EnvironmentTab_11=Edit variable
+EnvironmentTab_12=Variables list
+EnvironmentTab_13=Add to all configurations
+EnvironmentTab_14=Select variables
+EnvironmentTab_15=Current String List DISPLAY mode. Double-click to change
+EnvironmentTab_16=Origin
+EnvironmentTab_17=CONJ.
+EnvironmentTab_18=DISJ.
+EnvironmentTab_19=DISPL mode: 
+EnvironmentTab_2=Value
+EnvironmentTab_20=<UNDEFINED> 
+EnvironmentTab_21=REPLACE
+EnvironmentTab_22=WRITE mode: 
+EnvironmentTab_23=Current String List WRITE mode. Double-click to change
+EnvironmentTab_24=MODIFY
+EnvironmentTab_3=Append variables to native environment
+EnvironmentTab_4=Replace native environment with specified one
+EnvironmentTab_5=Add...
+EnvironmentTab_6=Select...
+EnvironmentTab_7=Edit...
+EnvironmentTab_8=Delete
+EnvironmentTab_9=Undefine
+IncludeTab_0=Include directories
+IncludeTab_1=Add directory path
+IncludeTab_2=Change directory path
+IncludeFileTab_0=Include files
+IncludeFileTab_1=Add include file
+IncludeFileTab_2=Change include file
+IncludeDialog_0=Directory:
+IncludeDialog_1=File:
+IncludeDialog_2=Add to all configurations
+IncludeDialog_3=Add to all languages
+LanguagesTab_0=Content type
+LanguagesTab_1=Language
+LibraryPathTab_1=Add...
+LibraryPathTab_2=Edit...
+LibraryTab_1=Add...
+LibraryTab_2=Edit...
+RefsTab_0=Expand All
+RefsTab_2=Collapse All
+RefsTab_3=Active
+RefsTab_4=Projects list
+SymbolTab_0=Symbol
+SymbolTab_1=Value
+SymbolTab_2=Add symbol
+SymbolTab_3=Change symbol
+ExpDialog_0=To all configurations
+ExpDialog_1=Save to: 
+ExpDialog_2=Languages
+ExpDialog_3=Content types
+ExpDialog_4=Is a workspace path
+ExpDialog_5=Apply to all
+ExpDialog_6=Name:
+ExpDialog_7=Value:
+ExpDialog_8=Name cannot be empty.
+ExpDialog_9=The same name already exists.
+ExpDialog_10=Value cannot be empty.
+ConfigMultiSelectionDialog_0=Select configurations
+ConfigMultiSelectionDialog_1=At least 2 configurations should be selected
+SymbolDialog_0=Name:
+SymbolDialog_1=Value:
+ConfigDescriptionTab_0=Project Description
+ConfigDescriptionTab_1=Configuration Description
+ConfigDescriptionTab_2=Resource Description
+BinaryParsTab_0=Binary parser:
+ErrorParsTab_error_NonEmptyName=Specify non empty name
+ErrorParsTab_error_NonUniqueID=Error parser ID is not unique, specify different name
+ErrorParsTab_error_OnApplyingSettings=Error applying Error Parser Tab settings
+ErrorParsTab_error_OnRestoring=Error restoring default Error Parser Tab settings
+ErrorParsTab_error_NonAccessibleID=[ Not accessible id={0} ]
+ErrorParsTab_error_IllegalCharacter=Special character ''{0}'' is not allowed
+ErrorParsTab_label_EnterName=Enter name of new error parser:
+ErrorParsTab_label_DefaultRegexErrorParserName=Regex Error Parser
+ErrorParsTab_message_ConfirmReset=Are you sure you want to delete all customized error parsers?
+ErrorParsTab_title_Add=Add Regex Error Parser
+ErrorParsTab_title_ConfirmReset=Confirm Resetting Error Parsers
+ErrorParsTab_title_Edit=Edit Regex Error Parser name
+StructureTreeTab_0=Level: 
+StructureTreeTab_1=Maximal tree nesting
+StructureTreeTab_2=Long
+StructureTreeTab_3=String
+StructureTreeTab_4=Object to view: 
+StructureTreeTab_5=Expand all
+StructureTreeTab_6=Expand level...
+StructureTreeTab_7=Collapse all
+StructureTreeTab_8=Property
+StructureTreeTab_9=Value
+StructureTreeTab_10=Class
+StructureTreeTab_11=Wait...
+PrefPage_PropertyPage_0=These settings will affect behavior of CDT property pages
+
+CConfigWizardPage_0=Select Configurations
+CConfigWizardPage_1=Select platforms and configurations you wish to deploy on
+CConfigWizardPage_4=Project type:
+CConfigWizardPage_5=Toolchains:
+CConfigWizardPage_6=Configurations: 
+CConfigWizardPage_7=Select all
+CConfigWizardPage_8=Deselect all
+CConfigWizardPage_9=Edit properties after project creation
+CConfigWizardPage_10=At least one configuration should be available. Project cannot be created.
+CConfigWizardPage_11=At least one configuration should be selected. Please check needed configurations.
+CConfigWizardPage_12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. 
+CConfigWizardPage_13=Advanced settings...
+
+CMainWizardPage_0=Project type:
+CMainWizardPage_1=Show project types and toolchains only if they are supported on the platform
+CMainWizardPage_10=A project with that name already exists in the workspace.
+CMainWizardPage_2=Edit properties after project creation
+CMainWizardPage_3=No project types available. Project cannot be created
+CMainWizardPage_5=Cannot create ICProjectTypeHandler: 
+CMainWizardPage_6=File with specified name already exists.
+CMainWizardPage_7=Directory with specified name already exists.
+CMainWizardPage_8=Project name:
+CMainWizardPage_9=Project name is empty
+
+ProjectContentsArea_0=Browse...
+ProjectContentsArea_1=Use default location
+ProjectContentsArea_2=Location:
+ProjectContentsArea_3=Invalid location path
+ProjectContentsArea_4=Project contents directory must be specified
+ProjectContentsArea_5=Select directory:
+ProjectContentsArea_6=Project path should be absolute
+ProjectContentsArea_7=Project path is not valid
+ProjectContentsArea_8=Cannot create given path
+ProjectContentsArea_9=File with given name already exists
+StdProjectTypeHandler_0=-- Other Toolchain --
+StdProjectTypeHandler_2=Default
+StdProjectTypeHandler_3=creation Make project: IBuilder is null
+
+CDTConfigWizardPage_0=Select configurations
+CDTCommonProjectWizard_0=Old project will be overridden
+CDTCommonProjectWizard_1=Existing project settings will be overridden.\nImport feature can be used instead to preserve old settings.\nOK to override ?
+CDTCommonProjectWizard_creatingProject=Creating project
+NewModelProjectWizard_0=CDT Project
+NewModelProjectWizard_1=Create CDT project of selected type
+NewModelProjectWizard_2=C++ Project
+NewModelProjectWizard_3=Create C++ project of selected type
+NewModelProjectWizard_4=C Project
+NewModelProjectWizard_5=Create C project of selected type
+BuildVarListDialog_0=Type:
+BuildVarListDialog_1=Text list
+BuildVarListDialog_2=File path
+BuildVarListDialog_3=List of File paths
+BuildVarListDialog_4=Directory path
+BuildVarListDialog_5=List of Directory paths
+BuildVarListDialog_6=Any path
+BuildVarListDialog_7=List of any paths
+BuildVarListDialog_8=Text
+BuildVarListDialog_0=<not available>
+BuildVarListDialog_1=Build variables
+StringVariableSelectionDialog_message=&Choose a variable (? = any character, * = any string):
+StringVariableSelectionDialog_columnDescription=&Variable Description:
+NewCfgDialog_0=
+NewCfgDialog_1=
+NewCfgDialog_2=Cannot create new configuration
+NewCfgDialog_3=-- not selected --
+NewCfgDialog_4=Import from projects
+NewCfgDialog_5=Import predefined
+CDTMainWizardPage_0=Project name cannot contain '\#' symbol
+CDTMainWizardPage_1=Project category is selected. Expand the category and select a concrete project type.
+CProjectWizard_0=Add C Project Nature
+CCProjectWizard_0=Add CC Project Nature
+WorkingSetConfigAction_21=Building project 
+WorkingSetConfigAction_22=Build error
+IncludeTab_export=Export Settings...
+IncludeTab_import=Import Settings...
+

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/BuildJob.java

@@ -25,7 +25,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.newui.UIMessages;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * A job that builds a bunch of workspace projects or a working set configuration.
@@ -41,7 +42,7 @@ public final class BuildJob extends Job {
 	 *            the projects to build
 	 */
 	public BuildJob(Collection<IProject> projects) {
-		super(UIMessages.getString("WorkingSetConfigAction.21")); //$NON-NLS-1$
+		super(Messages.WorkingSetConfigAction_21); 
 		this.projects = new java.util.ArrayList<IProject>(projects);
 	}
 
@@ -52,7 +53,7 @@ public final class BuildJob extends Job {
 	 *            the working set configuration to build
 	 */
 	public BuildJob(IWorkingSetConfiguration workingSetConfig) {
-		super(UIMessages.getString("WorkingSetConfigAction.21")); //$NON-NLS-1$
+		super(Messages.WorkingSetConfigAction_21); 
 		this.workingSetConfig = workingSetConfig;
 	}
 
@@ -69,11 +70,11 @@ public final class BuildJob extends Job {
 		try {
 			for (IProject p : projects) {
 				try {
-					setName(UIMessages.getString("WorkingSetConfigAction.21") + p.getName()); //$NON-NLS-1$
+					setName(Messages.WorkingSetConfigAction_21 + p.getName()); 
 					p.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
 				} catch (CoreException e) {
 					return new MultiStatus(CUIPlugin.PLUGIN_ID, 0, new IStatus[] { e.getStatus() },
-							UIMessages.getString("WorkingSetConfigAction.22"), //$NON-NLS-1$
+							Messages.WorkingSetConfigAction_22, 
 							null);
 				}
 				if (monitor.isCanceled()) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java

@@ -44,10 +44,10 @@ import org.eclipse.cdt.core.settings.model.ICSourceEntry;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.AbstractPage;
-import org.eclipse.cdt.ui.newui.UIMessages;
 
 import org.eclipse.cdt.internal.ui.actions.ActionMessages;
 import org.eclipse.cdt.internal.ui.actions.ExcludeFromBuildHandler;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * Action which excludes resources from build.
@@ -203,7 +203,7 @@ implements IWorkbenchWindowPulldownDelegate2, IObjectActionDelegate {
 				try {
 					CoreModel.getDefault().setProjectDescription(p, prjd);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(UIMessages.getString("AbstractPage.11") + e.getLocalizedMessage()); //$NON-NLS-1$
+					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				AbstractPage.updateViews(res);
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java

@@ -61,6 +61,7 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.internal.core.resources.ResourceLookup;
 
 import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * It is a parent for all standard property tabs 
@@ -88,23 +89,23 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab {
 
 	// commonly used button names
 	public static final String EMPTY_STR = ""; //$NON-NLS-1$
-	public static final String ADD_STR = UIMessages.getString("FileListControl.add"); //$NON-NLS-1$
+	public static final String ADD_STR = Messages.FileListControl_add; 
-	public static final String DEL_STR = UIMessages.getString("FileListControl.delete"); //$NON-NLS-1$
+	public static final String DEL_STR = Messages.FileListControl_delete; 
-	public static final String EDIT_STR = UIMessages.getString("FileListControl.edit"); //$NON-NLS-1$
+	public static final String EDIT_STR = Messages.FileListControl_edit; 
-	public static final String MOVEUP_STR = UIMessages.getString("FileListControl.moveup"); //$NON-NLS-1$
+	public static final String MOVEUP_STR = Messages.FileListControl_moveup; 
-	public static final String MOVEDOWN_STR = UIMessages.getString("FileListControl.movedown"); //$NON-NLS-1$
+	public static final String MOVEDOWN_STR = Messages.FileListControl_movedown; 
-	public static final String WORKSPACEBUTTON_NAME = UIMessages.getString("FileListControl.button.workspace"); //$NON-NLS-1$
+	public static final String WORKSPACEBUTTON_NAME = Messages.FileListControl_button_workspace; 
-	public static final String FILESYSTEMBUTTON_NAME = UIMessages.getString("FileListControl.button.fs"); //$NON-NLS-1$
+	public static final String FILESYSTEMBUTTON_NAME = Messages.FileListControl_button_fs; 
-	public static final String VARIABLESBUTTON_NAME = UIMessages.getString("AbstractCPropertyTab.1"); //$NON-NLS-1$
+	public static final String VARIABLESBUTTON_NAME = Messages.AbstractCPropertyTab_1; 
-	public static final String FILESYSTEM_DIR_DIALOG_MSG = UIMessages.getString("BrowseEntryDialog.fs.dir.dlg.msg");	//$NON-NLS-1$
+	public static final String FILESYSTEM_DIR_DIALOG_MSG = Messages.BrowseEntryDialog_fs_dir_dlg_msg;	
 	public static final String FILESYSTEM_FILE_DIALOG_TITLE = EMPTY_STR;	
-	public static final String WORKSPACE_DIR_DIALOG_TITLE = UIMessages.getString("BrowseEntryDialog.wsp.dir.dlg.title");	//$NON-NLS-1$
+	public static final String WORKSPACE_DIR_DIALOG_TITLE = Messages.BrowseEntryDialog_wsp_dir_dlg_title;	
-	public static final String WORKSPACE_FILE_DIALOG_TITLE = UIMessages.getString("BrowseEntryDialog.wsp.file.dlg.title");	//$NON-NLS-1$
+	public static final String WORKSPACE_FILE_DIALOG_TITLE = Messages.BrowseEntryDialog_wsp_file_dlg_title;	
-	public static final String WORKSPACE_DIR_DIALOG_MSG = UIMessages.getString("BrowseEntryDialog.wsp.dir.dlg.msg");	//$NON-NLS-1$
+	public static final String WORKSPACE_DIR_DIALOG_MSG = Messages.BrowseEntryDialog_wsp_dir_dlg_msg;	
-	public static final String WORKSPACE_FILE_DIALOG_MSG = UIMessages.getString("BrowseEntryDialog.wsp.file.dlg.msg");	//$NON-NLS-1$
+	public static final String WORKSPACE_FILE_DIALOG_MSG = Messages.BrowseEntryDialog_wsp_file_dlg_msg;	
-	public static final String WORKSPACE_FILE_DIALOG_ERR = UIMessages.getString("BrowseEntryDialog.wsp.file.dlg.err");	//$NON-NLS-1$
+	public static final String WORKSPACE_FILE_DIALOG_ERR = Messages.BrowseEntryDialog_wsp_file_dlg_err;	
-	public static final String WORKSPACE_DIR_DIALOG_ERR = UIMessages.getString("BrowseEntryDialog.wsp.dir.dlg.err");	//$NON-NLS-1$
+	public static final String WORKSPACE_DIR_DIALOG_ERR = Messages.BrowseEntryDialog_wsp_dir_dlg_err;	
-	public static final String BACKGROUND_TEXT_DEFAULT = UIMessages.getString("AbstractCPropertyTab.2"); //$NON-NLS-1$
+	public static final String BACKGROUND_TEXT_DEFAULT = Messages.AbstractCPropertyTab_2; 
 	public static final Color BACKGROUND_FOR_USER_VAR = new Color(Display.getDefault(), 255, 255, 200); // light yellow
 
 	private static final String PREFIX = "org.eclipse.cdt.ui."; //$NON-NLS-1$
@@ -422,7 +423,7 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab {
 		
 		ICdtVariableManager vm = CCorePlugin.getDefault().getCdtVariableManager();
 		BuildVarListDialog dialog = new BuildVarListDialog(shell, vm.getVariables(cfgd));
-		dialog.setTitle(UIMessages.getString("AbstractCPropertyTab.0")); //$NON-NLS-1$
+		dialog.setTitle(Messages.AbstractCPropertyTab_0); 
 		if (dialog.open() == Window.OK) {
 			Object[] selected = dialog.getResult();
 			if (selected.length > 0) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java

@@ -52,6 +52,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 public abstract class AbstractExportTab extends AbstractCPropertyTab {
 	protected Table table;
@@ -67,8 +68,8 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 	public static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM); 
 	public static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE); 
 	public static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
-	private static final String ALL = UIMessages.getString("AbstractExportTab.0"); //$NON-NLS-1$
+	private static final String ALL = Messages.AbstractExportTab_0; 
-	private static final String LIST = UIMessages.getString("AbstractExportTab.1"); //$NON-NLS-1$
+	private static final String LIST = Messages.AbstractExportTab_1; 
 	private static Map<String, String> names_l = new HashMap<String, String>();
 	private static Map<String, String> names_t = new HashMap<String, String>();
 	private static String[] names_ls; 	
@@ -128,16 +129,16 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 	    });
  	    TableColumn c = new TableColumn(table, SWT.NONE);
 	    c.setWidth(hasValues() ? 100 : 200);
-	    c.setText(UIMessages.getString("EnvDialog.0")); //$NON-NLS-1$
+	    c.setText(Messages.EnvDialog_0); 
  	    c = new TableColumn(table, SWT.NONE);
 	    c.setWidth(hasValues() ? 100 : 0);
-	    c.setText(UIMessages.getString("EnvDialog.1")); //$NON-NLS-1$
+	    c.setText(Messages.EnvDialog_1); 
  	    c = new TableColumn(table, SWT.NONE);
 	    c.setWidth(100);
-	    c.setText(UIMessages.getString("LanguagesTab.1")); //$NON-NLS-1$
+	    c.setText(Messages.LanguagesTab_1); 
  	    c = new TableColumn(table, SWT.NONE);
 	    c.setWidth(100);
-	    c.setText(UIMessages.getString("LanguagesTab.0")); //$NON-NLS-1$
+	    c.setText(Messages.LanguagesTab_0); 
 	    
 	    initButtons(new String[] {ADD_STR, EDIT_STR, DEL_STR});
 	    updateData(getResDesc());
@@ -230,7 +231,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 		switch (i) {
 		case 0: // add
 			dlg = new ExpDialog(usercomp.getShell(), true,
-					UIMessages.getString("AbstractExportTab.2"), EMPTY_STR, EMPTY_STR, cfg, //$NON-NLS-1$
+					Messages.AbstractExportTab_2, EMPTY_STR, EMPTY_STR, cfg, 
 					null, null, getKind(), names_ls, names_ts, namesList, false); 
 			if (dlg.open()) {
 				ent[0] = doAdd(dlg.text1.trim(), dlg.text2.trim(), dlg.check2);
@@ -259,7 +260,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 				s1 = s2 = old.getName();
 			boolean isWsp = (old.entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0;
 			dlg = new ExpDialog(usercomp.getShell(), false,
-					UIMessages.getString("AbstractExportTab.3"), s1, s2, cfg, //$NON-NLS-1$
+					Messages.AbstractExportTab_3, s1, s2, cfg, 
 					id2name(old.setting.getCompatibleLanguageIds(), names_l),
 					id2name(old.setting.getCompatibleContentTypeIds(), names_t),
 					getKind(), names_ls, names_ts, null, isWsp); 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java

@@ -70,6 +70,7 @@ import org.eclipse.cdt.core.settings.model.MultiLanguageSetting;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 	protected Table table;
@@ -102,7 +103,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			ADD_STR,
 			EDIT_STR,
 			DEL_STR, 
-			UIMessages.getString("AbstractLangsListTab.2"), //$NON-NLS-1$
+			Messages.AbstractLangsListTab_2, 
 			null,
 			MOVEUP_STR,
 			MOVEDOWN_STR
@@ -111,7 +112,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			ADD_STR,
 			EDIT_STR,
 			DEL_STR, 
-			UIMessages.getString("AbstractLangsListTab.2") //$NON-NLS-1$
+			Messages.AbstractLangsListTab_2 
 		};
 
 	private static final Comparator<Object> comp = CDTListComparator.getInstance();
@@ -212,7 +213,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 
 		lb1 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
 		lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$
+		lb1.setToolTipText(Messages.EnvironmentTab_15); 
 		lb1.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseDoubleClick(MouseEvent e) {
@@ -222,7 +223,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 		});
 
 		showBIButton = setupCheck(usercomp,
-				UIMessages.getString("AbstractLangsListTab.0"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+				Messages.AbstractLangsListTab_0, 1, GridData.FILL_HORIZONTAL); 
 		showBIButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -232,7 +233,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 
 		lb2 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
 		lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$
+		lb2.setToolTipText(Messages.EnvironmentTab_23); 
 		lb2.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseDoubleClick(MouseEvent e) {
@@ -264,11 +265,11 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			if (ent.isReadOnly()) canEdit = false;
 			if (ent.isReadOnly()) canDelete = false;
 			if (exported.contains(resolve(ent)))
-				buttonSetText(BUTTON_EXPORT_UNEXPORT, UIMessages.getString("AbstractLangsListTab.4")); //$NON-NLS-1$
+				buttonSetText(BUTTON_EXPORT_UNEXPORT, Messages.AbstractLangsListTab_4); 
 			else
-				buttonSetText(BUTTON_EXPORT_UNEXPORT, UIMessages.getString("AbstractLangsListTab.2")); //$NON-NLS-1$
+				buttonSetText(BUTTON_EXPORT_UNEXPORT, Messages.AbstractLangsListTab_2); 
 		} else {
-			buttonSetText(BUTTON_EXPORT_UNEXPORT, UIMessages.getString("AbstractLangsListTab.2")); //$NON-NLS-1$
+			buttonSetText(BUTTON_EXPORT_UNEXPORT, Messages.AbstractLangsListTab_2); 
 		}
 		boolean canMoveUp = false;
 		boolean canMoveDown = false;
@@ -315,14 +316,14 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 		});
 
 		langCol = new TreeColumn(langTree, SWT.NONE);
-		langCol.setText(UIMessages.getString("AbstractLangsListTab.1")); //$NON-NLS-1$
+		langCol.setText(Messages.AbstractLangsListTab_1); 
 		langCol.setWidth(200);
 		langCol.setResizable(false);
-		langCol.setToolTipText(UIMessages.getString("AbstractLangsListTab.1")); //$NON-NLS-1$
+		langCol.setToolTipText(Messages.AbstractLangsListTab_1); 
 //		langTree.getAccessible().addAccessibleListener(new AccessibleAdapter() {
 //			@Override
 //			public void getName(AccessibleEvent e) {
-//				e.result = UIMessages.getString("AbstractLangsListTab.1"); //$NON-NLS-1$
+//				e.result = UIMessages.AbstractLangsListTab_1; //$NON-NLS-1$
 //			}
 //		});
 		return langTree;
@@ -738,7 +739,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			if (columnIndex == 0) {
 				String s = le.getName();
 				if (exported.contains(resolve(le)))
-					s = s + UIMessages.getString("AbstractLangsListTab.3"); //$NON-NLS-1$
+					s = s + Messages.AbstractLangsListTab_3; 
 				return s;
 			}
 			if (le.getKind() == ICSettingEntry.MACRO) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java

@@ -96,6 +96,7 @@ import org.eclipse.cdt.utils.ui.controls.ControlFactory;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * It is a parent for all standard CDT property pages
@@ -231,11 +232,11 @@ implements
 
 		String s = null;
 		if (!checkElement()) {
-			s = UIMessages.getString("AbstractPage.0"); //$NON-NLS-1$
+			s = Messages.AbstractPage_0; 
 		} else if (!isApplicable()) {
 			return null;
 		} else if (!isCDTProject(getProject())) {
-			s = UIMessages.getString("AbstractPage.2"); //$NON-NLS-1$
+			s = Messages.AbstractPage_2; 
 		}
 		
 	    if (s == null) {
@@ -265,7 +266,7 @@ implements
 			configGroup.setLayout(new GridLayout(3, false));
 
 			Label configLabel = new Label(configGroup, SWT.NONE);
-			configLabel.setText(UIMessages.getString("AbstractPage.6")); //$NON-NLS-1$
+			configLabel.setText(Messages.AbstractPage_6); 
 			configLabel.setLayoutData(new GridData(GridData.BEGINNING));
 
 			configSelector = new Combo(configGroup, SWT.READ_ONLY | SWT.DROP_DOWN);
@@ -279,7 +280,7 @@ implements
 
 			if (!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOMNG)) {
 				manageButton = new Button(configGroup, SWT.PUSH);
-				manageButton.setText(UIMessages.getString("AbstractPage.12")); //$NON-NLS-1$
+				manageButton.setText(Messages.AbstractPage_12); 
 				gd = new GridData(GridData.END);
 				gd.minimumWidth = 150;
 				manageButton.setLayoutData(gd);
@@ -318,7 +319,7 @@ implements
 
 			if (isForFolder() || isForFile()) {
 				excludeFromBuildCheck = new Button(configGroup, SWT.CHECK);
-				excludeFromBuildCheck.setText(UIMessages.getString("AbstractPage.7")); //$NON-NLS-1$
+				excludeFromBuildCheck.setText(Messages.AbstractPage_7); 
 				gd = new GridData(GridData.FILL_HORIZONTAL);
 				gd.horizontalSpan = 3;
 				excludeFromBuildCheck.setLayoutData(gd);
@@ -571,7 +572,7 @@ implements
 		// if creation failed, report an error and return null
 		if (c == null) {
 			MessageBox mb = new MessageBox(getShell());
-			mb.setMessage(UIMessages.getString("AbstractPage.3")); //$NON-NLS-1$
+			mb.setMessage(Messages.AbstractPage_3); 
 			mb.open();
 		}
     	return c;
@@ -654,7 +655,7 @@ implements
 					else
 						CDTPropertyManager.performOk(AbstractPage.this);
 				} catch (CoreException e) {
-					CUIPlugin.getDefault().logErrorMessage(UIMessages.getString("AbstractPage.11") + e.getLocalizedMessage()); //$NON-NLS-1$
+					CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 				}
 				updateViews(internalElement);
 			}
@@ -665,8 +666,8 @@ implements
 		} catch (InvocationTargetException e) {
 			Throwable e1 = e.getTargetException();
 			CUIPlugin.errorDialog(getShell(), 
-					UIMessages.getString("AbstractPage.8"),  //$NON-NLS-1$
+					Messages.AbstractPage_8,  
-					UIMessages.getString("AbstractPage.9"), e1, true); //$NON-NLS-1$
+					Messages.AbstractPage_9, e1, true); 
 			return false;
 		} catch (InterruptedException e) {
 			// IProgressService.runInUI(...) misuses this exception to signal that the operation was canceled.
@@ -699,7 +700,7 @@ implements
 	private void rebuildIndex() {
 		final Shell shell= getShell();
 		final String title= getTitle();
-		final String msg= UIMessages.getString("AbstractPage.rebuildIndex.question"); //$NON-NLS-1$
+		final String msg= Messages.AbstractPage_rebuildIndex_question; 
 		int result= OptionalMessageDialog.open(PREF_ASK_REINDEX,
 				shell, title, null /* default image */, msg, MessageDialog.QUESTION, 
 				new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0);
@@ -745,7 +746,7 @@ implements
 		for (int i = 0; i < cfgDescs.length; ++i) {
 			String name = cfgDescs[i].getName();
 			if (cfgDescs[i].isActive()) {
-				name = name + "  " + UIMessages.getString("AbstractPage.16"); //$NON-NLS-1$ //$NON-NLS-2$
+				name = name + "  " + Messages.AbstractPage_16; //$NON-NLS-1$ 
 			}
 			configSelector.add(name);
 		}
@@ -755,14 +756,14 @@ implements
 
 		// "All cfgs" - shown if at least 2 cfgs available
 		if (cfgDescs.length > 1) {
-			configSelector.add(UIMessages.getString("AbstractPage.4")); //$NON-NLS-1$
+			configSelector.add(Messages.AbstractPage_4); 
 			if (multiCfgs == cfgDescs) {
 				cfgIndex = cfgDescs.length;
 			}
 		}
 		// "Multi cfgs" - shown if at least 3 cfgs available
 		if (cfgDescs.length > 2) {
-			configSelector.add(UIMessages.getString("AbstractPage.5")); //$NON-NLS-1$
+			configSelector.add(Messages.AbstractPage_5); 
 			if (multiCfgs != null && multiCfgs != cfgDescs) {
 				cfgIndex = cfgDescs.length + 1;
 			}
@@ -931,7 +932,7 @@ implements
 						else
 							out = cf.createFileDescription(p, out);
 					} catch (CoreException e) {
-						System.out.println(UIMessages.getString("AbstractPage.10") + //$NON-NLS-1$
+						System.out.println(Messages.AbstractPage_10 + 
 								p.toOSString() + "\n" + e.getLocalizedMessage()); //$NON-NLS-1$
 					}
 				}
@@ -1049,7 +1050,7 @@ implements
 			if (element.getName().equals(ELEMENT_NAME)) {
 				if (loadTab(element, parent)) return;
 			} else {
-				System.out.println(UIMessages.getString("AbstractPage.13") + element.getName()); //$NON-NLS-1$
+				System.out.println(Messages.AbstractPage_13 + element.getName()); 
 			}
 		}
 	}
@@ -1071,7 +1072,7 @@ implements
 		try {
 			page = (ICPropertyTab) element.createExecutableExtension(CLASS_NAME);
 		} catch (CoreException e) {
-			System.out.println(UIMessages.getString("AbstractPage.14") +  //$NON-NLS-1$
+			System.out.println(Messages.AbstractPage_14 +  
 					e.getLocalizedMessage());
 			return false; 
 		}
@@ -1226,7 +1227,7 @@ implements
 	@Override
 	public IAdaptable getElement() {
 		if (internalElement == null && !checkElement()) 
-			throw (new NullPointerException(UIMessages.getString("AbstractPage.15"))); //$NON-NLS-1$
+			throw (new NullPointerException(Messages.AbstractPage_15)); 
 		return internalElement; 
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java

@@ -49,6 +49,7 @@ import org.eclipse.cdt.ui.dialogs.ICOptionPage;
 import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
 
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * @noextend This class is not intended to be subclassed by clients.
@@ -133,7 +134,7 @@ public class BinaryParsTab extends AbstractCPropertyTab {
 
 		Composite c1 = new Composite(sashForm, SWT.NONE);
 		c1.setLayout(new GridLayout(2, false));
-		setupLabel(c1, UIMessages.getString("BinaryParsTab.0"), 2, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+		setupLabel(c1, Messages.BinaryParsTab_0, 2, GridData.FILL_HORIZONTAL); 
 		table = new Table(c1, SWT.BORDER | SWT.CHECK | SWT.SINGLE);
 		table.setLayoutData(new GridData(GridData.FILL_BOTH));
 		table.addSelectionListener(new SelectionAdapter() {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java

@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
 
-import org.eclipse.cdt.internal.ui.wizards.indexwizards.Messages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * Displays CDT variables dialog with ability to filter.
@@ -35,12 +35,12 @@ import org.eclipse.cdt.internal.ui.wizards.indexwizards.Messages;
  */
 public class BuildVarListDialog extends ElementListSelectionDialog {
 
-	private static final String TYPE = UIMessages.getString("BuildVarListDialog_0"); //$NON-NLS-1$
+	private static final String TYPE = Messages.BuildVarListDialog_0; 
     private IStringVariable[] sysVars = VariablesPlugin.getDefault().getStringVariableManager().getVariables();
 
 	private Text text;
 	private Label type;
-	private static final String LIST_DESCRIPTION = UIMessages.getString("BuildVarListDialog.1"); //$NON-NLS-1$
+	private static final String LIST_DESCRIPTION = Messages.BuildVarListDialog_1; 
 	
 	public BuildVarListDialog(Shell parent, Object[] input) {
 		super(parent, new LabelProvider () {
@@ -51,7 +51,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog {
 					return super.getText(element);
 			}});
 		setShellStyle(getShellStyle() | SWT.RESIZE);
-		setMessage(Messages.StringVariableSelectionDialog_message); 
+		setMessage(Messages.StringVariableSelectionDialog_message);
 		setMultipleSelection(false);
 		setElements(input);
 	}
@@ -66,7 +66,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog {
 			
 		Label desc = new Label(c, SWT.NONE);
 		desc.setFont(c.getFont());
-		desc.setText(Messages.StringVariableSelectionDialog_columnDescription);  
+		desc.setText(Messages.StringVariableSelectionDialog_columnDescription);
 		desc.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		
 		text = new Text(c, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
@@ -109,7 +109,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog {
 			}
 		}
 		if (descr == null) 
-			descr = UIMessages.getString("BuildVarListDialog.0"); //$NON-NLS-1$
+			descr = Messages.BuildVarListDialog_0; 
 		text.setText(descr);
 	}
 
@@ -117,29 +117,29 @@ public class BuildVarListDialog extends ElementListSelectionDialog {
 		String stringType;
 		switch(type){
 		case ICdtVariable.VALUE_TEXT_LIST:
-			stringType = UIMessages.getString("BuildVarListDialog_1"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_1; 
 			break;
 		case ICdtVariable.VALUE_PATH_FILE:
-			stringType = UIMessages.getString("BuildVarListDialog_2"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_2; 
 			break;
 		case ICdtVariable.VALUE_PATH_FILE_LIST:
-			stringType = UIMessages.getString("BuildVarListDialog_3"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_3; 
 			break;
 		case ICdtVariable.VALUE_PATH_DIR:
-			stringType = UIMessages.getString("BuildVarListDialog_4"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_4; 
 			break;
 		case ICdtVariable.VALUE_PATH_DIR_LIST:
-			stringType = UIMessages.getString("BuildVarListDialog_5"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_5; 
 			break;
 		case ICdtVariable.VALUE_PATH_ANY:
-			stringType = UIMessages.getString("BuildVarListDialog_6"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_6; 
 			break;
 		case ICdtVariable.VALUE_PATH_ANY_LIST:
-			stringType = UIMessages.getString("BuildVarListDialog_7"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_7; 
 			break;
 		case ICdtVariable.VALUE_TEXT:
 		default:
-			stringType = UIMessages.getString("BuildVarListDialog_8"); //$NON-NLS-1$
+			stringType = Messages.BuildVarListDialog_8; 
 			break;
 		}
 		return stringType;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java

@@ -23,6 +23,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 
 import org.eclipse.cdt.ui.CUIPlugin;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
 import org.eclipse.cdt.internal.ui.workingsets.WorkingSetConfigurationManager;
 
 /**
@@ -122,13 +123,13 @@ public class CDTPrefUtil {
 			setInt(KEY_DMODE, DMODE_CONJUNCTION);
 			// fallthrough
 		case DMODE_CONJUNCTION:
-			s = UIMessages.getString("EnvironmentTab.17");  //$NON-NLS-1$
+			s = Messages.EnvironmentTab_17;  
 			break;
 		case DMODE_DISJUNCTION:
-			s = UIMessages.getString("EnvironmentTab.18");  //$NON-NLS-1$
+			s = Messages.EnvironmentTab_18;  
 			break;
 		}
-		return UIMessages.getString("EnvironmentTab.19") + s;  //$NON-NLS-1$
+		return Messages.EnvironmentTab_19 + s;  
 	}
 	
 	@SuppressWarnings("fallthrough")
@@ -139,13 +140,13 @@ public class CDTPrefUtil {
 			setInt(KEY_WMODE, WMODE_MODIFY);
 			// fallthrough
 		case WMODE_MODIFY:
-			s = UIMessages.getString("EnvironmentTab.24");  //$NON-NLS-1$
+			s = Messages.EnvironmentTab_24;  
 			break;
 		case WMODE_REPLACE:
-			s = UIMessages.getString("EnvironmentTab.21");  //$NON-NLS-1$
+			s = Messages.EnvironmentTab_21;  
 			break;
 		}
-		return UIMessages.getString("EnvironmentTab.22") + s;  //$NON-NLS-1$
+		return Messages.EnvironmentTab_22 + s;  
 	}
 	
 	public static void spinDMode() {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java

@@ -23,6 +23,8 @@ import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.ui.CUIPlugin;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * This class is intended to handle  
  * 
@@ -140,7 +142,7 @@ public class CDTPropertyManager {
 		try {
 			CoreModel.getDefault().setProjectDescription(project, prjd);
 		} catch (CoreException e) {
-			CUIPlugin.getDefault().logErrorMessage(UIMessages.getString("AbstractPage.11") + e.getLocalizedMessage()); //$NON-NLS-1$
+			CUIPlugin.getDefault().logErrorMessage(Messages.AbstractPage_11 + e.getLocalizedMessage()); 
 		}
 		
 		if (pages.size() == 0) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java

@@ -20,6 +20,8 @@ import org.eclipse.cdt.core.settings.model.ICOutputEntry;
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -28,7 +30,7 @@ public class CLocationOutputTab extends CLocationTab {
 	@Override
 	public void createControls(Composite parent) {
 		super.createControls(parent);
-		label.setText(UIMessages.getString("CLocationOutputTab.0")); //$NON-NLS-1$
+		label.setText(Messages.CLocationOutputTab_0); 
 	}
 
 	@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java

@@ -21,6 +21,8 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSourceEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -29,7 +31,7 @@ public class CLocationSourceTab extends CLocationTab {
 	@Override
 	public void createControls(Composite parent) {
 		super.createControls(parent);
-		label.setText(UIMessages.getString("CLocationSourceTab.0"));  //$NON-NLS-1$
+		label.setText(Messages.CLocationSourceTab_0);  
 	}
 	
 	@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java

@@ -55,6 +55,7 @@ import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * CLocationTab implements common features for "Source Location" and "Output Location"
@@ -96,11 +97,11 @@ public abstract class CLocationTab extends AbstractCPropertyTab {
 		public String toString() {
 			String[] s = getExts();
 			if (s.length == 0) 
-				return UIMessages.getString("CLocationTab.0"); //$NON-NLS-1$
+				return Messages.CLocationTab_0; 
-			String x = UIMessages.getString("CLocationTab.1"); //$NON-NLS-1$
+			String x = Messages.CLocationTab_1; 
 			for (String element : s)
-				x = x + element + UIMessages.getString("CLocationTab.2"); //$NON-NLS-1$
+				x = x + element + Messages.CLocationTab_2; 
-			x = x.substring(0, x.length() - 2) + UIMessages.getString("CLocationTab.3"); //$NON-NLS-1$
+			x = x.substring(0, x.length() - 2) + Messages.CLocationTab_3; 
 			return x;
 		} 
 	}
@@ -140,7 +141,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab {
 				updateButtons();
 			}});
 		
-		initButtons(new String[] {UIMessages.getString("CLocationTab.4"),UIMessages.getString("CLocationTab.5"), UIMessages.getString("CLocationTab.6"), UIMessages.getString("CLocationTab.7")}, 150); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		initButtons(new String[] {Messages.CLocationTab_4, Messages.CLocationTab_5, Messages.CLocationTab_6, Messages.CLocationTab_7}, 150); 
 		tree.setContentProvider(new ITreeContentProvider() {
 			public Object[] getChildren(Object parentElement) {
 				if (parentElement instanceof _Entry)
@@ -434,7 +435,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab {
 				protected String decorateText(String input, Object element) {
 			    	if (element instanceof Holder &&
 			    	    ((Holder)element).isRoot())
-			    			return UIMessages.getString("CLocationTab.8"); //$NON-NLS-1$
+			    			return Messages.CLocationTab_8; 
 			    	return super.decorateText(input, element);
 			    }
 			},

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java

@@ -34,6 +34,8 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.ui.CUIPlugin;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -61,7 +63,7 @@ public class ConfigMultiSelectionDialog extends Dialog {
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
-		shell.setText(UIMessages.getString("ConfigMultiSelectionDialog.0")); //$NON-NLS-1$
+		shell.setText(Messages.ConfigMultiSelectionDialog_0); 
 	}
 	
 	/**
@@ -93,14 +95,14 @@ public class ConfigMultiSelectionDialog extends Dialog {
 		
 		message = new Label(composite, SWT.NONE);
 		message.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		message.setText(UIMessages.getString("ConfigMultiSelectionDialog.1")); //$NON-NLS-1$
+		message.setText(Messages.ConfigMultiSelectionDialog_1); 
 		message.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_RED));
 		
 		TableColumn col = new TableColumn(table, SWT.NONE);
-		col.setText(UIMessages.getString("ManageConfigDialog.1")); //$NON-NLS-1$
+		col.setText(Messages.ManageConfigDialog_1); 
 		col.setWidth(100);
 		col = new TableColumn(table, SWT.NONE);
-		col.setText(UIMessages.getString("ManageConfigDialog.2")); //$NON-NLS-1$
+		col.setText(Messages.ManageConfigDialog_2); 
 		col.setWidth(120);
 		
 		tv = new CheckboxTableViewer(table);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java

@@ -29,6 +29,8 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -81,7 +83,7 @@ public class EnvDialog extends Dialog {
 		GridData gd;
 		
 		Label l1 = new Label(c, SWT.NONE);
-		l1.setText(UIMessages.getString("EnvDialog.0")); //$NON-NLS-1$
+		l1.setText(Messages.EnvDialog_0); 
 		l1.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		text1 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -93,7 +95,7 @@ public class EnvDialog extends Dialog {
 			public void modifyText(ModifyEvent e) { setButtons(); }});
 		
 		Label l2 = new Label(c, SWT.NONE);
-		l2.setText(UIMessages.getString("EnvDialog.1")); //$NON-NLS-1$
+		l2.setText(Messages.EnvDialog_1); 
 		l2.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		text2 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -104,7 +106,7 @@ public class EnvDialog extends Dialog {
 			public void modifyText(ModifyEvent e) { setButtons(); }});
 
 		final Button b = new Button(c, SWT.PUSH);
-		b.setText(UIMessages.getString("EnvDialog.2")); //$NON-NLS-1$
+		b.setText(Messages.EnvDialog_2); 
 		b.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -119,7 +121,7 @@ public class EnvDialog extends Dialog {
 		b.setLayoutData(gd);
 		
 		b_add2all = new Button(c, SWT.CHECK);
-		b_add2all.setText(UIMessages.getString("EnvDialog.3")); //$NON-NLS-1$
+		b_add2all.setText(Messages.EnvDialog_3); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		if (cfgd == null)
 			b_add2all.setVisible(false);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java

@@ -59,6 +59,8 @@ import org.eclipse.cdt.internal.core.envvar.EnvVarDescriptor;
 import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager;
 import org.eclipse.cdt.internal.core.envvar.UserDefinedEnvironmentSupplier;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -113,7 +115,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 				return td.var.getName();
 			case 1:
 				if(td.var.getOperation() == IEnvironmentVariable.ENVVAR_REMOVE)
-					return UIMessages.getString("EnvironmentTab.20"); //$NON-NLS-1$
+					return Messages.EnvironmentTab_20; 
 				return td.var.getValue();
 			case 2:
 				return ce.getOrigin(td.var);
@@ -155,7 +157,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 		super.createControls(parent);
 		usercomp.setLayout(new GridLayout(3, true));
 		Label l1 = new Label(usercomp, SWT.LEFT);
-		l1.setText(UIMessages.getString("EnvironmentTab.0")); //$NON-NLS-1$
+		l1.setText(Messages.EnvironmentTab_0); 
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 3;
 		l1.setLayoutData(gd);
@@ -188,14 +190,14 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 		tv.setLabelProvider(new EnvironmentLabelProvider(true));
 		// add headers
 		TableColumn tc = new TableColumn(table, SWT.LEFT);
-		tc.setText(UIMessages.getString("EnvironmentTab.1")); //$NON-NLS-1$
+		tc.setText(Messages.EnvironmentTab_1); 
 		tc.setWidth(150);
 		tc = new TableColumn(table, SWT.LEFT);
-		tc.setText(UIMessages.getString("EnvironmentTab.2")); //$NON-NLS-1$
+		tc.setText(Messages.EnvironmentTab_2); 
 		tc.setWidth(150);
 		if (this.getResDesc() != null) {
 			tc = new TableColumn(table, SWT.LEFT);
-			tc.setText(UIMessages.getString("EnvironmentTab.16"));  //$NON-NLS-1$
+			tc.setText(Messages.EnvironmentTab_16);  
 			tc.setWidth(100);
 		}
 		                    
@@ -204,8 +206,8 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 	    table.setLayoutData(gd);
 	    
 	    b1 = new Button(usercomp, SWT.RADIO);
-	    b1.setText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$
+	    b1.setText(Messages.EnvironmentTab_3); 
-	    b1.setToolTipText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$
+	    b1.setToolTipText(Messages.EnvironmentTab_3); 
 	    gd = new GridData(GridData.FILL_HORIZONTAL);
 	    gd.horizontalSpan = 3; 
 	    b1.setLayoutData(gd);
@@ -220,8 +222,8 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 			}});
 
 	    b2 = new Button(usercomp, SWT.RADIO);
-	    b2.setText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$
+	    b2.setText(Messages.EnvironmentTab_4); 
-	    b2.setToolTipText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$
+	    b2.setToolTipText(Messages.EnvironmentTab_4); 
 	    gd = new GridData(GridData.FILL_HORIZONTAL);
 	    gd.horizontalSpan = 3; 
 	    b2.setLayoutData(gd);
@@ -241,7 +243,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 	    	
 	    	lb1 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
 	    	lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    	lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$
+	    	lb1.setToolTipText(Messages.EnvironmentTab_15); 
 	    	lb1.addMouseListener(new MouseAdapter() {
 	    		@Override
 	    		public void mouseDoubleClick(MouseEvent e) {
@@ -251,7 +253,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 
 	    	lb2 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
 	    	lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    	lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$
+	    	lb2.setToolTipText(Messages.EnvironmentTab_23); 
 	    	lb2.addMouseListener(new MouseAdapter() {
 	    		@Override
 	    		public void mouseDoubleClick(MouseEvent e) {
@@ -259,7 +261,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 	    			updateLbs(null, lb2);
 	    		}});
 	    }
-	    initButtons(new String[] {UIMessages.getString("EnvironmentTab.5"),UIMessages.getString("EnvironmentTab.6"),UIMessages.getString("EnvironmentTab.7"),UIMessages.getString("EnvironmentTab.8"),UIMessages.getString("EnvironmentTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+	    initButtons(new String[] {Messages.EnvironmentTab_5,Messages.EnvironmentTab_6,Messages.EnvironmentTab_7,Messages.EnvironmentTab_8,Messages.EnvironmentTab_9}); 
 	}
 	
 	@Override
@@ -367,13 +369,13 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 	private class MyListSelectionDialog extends ListSelectionDialog {
 		public boolean toAll = false;
 	    public MyListSelectionDialog(Shell parentShell, Object input, IStructuredContentProvider contentProvider) {
-	        super(parentShell, input, contentProvider, new LabelProvider() {}, UIMessages.getString("EnvironmentTab.12")); //$NON-NLS-1$
+	        super(parentShell, input, contentProvider, new LabelProvider() {}, Messages.EnvironmentTab_12); 
 	    }
 	    @Override
 		protected Control createDialogArea(Composite parent) {
 	    	Composite composite = (Composite) super.createDialogArea(parent);
 	    	Button b = new Button(composite, SWT.CHECK);
-	    	b.setText(UIMessages.getString("EnvironmentTab.13")); //$NON-NLS-1$
+	    	b.setText(Messages.EnvironmentTab_13); 
 	    	b.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 	    	if (cfgd == null)
 	    		b.setVisible(false);
@@ -393,7 +395,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 		IEnvironmentVariable var = ((TabData)tv.getElementAt(n)).var;
 		EnvDialog dlg = new EnvDialog(usercomp.getShell(), 
 				var, 
-				UIMessages.getString("EnvironmentTab.11"),  //$NON-NLS-1$ 
+				Messages.EnvironmentTab_11,  
 				false,
 				page.isMultiCfg(),
 				cfgd);
@@ -456,7 +458,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 		IEnvironmentVariable var = null;
 		EnvDialog dlg = new EnvDialog(usercomp.getShell(), 
 				var, 
-				UIMessages.getString("EnvironmentTab.10"), //$NON-NLS-1$ 
+				Messages.EnvironmentTab_10, 
 				true,
 				page.isMultiCfg(),
 				cfgd);
@@ -500,7 +502,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 		Map<?,?> v = EnvironmentReader.getEnvVars();
 		MyListSelectionDialog dialog = new MyListSelectionDialog(usercomp.getShell(), v, createSelectionDialogContentProvider());
 		
-		dialog.setTitle(UIMessages.getString("EnvironmentTab.14")); //$NON-NLS-1$
+		dialog.setTitle(Messages.EnvironmentTab_14); 
 		if (dialog.open() == Window.OK) {
 			Object[] selected = dialog.getResult();
 			ICConfigurationDescription[] cfgs;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java

@@ -32,6 +32,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -61,6 +62,7 @@ import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
 
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
 import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 
 /**
@@ -150,7 +152,7 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 							return name;
 						}
 					}
-					return UIMessages.getFormattedString("ErrorParsTab.error.NonAccessibleID", id); //$NON-NLS-1$
+					return NLS.bind(Messages.ErrorParsTab_error_NonAccessibleID, id); 
 				}
 				return OOPS;
 			}
@@ -306,22 +308,22 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 			public IStatus isValid(String newText) {
 				StatusInfo status = new StatusInfo();
 				if (newText.trim().length() == 0) {
-					status.setError(UIMessages.getString("ErrorParsTab.error.NonEmptyName")); //$NON-NLS-1$
+					status.setError(Messages.ErrorParsTab_error_NonEmptyName); 
 				} else if (newText.indexOf(ErrorParserManager.ERROR_PARSER_DELIMITER)>=0) {
-					String message = MessageFormat.format( UIMessages.getString("ErrorParsTab.error.IllegalCharacter"), //$NON-NLS-1$
+					String message = MessageFormat.format( Messages.ErrorParsTab_error_IllegalCharacter, 
 							new Object[] { ErrorParserManager.ERROR_PARSER_DELIMITER });
 					status.setError(message);
 				} else if (fAvailableErrorParsers.containsKey(makeId(newText))) {
-					status.setError(UIMessages.getString("ErrorParsTab.error.NonUniqueID")); //$NON-NLS-1$
+					status.setError(Messages.ErrorParsTab_error_NonUniqueID); 
 				}
 				return status;
 			}
 
 		};
 		InputStatusDialog addDialog = new InputStatusDialog(usercomp.getShell(),
-				UIMessages.getString("ErrorParsTab.title.Add"), //$NON-NLS-1$
+				Messages.ErrorParsTab_title_Add, 
-				UIMessages.getString("ErrorParsTab.label.EnterName"), //$NON-NLS-1$
+				Messages.ErrorParsTab_label_EnterName, 
-				UIMessages.getString("ErrorParsTab.label.DefaultRegexErrorParserName"), //$NON-NLS-1$
+				Messages.ErrorParsTab_label_DefaultRegexErrorParserName, 
 				inputValidator);
 		addDialog.setHelpAvailable(false);
 
@@ -352,9 +354,9 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 			public IStatus isValid(String newText) {
 				StatusInfo status = new StatusInfo();
 				if (newText.trim().length() == 0) {
-					status.setError(UIMessages.getString("ErrorParsTab.error.NonEmptyName")); //$NON-NLS-1$
+					status.setError(Messages.ErrorParsTab_error_NonEmptyName); 
 				} else if (newText.indexOf(ErrorParserManager.ERROR_PARSER_DELIMITER)>=0) {
-					String message = MessageFormat.format( UIMessages.getString("ErrorParsTab.error.IllegalCharacter"), //$NON-NLS-1$
+					String message = MessageFormat.format( Messages.ErrorParsTab_error_IllegalCharacter, 
 							new Object[] { ErrorParserManager.ERROR_PARSER_DELIMITER });
 					status.setError(message);
 				}
@@ -363,8 +365,8 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 
 		};
 		InputStatusDialog addDialog = new InputStatusDialog(usercomp.getShell(),
-				UIMessages.getString("ErrorParsTab.title.Edit"), //$NON-NLS-1$
+				Messages.ErrorParsTab_title_Edit, 
-				UIMessages.getString("ErrorParsTab.label.EnterName"), //$NON-NLS-1$
+				Messages.ErrorParsTab_label_EnterName, 
 				errorParser.getName(),
 				inputValidator);
 		addDialog.setHelpAvailable(false);
@@ -486,9 +488,9 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 					ErrorParserManager.setUserDefinedErrorParsers(errorParsers);
 					ErrorParserManager.setDefaultErrorParserIds(checkedErrorParserIds);
 				} catch (BackingStoreException e) {
-					CUIPlugin.log(UIMessages.getString("ErrorParsTab.error.OnApplyingSettings"), e); //$NON-NLS-1$
+					CUIPlugin.log(Messages.ErrorParsTab_error_OnApplyingSettings, e); 
 				} catch (CoreException e) {
-					CUIPlugin.log(UIMessages.getString("ErrorParsTab.error.OnApplyingSettings"), e); //$NON-NLS-1$
+					CUIPlugin.log(Messages.ErrorParsTab_error_OnApplyingSettings, e); 
 				}
 			}
 			initMapParsers();
@@ -534,16 +536,16 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 		if (isErrorParsersEditable()) {
 			// Must be Build Settings Preference Page
 			if (MessageDialog.openQuestion(usercomp.getShell(),
-					UIMessages.getString("ErrorParsTab.title.ConfirmReset"), //$NON-NLS-1$
+					Messages.ErrorParsTab_title_ConfirmReset, 
-					UIMessages.getString("ErrorParsTab.message.ConfirmReset"))) { //$NON-NLS-1$
+					Messages.ErrorParsTab_message_ConfirmReset)) { 
 
 				try {
 					ErrorParserManager.setUserDefinedErrorParsers(null);
 					ErrorParserManager.setDefaultErrorParserIds(null);
 				} catch (BackingStoreException e) {
-					CUIPlugin.log(UIMessages.getString("ErrorParsTab.error.OnRestoring"), e); //$NON-NLS-1$
+					CUIPlugin.log(Messages.ErrorParsTab_error_OnRestoring, e); 
 				} catch (CoreException e) {
-					CUIPlugin.log(UIMessages.getString("ErrorParsTab.error.OnRestoring"), e); //$NON-NLS-1$
+					CUIPlugin.log(Messages.ErrorParsTab_error_OnRestoring, e); 
 				}
 			}
 		} else {
@@ -566,7 +568,7 @@ public class ErrorParsTab extends AbstractCPropertyTab {
 					else
 						dynamicPage.performDefaults();
 				} catch (CoreException e) {
-					CUIPlugin.log(UIMessages.getString("ErrorParsTab.error.OnApplyingSettings"), e); //$NON-NLS-1$
+					CUIPlugin.log(Messages.ErrorParsTab_error_OnApplyingSettings, e); 
 				}
 			}
 		}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java

@@ -31,14 +31,16 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class ExpDialog extends AbstractPropertyDialog {
 	
-	protected static final String TO_ALL = UIMessages.getString("ExpDialog.5"); //$NON-NLS-1$
+	protected static final String TO_ALL = Messages.ExpDialog_5; 
-	protected static final String EMPTY_NAME = UIMessages.getString("ExpDialog.8"); //$NON-NLS-1$
+	protected static final String EMPTY_NAME = Messages.ExpDialog_8; 
-	protected static final String EMPTY_VALUE = UIMessages.getString("ExpDialog.10"); //$NON-NLS-1$
+	protected static final String EMPTY_VALUE = Messages.ExpDialog_10; 
 	
 	public String[] sel_types = null;
 	public String[] sel_langs = null; 
@@ -94,7 +96,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 		c.setLayout(new GridLayout(4, true));
 		
 		Label l1 = new Label(c, SWT.NONE);
-		l1.setText(UIMessages.getString("ExpDialog.6"));  //$NON-NLS-1$
+		l1.setText(Messages.ExpDialog_6);  
 		l1.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt1 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -108,7 +110,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 			}});
 				
 		Label l2 = new Label(c, SWT.NONE);
-		l2.setText(UIMessages.getString("ExpDialog.7"));  //$NON-NLS-1$
+		l2.setText(Messages.ExpDialog_7);  
 		l2.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt2 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -134,7 +136,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 		b_vars = setupButton(c, AbstractCPropertyTab.VARIABLESBUTTON_NAME);
 
 		c_all = new Button(c, SWT.CHECK);
-		c_all.setText(UIMessages.getString("ExpDialog.0")); //$NON-NLS-1$
+		c_all.setText(Messages.ExpDialog_0); 
 		gd = new GridData(GridData.BEGINNING);
 		gd.horizontalSpan = 2;
 		c_all.setLayoutData(gd);
@@ -144,7 +146,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 		b_file = setupButton(c, AbstractCPropertyTab.FILESYSTEMBUTTON_NAME);
 
 		c_wsp = new Button(c, SWT.CHECK);
-		c_wsp.setText(UIMessages.getString("ExpDialog.4")); //$NON-NLS-1$
+		c_wsp.setText(Messages.ExpDialog_4); 
 		gd = new GridData(GridData.BEGINNING);
 		gd.horizontalSpan = 3;
 		c_wsp.setLayoutData(gd);
@@ -164,18 +166,18 @@ public class ExpDialog extends AbstractPropertyDialog {
 		}
 		
 		Group dest = new Group(c, SWT.NONE);
-		dest.setText(UIMessages.getString("ExpDialog.1")); //$NON-NLS-1$
+		dest.setText(Messages.ExpDialog_1); 
 		dest.setLayout(new GridLayout(2, true));
 		gd = new GridData(GridData.FILL_BOTH);
 		gd.horizontalSpan = 4;
 		dest.setLayoutData(gd);
 		
 		Label l = new Label(dest, SWT.NONE);
-		l.setText(UIMessages.getString("ExpDialog.2")); //$NON-NLS-1$
+		l.setText(Messages.ExpDialog_2); 
 		l.setLayoutData(new GridData(GridData.BEGINNING));
 
 		l = new Label(dest, SWT.NONE);
-		l.setText(UIMessages.getString("ExpDialog.3")); //$NON-NLS-1$
+		l.setText(Messages.ExpDialog_3); 
 		l.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		c_langs = new Button(dest, SWT.CHECK);
@@ -242,7 +244,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 			}
 		}
 		if (enabled && existing != null && existing.contains(name)) {
-			message.setText(UIMessages.getString("ExpDialog.9")); //$NON-NLS-1$
+			message.setText(Messages.ExpDialog_9); 
 			enabled = false;
 		}
 		b_ok.setEnabled(enabled);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java

@@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsExportWizard;
 import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsImportWizard;
 import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsWizard;
@@ -49,7 +50,7 @@ public class ImportExportWizardButtons {
 		comp.setLayoutData(data);
 		
 		Button importButton = new Button(comp, SWT.NONE);
-		importButton.setText(UIMessages.getString("IncludeTab.import")); //$NON-NLS-1$
+		importButton.setText(Messages.IncludeTab_import); 
 		importButton.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_IMPORT_SETTINGS));
 		importButton.addSelectionListener(new SelectionAdapter() {
 			@Override public void widgetSelected(SelectionEvent e) {
@@ -62,7 +63,7 @@ public class ImportExportWizardButtons {
 		});
 		
 		Button exportButton = new Button(comp, SWT.NONE);
-		exportButton.setText(UIMessages.getString("IncludeTab.export")); //$NON-NLS-1$
+		exportButton.setText(Messages.IncludeTab_export); 
 		exportButton.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_EXPORT_SETTINGS));
 		exportButton.addSelectionListener(new SelectionAdapter() {
 			@Override public void widgetSelected(SelectionEvent e) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java

@@ -31,6 +31,7 @@ import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * @noextend This class is not intended to be subclassed by clients.
@@ -75,9 +76,9 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		
 		Label l1 = new Label(c, SWT.NONE);
 		if ((mode & DIR_MASK) == DIR_MASK)
-			l1.setText(UIMessages.getString("IncludeDialog.0")); //$NON-NLS-1$
+			l1.setText(Messages.IncludeDialog_0); 
 		else
-			l1.setText(UIMessages.getString("IncludeDialog.1")); //$NON-NLS-1$
+			l1.setText(Messages.IncludeDialog_1); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 2;
 		l1.setLayoutData(gd);
@@ -101,7 +102,7 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		c1.setLayout(new GridLayout(1, false));
 		
 		b_add2confs = new Button(c1, SWT.CHECK);
-		b_add2confs.setText(UIMessages.getString("IncludeDialog.2")); //$NON-NLS-1$
+		b_add2confs.setText(Messages.IncludeDialog_2); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		if (((mode & OLD_MASK) == OLD_MASK) ||
 				(cfgd instanceof ICMultiConfigDescription)) {
@@ -111,7 +112,7 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		b_add2confs.setLayoutData(gd);
 
 		b_add2langs = new Button(c1, SWT.CHECK);
-		b_add2langs.setText(UIMessages.getString("IncludeDialog.3")); //$NON-NLS-1$
+		b_add2langs.setText(Messages.IncludeDialog_3); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		if ((mode & OLD_MASK) == OLD_MASK) {
 			gd.heightHint = 1;
@@ -120,7 +121,7 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		b_add2langs.setLayoutData(gd);
 
 		c_wsp = new Button(c1, SWT.CHECK);
-		c_wsp.setText(UIMessages.getString("ExpDialog.4")); //$NON-NLS-1$
+		c_wsp.setText(Messages.ExpDialog_4); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		c_wsp.setLayoutData(gd);
 		c_wsp.setSelection(isWsp);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeFileTab.java

@@ -22,6 +22,8 @@ import org.eclipse.cdt.core.settings.model.CIncludeFileEntry;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * This class provides UI for the {@link ICSettingEntry#INCLUDE_FILE}
  * option type.
@@ -38,21 +40,20 @@ public class IncludeFileTab extends AbstractLangsListTab {
 	@Override
 	public void additionalTableSet() {
 		columnToFit = new TableColumn(table, SWT.NONE);
-		columnToFit.setText(UIMessages.getString("IncludeFileTab.0")); //$NON-NLS-1$
+		columnToFit.setText(Messages.IncludeFileTab_0); 
-		columnToFit.setToolTipText(UIMessages.getString("IncludeFileTab.0")); //$NON-NLS-1$
+		columnToFit.setToolTipText(Messages.IncludeFileTab_0); 
 		showBIButton.setSelection(true);
 		table.getAccessible().addAccessibleListener(new AccessibleAdapter() {
 			@Override
 			public void getName(AccessibleEvent e) {
-				e.result = UIMessages.getString("IncludeFileTab.0"); //$NON-NLS-1$
+				e.result = Messages.IncludeFileTab_0; 
 			}
 		});
 	}
 
 	@Override
 	public ICLanguageSettingEntry doAdd() {
-		IncludeDialog dlg = new IncludeDialog(usercomp.getShell(), IncludeDialog.NEW_FILE, UIMessages
+		IncludeDialog dlg = new IncludeDialog(usercomp.getShell(), IncludeDialog.NEW_FILE, Messages.IncludeFileTab_1,
-				.getString("IncludeFileTab.1"), //$NON-NLS-1$
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0) {
 			toAllCfgs = dlg.check1;
@@ -69,7 +70,7 @@ public class IncludeFileTab extends AbstractLangsListTab {
 	@Override
 	public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) {
 		IncludeDialog dlg = new IncludeDialog(usercomp.getShell(), IncludeDialog.OLD_FILE,
-				UIMessages.getString("IncludeFileTab.2"), //$NON-NLS-1$
+				Messages.IncludeFileTab_2, 
 				ent.getValue(), getResDesc().getConfiguration(),
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open()) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java

@@ -21,6 +21,8 @@ import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -29,14 +31,14 @@ public class IncludeTab extends AbstractLangsListTab {
    @Override
 public void additionalTableSet() {
 	   columnToFit = new TableColumn(table, SWT.NONE);
-	   columnToFit.setText(UIMessages.getString("IncludeTab.0")); //$NON-NLS-1$
+	   columnToFit.setText(Messages.IncludeTab_0); 
-	   columnToFit.setToolTipText(UIMessages.getString("IncludeTab.0")); //$NON-NLS-1$
+	   columnToFit.setToolTipText(Messages.IncludeTab_0); 
 	   showBIButton.setSelection(true);
 	   table.getAccessible().addAccessibleListener(
 				new AccessibleAdapter() {                       
                   @Override
 					public void getName(AccessibleEvent e) {
-                          e.result = UIMessages.getString("IncludeTab.0"); //$NON-NLS-1$
+                          e.result = Messages.IncludeTab_0; 
                   }
               }
 		  );
@@ -46,7 +48,7 @@ public void additionalTableSet() {
 	public ICLanguageSettingEntry doAdd() {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.NEW_DIR,
-				UIMessages.getString("IncludeTab.1"),  //$NON-NLS-1$
+				Messages.IncludeTab_1,  
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			toAllCfgs = dlg.check1;
@@ -64,7 +66,7 @@ public void additionalTableSet() {
 	public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.OLD_DIR,
-				UIMessages.getString("IncludeTab.2"),  //$NON-NLS-1$
+				Messages.IncludeTab_2,  
 				ent.getValue(), getResDesc().getConfiguration(),
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open()) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java

@@ -22,6 +22,8 @@ import org.eclipse.cdt.core.settings.model.CLibraryPathEntry;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -49,7 +51,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt
 	public ICLanguageSettingEntry doAdd() {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.NEW_DIR,
-				UIMessages.getString("LibraryPathTab.1"),  //$NON-NLS-1$ 
+				Messages.LibraryPathTab_1,  
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			toAllCfgs = dlg.check1;
@@ -65,7 +67,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt
 	public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.OLD_DIR,
-				UIMessages.getString("LibraryPathTab.2"),  //$NON-NLS-1$ 
+				Messages.LibraryPathTab_2,  
 				ent.getValue(), getResDesc().getConfiguration(),
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java

@@ -21,6 +21,8 @@ import org.eclipse.cdt.core.settings.model.CLibraryFileEntry;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -48,7 +50,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL
 	public ICLanguageSettingEntry doAdd() {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.NEW_FILE,
-				UIMessages.getString("LibraryTab.1"),  //$NON-NLS-1$ 
+				Messages.LibraryTab_1,  
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			toAllCfgs = dlg.check1;
@@ -64,7 +66,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL
 	public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) {
 		IncludeDialog dlg = new IncludeDialog(
 				usercomp.getShell(), IncludeDialog.OLD_FILE,
-				UIMessages.getString("LibraryTab.2"),  //$NON-NLS-1$
+				Messages.LibraryTab_2,  
 				ent.getValue(), getResDesc().getConfiguration(),
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java

@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -38,6 +39,8 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.ui.CUIPlugin;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -48,17 +51,6 @@ public class ManageConfigDialog extends Dialog {
 	public static final String TITLE_NAME = "title"; //$NON-NLS-1$
 	public static final String ID_NAME = "mbs_id"; //$NON-NLS-1$
 
-	// String constants
-	private static final String CMN_PREFIX = "BuildPropertyCommon";	//$NON-NLS-1$
-	private static final String CMN_LABEL = CMN_PREFIX + ".label";	//$NON-NLS-1$
-	private static final String NEW = CMN_LABEL + ".new";	//$NON-NLS-1$
-	private static final String REMOVE = CMN_LABEL + ".remove";	//$NON-NLS-1$
-	private static final String PREFIX = "ManageConfig";	//$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label";	//$NON-NLS-1$
-	private static final String RENAME = LABEL + ".rename";	//$NON-NLS-1$
-	private static final String NEW_CONF_DLG = LABEL + ".new.config.dialog";	//$NON-NLS-1$
-	private static final String RENAME_CONF_DLG = LABEL + ".rename.config.dialog";	//$NON-NLS-1$
-	
 	// The list of configurations to delete
 	private ICProjectDescription des;
 	private IProject prj;
@@ -112,17 +104,17 @@ public class ManageConfigDialog extends Dialog {
 			}});
 		
 		TableColumn col = new TableColumn(table, SWT.NONE);
-		col.setText(UIMessages.getString("ManageConfigDialog.1")); //$NON-NLS-1$
+		col.setText(Messages.ManageConfigDialog_1); 
 		col.setWidth(100);
 		col = new TableColumn(table, SWT.NONE);
-		col.setText(UIMessages.getString("ManageConfigDialog.2")); //$NON-NLS-1$
+		col.setText(Messages.ManageConfigDialog_2); 
 		col.setWidth(120);
 		col = new TableColumn(table, SWT.NONE);
-		col.setText(UIMessages.getString("ManageConfigDialog.3")); //$NON-NLS-1$
+		col.setText(Messages.ManageConfigDialog_3); 
 		col.setWidth(80);
 
 		actBtn = new Button(composite, SWT.PUSH);
-		actBtn.setText(UIMessages.getString("ManageConfigDialog.4")); //$NON-NLS-1$
+		actBtn.setText(Messages.ManageConfigDialog_4); 
 		actBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		actBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -136,7 +128,7 @@ public class ManageConfigDialog extends Dialog {
 			}} ); 
 
 		newBtn = new Button(composite, SWT.PUSH);
-		newBtn.setText(UIMessages.getString(NEW));
+		newBtn.setText(Messages.BuildPropertyCommon_label_new);
 		newBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		newBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -145,7 +137,7 @@ public class ManageConfigDialog extends Dialog {
 			}} ); 
 
 		delBtn = new Button(composite, SWT.PUSH);
-		delBtn.setText(UIMessages.getString(REMOVE));
+		delBtn.setText(Messages.BuildPropertyCommon_label_remove);
 		delBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		delBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -154,7 +146,7 @@ public class ManageConfigDialog extends Dialog {
 			}} ); 
 
 		renBtn = new Button(composite, SWT.PUSH);
-		renBtn.setText(UIMessages.getString(RENAME));
+		renBtn.setText(Messages.ManageConfig_label_rename);
 		renBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		renBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -175,7 +167,7 @@ public class ManageConfigDialog extends Dialog {
 		INewCfgDialog dialog = handleSpecificMBS(mbs_id);
 		if (dialog == null) { // default (core) implementation.
 			dialog = new NewConfigurationDialog(getShell());
-			dialog.setTitle(UIMessages.getString(NEW_CONF_DLG));
+			dialog.setTitle(Messages.ManageConfig_label_new_config_dialog);
 		}
 		dialog.setProject(des); 
 		if (dialog.open() == OK) updateData();
@@ -222,7 +214,7 @@ public class ManageConfigDialog extends Dialog {
 			ICConfigurationDescription cfgd = (ICConfigurationDescription) table.getItem(sel).getData();
 			RenameConfigurationDialog dialog = new RenameConfigurationDialog(
 					getShell(), cfgd, des.getConfigurations(),
-					UIMessages.getString(RENAME_CONF_DLG));
+					Messages.ManageConfig_label_rename_config_dialog);
 			if (dialog.open() == OK) {
 				cfgd.setName(dialog.getNewName());
 				cfgd.setDescription(dialog.getNewDescription());
@@ -243,9 +235,8 @@ public class ManageConfigDialog extends Dialog {
 		// Get the confirmation from user before deleting the configuration
 		Shell shell = CUIPlugin.getActiveWorkbenchShell();
 		boolean shouldDelete = MessageDialog.openQuestion(shell,
-		        UIMessages.getString("ManageConfig.deletedialog.title"), //$NON-NLS-1$
+		        Messages.ManageConfig_deletedialog_title,
-		        UIMessages.getFormattedString("ManageConfig.deletedialog.message",  //$NON-NLS-1$
+		        NLS.bind(Messages.ManageConfig_deletedialog_message, names));
-		                names));
 		if (shouldDelete) {
 			boolean wasActive = false;
 			for (int j=0; j<tis.length; j++) {
@@ -286,7 +277,7 @@ public class ManageConfigDialog extends Dialog {
 			TableItem t = new TableItem(table, 0);
 			t.setText(0, cfgds[i].getName());
 			t.setText(1, cfgds[i].getDescription());
-			t.setText(2, cfgds[i].isActive() ? UIMessages.getString("ManageConfigDialog.5") : ""); //$NON-NLS-1$ //$NON-NLS-2$
+			t.setText(2, cfgds[i].isActive() ? Messages.ManageConfigDialog_5 : ""); //$NON-NLS-1$ 
 			t.setData(cfgds[i]);
 		}
 		if (table.getItemCount() > 0) table.select(0);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java

@@ -25,11 +25,13 @@ import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.ui.CUIPlugin;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class ManageConfigRunner implements IConfigManager {
-	private static final String MANAGE_TITLE = UIMessages.getString("ManageConfigDialog.0");  //$NON-NLS-1$
+	private static final String MANAGE_TITLE = Messages.ManageConfigDialog_0;  
 
 	protected static ManageConfigRunner instance = null;
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java

@@ -25,6 +25,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  *	MultiLineTextFieldEditor.
  *	Field editor that is same as string field editor but 
@@ -34,8 +36,6 @@ import org.eclipse.swt.widgets.Text;
  */
 public class MultiLineTextFieldEditor extends FieldEditor {
 	
-	private static final String ERROR_MESSAGE = "Multiline.error.message";	//$NON-NLS-1$
-
 	/**
 	 * Validation strategy constant (value <code>0</code>) indicating that
 	 * the editor should perform validation after every key stroke.
@@ -125,7 +125,7 @@ public class MultiLineTextFieldEditor extends FieldEditor {
 		init(name, labelText);
 		setValidateStrategy(strategy);
 		isValid = false;
-		errorMessage = UIMessages.getString(ERROR_MESSAGE);
+		errorMessage = Messages.Multiline_error_message;
 		createControl(parent);
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java

@@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.JFacePreferences;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -35,21 +36,12 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
-	// String constants
-	private static final String PREFIX = "NewConfiguration";	//$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label";	//$NON-NLS-1$
-	private static final String ERROR = PREFIX + ".error";	//$NON-NLS-1$	
-	private static final String NAME = LABEL + ".name";	//$NON-NLS-1$
-	private static final String GROUP = LABEL + ".group";	//$NON-NLS-1$
-	private static final String DUPLICATE = ERROR + ".duplicateName";	//$NON-NLS-1$	
-	private static final String CASE = ERROR + ".caseName";	//$NON-NLS-1$	
-	private static final String INVALID = ERROR + ".invalidName";	//$NON-NLS-1$	
-	private static final String DESCRIPTION = LABEL + ".description";	//$NON-NLS-1$
-	
 	// Widgets
 	private Text configName;
 	private Text configDescription;
@@ -165,7 +157,7 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 		// as a directory name in the filesystem.
 		Label warningLabel = new Label(group1, SWT.BEGINNING | SWT.WRAP);
 		warningLabel.setFont(parent.getFont());
-		warningLabel.setText(UIMessages.getString("NewConfiguration.label.warning")); //$NON-NLS-1$
+		warningLabel.setText(Messages.NewConfiguration_label_warning); 
 		gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 3, 1);
 		gd.widthHint = 300;
 		warningLabel.setLayoutData(gd);
@@ -173,7 +165,7 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 		// Add a label and a text widget for Configuration's name
 		final Label nameLabel = new Label(group1, SWT.LEFT);
 		nameLabel.setFont(parent.getFont());
-		nameLabel.setText(UIMessages.getString(NAME));
+		nameLabel.setText(Messages.NewConfiguration_label_name);
 				
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 1;
@@ -197,7 +189,7 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 //		 Add a label and a text widget for Configuration's description
         final Label descriptionLabel = new Label(group1, SWT.LEFT);
         descriptionLabel.setFont(parent.getFont());
-        descriptionLabel.setText(UIMessages.getString(DESCRIPTION));
+        descriptionLabel.setText(Messages.NewConfiguration_label_description);
 
         gd = new GridData(GridData.FILL_HORIZONTAL);
         gd.horizontalSpan = 1;
@@ -215,7 +207,7 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 		
 		final Group group = new Group(composite, SWT.NONE);
 		group.setFont(composite.getFont());
-		group.setText(UIMessages.getString(GROUP));
+		group.setText(Messages.NewConfiguration_label_group);
 		GridLayout layout = new GridLayout(1, false);
 		group.setLayout(layout);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -343,12 +335,12 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 			s = "";	//$NON-NLS-1$
 			// Make sure the name is not a duplicate
 		} else if (isDuplicateName(currentName)) {
-			s = UIMessages.getFormattedString(DUPLICATE, currentName);
+			s = NLS.bind(Messages.NewConfiguration_error_duplicateName, currentName);
 		} else if (isSimilarName(currentName)) {
-			s = UIMessages.getFormattedString(CASE, currentName);
+			s = NLS.bind(Messages.NewConfiguration_error_caseName, currentName);
 		} else if (!validateName(currentName)) {
 			// TODO Create a decent I18N string to describe this problem
-			s = UIMessages.getFormattedString(INVALID, currentName);
+			s = NLS.bind(Messages.NewConfiguration_error_invalidName, currentName);
 		} 
 		if (statusLabel == null) return;
 		Button b = getButton(IDialogConstants.OK_ID);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties

@@ -1,554 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation, 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM - Initial API and implementation
-# QNX Software Systems - [272416] Rework the working set configurations
-###############################################################################
-
-# ----------- Configuration Selection Page -----------
-BuildPropertyPage.label.Platform=Project Type:
-BuildPropertyPage.label.Configuration=Configuration:
-BuildPropertyPage.label.Active=Active configuration
-BuildPropertyPage.label.Settings=Configuration Settings
-BuildPropertyPage.label.AddConfButton=Manage...
-BuildPropertyPage.selection.configuration.all=All configurations
-BuildPropertyPage.tip.platform=Select a platform for the project
-BuildPropertyPage.tip.config=Select the configuration to edit
-BuildPropertyPage.tip.manageconf=Manage configurations of the project
-BuildPropertyPage.tip.remconf=Remove configurations for the platform
-BuildPropertyPage.manage.title=Manage
-BuildPropertyPage.error.Unknown_tree_element=Unknown type of element in tree of type {0}
-BuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
-BuildPropertyPage.defaults.title=Reset Configuration Tools
-BuildPropertyPage.defaults.message=This action will reset all of the tools in the selected configuration to their default settings.\n\nDo you want to proceed? 
-BuildPropertyPage.changes.save.title=Apply Configuration Changes
-BuildPropertyPage.changes.save.question=You have made changes to the {0} configuration.\n\nDo you want to apply these changes before switching to the {1} configuration? 
-BuildPropertyPage.changes.save.error=The configuration changes could not be applied.
-BuildPropertyPage.unsupported.proj=The project support is not installed on the system
-BuildPropertyPage.unsupported.config=The configuration support is not installed on the system
-BuildPropertyPage.config.notselected=No configurations selected
-
-# ----------- Managed Build Custom Wizard Page Manager Error Strings -----------
-MBSCustomPageManager.error0=Unknown element type 
-MBSCustomPageManager.error1=\ for extension point 
-MBSCustomPageManager.error2=Unknown child element type 
-MBSCustomPageManager.error3=\ for wizardPage element in extension point 
-MBSCustomPageManager.error4=Missing projectType ID
-MBSCustomPageManager.error5=Missing toolchain ID
-MBSCustomPageManager.error6=Missing nature ID
-
-
-# ----------- Managed Build Preference Page -----------
-BuildPreferencePage.label.Settings=Workspace Settings
-BuildPreferencePage.job.rebuild=Rebuilding the Managed Projects
-BuildPreferencePage.apply.internal.error=An Internal error has occurred. Please check error log.
-
-#--------------- Resource Configuration Selection Page --------------
-ResourceBuildPropertyPage.defaults.title=Reset Resource Configuration Tool
-ResourceBuildPropertyPage.defaults.message=This action will reset all options of the tool in the current resource configuration to their default settings.\n\nDo you want to proceed? 
-
-# ----------- New Env Var Dialog -----------
-NewEnvVarDialog.label.name=Name
-NewEnvVarDialog.label.value=Value
-NewEnvVarDialog.label.delimiter=Delimiter
-NewEnvVarDialog.label.operation=Operation
-NewEnvVarDialog.label.operation.replace=Replace
-NewEnvVarDialog.label.operation.prepend=Prepend
-NewEnvVarDialog.label.operation.append=Append
-NewEnvVarDialog.label.operation.remove=Delete
-NewEnvVarDialog.label.value.prepend=Prepended Value
-NewEnvVarDialog.label.value.append=Appended Value
-NewEnvVarDialog.label.value.undef=<UNDEFINED>
-NewEnvVarDialog.label.title.new=Define a new variable
-NewEnvVarDialog.label.title.edit=Edit existing variable
-NewEnvVarDialog.label.status.cannot.create=The "{0}" Variable can not be created by user
-
-# ----------- Macros Block -----------
-MacrosBlock.label.header.name=Name
-MacrosBlock.label.header.type=Type
-MacrosBlock.label.header.value=Value
-MacrosBlock.label.button.new=New
-MacrosBlock.label.button.edit=Edit
-MacrosBlock.label.button.delete=Delete
-MacrosBlock.label.button.check.chow.parent=Show parent context Build Variables
-MacrosBlock.label.user.macros=User Build Variables
-MacrosBlock.label.system.macros=System Build Variables
-MacrosBlock.label.delete.confirm.title=Build Variable Deletion Confirmation
-MacrosBlock.label.delete.confirm.message=Are you sure you want to delete the selected user Build Variable(s)? 
-MacrosBlock.label.delete.all.confirm.title=Build Variables Deletion Confirmation
-MacrosBlock.label.delete.all.confirm.message=Are you sure you want to delete all user Build Variables?
-MacrosBlock.label.value.eclipse.dynamic=<ECLIPSE DYNAMIC VARIABLE>
-MacrosBlock.label.type.text=String
-MacrosBlock.label.type.text.list=String List
-MacrosBlock.label.type.path.file=File
-MacrosBlock.label.type.path.dir=Directory
-MacrosBlock.label.type.path.file.list=File List
-MacrosBlock.label.type.path.dir.list=Directory List
-MacrosBlock.label.type.path.any=Path
-MacrosBlock.label.type.path.any.list=Path List
-
-# ----------- New Build Macro Dialog -----------
-NewBuildMacroDialog.label.value=Value:
-NewBuildMacroDialog.label.type=Type:
-NewBuildMacroDialog.label.type.text=String
-NewBuildMacroDialog.label.type.text.list=String List
-NewBuildMacroDialog.label.type.path.file=File
-NewBuildMacroDialog.label.type.path.dir=Directory
-NewBuildMacroDialog.label.type.path.file.list=File List
-NewBuildMacroDialog.label.type.path.dir.list=Directory List
-NewBuildMacroDialog.label.type.path.any=Path
-NewBuildMacroDialog.label.type.path.any.list=Path List
-NewBuildMacroDialog.label.browse=Browse
-NewBuildMacroDialog.label.title.new=Define a New Build Variable
-NewBuildMacroDialog.label.title.edit=Edit Existing Build Variable
-NewBuildMacroDialog.label.list.title=Value of Build Variable
-NewBuildMacroDialog.label.status.cannot.create=The "{0}" Variable can not be created by user
-
-# ------------Resource Configuration Selection Page
-ResourceBuildPropertyPage.label.ActiveResource=Active Resource configuration
-ResourceBuildPropertyPage.label.ResourceSettings=Resource Configuration settings
-ResourceBuildPropertyPage.label.Configuration=Configuration:
-ResourceBuildPropertyPage.label.ExcludeCheckBox= Exclude from build
-ResourceBuildPropertyPage.selection.configuration.all=All configurations
-ResourceBuildPropertyPage.label.ToolTree=Tools
-ResourceBuildPropertyPage.label.ToolOptions=Options
-ResourceBuildPropertyPage.label.NotMBSFile=The project is closed or the file is not contained within a Managed Make project.
-ResourceBuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
-ResourceBuildPropertyPage.tip.excludecheck=Exclude the file from building in the selected configuration
-ResourceBuildPropertyPage.tip.config=Select the configuration to edit
-ResourceBuildPropertyPage.unsupported.proj=The project support is not installed on the system
-ResourceBuildPropertyPage.unsupported.config=The configuration support is not installed on the system
-ResourceBuildPropertyPage.config.notselected=No configurations selected
-ResourceBuildPropertyPage.rc.non.build=Managed Build settings for this resource are not available
-ResourceBuildPropertyPage.rc.generated=The selected resource is created by the buildfile generator
-
-# ----------- Languages Page
-
-CLanguagesPropertyPage.label.ActiveResource=Active Resource configuration
-CLanguagesPropertyPage.label.ResourceSettings=Known languages
-CLanguagesPropertyPage.label.ApplyToAllCheckBox=Apply changes to all configurations
-CLanguagesPropertyPage.label.Configuration=Configuration:
-
-# ----------- Resource Custom Build Step Block -----------
-ResourceCustomBuildStepBlock.label.settings=Custom Build Steps
-ResourceCustomBuildStepBlock.label.tool.group=Resource Custom Build Step
-ResourceCustomBuildStepBlock.label.applicability=Custom Build Step Applicability
-ResourceCustomBuildStepBlock.label.applicability.rule.before=Apply Custom Build Step Before Other Tools
-ResourceCustomBuildStepBlock.label.applicability.rule.after=Apply Custom Build Step After Other Tools
-ResourceCustomBuildStepBlock.label.applicability.rule.override=Apply Custom Build Step Overriding Other Tools
-ResourceCustomBuildStepBlock.label.applicability.rule.disable=Disable Custom Build Step
-ResourceCustomBuildStepBlock.label.input.filenames=Additional Input file name(s):
-ResourceCustomBuildStepBlock.label.output.filenames=Output file name(s):
-ResourceCustomBuildStepBlock.label.command.cmd=Command:
-ResourceCustomBuildStepBlock.label.description.desc=Description:
-ResourceCustomBuildStepBlock.tip.applicability=specifies how to apply the custom build step with respect to other resource configuration tools
-ResourceCustomBuildStepBlock.tip.inputs=a semicolon separated list of additional input files for this build step.  Paths are interpreted as relative to the Project directory.
-ResourceCustomBuildStepBlock.tip.outputs=a semicolon separated list of the output files produced by this build step.  Paths are interpreted as relative to the Build directory.
-ResourceCustomBuildStepBlock.tip.command=a semicolon separated list of commands or a single command to be executed by this build step.  Paths are interpreted as relative to the Build directory.
-ResourceCustomBuildStepBlock.tip.announcement=a message to be output in the build log upon execution of this build step
-ResourceCustomBuildStepBlock.defaults.title=Reset Resource Custom Build Step
-ResourceCustomBuildStepBlock.defaults.message=This action will reset the resource custom build step to the default settings.\n\nDo you want to proceed?
-
-# ----------- Entry Dialog -----------
-BrowseEntryDialog.error.Folder_name_invalid = Folder name invalid
-BrowseEntryDialog.message.file = File:
-BrowseEntryDialog.message.directory = Directory:
-BrowseEntryDialog.file.title.add=Add file path
-BrowseEntryDialog.dir.title.add=Add directory path
-BrowseEntryDialog.file.title.edit=Edit file path
-BrowseEntryDialog.dir.title.edit=Edit directory path
-BrowseEntryDialog.wsp.dir.dlg.title=Folder selection
-BrowseEntryDialog.wsp.file.dlg.title=File selection
-BrowseEntryDialog.wsp.dir.dlg.msg=Select a folder from workspace:
-BrowseEntryDialog.wsp.file.dlg.msg=Select a file from workspace:
-BrowseEntryDialog.wsp.file.dlg.err=The selected element is not a file.
-BrowseEntryDialog.wsp.dir.dlg.err=The selected element is not a directory.
-BrowseEntryDialog.fs.dir.dlg.msg=Select a folder from file system:
-
-# ----------- New Configuration -----------
-NewConfiguration.label.name=Name:
-NewConfiguration.label.description=Description:
-NewConfiguration.label.group=Copy settings from
-NewConfiguration.label.copy=Default configuration:
-NewConfiguration.label.clone=Existing configuration:
-NewConfiguration.label.showall=Show unsupported configurations 
-NewConfiguration.label.warning=Note: The configuration name will be used as a directory name in the file system.  Please ensure that it is valid for your platform. 
-NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.
-NewConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
-NewConfiguration.error.invalidName=The name "{0}" is invalid.
-
-# ----------- Rename Configuration -----------
-RenameConfiguration.label.name=Name:
-RenameConfiguration.label.description=Description:
-RenameConfiguration.label.warning=Note: The configuration name will be used as a directory name in the file system.  Please ensure that it is valid for your platform. 
-RenameConfiguration.error.duplicateName=A configuration named "{0}" already exists.
-RenameConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
-RenameConfiguration.error.invalidName=The name "{0}" is invalid.
-
-# ----------- Target/Config management dialog -----------------
-ManageConfig.label.configs=Manage Configurations
-ManageConfig.label.rename=Rename...
-ManageConfig.label.conversionTargetLabel=Tool chain conversion targets:
-ManageConfig.label.convertTarget=Convert
-ManageConfig.label.new.config.dialog=Create Configuration
-ManageConfig.label.rename.config.dialog=Rename Configuration
-ManageConfig.deletedialog.message=Are you sure you want to delete the "{0}" configuration?
-ManageConfig.deletedialog.title=Confirm Delete
-ManageConfig.tip.convert=Converts the selected configuration to use a tool chain selected in the conversion target list
-ManageConfigDialog.1=Configuration
-ManageConfigDialog.2=Description
-ManageConfigDialog.3=Status
-ManageConfigDialog.4=Set Active
-ManageConfigDialog.5=Active
-ManageConfigDialog.0=Manage Configurations
-ManageConfig.tip.conversionTarget=A list of conversion targets available for the selected configuration 
-
-# Toolchain Conversion Target confirmation Dialog
-ConfigurationConvert.confirmdialog.message=Currently the "{0}" Configuration uses "{1}" toolchain. After conversion it will use "{2}" toolchain. Do you want to proceed?
-ConfigurationConvert.confirmdialog.title=Confirm Configuration Conversion
-
-# ----------- Build Property Common -----------
-BuildPropertyCommon.label.title=Enter Value
-BuildPropertyCommon.label.new=New...
-BuildPropertyCommon.label.remove=Delete
-BuildPropertyCommon.label.up=Up
-BuildPropertyCommon.label.down=Down
-BuildPropertyCommon.label.editVar=Edit...
-BuildPropertyCommon.label.addVar=Add
-BuildPropertyCommon.label.message=Value:
-BuildPropertyCommon.label.browse=Browse...
-BuildPropertyCommon.label.configs=Defined configurations:
-
-# ----------- Field Editors -----------
-Multiline.error.message=Please give correct input
-
-# ----------- Build Tool Settings -----------
-BuildToolSettingsPage.alloptions=All options:
-BuildToolSettingsPage.tool.command=Command:
-BuildToolSettingsPage.tool.commandLinePattern=Command\nline pattern:
-BuildToolSettingsPage.tool.advancedSettings=Expert settings:
-
-# ----------- File List Control -----------
-FileListControl.add=Add...
-FileListControl.delete=Delete
-FileListControl.edit=Edit...
-FileListControl.moveup=Move Up
-FileListControl.movedown=Move Down
-FileListControl.filedialog.title=Select File
-FileListControl.dirdialog.title=Select Include Directory
-FileListControl.dirdialog.desc=Select Include Paths
-FileListControl.deletedialog.message=Are you sure you want to remove the selected entries?
-FileListControl.deletedialog.title=Confirm Remove
-FileListControl.editdialog.title=Edit Dialog
-FileListControl.newdialog.title=New Dialog
-FileListControl.button.workspace=Workspace...
-FileListControl.button.fs=File system...
-FileListControl.BrowseEntryDialog.wsp.dir.dlg.msg=Select one or more Workspace Folders
-FileListControl.BrowseEntryDialog.wsp.file.dlg.msg=Select one or more Workspace Files
-FileListControl.BrowseEntryDialog.wsp.file.dlg.err=One of the elements selected isn't a file
-# ----------- Property Page ----------
-MngMakeProjectPropertyPage.closedproject=Project Closed
-MngMakeProjectPropertyPage.internalError=An Internal error has occurred. Please check error log.
-
-# Copies from org.eclipse.ui.workbench
-showAdvanced = &Advanced >>
-hideAdvanced = << &Advanced
-NewFolderDialog.folderNameEmpty = Folder name must be specified
-
-# Project Conversion Dialog messages
-ProjectConvert.confirmdialog.title=Confirm Project Conversion
-ProjectConvert.confirmdialog.message=The selected project {0} will be converted. Do you want to proceed ?
-
-ProjectConvert.conversionErrordialog.title=Project Conversion Error
-ProjectConvert.conversionErrordialog.message=Error has occurred during the conversion of the project {0} .
-
-ProjectConvert.noConverterErrordialog.title=Project Conversion Error
-ProjectConvert.noConverterErrordialog.message=There are no converters available to convert the project {0} .
-
-ProjectConvert.title=Project Converters for {0}
-PropertyMultiCfgTab.0=* This functionality is experimental *
-PropertyMultiCfgTab.1=Enable multiple configurations setting
-PropertyMultiCfgTab.10=Add/remove/change affected elements, do not touch others
-PropertyMultiCfgTab.11=Replace existing string lists with string list shown to user
-PropertyMultiCfgTab.3=String List Display Mode
-PropertyMultiCfgTab.4=Define how string lists from different configurations should be combined for display when lists are not equal:
-PropertyMultiCfgTab.6=Show common elements (conjunction)
-PropertyMultiCfgTab.7=Show all elements except doubles (disjunction)
-PropertyMultiCfgTab.8=String List Write Mode
-PropertyMultiCfgTab.9=Define how to save changes in string lists for different configurations:
-PropertyPageDefsTab.0=Show "Manage Configurations..." button
-PropertyPageDefsTab.1=Display "Data Hierarchy" tab
-PropertyPageDefsTab.10=Display "Export Settings" tab
-PropertyPageDefsTab.11=Save Property Dialog Bounds
-PropertyPageDefsTab.12=Save size and position
-PropertyPageDefsTab.13=Save size only
-PropertyPageDefsTab.14=Do not save at all
-PropertyPageDefsTab.15=Center dialogs on screen
-PropertyPageDefsTab.16=Display tool option tips of "Tool Settings" tab at fixed location
-PropertyPageDefsTab.4=Display "Tool Chain Editor" tab
-PropertyPageDefsTab.5=Discovery Profiles Naming Rule
-PropertyPageDefsTab.6=Show disc. page names if they are unique. Else names + profile IDs.
-PropertyPageDefsTab.7=Show disc. page names if they are unique. Else show profile IDs.
-PropertyPageDefsTab.8=Always show names + profile IDs
-PropertyPageDefsTab.9=Always show profile IDs only
-PropertyPageDefsTab.showIncludeFileTab=Display "Include Files" tab
-ProjectConvert.convertersList=Converters List
-
-ScannerConfigOptionsDialog.title=Discovery Options
-ScannerConfigOptionsDialog.description=Set the scanner configuration discovery options for this project
-ScannerConfigOptionsDialog.scGroup.label=Automated discovery of paths and symbols
-ScannerConfigOptionsDialog.scGroup.enabled.button=Automate discovery of paths and symbols
-ScannerConfigOptionsDialog.scGroup.problemReporting.enabled.button=Report path detection problems
-ScannerConfigOptionsDialog.scGroup.selectedProfile.combo=Discovery profile:
-ScannerConfigOptionsDialog.profile.group.label=Discovery profile options
-ScannerConfigOptionsDialog.boProvider.parser.enabled.button=Enable build output scanner info discovery
-ScannerConfigOptionsDialog.boProvider.open.label=Load build output from file
-ScannerConfigOptionsDialog.boProvider.browse.button=Browse...
-ScannerConfigOptionsDialog.boProvider.browse.openFileDialog=Build output file:
-ScannerConfigOptionsDialog.boProvider.load.button=Load
-ScannerConfigOptionsDialog.siProvider.parser.enabled.button=Enable generate scanner info command
-ScannerConfigOptionsDialog.siProvider.command.label=Compiler invocation command  
-ScannerConfigOptionsDialog.siProvider.browse.button=Browse...
-ScannerConfigOptionsDialog.siProvider.browse.runCommandDialog='gcc' command:
-ScannerConfigOptionsDialog.siProvider.command.errorMessage=Must enter compiler invocation command
-ScannerConfigOptionsDialog.apply.progressMessage=Setting scanner configuration discovery options...
-ScannerConfigOptionsDialog.common.variables.button=Variables...
-
-ScannerConfigOptionsDialog.unsavedchanges.title=Setting C/C++ Make Project Discovery Options 
-ScannerConfigOptionsDialog.unsavedchanges.message=The C/C++ Make Project Discovery Options property page contains unsaved modifications. Do you want to save changes so that other discovery related settings can be updated?
-ScannerConfigOptionsDialog.unsavedchanges.button.save=Apply
-ScannerConfigOptionsDialog.unsavedchanges.button.cancel=Cancel
-
-ScannerConfigOptionsDialog.error.title=Error Setting Project Discovery options
-ScannerConfigOptionsDialog.error.message=An error occurred while setting the project discovery options
-
-# --- DiscoveredScannerConfigurationContainerPage ---
-DiscoveredScannerConfigurationContainerPage.title=Edit container
-DiscoveredScannerConfigurationContainerPage.description=Manage discovered scanner configuration
-DiscoveredScannerConfigurationContainerPage.list.title=Discovered include paths and symbol definitions
-DiscoveredScannerConfigurationContainerPage.initialization.error.message=Error initializing Discovered paths container
-
-# new strings
-
-AbstractCPropertyTab.0=Select build variable
-AbstractCPropertyTab.1=Variables...
-AbstractCPropertyTab.2=This tab is not supported in multi-configuration mode
-AbstractPage.0=Unknown element selected
-AbstractPage.1=This file has no properties to display
-AbstractPage.12=Manage Configurations...
-AbstractPage.11=setProjectDescription: 
-AbstractPage.10=Cannot create resource configuration for 
-AbstractPage.13=Cannot load 
-AbstractPage.14=Cannot create page: 
-AbstractPage.15=element not initialized.
-AbstractPage.16=[ Active ]
-AbstractPage.2=This project is not a CDT project
-AbstractPage.3=Error while accessing new configuration. <Apply> cannot work. Use <OK>.
-AbstractPage.4=[ All configurations ]
-AbstractPage.5=[ Multiple configurations...]
-AbstractPage.6=Configuration: 
-AbstractPage.7=Exclude resource from build
-AbstractPage.8=Cannot apply
-AbstractPage.9=Internal error
-AbstractPage.rebuildIndex.question=Changes to the include search paths or defined symbols will not be reflected in the index until it is rebuilt. Do you wish to rebuild it now?
-
-AbstractLangsListTab.0=Show built-in values
-AbstractLangsListTab.1=Languages
-AbstractLangsListTab.2=Export
-AbstractLangsListTab.3=\ [exp]
-AbstractLangsListTab.4=Unexport
-AbstractPrefPage.0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected.
-AbstractExportTab.0=[All]
-AbstractExportTab.1=[List]
-AbstractExportTab.2=Create...
-AbstractExportTab.3=Edit...
-CLocationTab.0=Filter (empty)
-CLocationTab.1=Filter (
-CLocationTab.2=, 
-CLocationTab.3=)
-CLocationTab.4=Add Folder...
-CLocationTab.5=Link Folder...
-CLocationTab.6=Edit Filter...
-CLocationTab.7=Delete
-CLocationTab.8=<root folder>
-CLocationSourceTab.0=Source folders on build path:
-CLocationOutputTab.0=Output folders on build path:
-EnvDialog.0=Name:
-EnvDialog.1=Value:
-EnvDialog.2=Variables
-EnvDialog.3=Add to all configurations
-EnvironmentTab.0=Environment variables to set
-EnvironmentTab.1=Variable
-EnvironmentTab.10=New variable
-EnvironmentTab.11=Edit variable
-EnvironmentTab.12=Variables list
-EnvironmentTab.13=Add to all configurations
-EnvironmentTab.14=Select variables
-EnvironmentTab.15=Current String List DISPLAY mode. Double-click to change
-EnvironmentTab.16=Origin
-EnvironmentTab.17=CONJ.
-EnvironmentTab.18=DISJ.
-EnvironmentTab.19=DISPL mode: 
-EnvironmentTab.2=Value
-EnvironmentTab.20=<UNDEFINED> 
-EnvironmentTab.21=REPLACE
-EnvironmentTab.22=WRITE mode: 
-EnvironmentTab.23=Current String List WRITE mode. Double-click to change
-EnvironmentTab.24=MODIFY
-EnvironmentTab.3=Append variables to native environment
-EnvironmentTab.4=Replace native environment with specified one
-EnvironmentTab.5=Add...
-EnvironmentTab.6=Select...
-EnvironmentTab.7=Edit...
-EnvironmentTab.8=Delete
-EnvironmentTab.9=Undefine
-IncludeTab.0=Include directories
-IncludeTab.1=Add directory path
-IncludeTab.2=Change directory path
-IncludeFileTab.0=Include files
-IncludeFileTab.1=Add include file
-IncludeFileTab.2=Change include file
-IncludeDialog.0=Directory:
-IncludeDialog.1=File:
-IncludeDialog.2=Add to all configurations
-IncludeDialog.3=Add to all languages
-LanguagesTab.0=Content type
-LanguagesTab.1=Language
-LibraryPathTab.1=Add...
-LibraryPathTab.2=Edit...
-LibraryTab.1=Add...
-LibraryTab.2=Edit...
-RefsTab.0=Expand All
-RefsTab.2=Collapse All
-RefsTab.3=Active
-RefsTab.4=Projects list
-SymbolTab.0=Symbol
-SymbolTab.1=Value
-SymbolTab.2=Add symbol
-SymbolTab.3=Change symbol
-ExpDialog.0=To all configurations
-ExpDialog.1=Save to: 
-ExpDialog.2=Languages
-ExpDialog.3=Content types
-ExpDialog.4=Is a workspace path
-ExpDialog.5=Apply to all
-ExpDialog.6=Name:
-ExpDialog.7=Value:
-ExpDialog.8=Name cannot be empty.
-ExpDialog.9=The same name already exists.
-ExpDialog.10=Value cannot be empty.
-ConfigMultiSelectionDialog.0=Select configurations
-ConfigMultiSelectionDialog.1=At least 2 configurations should be selected
-SymbolDialog.0=Name:
-SymbolDialog.1=Value:
-ConfigDescriptionTab.0=Project Description
-ConfigDescriptionTab.1=Configuration Description
-ConfigDescriptionTab.2=Resource Description
-BinaryParsTab.0=Binary parser:
-ErrorParsTab.error.NonEmptyName=Specify non empty name
-ErrorParsTab.error.NonUniqueID=Error parser ID is not unique, specify different name
-ErrorParsTab.error.OnApplyingSettings=Error applying Error Parser Tab settings
-ErrorParsTab.error.OnRestoring=Error restoring default Error Parser Tab settings
-ErrorParsTab.error.NonAccessibleID=[ Not accessible id={0} ]
-ErrorParsTab.error.IllegalCharacter=Special character ''{0}'' is not allowed
-ErrorParsTab.label.EnterName=Enter name of new error parser:
-ErrorParsTab.label.DefaultRegexErrorParserName=Regex Error Parser
-ErrorParsTab.message.ConfirmReset=Are you sure you want to delete all customized error parsers?
-ErrorParsTab.title.Add=Add Regex Error Parser
-ErrorParsTab.title.ConfirmReset=Confirm Resetting Error Parsers
-ErrorParsTab.title.Edit=Edit Regex Error Parser name
-StructureTreeTab.0=Level: 
-StructureTreeTab.1=Maximal tree nesting
-StructureTreeTab.2=Long
-StructureTreeTab.3=String
-StructureTreeTab.4=Object to view: 
-StructureTreeTab.5=Expand all
-StructureTreeTab.6=Expand level...
-StructureTreeTab.7=Collapse all
-StructureTreeTab.8=Property
-StructureTreeTab.9=Value
-StructureTreeTab.10=Class
-StructureTreeTab.11=Wait...
-PrefPage_PropertyPage.0=These settings will affect behavior of CDT property pages
-
-CConfigWizardPage.0=Select Configurations
-CConfigWizardPage.1=Select platforms and configurations you wish to deploy on
-CConfigWizardPage.4=Project type:
-CConfigWizardPage.5=Toolchains:
-CConfigWizardPage.6=Configurations: 
-CConfigWizardPage.7=Select all
-CConfigWizardPage.8=Deselect all
-CConfigWizardPage.9=Edit properties after project creation
-CConfigWizardPage.10=At least one configuration should be available. Project cannot be created.
-CConfigWizardPage.11=At least one configuration should be selected. Please check needed configurations.
-CConfigWizardPage.12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. 
-CConfigWizardPage.13=Advanced settings...
-
-CMainWizardPage.0=Project type:
-CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform
-CMainWizardPage.10=A project with that name already exists in the workspace.
-CMainWizardPage.2=Edit properties after project creation
-CMainWizardPage.3=No project types available. Project cannot be created
-CMainWizardPage.5=Cannot create ICProjectTypeHandler: 
-CMainWizardPage.6=File with specified name already exists.
-CMainWizardPage.7=Directory with specified name already exists.
-CMainWizardPage.8=Project name:
-CMainWizardPage.9=Project name is empty
-
-ProjectContentsArea.0=Browse...
-ProjectContentsArea.1=Use default location
-ProjectContentsArea.2=Location:
-ProjectContentsArea.3=Invalid location path
-ProjectContentsArea.4=Project contents directory must be specified
-ProjectContentsArea.5=Select directory:
-ProjectContentsArea.6=Project path should be absolute
-ProjectContentsArea.7=Project path is not valid
-ProjectContentsArea.8=Cannot create given path
-ProjectContentsArea.9=File with given name already exists
-StdProjectTypeHandler.0=-- Other Toolchain --
-StdProjectTypeHandler.2=Default
-StdProjectTypeHandler.3=creation Make project: IBuilder is null
-
-CDTConfigWizardPage.0=Select configurations
-CDTCommonProjectWizard.0=Old project will be overridden
-CDTCommonProjectWizard.1=Existing project settings will be overridden.\nImport feature can be used instead to preserve old settings.\nOK to override ?
-CDTCommonProjectWizard.creatingProject=Creating project
-NewModelProjectWizard.0=CDT Project
-NewModelProjectWizard.1=Create CDT project of selected type
-NewModelProjectWizard.2=C++ Project
-NewModelProjectWizard.3=Create C++ project of selected type
-NewModelProjectWizard.4=C Project
-NewModelProjectWizard.5=Create C project of selected type
-BuildVarListDialog_0=Type:
-BuildVarListDialog_1=Text list
-BuildVarListDialog_2=File path
-BuildVarListDialog_3=List of File paths
-BuildVarListDialog_4=Directory path
-BuildVarListDialog_5=List of Directory paths
-BuildVarListDialog_6=Any path
-BuildVarListDialog_7=List of any paths
-BuildVarListDialog_8=Text
-BuildVarListDialog.0=<not available>
-BuildVarListDialog.1=Build variables
-StringVariableSelectionDialog_message=&Choose a variable (? = any character, * = any string):
-StringVariableSelectionDialog_columnDescription=&Variable Description:
-NewCfgDialog.0=
-NewCfgDialog.1=
-NewCfgDialog.2=Cannot create new configuration
-NewCfgDialog.3=-- not selected --
-NewCfgDialog.4=Import from projects
-NewCfgDialog.5=Import predefined
-CDTMainWizardPage.0=Project name cannot contain '\#' symbol
-CDTMainWizardPage.1=Project category is selected. Expand the category and select a concrete project type.
-CProjectWizard.0=Add C Project Nature
-CCProjectWizard.0=Add CC Project Nature
-WorkingSetConfigAction.21=Building project 
-WorkingSetConfigAction.22=Build error
-IncludeTab.export=Export Settings...
-IncludeTab.import=Import Settings...
-

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java

@@ -35,18 +35,20 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class ProjectContentsArea {
-	private static final String ERROR_INVALID_PATH = UIMessages.getString("ProjectContentsArea.3"); //$NON-NLS-1$
+	private static final String ERROR_INVALID_PATH = Messages.ProjectContentsArea_3; 
-	private static final String ERROR_PATH_EMPTY = UIMessages.getString("ProjectContentsArea.4"); //$NON-NLS-1$
+	private static final String ERROR_PATH_EMPTY = Messages.ProjectContentsArea_4; 
-	private static final String ERROR_NOT_ABSOLUTE = UIMessages.getString("ProjectContentsArea.6"); //$NON-NLS-1$
+	private static final String ERROR_NOT_ABSOLUTE = Messages.ProjectContentsArea_6; 
-	private static final String ERROR_NOT_VALID = UIMessages.getString("ProjectContentsArea.7");  //$NON-NLS-1$
+	private static final String ERROR_NOT_VALID = Messages.ProjectContentsArea_7;  
-	private static final String ERROR_CANNOT_CREATE = UIMessages.getString("ProjectContentsArea.8");  //$NON-NLS-1$
+	private static final String ERROR_CANNOT_CREATE = Messages.ProjectContentsArea_8;  
-	private static final String ERROR_FILE_EXISTS = UIMessages.getString("ProjectContentsArea.9"); //$NON-NLS-1$
+	private static final String ERROR_FILE_EXISTS = Messages.ProjectContentsArea_9; 
 	
-	private static final String BROWSE_LABEL = UIMessages.getString("ProjectContentsArea.0"); //$NON-NLS-1$
+	private static final String BROWSE_LABEL = Messages.ProjectContentsArea_0; 
 	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
 	private static final String FILE_SCHEME = "file"; //$NON-NLS-1$
 	private Label locationLabel;
@@ -83,7 +85,7 @@ public class ProjectContentsArea {
 		projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		useDefaultsButton = new Button(projectGroup, SWT.CHECK | SWT.RIGHT);
-		useDefaultsButton.setText(UIMessages.getString("ProjectContentsArea.1")); //$NON-NLS-1$
+		useDefaultsButton.setText(Messages.ProjectContentsArea_1); 
 		useDefaultsButton.setSelection(defaultEnabled);
 		GridData buttonData = new GridData();
 		buttonData.horizontalSpan = 4;
@@ -128,7 +130,7 @@ public class ProjectContentsArea {
 	private void createUserEntryArea(Composite composite, boolean defaultEnabled) {
 		// location label
 		locationLabel = new Label(composite, SWT.NONE);
-		locationLabel.setText(UIMessages.getString("ProjectContentsArea.2")); //$NON-NLS-1$
+		locationLabel.setText(Messages.ProjectContentsArea_2); 
 
 		// project location entry field
 		locationPathField = new Text(composite, SWT.BORDER);
@@ -222,7 +224,7 @@ public class ProjectContentsArea {
 		}
 
 		DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
-		dialog.setMessage(UIMessages.getString("ProjectContentsArea.5")); //$NON-NLS-1$
+		dialog.setMessage(Messages.ProjectContentsArea_5); 
 		dialog.setFilterPath(dirName);
 		selectedDirectory = dialog.open();
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java

@@ -40,6 +40,8 @@ import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -50,7 +52,7 @@ public class RefsTab extends AbstractCPropertyTab {
 	public Composite comp;
 	private Tree tree;
 
-	static private final String ACTIVE = "[" + UIMessages.getString("RefsTab.3") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	static private final String ACTIVE = "[" + Messages.RefsTab_3 + "]"; //$NON-NLS-1$ //$NON-NLS-2$ 
 
 	private static final int EXPAND_ALL_BUTTON = 0;
 	private static final int COLLAPSE_ALL_BUTTON = 1;
@@ -61,8 +63,8 @@ public class RefsTab extends AbstractCPropertyTab {
 	public void createControls(Composite parent) {
 		super.createControls(parent);
 		initButtons(new String[] {
-				UIMessages.getString("RefsTab.0"), //$NON-NLS-1$
+				Messages.RefsTab_0, 
-				UIMessages.getString("RefsTab.2"), //$NON-NLS-1$
+				Messages.RefsTab_2, 
 				null,
 				MOVEUP_STR,
 				MOVEDOWN_STR}, 120);
@@ -74,7 +76,7 @@ public class RefsTab extends AbstractCPropertyTab {
             new AccessibleAdapter() {                       
                 @Override
 				public void getName(AccessibleEvent e) {
-                	e.result = UIMessages.getString("RefsTab.4"); //$NON-NLS-1$
+                	e.result = Messages.RefsTab_4; 
                 }
             }
         );

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java

@@ -12,10 +12,14 @@
 package org.eclipse.cdt.ui.newui;
 
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.JFacePreferences;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -33,16 +37,6 @@ import org.eclipse.swt.widgets.Text;
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class RenameConfigurationDialog extends Dialog {
-	// String constants
-	private static final String PREFIX = "RenameConfiguration";	//$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label";	//$NON-NLS-1$
-	private static final String ERROR = PREFIX + ".error";	//$NON-NLS-1$	
-	private static final String NAME = LABEL + ".name";	//$NON-NLS-1$
-	private static final String DUPLICATE = ERROR + ".duplicateName";	//$NON-NLS-1$	
-	private static final String CASE = ERROR + ".caseName";	//$NON-NLS-1$	
-	private static final String INVALID = ERROR + ".invalidName";	//$NON-NLS-1$	
-	private static final String DESCRIPTION = LABEL + ".description"; //$NON-NLS-1$
-	
 	// Widgets
 	
 	private Text configName;
@@ -132,7 +126,7 @@ public class RenameConfigurationDialog extends Dialog {
 		// as a directory name in the filesystem.
 		Label warningLabel = new Label(group1, SWT.BEGINNING | SWT.WRAP);
 		warningLabel.setFont(parent.getFont());
-		warningLabel.setText(UIMessages.getString("RenameConfiguration.label.warning")); //$NON-NLS-1$
+		warningLabel.setText(Messages.RenameConfiguration_label_warning); 
 		gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 3, 1);
 		gd.widthHint = 300;
 		warningLabel.setLayoutData(gd);
@@ -140,7 +134,7 @@ public class RenameConfigurationDialog extends Dialog {
 		// Add a label and a text widget for Configuration's name
 		final Label nameLabel = new Label(group1, SWT.LEFT);
 		nameLabel.setFont(parent.getFont());
-		nameLabel.setText(UIMessages.getString(NAME));
+		nameLabel.setText(Messages.RenameConfiguration_label_name);
 				
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 1;
@@ -164,7 +158,7 @@ public class RenameConfigurationDialog extends Dialog {
 //		 Add a label and a text widget for Configuration's description
         final Label descriptionLabel = new Label(group1, SWT.LEFT);
         descriptionLabel.setFont(parent.getFont());
-        descriptionLabel.setText(UIMessages.getString(DESCRIPTION));
+        descriptionLabel.setText(Messages.RenameConfiguration_label_description);
 
         gd = new GridData(GridData.FILL_HORIZONTAL);
         gd.horizontalSpan = 1;
@@ -252,11 +246,11 @@ public class RenameConfigurationDialog extends Dialog {
 			s = "";	//$NON-NLS-1$
 		 	// Make sure the name is not a duplicate
 		} else if (isDuplicateName(currentName)) {
-			s = UIMessages.getFormattedString(DUPLICATE, currentName);
+			s = NLS.bind(Messages.RenameConfiguration_error_duplicateName, currentName);
 		} else if (isSimilarName(currentName)) {
-			s = UIMessages.getFormattedString(CASE, currentName);
+			s = NLS.bind(Messages.RenameConfiguration_error_caseName, currentName);
 		} else if (!validateName(currentName)) {
-			s = UIMessages.getFormattedString(INVALID, currentName);	
+			s = NLS.bind(Messages.RenameConfiguration_error_invalidName, currentName);	
 		}
 		Button b = getButton(IDialogConstants.OK_ID);
 		if (s != null) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java

@@ -65,6 +65,7 @@ import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData;
 import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * This tab is intended to browse 
@@ -93,7 +94,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 			c.setLayoutData(new GridData(GridData.FILL_BOTH));
 			c.setLayout(new GridLayout(2, false));
 			Label l = new Label(c, 0);
-			l.setText(UIMessages.getString("StructureTreeTab.0"));  //$NON-NLS-1$
+			l.setText(Messages.StructureTreeTab_0);  
 			c.setLayoutData(new GridData(GridData.BEGINNING));
 			Spinner sp = new Spinner(c, SWT.BORDER);
 			sp.setMaximum(NESTING_MAX);
@@ -134,7 +135,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 			ti = ti.getParentItem();
 			if (ti == null) return true;
 		}
-		tiSaved.setText(2, UIMessages.getString("StructureTreeTab.1")); //$NON-NLS-1$
+		tiSaved.setText(2, Messages.StructureTreeTab_1); 
 		tiSaved.setImage(IMG);
 		return false;
 	}
@@ -152,7 +153,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 	}
 	private TreeItem create(TreeItem ti0, String text, long val) {
 		TreeItem t = create(ti0, text, String.valueOf(val));
-		t.setText(2, UIMessages.getString("StructureTreeTab.2")); //$NON-NLS-1$
+		t.setText(2, Messages.StructureTreeTab_2); 
 		return t;
 	}
 
@@ -160,7 +161,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		TreeItem ti =  ti0 == null ? new TreeItem(tree, 0) : new TreeItem(ti0, 0);
 		ti.setText(0, text == null ? NULL : text);
 		ti.setText(1, val  == null ? NULL : val );
-		ti.setText(2, UIMessages.getString("StructureTreeTab.3")); //$NON-NLS-1$
+		ti.setText(2, Messages.StructureTreeTab_3); 
 		return ti;
 	}
 	
@@ -170,15 +171,15 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		usercomp.setLayout(new GridLayout(5, false));
 		
 		Label lb = new Label(usercomp, 0);
-		lb.setText(UIMessages.getString("StructureTreeTab.4")); //$NON-NLS-1$
+		lb.setText(Messages.StructureTreeTab_4); 
 		lb.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		combo = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
 		combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		combo.add(UIMessages.getString("ConfigDescriptionTab.0")); //$NON-NLS-1$
+		combo.add(Messages.ConfigDescriptionTab_0); 
-		combo.add(UIMessages.getString("ConfigDescriptionTab.1")); //$NON-NLS-1$
+		combo.add(Messages.ConfigDescriptionTab_1); 
 		if (page.isForFolder() || page.isForFile()) {
-			combo.add(UIMessages.getString("ConfigDescriptionTab.2")); //$NON-NLS-1$
+			combo.add(Messages.ConfigDescriptionTab_2); 
 			combo.select(2); // ResourceDescription
 		} else
 			combo.select(1); // ConfigurationDescription
@@ -192,7 +193,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		GridData gd = new GridData(GridData.END);
 		gd.minimumWidth = BUTTON_WIDTH;
 		b1.setLayoutData(gd);
-		b1.setText(UIMessages.getString("StructureTreeTab.5")); //$NON-NLS-1$
+		b1.setText(Messages.StructureTreeTab_5); 
 		b1.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -205,7 +206,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		gd = new GridData(GridData.END);
 		gd.minimumWidth = BUTTON_WIDTH;
 		b2.setLayoutData(gd);
-		b2.setText(UIMessages.getString("StructureTreeTab.6")); //$NON-NLS-1$
+		b2.setText(Messages.StructureTreeTab_6); 
 		b2.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -221,7 +222,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		gd = new GridData(GridData.END);
 		gd.minimumWidth = BUTTON_WIDTH;
 		b3.setLayoutData(gd);
-		b3.setText(UIMessages.getString("StructureTreeTab.7")); //$NON-NLS-1$
+		b3.setText(Messages.StructureTreeTab_7); 
 		b3.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -236,13 +237,13 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 		tree.setLayoutData(gd);
 		
 		TreeColumn tc = new TreeColumn(tree, 0);
-		tc.setText(UIMessages.getString("StructureTreeTab.8")); //$NON-NLS-1$
+		tc.setText(Messages.StructureTreeTab_8); 
 		tc.setWidth(300);
 		tc = new TreeColumn(tree, 0);
-		tc.setText(UIMessages.getString("StructureTreeTab.9")); //$NON-NLS-1$
+		tc.setText(Messages.StructureTreeTab_9); 
 		tc.setWidth(100);
 		tc = new TreeColumn(tree, 0);
-		tc.setText(UIMessages.getString("StructureTreeTab.10")); //$NON-NLS-1$
+		tc.setText(Messages.StructureTreeTab_10); 
 		tc.setWidth(200);
 		
 		tree.setHeaderVisible(true);
@@ -768,7 +769,7 @@ public class StructureTreeTab  extends AbstractCPropertyTab {
 				try {
 					tree.removeAll();
 					TreeItem ti = new TreeItem(tree, 0);
-					ti.setText(0, UIMessages.getString("StructureTreeTab.11")); //$NON-NLS-1$
+					ti.setText(0, Messages.StructureTreeTab_11); 
 					tree.update();
 					tree.setRedraw(false);
 					tree.removeAll();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java

@@ -27,6 +27,8 @@ import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -59,7 +61,7 @@ public class SymbolDialog extends AbstractPropertyDialog {
 		GridData gd;
 		
 		Label l1 = new Label(c, SWT.NONE);
-		l1.setText(UIMessages.getString("SymbolDialog.0")); //$NON-NLS-1$
+		l1.setText(Messages.SymbolDialog_0); 
 		l1.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt1 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -73,7 +75,7 @@ public class SymbolDialog extends AbstractPropertyDialog {
 			}}); 
 		
 		Label l2 = new Label(c, SWT.NONE);
-		l2.setText(UIMessages.getString("SymbolDialog.1")); //$NON-NLS-1$
+		l2.setText(Messages.SymbolDialog_1); 
 		l2.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt2 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -89,7 +91,7 @@ public class SymbolDialog extends AbstractPropertyDialog {
 		b_vars = setupButton(c, AbstractCPropertyTab.VARIABLESBUTTON_NAME);
 			
 		b_add2conf = new Button(c, SWT.CHECK);
-		b_add2conf.setText(UIMessages.getString("IncludeDialog.2")); //$NON-NLS-1$
+		b_add2conf.setText(Messages.IncludeDialog_2); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 4;
 		b_add2conf.setLayoutData(gd);
@@ -99,7 +101,7 @@ public class SymbolDialog extends AbstractPropertyDialog {
 		}
 
 		b_add2lang = new Button(c, SWT.CHECK);
-		b_add2lang.setText(UIMessages.getString("IncludeDialog.3")); //$NON-NLS-1$
+		b_add2lang.setText(Messages.IncludeDialog_3); 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 4;
 		b_add2lang.setLayoutData(gd);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java

@@ -24,6 +24,8 @@ import org.eclipse.cdt.core.settings.model.CMacroEntry;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  */
@@ -31,18 +33,18 @@ public class SymbolTab extends AbstractLangsListTab {
     @Override
 	public void additionalTableSet() {
     	TableColumn tc = new TableColumn(table, SWT.LEFT);
-    	tc.setText(UIMessages.getString("SymbolTab.0")); //$NON-NLS-1$
+    	tc.setText(Messages.SymbolTab_0); 
     	tc.setWidth(80);
-    	tc.setToolTipText(UIMessages.getString("SymbolTab.0")); //$NON-NLS-1$
+    	tc.setToolTipText(Messages.SymbolTab_0); 
     	tc = new TableColumn(table, SWT.LEFT);
-    	tc.setText(UIMessages.getString("SymbolTab.1")); //$NON-NLS-1$
+    	tc.setText(Messages.SymbolTab_1); 
     	tc.setWidth(130);
-    	tc.setToolTipText(UIMessages.getString("SymbolTab.1")); //$NON-NLS-1$
+    	tc.setToolTipText(Messages.SymbolTab_1); 
     	table.getAccessible().addAccessibleListener(
 				new AccessibleAdapter() {                       
                     @Override
 					public void getName(AccessibleEvent e) {
-                            e.result = UIMessages.getString("SymbolTab.0"); //$NON-NLS-1$
+                            e.result = Messages.SymbolTab_0; 
                     }
                 }
 		  );
@@ -52,7 +54,7 @@ public class SymbolTab extends AbstractLangsListTab {
 	public ICLanguageSettingEntry doAdd() {
 		SymbolDialog dlg = new SymbolDialog(
 				usercomp.getShell(), true,
-				UIMessages.getString("SymbolTab.2"), EMPTY_STR, EMPTY_STR, getResDesc()); //$NON-NLS-1$
+				Messages.SymbolTab_2, EMPTY_STR, EMPTY_STR, getResDesc()); 
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			toAllCfgs = dlg.check1;
 			toAllLang = dlg.check3;
@@ -65,7 +67,7 @@ public class SymbolTab extends AbstractLangsListTab {
 	public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) {
 		SymbolDialog dlg = new SymbolDialog(
 				usercomp.getShell(), false,
-				UIMessages.getString("SymbolTab.3"), ent.getName(),  //$NON-NLS-1$
+				Messages.SymbolTab_3, ent.getName(),  
 				ent.getValue(), getResDesc());
 		if (dlg.open())
 			return new CMacroEntry(dlg.text1, dlg.text2, 0);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/UIMessages.java

@@ -18,10 +18,12 @@ import java.util.ResourceBundle;
  * @since 2.0
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
+ * @deprecated As of CDT 8.0. For internalization {@link org.eclipse.cdt.internal.ui.newui.Messages} is used.
  */
+@Deprecated
 public class UIMessages {
 	// Bundle ID
-	private static final String BUNDLE_ID = "org.eclipse.cdt.ui.newui.PluginResources"; //$NON-NLS-1$
+	private static final String BUNDLE_ID = "org.eclipse.cdt.internal.ui.newui.Messages"; //$NON-NLS-1$
 	//Resource bundle.
 	private static ResourceBundle resourceBundle;
 
@@ -33,15 +35,21 @@ public class UIMessages {
 		}
 	}
 
+	private static String toNlsFormatKey(String key) {
+		return key.replace('.', '_');
+	}
 	public static String getFormattedString(String key, String arg) {
+		key = toNlsFormatKey(key);
 		return MessageFormat.format(getString(key), new String[] { arg });
 	}
 
 	public static String getFormattedString(String key, String[] args) {
+		key = toNlsFormatKey(key);
 		return MessageFormat.format(getString(key), args);
 	}
 
 	public static String getString(String key) {
+		key = toNlsFormatKey(key);
 		try {
 			return resourceBundle.getString(key);
 		} catch (MissingResourceException e) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java

@@ -19,7 +19,8 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.ui.newui.UIMessages;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * The wizard to create new MBS C++ Project.
@@ -27,7 +28,7 @@ import org.eclipse.cdt.ui.newui.UIMessages;
 public class CCProjectWizard extends CDTCommonProjectWizard {
 
 	public CCProjectWizard() {
-		super(UIMessages.getString("NewModelProjectWizard.2"), UIMessages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$
+		super(Messages.NewModelProjectWizard_2, Messages.NewModelProjectWizard_3); 
 	}
 	
 	@Override
@@ -42,7 +43,7 @@ public class CCProjectWizard extends CDTCommonProjectWizard {
 		}
 		
 		try {
-			continueCreationMonitor.beginTask(UIMessages.getString("CCProjectWizard.0"), 2); //$NON-NLS-1$
+			continueCreationMonitor.beginTask(Messages.CCProjectWizard_0, 2); 
 			CProjectNature.addCNature(prj, new SubProgressMonitor(continueCreationMonitor, 1));
 			CCProjectNature.addCCNature(prj, new SubProgressMonitor(continueCreationMonitor, 1));
 		} catch (CoreException e) {}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java

@@ -50,8 +50,8 @@ import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.newui.UIMessages;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
 import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;
 
 public abstract class CDTCommonProjectWizard extends BasicNewResourceWizard 
@@ -76,7 +76,7 @@ implements IExecutableExtension, IWizardWithMemory, ICDTCommonProjectWizard
 	private CWizardHandler savedHandler = null;
 
 	public CDTCommonProjectWizard() {
-		this(UIMessages.getString("NewModelProjectWizard.0"),UIMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
+		this(Messages.NewModelProjectWizard_0,Messages.NewModelProjectWizard_1); 
 	}
 
 	public CDTCommonProjectWizard(String title, String desc) {
@@ -137,11 +137,7 @@ implements IExecutableExtension, IWizardWithMemory, ICDTCommonProjectWizard
 		  		IFileInfo f = fs.fetchInfo();
 		  		if (f.exists() && f.isDirectory()) {
 		  			if (fs.getChild(".project").fetchInfo().exists()) { //$NON-NLS-1$
-	                	if (!
+						if (!MessageDialog.openConfirm(getShell(), Messages.CDTCommonProjectWizard_0, Messages.CDTCommonProjectWizard_1))
-	                		MessageDialog.openConfirm(getShell(), 
-	        				UIMessages.getString("CDTCommonProjectWizard.0"),  //$NON-NLS-1$
-							UIMessages.getString("CDTCommonProjectWizard.1")) //$NON-NLS-1$
-							)
 	                		return null;
 	                }
 	                existingPath = true;
@@ -300,7 +296,7 @@ implements IExecutableExtension, IWizardWithMemory, ICDTCommonProjectWizard
 	 */	
 	public IProject createIProject(final String name, final URI location, IProgressMonitor monitor) throws CoreException{
 		
-		monitor.beginTask(UIMessages.getString("CDTCommonProjectWizard.creatingProject"), 100); //$NON-NLS-1$
+		monitor.beginTask(Messages.CDTCommonProjectWizard_creatingProject, 100); 
 		
 		if (newProject != null)	return newProject;
 		

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java

@@ -48,9 +48,9 @@ import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.CDTPrefUtil;
 import org.eclipse.cdt.ui.newui.PageLayout;
-import org.eclipse.cdt.ui.newui.UIMessages;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 	public class CDTMainWizardPage extends WizardNewProjectCreationPage implements IWizardItemsListListener {
 		private static final Image IMG_CATEGORY = CPluginImages.get(CPluginImages.IMG_OBJS_SEARCHFOLDER);
@@ -104,7 +104,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	    	c.setLayout(new GridLayout(2, true));
 	    	
 	        Label l1 = new Label(c, SWT.NONE);
-	        l1.setText(UIMessages.getString("CMainWizardPage.0")); //$NON-NLS-1$
+	        l1.setText(Messages.CMainWizardPage_0); 
 	        l1.setFont(parent.getFont());
 	        l1.setLayoutData(new GridData(GridData.BEGINNING));
 	        
@@ -130,7 +130,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 		                		 if (tree.getItem(i).getText().compareTo(e.result) == 0)
 		                			 return;
 		                	 }
-	                         e.result = UIMessages.getString("CMainWizardPage.0"); //$NON-NLS-1$
+	                         e.result = Messages.CMainWizardPage_0; 
 		                 }
 		             }
 				 );
@@ -139,7 +139,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	        right.setLayout(new PageLayout());
 
 	        show_sup = new Button(c, SWT.CHECK);
-	        show_sup.setText(UIMessages.getString("CMainWizardPage.1")); //$NON-NLS-1$
+	        show_sup.setText(Messages.CMainWizardPage_1); 
 	        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 	        gd.horizontalSpan = 2;
 	        show_sup.setLayoutData(gd);
@@ -179,7 +179,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	    		return false;
 
 	        if (getProjectName().indexOf('#') >= 0) {
-	            setErrorMessage(UIMessages.getString("CDTMainWizardPage.0"));	             //$NON-NLS-1$
+	            setErrorMessage(Messages.CDTMainWizardPage_0);	             
 	            return false;
 	        }
 	        
@@ -193,7 +193,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	        			bad = false;
 	        	}
 	        	if (bad) { 
-	        		setErrorMessage(UIMessages.getString("CMainWizardPage.10")); //$NON-NLS-1$
+	        		setErrorMessage(Messages.CMainWizardPage_10); 
 	        	    return false;
 	        	}
 	        }
@@ -210,9 +210,9 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	        		IFileInfo f = fs.fetchInfo();
 		        	if (f.exists()) {
 		        		if (f.isDirectory()) {
-		        			setMessage(UIMessages.getString("CMainWizardPage.7"), IMessageProvider.WARNING); //$NON-NLS-1$
+		        			setMessage(Messages.CMainWizardPage_7, IMessageProvider.WARNING); 
 		        		} else {
-		        			setErrorMessage(UIMessages.getString("CMainWizardPage.6")); //$NON-NLS-1$
+		        			setErrorMessage(Messages.CMainWizardPage_6); 
 		        			return false;
 		        		}
 		        	}
@@ -231,7 +231,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 	        }
 
 	        if (tree.getItemCount() == 0) {
-	        	setErrorMessage(UIMessages.getString("CMainWizardPage.3")); //$NON-NLS-1$
+	        	setErrorMessage(Messages.CMainWizardPage_3); 
 	        	return false;
 	        }
 	        
@@ -283,7 +283,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 						try {
 							w = (CNewWizard) element.createExecutableExtension(CLASS_NAME);
 						} catch (CoreException e) {
-							System.out.println(UIMessages.getString("CMainWizardPage.5") + e.getLocalizedMessage()); //$NON-NLS-1$
+							System.out.println(Messages.CMainWizardPage_5 + e.getLocalizedMessage()); 
 							return null; 
 						}
 						if (w == null) return null;
@@ -439,7 +439,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 					if (categorySelectedLabel == null) {
 						categorySelectedLabel = new Label(right, SWT.WRAP);
 						categorySelectedLabel.setText(
-								UIMessages.getString("CDTMainWizardPage.1"));  //$NON-NLS-1$
+								Messages.CDTMainWizardPage_1);  
 						right.layout();
 					}
 					categorySelectedLabel.setVisible(true);

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java

@@ -12,12 +12,12 @@ package org.eclipse.cdt.ui.wizards;
 
 import org.eclipse.core.resources.IProject;
 
-import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 public class CDTProjectWizard extends CDTCommonProjectWizard {
 
 	public CDTProjectWizard() {
-		super(UIMessages.getString("NewModelProjectWizard.0"), UIMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
+		super(Messages.NewModelProjectWizard_0, Messages.NewModelProjectWizard_1); 
 	}
 	
 	@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java

@@ -18,7 +18,8 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.ui.newui.UIMessages;
+
+import org.eclipse.cdt.internal.ui.newui.Messages;
 
 /**
  * The wizard to create new MBS C Project.
@@ -26,8 +27,7 @@ import org.eclipse.cdt.ui.newui.UIMessages;
 public class CProjectWizard extends CDTCommonProjectWizard {
 
 	public CProjectWizard() {
-		super(UIMessages.getString("NewModelProjectWizard.4"),  //$NON-NLS-1$
+		super(Messages.NewModelProjectWizard_4, Messages.NewModelProjectWizard_5);
-			  UIMessages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$
 	}
 
 	@Override
@@ -42,7 +42,7 @@ public class CProjectWizard extends CDTCommonProjectWizard {
 		}
 		
 		try {
-			continueCreationMonitor.beginTask(UIMessages.getString("CProjectWizard.0"), 1); //$NON-NLS-1$
+			continueCreationMonitor.beginTask(Messages.CProjectWizard_0, 1);
 			CProjectNature.addCNature(prj, new SubProgressMonitor(continueCreationMonitor, 1));
 		} catch (CoreException e) {}
 		finally {continueCreationMonitor.done();}

core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java

@@ -81,7 +81,6 @@ import org.eclipse.cdt.ui.CDTUIImages;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.newui.CDTStatusInfo;
 import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter;
-import org.eclipse.cdt.ui.newui.UIMessages;
 import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
 import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo;
 import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;
@@ -90,6 +89,8 @@ import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor;
 
 import org.eclipse.cdt.internal.core.resources.ResourceLookup;
 
+import org.eclipse.cdt.internal.ui.newui.Messages;
+
 /**
  * Instances of this class allow the user to add, remove, delete, moveup and movedown
  * the items in the list control.
@@ -431,27 +432,27 @@ public class FileListControl {
 	private static final IPath PROJECTNAME_PATH = new Path(VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression(PROJECTNAME_VAR, null));
 
 	/* Names, messages and titles */
-	private static final String WORKSPACEBUTTON_NAME = UIMessages.getString("FileListControl.button.workspace"); //$NON-NLS-1$
+	private static final String WORKSPACEBUTTON_NAME = Messages.FileListControl_button_workspace; 
-	private static final String FILESYSTEMBUTTON_NAME = UIMessages.getString("FileListControl.button.fs"); //$NON-NLS-1$
+	private static final String FILESYSTEMBUTTON_NAME = Messages.FileListControl_button_fs; 
 
-	private static final String ADD_STR = UIMessages.getString("FileListControl.add"); //$NON-NLS-1$
+	private static final String ADD_STR = Messages.FileListControl_add; 
-	private static final String DEL_STR = UIMessages.getString("FileListControl.delete"); //$NON-NLS-1$
+	private static final String DEL_STR = Messages.FileListControl_delete; 
-	private static final String EDIT_STR = UIMessages.getString("FileListControl.edit"); //$NON-NLS-1$
+	private static final String EDIT_STR = Messages.FileListControl_edit; 
-	private static final String MOVEUP_STR = UIMessages.getString("FileListControl.moveup"); //$NON-NLS-1$
+	private static final String MOVEUP_STR = Messages.FileListControl_moveup; 
-	private static final String MOVEDOWN_STR = UIMessages.getString("FileListControl.movedown"); //$NON-NLS-1$
+	private static final String MOVEDOWN_STR = Messages.FileListControl_movedown; 
-	private static final String FILE_TITLE_ADD = UIMessages.getString("BrowseEntryDialog.file.title.add");	//$NON-NLS-1$
+	private static final String FILE_TITLE_ADD = Messages.BrowseEntryDialog_file_title_add;	
-	private static final String DIR_TITLE_ADD = UIMessages.getString("BrowseEntryDialog.dir.title.add");	//$NON-NLS-1$
+	private static final String DIR_TITLE_ADD = Messages.BrowseEntryDialog_dir_title_add;	
-	private static final String FILE_TITLE_EDIT = UIMessages.getString("BrowseEntryDialog.file.title.edit");	//$NON-NLS-1$
+	private static final String FILE_TITLE_EDIT = Messages.BrowseEntryDialog_file_title_edit;	
-	private static final String DIR_TITLE_EDIT = UIMessages.getString("BrowseEntryDialog.dir.title.edit");	//$NON-NLS-1$
+	private static final String DIR_TITLE_EDIT = Messages.BrowseEntryDialog_dir_title_edit;	
-	private static final String WORKSPACE_DIR_DIALOG_TITLE = UIMessages.getString("BrowseEntryDialog.wsp.dir.dlg.title");	//$NON-NLS-1$
+	private static final String WORKSPACE_DIR_DIALOG_TITLE = Messages.BrowseEntryDialog_wsp_dir_dlg_title;	
-	private static final String WORKSPACE_FILE_DIALOG_TITLE = UIMessages.getString("BrowseEntryDialog.wsp.file.dlg.title");	//$NON-NLS-1$
+	private static final String WORKSPACE_FILE_DIALOG_TITLE = Messages.BrowseEntryDialog_wsp_file_dlg_title;	
-	private static final String WORKSPACE_DIR_DIALOG_MSG = UIMessages.getString("FileListControl.BrowseEntryDialog.wsp.dir.dlg.msg");	//$NON-NLS-1$
+	private static final String WORKSPACE_DIR_DIALOG_MSG = Messages.FileListControl_BrowseEntryDialog_wsp_dir_dlg_msg;	
-	private static final String WORKSPACE_FILE_DIALOG_MSG = UIMessages.getString("FileListControl.BrowseEntryDialog.wsp.file.dlg.msg");	//$NON-NLS-1$
+	private static final String WORKSPACE_FILE_DIALOG_MSG = Messages.FileListControl_BrowseEntryDialog_wsp_file_dlg_msg;	
-	private static final String WORKSPACE_FILE_DIALOG_ERR = UIMessages.getString("FileListControl.BrowseEntryDialog.wsp.file.dlg.err");	//$NON-NLS-1$
+	private static final String WORKSPACE_FILE_DIALOG_ERR = Messages.FileListControl_BrowseEntryDialog_wsp_file_dlg_err;	
-	private static final String FILESYSTEM_DIR_DIALOG_MSG = UIMessages.getString("BrowseEntryDialog.fs.dir.dlg.msg");	//$NON-NLS-1$
+	private static final String FILESYSTEM_DIR_DIALOG_MSG = Messages.BrowseEntryDialog_fs_dir_dlg_msg;	
-	private static final String FILE_MSG = UIMessages.getString("BrowseEntryDialog.message.file");	//$NON-NLS-1$
+	private static final String FILE_MSG = Messages.BrowseEntryDialog_message_file;	
-	private static final String DIR_MSG = UIMessages.getString("BrowseEntryDialog.message.directory");	//$NON-NLS-1$
+	private static final String DIR_MSG = Messages.BrowseEntryDialog_message_directory;	
-	private static final String TITLE = UIMessages.getString("BuildPropertyCommon.label.title");	//$NON-NLS-1$
+	private static final String TITLE = Messages.BuildPropertyCommon_label_title;	
 
 	/** flag which prevents us from resetting the prompt for delete flag */
 	private boolean neverPromptForDelete;
@@ -823,8 +824,8 @@ public class FileListControl {
 			return;
 		boolean delDir = true;
 		if (promptForDelete) {
-			String quest = UIMessages.getString("FileListControl.deletedialog.message"); //$NON-NLS-1$
+			String quest = Messages.FileListControl_deletedialog_message; 
-			String title = UIMessages.getString("FileListControl.deletedialog.title"); //$NON-NLS-1$
+			String title = Messages.FileListControl_deletedialog_title; 
 			delDir = MessageDialog.openQuestion(list.getShell(), title, quest);
 		}
 		if (delDir){
@@ -887,7 +888,7 @@ public class FileListControl {
 					}
 					dialog =  new SelectPathInputDialog(getListControl().getShell(), title, message, selItem, null, browseType);
 				} else {
-					String title = UIMessages.getString("FileListControl.editdialog.title"); //$NON-NLS-1$
+					String title = Messages.FileListControl_editdialog_title; 
 					dialog = new InputDialog(null, title, compTitle, selItem, null);
 				}