From b9763f53a26a768f0a5058037d4584500d2bb45c Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Sat, 20 Nov 2010 00:08:09 +0000
Subject: [PATCH] 2010-11-18  Francois Chouinard  <fchouinard@gmail.com> 
 Contribution for Bug315307

---
 .../plugin.properties                         |   1 +
 .../feature.properties                        |   6 +
 .../plugin.properties                         |  78 ++++++--
 org.eclipse.linuxtools.lttng.ui/plugin.xml    | 161 +++++++--------
 .../ui/views/project/LTTngProjectNature.java  |   2 +-
 org.eclipse.linuxtools.lttng/ChangeLog        |   5 +
 org.eclipse.linuxtools.lttng/build.properties |   2 +-
 .../lttng/trace/LTTngTextTrace.java           |   4 +-
 .../feature.properties                        |   6 +
 .../plugin.xml                                |   6 +-
 .../plugin.properties                         |  68 ++++++-
 org.eclipse.linuxtools.tmf.ui/plugin.xml      | 185 +++++++++---------
 .../ui/dialogs/ManageCustomParsersDialog.java |  28 +--
 .../linuxtools/tmf/ui/dialogs/Messages.java   |  27 +++
 .../tmf/ui/dialogs/messages.properties        |  13 ++
 .../tmf/ui/viewers/events/Messages.java       |  19 ++
 .../tmf/ui/viewers/events/TmfEventsTable.java |  15 +-
 .../tmf/ui/viewers/events/messages.properties |   5 +
 .../tmf/ui/views/project/ProjectView.java     |   8 +-
 .../ui/views/project/TmfProjectNature.java    |   2 +-
 .../views/project/dialogs/AddTraceWizard.java |   6 +-
 .../project/dialogs/AddTraceWizardPage.java   |   6 +-
 .../project/dialogs/IDEWorkbenchMessages.java |  16 ++
 .../ui/views/project/dialogs/Messages.java    |  11 +-
 .../project/dialogs/NewExperimentDialog.java  |  19 +-
 .../project/dialogs/NewProjectWizard.java     |   4 +-
 .../views/project/dialogs/messages.properties |  12 +-
 .../CustomTxtParserInputWizardPage.java       |  12 +-
 .../CustomXmlParserInputWizardPage.java       |  47 +++--
 .../linuxtools/tmf/ui/wizards/Messages.java   |  44 ++---
 .../tmf/ui/wizards/messages.properties        |  44 ++---
 31 files changed, 531 insertions(+), 331 deletions(-)
 create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/Messages.java
 create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/messages.properties
 create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/Messages.java
 create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/messages.properties
 create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/IDEWorkbenchMessages.java

diff --git a/org.eclipse.linuxtools.lttng.jni/plugin.properties b/org.eclipse.linuxtools.lttng.jni/plugin.properties
index 0030ed33a2..17a28d030e 100644
--- a/org.eclipse.linuxtools.lttng.jni/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.jni/plugin.properties
@@ -1,2 +1,3 @@
+#Properties file for org.eclipse.linuxtools.lttng.jni
 Bundle-Vendor = Eclipse Linux Tools
 Bundle-Name = JNI implementation for LTTng (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.test-feature/feature.properties b/org.eclipse.linuxtools.lttng.test-feature/feature.properties
index 10b1a82122..ab619c42b7 100644
--- a/org.eclipse.linuxtools.lttng.test-feature/feature.properties
+++ b/org.eclipse.linuxtools.lttng.test-feature/feature.properties
@@ -8,11 +8,17 @@
 # Contributors:
 #    Red Hat, Inc. - initial API and implementation
 #********************************************************************************
+
 featureName=LTTng Tests (Incubation)
+
 description=Tests for the LTTng integration in Eclipse
+
 featureProvider=Eclipse Linux Tools
+
 copyright=Copyright 2010 Ericsson
+
 licenseURL=epl-v10.html
+
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
 March 17, 2005\n\
diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties
index 75b2914195..3dfa72032b 100644
--- a/org.eclipse.linuxtools.lttng.ui/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -2,27 +2,63 @@
 Bundle-Name = Linux Tracing Toolkit (LTTng) UI (Incubation)
 Bundle-Vendor = Eclipse Linux Tools
 
-# org.eclipse.ui.perspectives
-extension.name.0 = LTTng Perspective
-perspective.name = LTTng
+#Properties file for org.eclipse.linuxtools.tmf.ui (plugin.xml)
+perspective.category.name = LTTng
 
-# org.eclipse.ui.views
-extension.name.1 = LTTng Views
-category.name = LTTng
-view.name.0 = Project
-view.name.1 = Control
-view.name.2 = Events
-view.name.3 = Time Frame
-view.name.4 = Control Flow
-view.name.5 = Resources
-view.name.6 = Statistics
-view.name.7 = Histogram
+views.category.name = LTTng
+project.view.name = Projects
+control.view.name = Control
+events.view.name = Events
+timeframe.view.name = Time Frame
+controlflow.view.name = Control Flow
+resources.view.name = Resources
+statistics.view.name = Statistics
+histogram.view.name = Histogram
 
-# org.eclipse.ui.newWizards
-extension.name.2 = LTTng New Wizards
-category.name.0 = LTTng
-wizard.name.0 = LTTng Project
-wizard.description.0 = Create an LTTng project
+wizard.category.name = LTTng
+project.new.wizard.name = LTTng Project
+project.new.wizard.description = Create a new LTTng project
 
-# org.eclipse.core.resources.natures
-extension.name.3 = LTTng Project Nature
+action.set.label = LTTng Action Set
+action.set.description = LTTng Action Set
+
+#Commands and Menus
+commands.project.category.name = LTTng Project Commands
+commands.project.category.description = LTTng Project Commands
+commands.project.new = New Project
+commands.project.new.description = Create a new LTTng Project
+commands.project.open = Open Project
+commands.project.open.description = Open an LTTng Project
+commands.project.close = Close Project
+commands.project.close.description = Close an LTTng Project
+commands.project.rename = Rename Project
+commands.project.rename.description = Rename an LTTng Project
+commands.project.delete = Delete Project
+commands.project.delete.description = Delete an LTTng Project
+commands.project.refresh = Refresh View
+commands.project.refresh.description = Refresh the Project list
+
+commands.trace.category.name = LTTng Trace Commands
+commands.trace.category.description = LTTng Trace Commands
+commands.trace.import = Import Trace
+commands.trace.import.description = Import an LTTng Trace
+commands.trace.open = Open Trace
+commands.trace.open.description = Open an LTTng Trace
+commands.trace.rename = Rename Trace
+commands.trace.rename.description = Rename an LTTng Trace
+commands.trace.delete = Delete Trace
+commands.trace.delete.description = Delete an LTTng Trace
+commands.trace.selectparser = Select Parser
+
+commands.experiment.category.name = LTTng Experiment Commands
+commands.experiment.category.description = LTTng Experiment Commands
+commands.experiment.new = New Experiment
+commands.experiment.new.description = Create a new LTTng Experiment
+commands.experiment.selecttraces = Select Traces
+commands.experiment.selecttraces.description = Select LTTng Traces
+commands.experiment.open = Open Experiment
+commands.experiment.open.description = Open an LTTng Experiment
+commands.experiment.rename = Rename Experiment
+commands.experiment.rename.description = Rename an LTTng Experiment
+commands.experiment.delete = Delete Experiment
+commands.experiment.delete.description = Delete an LTTng Experiment
diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml
index 1a00545379..aeb47c4099 100644
--- a/org.eclipse.linuxtools.lttng.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -3,22 +3,20 @@
 <plugin>
    <extension
          id="org.eclipse.linuxtools.lttng.ui.perspective"
-         name="%extension.name.0"
          point="org.eclipse.ui.perspectives">
       <perspective
             class="org.eclipse.linuxtools.lttng.ui.views.PerspectiveFactory"
             icon="icons/garland16.png"
             id="org.eclipse.linuxtools.lttng.ui.perspective"
-            name="%perspective.name">
+            name="%perspective.category.name">
       </perspective>
    </extension>
    <extension
          id="org.eclipse.linuxtools.lttng.ui.views"
-         name="%extension.name.1"
          point="org.eclipse.ui.views">
       <category
             id="org.eclipse.linuxtools.lttng.ui.views.category"
-            name="%category.name">
+            name="%views.category.name">
       </category>
       <view
             allowMultiple="false"
@@ -26,7 +24,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.project.ProjectView"
             icon="icons/project_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.project"
-            name="%view.name.0"
+            name="%project.view.name"
             restorable="true">
       </view>
       <view
@@ -35,7 +33,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.control.ControlView"
             icon="icons/control_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.control"
-            name="%view.name.1"
+            name="%control.view.name"
             restorable="true">
       </view>
       <view
@@ -44,7 +42,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.events.EventsView"
             icon="icons/events_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.events"
-            name="%view.name.2"
+            name="%events.view.name"
             restorable="true">
       </view>
       <view
@@ -53,7 +51,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.timeframe.TimeFrameView"
             icon="icons/time_frame_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.timeframe"
-            name="%view.name.3"
+            name="%timeframe.view.name"
             restorable="true">
       </view>
       <view
@@ -62,7 +60,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView"
             icon="icons/control_flow_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.controlflow"
-            name="%view.name.4"
+            name="%controlflow.view.name"
             restorable="true">
       </view>
       <view
@@ -71,7 +69,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView"
             icon="icons/resources_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.resources"
-            name="%view.name.5"
+            name="%resources.view.name"
             restorable="true">
       </view>
       <view
@@ -80,7 +78,7 @@
             class="org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView"
             icon="icons/statistics_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.statistics"
-            name="%view.name.6"
+            name="%statistics.view.name"
             restorable="true">
       </view>
       <view
@@ -89,17 +87,16 @@
             class="org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramView"
             icon="icons/histogram.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.histogram"
-            name="%view.name.7"
+            name="%histogram.view.name"
             restorable="true">
       </view>
    </extension>
    <extension
          id="org.eclipse.linuxtools.lttng.wizards.new"
-         name="%extension.name.2"
          point="org.eclipse.ui.newWizards">
       <category
             id="org.eclipse.linuxtools.lttng.ui.wizards.new"
-            name="%category.name.0">
+            name="%wizard.category.name">
       </category>
       <wizard
             category="org.eclipse.linuxtools.lttng.ui.wizards.new"
@@ -108,16 +105,15 @@
             finalPerspective="org.eclipse.linuxtools.lttng.ui.perspective"
             icon="icons/garland16.png"
             id="org.eclipse.linuxtools.lttng.ui.views.ui.wizards.newProject"
-            name="%wizard.name.0"
+            name="%project.new.wizard.name"
             project="true">
          <description>
-            %wizard.description.0
+            %project.new.wizard.description
          </description>
       </wizard>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature"
-         name="%extension.name.3"
+         id="org.eclipse.linuxtools.lttng.project.nature"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
@@ -127,118 +123,124 @@
    </extension>
    <extension
          id="org.eclipse.linuxtools.lttng.ui.actionSets"
-         name="LTTng Action Sets"
          point="org.eclipse.ui.actionSets">
       <actionSet
-            description="LTTng Action Set"
+            description="%action.set.description"
             id="org.eclipse.linuxtools.lttng.ui.actionSet"
-            label="LTTng Action Set"
+            label="%action.set.label"
             visible="true">
       </actionSet>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.lttng.ui.commands"
-         name="LTTng Commands"
          point="org.eclipse.ui.commands">
       <category
-            description="LTTng Project Commands"
+            description="%commands.project.category.description"
             id="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            name="LTTng Project Commands">
+            name="%commands.project.category.name">
       </category>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Create an LTTng Project"
+            description="%commands.project.new.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.new"
-            name="New Project">
+            name="%commands.project.new">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Open an LTTng Project"
+            description="%commands.project.open.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.open"
-            name="Open Project">
+            name="%commands.project.open">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Close an LTTng Project"
+            description="%commands.project.close.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.close"
-            name="Close Project">
+            name="%commands.project.close">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Rename an LTTng Project"
+            description="%commands.project.rename.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.rename"
-            name="Rename Project">
+            name="%commands.project.rename">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Delete an LTTng Project"
+            description="%commands.project.delete.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.delete"
-            name="Delete Project">
+            name="%commands.project.delete">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Import an LTTng Trace"
+            description="%commands.project.refresh.description"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.refresh"
+            name="%commands.project.refresh">
+      </command>
+      <category
+            description="%commands.trace.category.description"
+            id="org.eclipse.linuxtools.lttng.ui.commands.trace.category"
+            name="%commands.trace.category.name">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.trace.category"
+            description="%commands.trace.import.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.trace.import"
-            name="Import Trace">
+            name="%commands.trace.import">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Open an LTTng Trace"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.trace.category"
+            description="%commands.trace.open.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.trace.open"
-            name="Open Trace">
+            name="%commands.trace.open">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Rename an LTTng Trace"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.trace.category"
+            description="%commands.trace.rename.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.trace.rename"
-            name="Rename Trace">
+            name="%commands.trace.rename">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Delete an LTTng Trace"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.trace.category"
+            description="%commands.trace.delete.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.trace.delete"
-            name="Delete Trace">
+            name="%commands.trace.delete">
       </command>
+      <category
+            description="%commands.experiment.category.description"
+            id="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            name="%commands.experiment.category.name">
+      </category>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Create an LTTng Experiment"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            description="%commands.experiment.new.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.new"
-            name="New Experiment">
+            name="%commands.experiment.new">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Select LTTng Traces"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            description="%commands.experiment.selecttraces.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.select"
-            name="Select Traces">
+            name="%commands.experiment.selecttraces">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Open an LTTng Experiment"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            description="%commands.experiment.open.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.open"
-            name="Open Experiment">
+            name="%commands.experiment.open">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Rename an LTTng Experiment"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            description="%commands.experiment.rename.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.rename"
-            name="Rename Experiment">
+            name="%commands.experiment.rename">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Delete an LTTng Experiment"
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.experiment.category"
+            description="%commands.experiment.delete.description"
             id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.delete"
-            name="Delete Experiment">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
-            description="Refresh View"
-            id="org.eclipse.linuxtools.lttng.ui.command.project.refresh"
-            name="Refresh View">
+            name="%commands.experiment.delete">
       </command>
    </extension>
    <extension
          id="org.eclipse.linuxtools.lttng.ui.menus"
-         name="LTTng Menus"
          point="org.eclipse.ui.menus">
       <menuContribution
             locationURI="popup:org.eclipse.linuxtools.lttng.ui.views.project?after=additions">
@@ -246,19 +248,19 @@
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.new"
                icon="icons/garland16.png"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.new"
-               label="New Project"
+               label="%commands.project.new"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.open"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.open"
-               label="Open Project"
+               label="%commands.project.open"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.close"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.close"
-               label="Close Project"
+               label="%commands.project.close"
                style="push">
          </command>
          <!-- command
@@ -270,7 +272,7 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.delete"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.delete"
-               label="Delete Project"
+               label="%commands.project.delete"
                style="push">
          </command>
          <separator
@@ -280,19 +282,19 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.new"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.new"
-               label="New Experiment"
+               label="%commands.experiment.new"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.select"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.select"
-               label="Select Traces"
+               label="%commands.experiment.selecttraces"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.open"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.open"
-               label="Open Experiment"
+               label="%commands.experiment.open"
                style="push">
          </command>
          <!-- command
@@ -304,7 +306,7 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.delete"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.delete"
-               label="Delete Experiment"
+               label="%commands.experiment.delete"
                style="push">
          </command>
          <separator
@@ -314,7 +316,7 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.import"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.import"
-               label="Import Traces"
+               label="%commands.trace.import"
                style="push">
          </command>
          <!-- command
@@ -332,7 +334,7 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.delete"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.delete"
-               label="Delete Trace"
+               label="%commands.trace.delete"
                style="push">
          </command>
          <separator
@@ -342,14 +344,13 @@
          <command
                commandId="org.eclipse.linuxtools.lttng.ui.command.project.refresh"
                id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.refresh"
-               label="Refresh View"
+               label="%commands.project.refresh"
                style="push">
          </command>
       </menuContribution>
    </extension>
    <extension
          id="org.eclipse.linuxtools.lttng.ui.handlers"
-         name="LTTng Command Handlers"
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.NewProjectHandler"
diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java
index 2e32fccf26..8568f033a2 100644
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException;
  */
 public class LTTngProjectNature implements IProjectNature {
 
-	public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.linuxtools.lttng.project.nature"; //$NON-NLS-1$
 
 	private IProject fProject;
 	
diff --git a/org.eclipse.linuxtools.lttng/ChangeLog b/org.eclipse.linuxtools.lttng/ChangeLog
index 12afa7963b..91346bbac3 100644
--- a/org.eclipse.linuxtools.lttng/ChangeLog
+++ b/org.eclipse.linuxtools.lttng/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-19  Francois Chouinard  <fchouinard@gmail.com>
+
+	* build.properties: Cosmetic spacing
+	* src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java: Suppress warning for non-externalized strings
+
 2010-11-10  Francois Chouinard  <fchouinard@gmail.com>
 
     Suppress warning for non-externalized strings
diff --git a/org.eclipse.linuxtools.lttng/build.properties b/org.eclipse.linuxtools.lttng/build.properties
index a640f99858..5fde8c31a4 100644
--- a/org.eclipse.linuxtools.lttng/build.properties
+++ b/org.eclipse.linuxtools.lttng/build.properties
@@ -2,5 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-	       about.html,\
+	           about.html,\
                plugin.properties
diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
index 7918d35847..6fe51f9f5b 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
@@ -462,13 +462,13 @@ class TextLttngEvent extends LttngEvent {
 	
 	@Override
 	public JniEvent convertEventTmfToJni() {
-		System.out.println("WARNING : Cannot use convertEventTmfToJni() on a trace in text format.");
+		System.out.println("WARNING : Cannot use convertEventTmfToJni() on a trace in text format."); //$NON-NLS-1$
 		return null;
 	}
 	
 	@Override
 	public void updateJniEventReference(JniEvent newJniEventReference) {
-		System.out.println("WARNING : Cannot use updateJniEventReference on a trace in text format. Using null.");
+		System.out.println("WARNING : Cannot use updateJniEventReference on a trace in text format. Using null."); //$NON-NLS-1$
     }
 }
 
diff --git a/org.eclipse.linuxtools.tmf.test-feature/feature.properties b/org.eclipse.linuxtools.tmf.test-feature/feature.properties
index e9441d215e..0070bd5756 100644
--- a/org.eclipse.linuxtools.tmf.test-feature/feature.properties
+++ b/org.eclipse.linuxtools.tmf.test-feature/feature.properties
@@ -8,11 +8,17 @@
 # Contributors:
 #    Red Hat, Inc. - initial API and implementation
 #********************************************************************************
+
 featureName=TMF Tests (Incubation)
+
 description=Tests for the TMF integration in Eclipse
+
 featureProvider=Eclipse Linux Tools
+
 copyright=Copyright 2010 Ericsson
+
 licenseURL=epl-v10.html
+
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
 March 17, 2005\n\
diff --git a/org.eclipse.linuxtools.tmf.ui.tests/plugin.xml b/org.eclipse.linuxtools.tmf.ui.tests/plugin.xml
index d3ffb0ffcf..66e15b376c 100644
--- a/org.eclipse.linuxtools.tmf.ui.tests/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui.tests/plugin.xml
@@ -2,15 +2,13 @@
 <?eclipse version="3.4"?>
 <plugin>
 	<extension
-       id="org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis"
-       name="TmfTimeAnalysis"
        point="org.eclipse.ui.views">
-		<category id="org.eclipse.linuxtools.tmf.ui.stubs" name="Tmf Ui Stubs">
+		<category id="org.eclipse.linuxtools.tmf.ui.stubs" name="TMF UI Stubs">
 		</category>
 		<view category="org.eclipse.linuxtools.tmf.ui.stubs"
 			class="org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.test.stub.views.TsfTraceAnalysisView"
 			id="org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.test.stub.views.TmfTaTimeAnalysis"
-			name="Tmf Time Analysis View" restorable="true">
+			name="TMF Time Analysis View" restorable="true">
 		</view>
 	</extension>
 
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties
index 6b8dc5e743..f852117b9b 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -1,3 +1,69 @@
 #Properties file for org.eclipse.linuxtools.tmf.ui
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = Tracing and Monitoring Framework (TMF) UI (Incubation)
\ No newline at end of file
+Bundle-Name = Tracing and Monitoring Framework (TMF) UI (Incubation)
+
+#Properties file for org.eclipse.linuxtools.tmf.ui (plugin.xml)
+views.category.name = TMF
+project.view.name = Projects
+events.view.name = Events
+events.editor.name = Events
+
+wizard.category.name = TMF
+project.new.wizard.name = TMF Project
+project.new.wizard.description = Create a new TMF project
+project.new.wizard.custom.text.parser = Custom Text Parser
+project.new.wizard.custom.xml.parser = Custom XML Parser
+
+action.set.label = TMF Action Set
+action.set.description = TMF Action Set
+
+#Commands and Menus
+commands.project.category.name = TMF Project Commands
+commands.project.category.description = TMF Project Commands
+commands.project.new = New Project
+commands.project.new.description = Create a new TMF Project
+commands.project.open = Open Project
+commands.project.open.description = Open a TMF Project
+commands.project.close = Close Project
+commands.project.close.description = Close a TMF Project
+commands.project.rename = Rename Project
+commands.project.rename.description = Rename a TMF Project
+commands.project.delete = Delete Project
+commands.project.delete.description = Delete a TMF Project
+commands.project.refresh = Refresh View
+commands.project.refresh.description = Refresh the Project list
+
+commands.trace.category.name = TMF Trace Commands
+commands.trace.category.description = TMF Trace Commands
+commands.trace.import = Import Trace
+commands.trace.import.description = Import a TMF Trace
+commands.trace.open = Open Trace
+commands.trace.open.description = Open a TMF Trace
+commands.trace.rename = Rename Trace
+commands.trace.rename.description = Rename a TMF Trace
+commands.trace.delete = Delete Trace
+commands.trace.delete.description = Delete a TMF Trace
+commands.trace.selectparser = Select Parser
+commands.trace.selectparser.description = Select the Parser for a TMF Trace
+commands.trace.selectparser.parser = Parser
+
+commands.experiment.category.name = TMF Experiment Commands
+commands.experiment.category.description = TMF Experiment Commands
+commands.experiment.new = New Experiment
+commands.experiment.new.description = Create a new TMF Experiment
+commands.experiment.selecttraces = Select Traces
+commands.experiment.selecttraces.description = Select TMF Traces
+commands.experiment.open = Open Experiment
+commands.experiment.open.description = Open a TMF Experiment
+commands.experiment.rename = Rename Experiment
+commands.experiment.rename.description = Rename a TMF Experiment
+commands.experiment.delete = Delete Experiment
+commands.experiment.delete.description = Delete a TMF Experiment
+
+commands.parser.category.name = TMF Parser Commands
+commands.parser.category.description = TMF Parser Commands
+commands.parser.manage = Manage Custom Parsers
+commands.parser.manage.description = Manage Custom Parsers
+ 
+contenttype.trace = TMF Trace
+ 
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 18e64d12ec..82dc906f56 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -6,7 +6,7 @@
          point="org.eclipse.ui.views">
       <category
             id="org.eclipse.linuxtools.tmf.ui.views.category"
-            name="TMF">
+            name="%views.category.name">
       </category>
       <view
             allowMultiple="false"
@@ -14,7 +14,7 @@
             class="org.eclipse.linuxtools.tmf.ui.views.project.ProjectView"
             icon="icons/project_view.gif"
             id="org.eclipse.linuxtools.tmf.ui.views.project"
-            name="Projects"
+            name="%project.view.name"
             restorable="true">
       </view>
       <view
@@ -23,7 +23,7 @@
             class="org.eclipse.linuxtools.tmf.ui.views.TmfEventsView"
             icon="icons/events_view.gif"
             id="org.eclipse.linuxtools.tmf.ui.views.events"
-            name="Events"
+            name="%events.view.name"
             restorable="true">
       </view>
    </extension>
@@ -34,28 +34,27 @@
             default="false"
             icon="icons/events_view.gif"
             id="org.eclipse.linuxtools.tmf.ui.editors.events"
-            name="Events">
+            name="%events.editor.name">
          <contentTypeBinding
                contentTypeId="org.eclipse.linuxtools.tmf.ui.content-type.trace">
          </contentTypeBinding>
       </editor>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.wizards.new"
-         name="%extension.name.2"
          point="org.eclipse.ui.newWizards">
       <category
             id="org.eclipse.linuxtools.tmf.ui.wizards.new"
-            name="TMF">
+            name="%wizard.category.name">
       </category>
       <wizard
             category="org.eclipse.linuxtools.tmf.ui.wizards.new"
             class="org.eclipse.linuxtools.tmf.ui.views.project.dialogs.NewProjectWizard"
             id="org.eclipse.linuxtools.tmf.ui.views.ui.wizards.newProject"
-            name="TMF Project"
+            name="%project.new.wizard.name"
             project="true">
          <description>
-            %wizard.description.0
+            %project.new.wizard.description
+            
          </description>
       </wizard>
       <wizard
@@ -63,19 +62,18 @@
             class="org.eclipse.linuxtools.tmf.ui.wizards.CustomTxtParserWizard"
             icon="icons/customparser_wizard.gif"
             id="org.eclipse.linuxtools.tmf.ui.wizards.custom.text"
-            name="Custom Text Parser">
+            name="%project.new.wizard.custom.text.parser">
       </wizard>
       <wizard
             category="org.eclipse.linuxtools.tmf.ui.wizards.new"
             class="org.eclipse.linuxtools.tmf.ui.wizards.CustomXmlParserWizard"
             icon="icons/customparser_wizard.gif"
             id="org.eclipse.linuxtools.tmf.ui.wizards.custom.xml"
-            name="Custom XML Parser">
+            name="%project.new.wizard.custom.xml.parser">
       </wizard>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.ui.views.project.TmfProjectNature"
-         name="TMF Project Nature"
+         id="org.eclipse.linuxtools.tmf.project.nature"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
@@ -84,159 +82,170 @@
       </runtime>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.ui.actionSets"
-         name="TMF Action Sets"
          point="org.eclipse.ui.actionSets">
       <actionSet
-            description="TMF Action Set"
+            description="%action.set.description"
             id="org.eclipse.linuxtools.tmf.ui.actionSet"
-            label="TMF Action Set"
+            label="%action.set.label"
             visible="true">
       </actionSet>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.ui.commands"
-         name="TMF Commands"
          point="org.eclipse.ui.commands">
       <category
-            description="TMF Project Commands"
+            description="%commands.project.category.description"
             id="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            name="TMF Project Commands">
+            name="%commands.project.category.name">
       </category>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Create an TMF Project"
+            description="%commands.project.new.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.new"
-            name="New Project">
+            name="%commands.project.new">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Open an TMF Project"
+            description="%commands.project.open.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.open"
-            name="Open Project">
+            name="%commands.project.open">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Close an TMF Project"
+            description="%commands.project.close.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.close"
-            name="Close Project">
+            name="%commands.project.close">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Rename an TMF Project"
+            description="%commands.project.rename.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.rename"
-            name="Rename Project">
+            name="%commands.project.rename">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Delete an TMF Project"
+            description="%commands.project.delete.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.delete"
-            name="Delete Project">
+            name="%commands.project.delete">
       </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Import an TMF Trace"
+            description="%commands.project.refresh.description"
+            id="org.eclipse.linuxtools.tmf.ui.command.project.refresh"
+            name="%commands.project.refresh">
+      </command>
+      <category
+            description="%commands.trace.category.description"
+            id="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            name="%commands.trace.category.name">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            description="%commands.trace.import.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"
-            name="Import Trace">
+            name="%commands.trace.import">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Open an TMF Trace"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            description="%commands.trace.open.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"
-            name="Open Trace">
+            name="%commands.trace.open">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Select the Parser for a TMF Trace"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            description="%commands.trace.rename.description"
+            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"
+            name="%commands.trace.rename">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            description="%commands.trace.selectparser.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.trace.selectparser"
-            name="Select Parser">
+            name="%commands.trace.selectparser">
          <commandParameter
                id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.selectparser.parser"
-               name="Parser"
+               name="%commands.trace.selectparser.parser"
                optional="false">
          </commandParameter>
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Rename an TMF Trace"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"
-            name="Rename Trace">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Delete an TMF Trace"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
+            description="%commands.trace.delete.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"
-            name="Delete Trace">
+            name="%commands.trace.delete">
       </command>
+      <category
+            description="%commands.experiment.category.description"
+            id="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            name="%commands.experiment.category.name">
+      </category>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Create an TMF Experiment"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            description="%commands.experiment.new.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.new"
-            name="New Experiment">
+            name="%commands.experiment.new">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Select TMF Traces"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            description="%commands.experiment.selecttraces.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"
-            name="Select Traces">
+            name="%commands.experiment.selecttraces">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Open an TMF Experiment"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            description="%commands.experiment.open.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"
-            name="Open Experiment">
+            name="%commands.experiment.open">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Rename an TMF Experiment"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            description="%commands.experiment.rename.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename"
-            name="Rename Experiment">
+            name="%commands.experiment.rename">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Delete an TMF Experiment"
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
+            description="%commands.experiment.delete.description"
             id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"
-            name="Delete Experiment">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.project.category"
-            description="Refresh View"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.refresh"
-            name="Refresh View">
+            name="%commands.experiment.delete">
       </command>
+      <category
+            description="%commands.parser.category.description"
+            id="org.eclipse.linuxtools.tmf.ui.commands.parser.category"
+            name="%commands.parser.category.name">
+      </category>
       <command
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.parser.category"
+            description="%commands.parser.manage.description"
             id="org.eclipse.linuxtools.tmf.ui.command.managecustomparsers"
-            name="Manage Custom Parsers">
+            name="%commands.parser.manage">
       </command>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.ui.menus"
-         name="TMF Menus"
          point="org.eclipse.ui.menus">
       <menuContribution
             locationURI="popup:org.eclipse.linuxtools.tmf.ui.views.project?after=additions">
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.new"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.new"
-               label="New Project"
+               label="%commands.project.new"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.open"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.open"
-               label="Open Project"
+               label="%commands.project.open"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.close"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.close"
-               label="Close Project"
+               label="%commands.project.close"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.delete"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.delete"
-               label="Delete Project"
+               label="%commands.project.delete"
                style="push">
          </command>
          <separator
@@ -246,25 +255,25 @@
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.new"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.experiment.new"
-               label="New Experiment"
+               label="%commands.experiment.new"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.experiment.select"
-               label="Select Traces"
+               label="%commands.experiment.selecttraces"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.experiment.open"
-               label="Open Experiment"
+               label="%commands.experiment.open"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.experiment.delete"
-               label="Delete Experiment"
+               label="%commands.experiment.delete"
                style="push">
          </command>
          <separator
@@ -274,18 +283,18 @@
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.trace.import"
-               label="Import Traces"
+               label="%commands.trace.import"
                style="push">
          </command>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.trace.open"
-               label="Open Trace"
+               label="%commands.trace.open"
                style="push">
          </command>
          <menu
                id="org.eclipse.linuxtools.tmf.ui.menu.project.trace.selectparser"
-               label="Select Parser">
+               label="%commands.trace.selectparser">
             <dynamic
                   class="org.eclipse.linuxtools.tmf.ui.views.project.handlers.SelectParserContributionItem"
                   id="org.eclipse.linuxtools.tmf.ui.command.project.trace.selectparser.dynamic">
@@ -294,7 +303,7 @@
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.trace.delete"
-               label="Delete Trace"
+               label="%commands.trace.delete"
                style="push">
          </command>
          <separator
@@ -304,7 +313,7 @@
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.project.refresh"
                id="org.eclipse.linuxtools.tmf.ui.menu.popup.project.refresh"
-               label="Refresh View"
+               label="%commands.project.refresh"
                style="push">
          </command>
       </menuContribution>
@@ -318,8 +327,6 @@
       </menuContribution>
    </extension>
    <extension
-         id="org.eclipse.linuxtools.tmf.ui.handlers"
-         name="TMF Command Handlers"
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.linuxtools.tmf.ui.views.project.handlers.NewProjectHandler"
@@ -401,7 +408,7 @@
       <content-type
             file-extensions="log"
             id="org.eclipse.linuxtools.tmf.ui.content-type.trace"
-            name="TMF Trace"
+            name="%contenttype.trace"
             priority="normal">
       </content-type>
    </extension>
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java
index 87a4ca8b5e..76a7f41158 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java
@@ -81,7 +81,7 @@ public class ManageCustomParsersDialog extends Dialog {
      */
     @Override
     protected Control createDialogArea(Composite parent) {
-        getShell().setText("Manage Custom Parsers");
+        getShell().setText(Messages.ManageCustomParsersDialog_DialogHeader);
         getShell().setImage(image);
         
         Composite composite = (Composite) super.createDialogArea(parent);
@@ -101,7 +101,7 @@ public class ManageCustomParsersDialog extends Dialog {
         radioContainer.setLayout(rcgl);
         
         txtButton = new Button(radioContainer, SWT.RADIO);
-        txtButton.setText("Text");
+        txtButton.setText(Messages.ManageCustomParsersDialog_TextButtonLabel);
         txtButton.setSelection(true);
         txtButton.addSelectionListener(new SelectionListener(){
             @Override
@@ -147,7 +147,7 @@ public class ManageCustomParsersDialog extends Dialog {
 
         newButton = new Button(buttonContainer, SWT.PUSH);
         newButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        newButton.setText("New...");
+        newButton.setText(Messages.ManageCustomParsersDialog_NewButtonLabel);
         newButton.addSelectionListener(new SelectionListener(){
             @Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
@@ -167,7 +167,7 @@ public class ManageCustomParsersDialog extends Dialog {
         
         editButton = new Button(buttonContainer, SWT.PUSH);
         editButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        editButton.setText("Edit...");
+        editButton.setText(Messages.ManageCustomParsersDialog_EditButtonLabel);
         editButton.setEnabled(false);
         editButton.addSelectionListener(new SelectionListener(){
             @Override
@@ -190,7 +190,7 @@ public class ManageCustomParsersDialog extends Dialog {
 
         deleteButton = new Button(buttonContainer, SWT.PUSH);
         deleteButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        deleteButton.setText("Delete");
+        deleteButton.setText(Messages.ManageCustomParsersDialog_DeleteButtonLabel);
         deleteButton.setEnabled(false);
         deleteButton.addSelectionListener(new SelectionListener(){
             @Override
@@ -199,8 +199,8 @@ public class ManageCustomParsersDialog extends Dialog {
 			public void widgetSelected(SelectionEvent e) {
                 boolean confirm = MessageDialog.openQuestion(
                         getShell(),
-                        "Delete Custom Parser",
-                        "Are you sure you want to delete the " + parserList.getSelection()[0] + " custom parser?");
+                        Messages.ManageCustomParsersDialog_DeleteParserDialogHeader,
+                        Messages.ManageCustomParsersDialog_DeleteConfirmation + parserList.getSelection()[0] + "?"); //$NON-NLS-1$
                 if (confirm) {
                     if (txtButton.getSelection()) {
                         CustomTxtTraceDefinition.delete(parserList.getSelection()[0]);
@@ -215,14 +215,14 @@ public class ManageCustomParsersDialog extends Dialog {
         
         importButton = new Button(buttonContainer, SWT.PUSH);
         importButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        importButton.setText("Import...");
+        importButton.setText(Messages.ManageCustomParsersDialog_ImportButtonLabel);
         importButton.addSelectionListener(new SelectionListener(){
             @Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
             @Override
 			public void widgetSelected(SelectionEvent e) {
                 FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN);
-                dialog.setText("Select custom parser file to import");
+                dialog.setText(Messages.ManageCustomParsersDialog_ImportParserSelection);
                 dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$
                 String path = dialog.open();
                 if (path != null) {
@@ -243,7 +243,7 @@ public class ManageCustomParsersDialog extends Dialog {
 
         exportButton = new Button(buttonContainer, SWT.PUSH);
         exportButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        exportButton.setText("Export...");
+        exportButton.setText(Messages.ManageCustomParsersDialog_ExportButtonLabel);
         exportButton.setEnabled(false);
         exportButton.addSelectionListener(new SelectionListener(){
             @Override
@@ -251,7 +251,7 @@ public class ManageCustomParsersDialog extends Dialog {
             @Override
 			public void widgetSelected(SelectionEvent e) {
                 FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE);
-                dialog.setText("Select file to export the " + parserList.getSelection()[0] + " custom parser");
+                dialog.setText(Messages.ManageCustomParsersDialog_ExportParserSelection + parserList.getSelection()[0]);
                 dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$
                 String path = dialog.open();
                 if (path != null) {
@@ -269,7 +269,7 @@ public class ManageCustomParsersDialog extends Dialog {
 
         parseButton = new Button(buttonContainer, SWT.PUSH);
         parseButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-        parseButton.setText("Parse...");
+        parseButton.setText(Messages.ManageCustomParsersDialog_ParseButtonLabel);
         parseButton.setEnabled(false);
         parseButton.addSelectionListener(new SelectionListener(){
             @Override
@@ -277,7 +277,7 @@ public class ManageCustomParsersDialog extends Dialog {
             @Override
 			public void widgetSelected(SelectionEvent e) {
                 FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN);
-                dialog.setText("Select log file to parse using the " + parserList.getSelection()[0] + " custom parser");
+                dialog.setText(Messages.ManageCustomParsersDialog_TraceSelection + parserList.getSelection()[0]);
                 if (xmlButton.getSelection()) {
                     dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$
                 }
@@ -314,7 +314,7 @@ public class ManageCustomParsersDialog extends Dialog {
                                 editor = activePage.openEditor(editorInput, editorId);
                             }
                         } catch (CoreException e1) {
-                            MessageDialog.openError(getShell(), "Parse Error", e1.getMessage());
+                            MessageDialog.openError(getShell(), "Parse Error", e1.getMessage()); //$NON-NLS-1$
                         }
                     }
                 }
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/Messages.java
new file mode 100644
index 0000000000..f7091cec70
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/Messages.java
@@ -0,0 +1,27 @@
+package org.eclipse.linuxtools.tmf.ui.dialogs;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.dialogs.messages"; //$NON-NLS-1$
+    public static String ManageCustomParsersDialog_DeleteButtonLabel;
+    public static String ManageCustomParsersDialog_DeleteConfirmation;
+    public static String ManageCustomParsersDialog_DeleteParserDialogHeader;
+    public static String ManageCustomParsersDialog_DialogHeader;
+    public static String ManageCustomParsersDialog_EditButtonLabel;
+    public static String ManageCustomParsersDialog_ExportButtonLabel;
+    public static String ManageCustomParsersDialog_ExportParserSelection;
+    public static String ManageCustomParsersDialog_ImportButtonLabel;
+    public static String ManageCustomParsersDialog_ImportParserSelection;
+    public static String ManageCustomParsersDialog_NewButtonLabel;
+    public static String ManageCustomParsersDialog_ParseButtonLabel;
+    public static String ManageCustomParsersDialog_TextButtonLabel;
+    public static String ManageCustomParsersDialog_TraceSelection;
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    private Messages() {
+    }
+}
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/messages.properties
new file mode 100644
index 0000000000..4c1675616c
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/messages.properties
@@ -0,0 +1,13 @@
+ManageCustomParsersDialog_DeleteButtonLabel=Delete
+ManageCustomParsersDialog_DeleteConfirmation=Are you sure you want to delete 
+ManageCustomParsersDialog_DeleteParserDialogHeader=Delete Custom Parser
+ManageCustomParsersDialog_DialogHeader=Manage Custom Parsers
+ManageCustomParsersDialog_EditButtonLabel=Edit...
+ManageCustomParsersDialog_ExportButtonLabel=Export...
+ManageCustomParsersDialog_ExportParserSelection=Select file to export 
+ManageCustomParsersDialog_ImportButtonLabel=Import...
+ManageCustomParsersDialog_ImportParserSelection=Select custom parser file to import
+ManageCustomParsersDialog_NewButtonLabel=New...
+ManageCustomParsersDialog_ParseButtonLabel=Parse...
+ManageCustomParsersDialog_TextButtonLabel=Text
+ManageCustomParsersDialog_TraceSelection=Select log file to parse using 
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/Messages.java
new file mode 100644
index 0000000000..b0d39f116d
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/Messages.java
@@ -0,0 +1,19 @@
+package org.eclipse.linuxtools.tmf.ui.viewers.events;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.viewers.events.messages"; //$NON-NLS-1$
+    public static String TmfEventsTable_ContentColumnHeader;
+    public static String TmfEventsTable_ReferenceColumnHeader;
+    public static String TmfEventsTable_SourceColumnHeader;
+    public static String TmfEventsTable_TimestampColumnHeader;
+    public static String TmfEventsTable_TypeColumnHeader;
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    private Messages() {
+    }
+}
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
index c1f101d921..4be1298154 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
@@ -53,17 +53,12 @@ public class TmfEventsTable extends TmfComponent {
     protected boolean fPackDone = false;
 
     // Table column names
-    static private final String TIMESTAMP_COLUMN = "Timestamp";
-    static private final String SOURCE_COLUMN    = "Source";
-    static private final String TYPE_COLUMN      = "Type";
-    static private final String REFERENCE_COLUMN = "File";
-    static private final String CONTENT_COLUMN   = "Content";
     static private final String[] COLUMN_NAMES =  new String[] {
-        TIMESTAMP_COLUMN,
-        SOURCE_COLUMN,
-        TYPE_COLUMN,
-        REFERENCE_COLUMN,
-        CONTENT_COLUMN
+        Messages.TmfEventsTable_TimestampColumnHeader,
+        Messages.TmfEventsTable_SourceColumnHeader,
+        Messages.TmfEventsTable_TypeColumnHeader,
+        Messages.TmfEventsTable_ReferenceColumnHeader,
+        Messages.TmfEventsTable_ContentColumnHeader
     };
 
     static private ColumnData[] COLUMN_DATA = new ColumnData[] {
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/messages.properties
new file mode 100644
index 0000000000..feee916ccf
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/messages.properties
@@ -0,0 +1,5 @@
+TmfEventsTable_ContentColumnHeader=Content
+TmfEventsTable_ReferenceColumnHeader=File
+TmfEventsTable_SourceColumnHeader=Source
+TmfEventsTable_TimestampColumnHeader=Timestamp
+TmfEventsTable_TypeColumnHeader=Type
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java
index 2e08cc4594..1b4af007f4 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java
@@ -245,8 +245,8 @@ public class ProjectView extends TmfView {
                 IFolder targetFolder = ((TmfProjectNode) node).getTracesFolder().getFolder();
                 if (data instanceof String[]) {
                     // FileTransfer
-                    System.out.println("Drop:" + ((String[])data)[0]);
-                    System.out.println("Folder:" + targetFolder);
+                    System.out.println("Drop:" + ((String[])data)[0]); //$NON-NLS-1$
+                    System.out.println("Folder:" + targetFolder); //$NON-NLS-1$
                     for (String path : (String[]) data) {
                         File sourceFile = new File(path);
                         if (sourceFile.isFile()) {
@@ -264,8 +264,8 @@ public class ProjectView extends TmfView {
                     }
                 } else if (data instanceof IResource[]) {
                     // ResourceTransfer
-                    System.out.println("Drop:" + ((IResource[])data)[0].getName());
-                    System.out.println("Folder:" + targetFolder);
+                    System.out.println("Drop:" + ((IResource[])data)[0].getName()); //$NON-NLS-1$
+                    System.out.println("Folder:" + targetFolder); //$NON-NLS-1$
                     for (IResource resource : (IResource[]) data) {
                         if (resource instanceof IFile) {
                             IFile file = targetFolder.getFile(resource.getName());
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java
index 90272d6e5b..190ee95353 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException;
  */
 public class TmfProjectNature implements IProjectNature {
 
-	public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.project.TmfProjectNature"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.linuxtools.tmf.project.nature"; //$NON-NLS-1$
 
 	private IProject fProject;
 	
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java
index 447ed34d19..643f5756a3 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java
@@ -51,7 +51,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard {
 	 */
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
-    	setWindowTitle(Messages.AddTraceWizard_windowTitle);
+    	setWindowTitle(Messages.AddTraceWizard_WindowTitle);
 	}
 
     /* (non-Javadoc)
@@ -84,7 +84,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard {
 			            folder.createLink(location, IResource.REPLACE, null);
 			        }
 			        else {
-			            System.out.println(Messages.AddTraceWizard_invalidTraceLocation);
+			            System.out.println("Invalid Trace Location"); //$NON-NLS-1$
 			        }
 			    } else {
                     IFile file = experimentFolder.getFile(trace.getName());
@@ -92,7 +92,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard {
                         file.createLink(location, IResource.REPLACE, null);
                     }
                     else {
-                        System.out.println(Messages.AddTraceWizard_invalidTraceLocation);
+                        System.out.println("Invalid Trace Location"); //$NON-NLS-1$
                     }
 			    }
 			} catch (CoreException e) {
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java
index 8ac1514ed9..2837f48e30 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java
@@ -38,8 +38,8 @@ public class AddTraceWizardPage extends WizardPage {
 	
 	protected AddTraceWizardPage(TmfProjectNode project, String pageName) {
 		super(pageName);
-		setTitle(Messages.AddTraceWizardPage_windowTitle);
-		setDescription(Messages.AddTraceWizardPage_description);
+		setTitle(Messages.AddTraceWizardPage_WindowTitle);
+		setDescription(Messages.AddTraceWizardPage_Description);
 		fProject = project;
 	}
 
@@ -64,7 +64,7 @@ public class AddTraceWizardPage extends WizardPage {
 
 		final TableColumn tableColumn = new TableColumn(table, SWT.NONE);
 		tableColumn.setWidth(200);
-		tableColumn.setText(Messages.AddTraceWizardPage_columnHeader);
+		tableColumn.setText(Messages.AddTraceWizardPage_TraceColumnHeader);
 
         fCheckboxTableViewer.setInput(fProject.getTracesFolder());
 	}
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/IDEWorkbenchMessages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/IDEWorkbenchMessages.java
new file mode 100644
index 0000000000..a1df47caed
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/IDEWorkbenchMessages.java
@@ -0,0 +1,16 @@
+package org.eclipse.linuxtools.tmf.ui.views.project.dialogs;
+
+import org.eclipse.osgi.util.NLS;
+
+public class IDEWorkbenchMessages extends NLS {
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.project.dialogs.messages"; //$NON-NLS-1$
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, IDEWorkbenchMessages.class);
+    }
+
+    private IDEWorkbenchMessages() {
+    }
+
+    public static String NewExperimentDialog_ExperimentName;
+}
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java
index c626b51e63..556c2adb04 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java
@@ -4,11 +4,12 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.project.dialogs.messages"; //$NON-NLS-1$
-	public static String AddTraceWizard_invalidTraceLocation;
-	public static String AddTraceWizard_windowTitle;
-	public static String AddTraceWizardPage_columnHeader;
-	public static String AddTraceWizardPage_description;
-	public static String AddTraceWizardPage_windowTitle;
+	public static String AddTraceWizard_WindowTitle;
+	public static String AddTraceWizardPage_TraceColumnHeader;
+	public static String AddTraceWizardPage_WindowTitle;
+	public static String AddTraceWizardPage_Description;
+    public static String NewProjectWizard_DialogHeader;
+    public static String NewProjectWizard_DialogMessage;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java
index 6044a550a7..7a8b3f33f8 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java
@@ -46,7 +46,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.internal.ide.dialogs.CreateLinkedResourceGroup;
 
@@ -72,7 +71,7 @@ public class NewExperimentDialog extends SelectionStatusDialog {
 	public NewExperimentDialog(Shell parentShell, TmfExperimentFolderNode experimentFolder) {
 		super(parentShell);
 		this.container = experimentFolder.getFolder();
-		setTitle("Tmf Experiment");
+		setTitle(""); //$NON-NLS-1$
 		setStatusLineAboveButtons(true);
 	}
 
@@ -155,7 +154,7 @@ public class NewExperimentDialog extends SelectionStatusDialog {
 		// new folder label
 		Label folderLabel = new Label(folderGroup, SWT.NONE);
 		folderLabel.setFont(font);
-		folderLabel.setText("Experiment name: ");
+		folderLabel.setText(org.eclipse.linuxtools.tmf.ui.views.project.dialogs.IDEWorkbenchMessages.NewExperimentDialog_ExperimentName + ": "); //$NON-NLS-1$
 
 		// new folder name entry field
 		folderNameField = new Text(folderGroup, SWT.BORDER);
@@ -202,7 +201,7 @@ public class NewExperimentDialog extends SelectionStatusDialog {
 			@Override
 			public void execute(IProgressMonitor monitor) throws CoreException {
 				try {
-					monitor.beginTask(IDEWorkbenchMessages.NewFolderDialog_progress, 2000);
+					monitor.beginTask("", 2000); //$NON-NLS-1$
 					if (monitor.isCanceled()) {
 						throw new OperationCanceledException();
 					}
@@ -225,17 +224,13 @@ public class NewExperimentDialog extends SelectionStatusDialog {
 			return null;
 		} catch (InvocationTargetException exception) {
 			if (exception.getTargetException() instanceof CoreException) {
-				ErrorDialog.openError(getShell(),
-						IDEWorkbenchMessages.NewFolderDialog_errorTitle, null, // no special message
+				ErrorDialog.openError(getShell(), "", null, // no special message //$NON-NLS-1$
 						((CoreException) exception.getTargetException()).getStatus());
 			} else {
 				// CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur.
-				IDEWorkbenchPlugin.log(getClass(),
-						"createNewExperiment", exception.getTargetException());
-				MessageDialog.openError(getShell(),
-						IDEWorkbenchMessages.NewFolderDialog_errorTitle,
-						NLS.bind(IDEWorkbenchMessages.NewFolderDialog_internalError,
-							exception.getTargetException().getMessage()));
+				IDEWorkbenchPlugin.log(getClass(), "", exception.getTargetException()); //$NON-NLS-1$
+				MessageDialog.openError(getShell(), "", //$NON-NLS-1$
+						NLS.bind("", exception.getTargetException().getMessage())); //$NON-NLS-1$
 			}
 			return null;
 		}
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java
index 099d821e74..c96b363ee9 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java
@@ -50,7 +50,7 @@ public class NewProjectWizard extends BasicNewResourceWizard {
      * 
      */
     public NewProjectWizard() {
-        this("Tmf Project", "Create a Tmf Project");
+        this(Messages.NewProjectWizard_DialogHeader, Messages.NewProjectWizard_DialogMessage);
     }
 
     /**
@@ -72,7 +72,7 @@ public class NewProjectWizard extends BasicNewResourceWizard {
      */
     @Override
     public void addPages() {
-        fMainPage= new NewProjectMainWizardPage("Tmf Project");
+        fMainPage= new NewProjectMainWizardPage(Messages.NewProjectWizard_DialogHeader);
         fMainPage.setTitle(fTtitle);
         fMainPage.setDescription(fDescription);
         addPage(fMainPage);
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties
index 93f37e27bf..5d28813701 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties
@@ -1,5 +1,7 @@
-AddTraceWizard_invalidTraceLocation=Problem
-AddTraceWizard_windowTitle=Adding traces to experiment
-AddTraceWizardPage_columnHeader=Trace
-AddTraceWizardPage_description=Select the traces to add to the experiment
-AddTraceWizardPage_windowTitle=Select traces
+AddTraceWizard_WindowTitle=Add traces to experiment
+AddTraceWizardPage_TraceColumnHeader=Trace
+AddTraceWizardPage_WindowTitle=Select Traces
+AddTraceWizardPage_Description=Select the traces to add to the experiment
+NewExperimentDialog_ExperimentName=Experiment name
+NewProjectWizard_DialogHeader=TMF Project
+NewProjectWizard_DialogMessage=Create a TMF Project
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java
index 6175be993d..681393b33f 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java
@@ -771,9 +771,9 @@ public class CustomTxtParserInputWizardPage extends WizardPage {
                 dateFormat = new SimpleDateFormat(timestampOutputFormatText.getText().trim());
                 timestampPreviewText.setText(dateFormat.format(date));
             } catch (ParseException e) {
-                timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_20 + firstEntryTimeStamp + Messages.CustomTxtParserInputWizardPage_21 + firstEntryTimeStampInputFormat + Messages.CustomTxtParserInputWizardPage_22);
+                timestampPreviewText.setText("*parse exception* [" + firstEntryTimeStamp + "] <> [" + firstEntryTimeStampInputFormat + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             } catch (IllegalArgumentException e) {
-                timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_23);
+                timestampPreviewText.setText("*parse exception* [Illegal Argument]"); //$NON-NLS-1$
             }
 
         }
@@ -885,15 +885,15 @@ public class CustomTxtParserInputWizardPage extends WizardPage {
         int line1start = 0;
         String line1 = Messages.CustomTxtParserInputWizardPage_nonMatchingLine;
         int line2start = line1start + line1.length();
-        String line2 = Messages.CustomTxtParserInputWizardPage_matchingLineRoot+CG+" "+UCG+" "+UT+" \n";  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        String line2 = Messages.CustomTxtParserInputWizardPage_matchingLineRoot + CG + " " + UCG + " " + UT + " \n";  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         int line3start = line2start + line2.length();
-        String line3 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        String line3 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine + CG + " " + UCG + " " + UT + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         int line4start = line3start + line3.length();
-        String line4 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        String line4 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine + CG + " " + UCG + " " + UT + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         int line5start = line4start + line4.length();
         String line5 = Messages.CustomTxtParserInputWizardPage_nonMatchingLine;
         int line6start = line5start + line5.length();
-        String line6 = Messages.CustomTxtParserInputWizardPage_44+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+        String line6 = Messages.CustomTxtParserInputWizardPage_matchingRootLine + CG + " " + UCG + " " + UT + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
  
         final Shell legendShell = new Shell(getShell(), SWT.DIALOG_TRIM);
         legendShell.setLayout(new FillLayout());
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java
index 8e84ec3396..4c9355949a 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java
@@ -1402,14 +1402,14 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
         StringBuffer errors = new StringBuffer();
 
         if (definition.definitionName.length() == 0) {
-            errors.append(Messages.CustomXmlParserInputWizardPage_62);
+            errors.append(Messages.CustomXmlParserInputWizardPage_emptyLogTypeError);
             logtypeText.setBackground(COLOR_LIGHT_RED);
         } else {
             logtypeText.setBackground(COLOR_TEXT_BACKGROUND);
             for (CustomXmlTraceDefinition def : CustomXmlTraceDefinition.loadAll()) {
                 if (definition.definitionName.equals(def.definitionName)) {
                     if (editDefinitionName == null || ! editDefinitionName.equals(definition.definitionName)) {
-                        errors.append(Messages.CustomXmlParserInputWizardPage_63);
+                        errors.append(Messages.CustomXmlParserInputWizardPage_duplicatelogTypeError);
                         logtypeText.setBackground(COLOR_LIGHT_RED);
                         break;
                     }
@@ -1418,7 +1418,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
         }
         
         if (definition.rootInputElement == null) {
-            errors.append(Messages.CustomXmlParserInputWizardPage_64);
+            errors.append(Messages.CustomXmlParserInputWizardPage_noDocumentError);
         }
         
         if (definition.rootInputElement != null) {
@@ -1431,28 +1431,28 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
             if ((definition.rootInputElement.attributes != null && definition.rootInputElement.attributes.size() != 0) ||
                     (definition.rootInputElement.childElements != null && definition.rootInputElement.childElements.size() != 0) || errors.length() == 0) {
                 if (!logEntryFound) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_65);
+                    errors.append(Messages.CustomXmlParserInputWizardPage_missingLogEntryError);
                 }
 
                 if (timeStampFound) {
                     if (timeStampOutputFormatText.getText().trim().length() == 0) {
-                        errors.append(Messages.CustomXmlParserInputWizardPage_66);
+                        errors.append(Messages.CustomXmlParserInputWizardPage_missingTimestampFmtError);
                         timeStampOutputFormatText.setBackground(COLOR_LIGHT_RED);
                     } else {
                         try {
                             new SimpleDateFormat(timeStampOutputFormatText.getText().trim());
                             timeStampOutputFormatText.setBackground(COLOR_TEXT_BACKGROUND);
                         } catch (IllegalArgumentException e) {
-                            errors.append(Messages.CustomXmlParserInputWizardPage_67);
+                            errors.append(Messages.CustomXmlParserInputWizardPage_invalidTimestampFmtError);
                             timeStampOutputFormatText.setBackground(COLOR_LIGHT_RED);
                         }
                     }
                 } else {
-                    timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_68);
+                    timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_notimestamporAttributeError);
                 }
             }
         } else {
-            timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_69);
+            timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_notimestamporAttributeError);
         }
     
         if (errors.length() == 0) {
@@ -1470,7 +1470,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
         if (selectedElement != null && selectedElement.inputElement.equals(inputElement)) elementNode = selectedElement;
         if (inputElement == definition.rootInputElement) {
             if (inputElement.elementName.length() == 0) {
-                errors.append(Messages.CustomXmlParserInputWizardPage_70);
+                errors.append(Messages.CustomXmlParserInputWizardPage_missingDocumentElementError);
                 if (elementNode != null) elementNode.elementNameText.setBackground(COLOR_LIGHT_RED);
             } else {
                 if (elementNode != null) elementNode.elementNameText.setBackground(COLOR_TEXT_BACKGROUND);
@@ -1484,19 +1484,21 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
             if (inputElement.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) {
                 timeStampFound = true;
                 if (inputElement.inputFormat.length() == 0) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_71 + getName(inputElement) + "). "); //$NON-NLS-1$
+                    errors.append(Messages.CustomXmlParserInputWizardPage_timestampFormatPrompt + 
+                            " (" + Messages.CustomXmlParserInputWizardPage_timestampElementPrompt + " " + getName(inputElement) + "). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED);
                 } else {
                     try {
                         new SimpleDateFormat(inputElement.inputFormat);
                         if (elementNode != null) elementNode.tagText.setBackground(COLOR_TEXT_BACKGROUND);
                     } catch (IllegalArgumentException e) {
-                        errors.append(Messages.CustomXmlParserInputWizardPage_73 + getName(inputElement) + "). "); //$NON-NLS-1$
+                        errors.append(Messages.CustomXmlParserInputWizardPage_invalidTimestampFmtError + 
+                                " (" + Messages.CustomXmlParserInputWizardPage_timestampElementPrompt + " " + getName(inputElement) + "). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                         if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED);
                     }
                 }
             } else if (inputElement.inputName.length() == 0) {
-                errors.append(Messages.CustomXmlParserInputWizardPage_75);
+                errors.append(Messages.CustomXmlParserInputWizardPage_missingInputElementNameError);
                 if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED);
             } else {
                 if (elementNode != null) elementNode.tagText.setBackground(COLOR_TEXT_BACKGROUND);
@@ -1521,28 +1523,33 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                     }
                 }
                 if (attribute.attributeName.length() == 0) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_76 + getName(inputElement) + ": ?). "); //$NON-NLS-1$
+                    errors.append(Messages.CustomXmlParserInputWizardPage_missingAttribute + 
+                            " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(inputElement) + ": ?). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     if (elementNode != null) elementNode.attributes.get(i).attributeNameText.setBackground(COLOR_LIGHT_RED);
                 } else if (duplicate) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_78 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$
+                    errors.append(Messages.CustomXmlParserInputWizardPage_duplicateAttributeError +
+                            " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     if (elementNode != null) elementNode.attributes.get(i).attributeNameText.setBackground(COLOR_LIGHT_RED);
                 }
                 if (attribute.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) {
                     timeStampFound = true;
                     if (attribute.inputFormat.length() == 0) {
-                        errors.append(Messages.CustomXmlParserInputWizardPage_80 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$
+                        errors.append(Messages.CustomXmlParserInputWizardPage_missingTimestampInFmtError +
+                                " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                         if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED);
                     } else {
                         try {
                             new SimpleDateFormat(attribute.inputFormat);
                             if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_TEXT_BACKGROUND);
                         } catch (IllegalArgumentException e) {
-                            errors.append(Messages.CustomXmlParserInputWizardPage_82 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$
+                            errors.append(Messages.CustomXmlParserInputWizardPage_invalidTimestampInFmtError + 
+                                    " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                             if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED);
                         }
                     }
                 } else if (attribute.inputName.length() == 0) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_84 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$
+                    errors.append(Messages.CustomXmlParserInputWizardPage_missingDataGroupNameError + 
+                            " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED);
                 } else {
                     if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_TEXT_BACKGROUND);
@@ -1560,7 +1567,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                 ElementNode childElementNode = null;
                 if (selectedElement != null && selectedElement.inputElement.equals(child)) childElementNode = selectedElement;
                 if (child.elementName.length() == 0) {
-                    errors.append(Messages.CustomXmlParserInputWizardPage_86 + getName(child) + "). "); //$NON-NLS-1$
+                    errors.append(Messages.CustomXmlParserInputWizardPage_missingElementNameError + 
+                            " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(child) + "). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     if (childElementNode != null) childElementNode.elementNameText.setBackground(COLOR_LIGHT_RED);
                 } else {
                     boolean duplicate = false;
@@ -1574,7 +1582,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                         }
                     }
                     if (duplicate) {
-                        errors.append(Messages.CustomXmlParserInputWizardPage_88 + getName(child) + "). "); //$NON-NLS-1$
+                        errors.append(Messages.CustomXmlParserInputWizardPage_duplicateElementNameError + 
+                                " (" + Messages.CustomXmlParserInputWizardPage_attributePrompt + " " + getName(child) + "). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                         if (childElementNode != null) childElementNode.elementNameText.setBackground(COLOR_LIGHT_RED);
                     }
                 }
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java
index 1a67bf5dc5..7d81fd2edd 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java
@@ -4,11 +4,6 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.wizards.messages"; //$NON-NLS-1$
-	public static String CustomTxtParserInputWizardPage_20;
-	public static String CustomTxtParserInputWizardPage_21;
-	public static String CustomTxtParserInputWizardPage_22;
-	public static String CustomTxtParserInputWizardPage_23;
-	public static String CustomTxtParserInputWizardPage_44;
 	public static String CustomTxtParserInputWizardPage_addChildLine;
 	public static String CustomTxtParserInputWizardPage_addGroup;
 	public static String CustomTxtParserInputWizardPage_addNextLine;
@@ -25,6 +20,7 @@ public class Messages extends NLS {
 	public static String CustomTxtParserInputWizardPage_logType;
 	public static String CustomTxtParserInputWizardPage_matchingLineRoot;
 	public static String CustomTxtParserInputWizardPage_matchingOtherLine;
+	public static String CustomTxtParserInputWizardPage_matchingRootLine;
 	public static String CustomTxtParserInputWizardPage_max;
 	public static String CustomTxtParserInputWizardPage_min;
 	public static String CustomTxtParserInputWizardPage_moveDown;
@@ -55,25 +51,25 @@ public class Messages extends NLS {
 	public static String CustomTxtParserOutputWizardPage_moveAfter;
 	public static String CustomTxtParserOutputWizardPage_moveBefore;
 	public static String CustomTxtParserOutputWizardPage_visible;
-	public static String CustomXmlParserInputWizardPage_62;
-	public static String CustomXmlParserInputWizardPage_63;
-	public static String CustomXmlParserInputWizardPage_64;
-	public static String CustomXmlParserInputWizardPage_65;
-	public static String CustomXmlParserInputWizardPage_66;
-	public static String CustomXmlParserInputWizardPage_67;
-	public static String CustomXmlParserInputWizardPage_68;
-	public static String CustomXmlParserInputWizardPage_69;
-	public static String CustomXmlParserInputWizardPage_70;
-	public static String CustomXmlParserInputWizardPage_71;
-	public static String CustomXmlParserInputWizardPage_73;
-	public static String CustomXmlParserInputWizardPage_75;
-	public static String CustomXmlParserInputWizardPage_76;
-	public static String CustomXmlParserInputWizardPage_78;
-	public static String CustomXmlParserInputWizardPage_80;
-	public static String CustomXmlParserInputWizardPage_82;
-	public static String CustomXmlParserInputWizardPage_84;
-	public static String CustomXmlParserInputWizardPage_86;
-	public static String CustomXmlParserInputWizardPage_88;
+	public static String CustomXmlParserInputWizardPage_emptyLogTypeError;
+	public static String CustomXmlParserInputWizardPage_duplicatelogTypeError;
+	public static String CustomXmlParserInputWizardPage_noDocumentError;
+	public static String CustomXmlParserInputWizardPage_missingLogEntryError;
+	public static String CustomXmlParserInputWizardPage_missingTimestampFmtError;
+	public static String CustomXmlParserInputWizardPage_invalidTimestampFmtError;
+	public static String CustomXmlParserInputWizardPage_notimestamporAttributeError;
+	public static String CustomXmlParserInputWizardPage_missingDocumentElementError;
+	public static String CustomXmlParserInputWizardPage_timestampFormatPrompt;
+    public static String CustomXmlParserInputWizardPage_timestampElementPrompt;
+	public static String CustomXmlParserInputWizardPage_missingInputElementNameError;
+	public static String CustomXmlParserInputWizardPage_attributePrompt;
+	public static String CustomXmlParserInputWizardPage_missingAttribute;
+	public static String CustomXmlParserInputWizardPage_duplicateAttributeError;
+	public static String CustomXmlParserInputWizardPage_missingTimestampInFmtError;
+	public static String CustomXmlParserInputWizardPage_invalidTimestampInFmtError;
+	public static String CustomXmlParserInputWizardPage_missingDataGroupNameError;
+	public static String CustomXmlParserInputWizardPage_missingElementNameError;
+	public static String CustomXmlParserInputWizardPage_duplicateElementNameError;
 	public static String CustomXmlParserInputWizardPage_addAttribute;
 	public static String CustomXmlParserInputWizardPage_addChildElement;
 	public static String CustomXmlParserInputWizardPage_addDocumentEleemnt;
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties
index ee1b65ccc3..6b8690add7 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties
@@ -1,8 +1,3 @@
-CustomTxtParserInputWizardPage_20=*parse exception* [
-CustomTxtParserInputWizardPage_21=] <> [
-CustomTxtParserInputWizardPage_22=]
-CustomTxtParserInputWizardPage_23=*parse exception* [Illegal Argument]
-CustomTxtParserInputWizardPage_44=matchingRootLine
 CustomTxtParserInputWizardPage_addChildLine=Add child line
 CustomTxtParserInputWizardPage_addGroup=Add group
 CustomTxtParserInputWizardPage_addNextLine=Add next line
@@ -19,6 +14,7 @@ CustomTxtParserInputWizardPage_highlightAll=Highlight All
 CustomTxtParserInputWizardPage_logType=Log type:
 CustomTxtParserInputWizardPage_matchingLineRoot=Matching root line : 
 CustomTxtParserInputWizardPage_matchingOtherLine=Matching other line: 
+CustomTxtParserInputWizardPage_matchingRootLine=matchingRootLine
 CustomTxtParserInputWizardPage_max=max:
 CustomTxtParserInputWizardPage_min=min:
 CustomTxtParserInputWizardPage_moveDown=Move down
@@ -49,25 +45,25 @@ CustomTxtParserOutputWizardPage_description=Customize the output of the parser
 CustomTxtParserOutputWizardPage_moveAfter=Move After
 CustomTxtParserOutputWizardPage_moveBefore=Move Before
 CustomTxtParserOutputWizardPage_visible=Visible
-CustomXmlParserInputWizardPage_62=Enter a name for the new log type. 
-CustomXmlParserInputWizardPage_63=The log type name already exists. 
-CustomXmlParserInputWizardPage_64=Add a document element. 
-CustomXmlParserInputWizardPage_65=Identify a Log Entry element. 
-CustomXmlParserInputWizardPage_66=Enter the output format for the Time Stamp field. 
-CustomXmlParserInputWizardPage_67=Enter a valid output format for the Time Stamp field. 
-CustomXmlParserInputWizardPage_68=*no time stamp element or attribute*
-CustomXmlParserInputWizardPage_69=*no time stamp element or attribute*
-CustomXmlParserInputWizardPage_70=Enter a name for the document element. 
-CustomXmlParserInputWizardPage_71=Enter the input format for the Time Stamp (Element 
-CustomXmlParserInputWizardPage_73=Enter a valid input format for the Time Stamp (Element 
-CustomXmlParserInputWizardPage_75=Enter a name for the input . 
-CustomXmlParserInputWizardPage_76=Enter a name for the attribute (Attribute 
-CustomXmlParserInputWizardPage_78=Duplicate attribute names (Attribute 
-CustomXmlParserInputWizardPage_80=Enter the input format for the Time Stamp (Attribute 
-CustomXmlParserInputWizardPage_82=Enter a valid input format for the Time Stamp (Attribute 
-CustomXmlParserInputWizardPage_84=Enter a name for the data group (Attribute 
-CustomXmlParserInputWizardPage_86=Enter a name for the element (Element 
-CustomXmlParserInputWizardPage_88=Duplicate element names (Element 
+CustomXmlParserInputWizardPage_emptyLogTypeError=Enter a name for the new log type. 
+CustomXmlParserInputWizardPage_duplicatelogTypeError=The log type name already exists. 
+CustomXmlParserInputWizardPage_noDocumentError=Add a document element. 
+CustomXmlParserInputWizardPage_missingLogEntryError=Identify a Log Entry element. 
+CustomXmlParserInputWizardPage_missingTimestampFmtError=Enter the output format for the Time Stamp field. 
+CustomXmlParserInputWizardPage_invalidTimestampFmtError=Enter a valid output format for the Time Stamp field. 
+CustomXmlParserInputWizardPage_notimestamporAttributeError=*no time stamp element or attribute*
+CustomXmlParserInputWizardPage_missingDocumentElementError=Enter a name for the document element. 
+CustomXmlParserInputWizardPage_timestampElementPrompt=Element
+CustomXmlParserInputWizardPage_timestampFormatPrompt=Enter the input format for the Time Stamp
+CustomXmlParserInputWizardPage_missingInputElementNameError=Enter a name for the input
+CustomXmlParserInputWizardPage_attributePrompt=Attribute
+CustomXmlParserInputWizardPage_missingAttribute=Enter a name for the attribute
+CustomXmlParserInputWizardPage_duplicateAttributeError=Duplicate attribute names
+CustomXmlParserInputWizardPage_missingTimestampInFmtError=Enter the input format for the Time Stamp
+CustomXmlParserInputWizardPage_invalidTimestampInFmtError=Enter a valid input format for the Time Stamp
+CustomXmlParserInputWizardPage_missingDataGroupNameError=Enter a name for the data group
+CustomXmlParserInputWizardPage_missingElementNameError=Enter a name for the element
+CustomXmlParserInputWizardPage_duplicateElementNameError=Duplicate element names 
 CustomXmlParserInputWizardPage_addAttribute=Add attribute
 CustomXmlParserInputWizardPage_addChildElement=Add child element
 CustomXmlParserInputWizardPage_addDocumentEleemnt=Add document element
-- 
2.34.1