From 43ee8b79f83530ffaab3c4771edc5e8a498777f7 Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Fri, 4 Jul 2014 14:36:05 -0400
Subject: [PATCH] lttng: Fix string externalization in plugin.xml's

Some strings were not externalized, some others were refering to
non-existing labels.

Change-Id: I2e0052785c02a008de81d7328e47fddfb0e1876c
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/29492
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Hudson CI
---
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../plugin.properties                         |  1 +
 .../plugin.xml                                |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../plugin.properties                         |  4 ++++
 org.eclipse.linuxtools.tmf.core/plugin.xml    |  4 ++--
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../plugin.properties                         |  9 +++++++++
 org.eclipse.linuxtools.tmf.ui/plugin.xml      | 20 +++++++++----------
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 .../.settings/org.eclipse.pde.prefs           |  2 +-
 25 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/org.eclipse.linuxtools.btf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.btf.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.btf.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.btf.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.btf.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.btf.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.btf.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.btf.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.gdbtrace.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.gdbtrace.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.gdbtrace.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.gdbtrace.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.gdbtrace.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.gdbtrace.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.gdbtrace.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.gdbtrace.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.statesystem.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.statesystem.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.statesystem.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.statesystem.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.analysis.xml.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tmf.analysis.xml.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.properties b/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.properties
index e0cfc5c529..d90d593f73 100644
--- a/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.properties
@@ -14,3 +14,4 @@
 Bundle-Vendor = Eclipse Linux Tools
 Bundle-Name = Linux Tools TMF XML Analysis Core Plug-in
 
+extensionpoint.xml_files.name = Plugin's builtin XML files
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.xml b/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.xml
index 2ad7647d78..6ebb1f6eab 100644
--- a/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.analysis.xml.core/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.eclipse.linuxtools.tmf.analysis.xml.core.files" name="Plugin&apos;s builtin XML files" schema="schema/org.eclipse.linuxtools.tmf.analysis.xml.core.files.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.analysis.xml.core.files" name="%extensionpoint.xml_files.name" schema="schema/org.eclipse.linuxtools.tmf.analysis.xml.core.files.exsd"/>
 
 </plugin>
diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.analysis.xml.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tmf.analysis.xml.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tmf.analysis.xml.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.core/plugin.properties b/org.eclipse.linuxtools.tmf.core/plugin.properties
index a60daa47b4..c409cf810a 100644
--- a/org.eclipse.linuxtools.tmf.core/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.core/plugin.properties
@@ -14,5 +14,9 @@
 Bundle-Vendor = Eclipse Linux Tools
 Bundle-Name = Linux Tools TMF Core Plug-in
 
+# Extension points
+extensionpoint.trace_type.name = Tmf Trace Type
+extensionpoint.analysis_module.name = Trace Analysis Module
+
 # Experiment type
 experimenttype.type.generic = Generic Experiment
diff --git a/org.eclipse.linuxtools.tmf.core/plugin.xml b/org.eclipse.linuxtools.tmf.core/plugin.xml
index 0df89e021c..45eaf88b1d 100644
--- a/org.eclipse.linuxtools.tmf.core/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.core/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.eclipse.linuxtools.tmf.core.tracetype" name="Tmf Trace Type" schema="schema/org.eclipse.linuxtools.tmf.core.tracetype.exsd"/>
-   <extension-point id="org.eclipse.linuxtools.tmf.core.analysis" name="Trace Analysis Module" schema="schema/org.eclipse.linuxtools.tmf.core.analysis.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.core.tracetype" name="%extensionpoint.trace_type.name" schema="schema/org.eclipse.linuxtools.tmf.core.tracetype.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.core.analysis" name="%extensionpoint.analysis_module.name" schema="schema/org.eclipse.linuxtools.tmf.core.analysis.exsd"/>
 
    <extension
          point="org.eclipse.core.runtime.preferences">
diff --git a/org.eclipse.linuxtools.tmf.ctf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.ctf.core/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tmf.ctf.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tmf.ctf.core/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties
index b828ee6575..1ed9a90c15 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -14,6 +14,10 @@
 Bundle-Vendor = Eclipse Linux Tools
 Bundle-Name = Linux Tools TMF UI Plug-in
 
+# Extension points
+extensionpoint.trace_type_ui.name = Tmf Trace Type UI Elements
+extensionpoint.sequence_diagram_loader.name = TMF UML 2 Sequence Diagram Loader
+
 # Perspective and Views names
 perspective.category.name = Tracing
 
@@ -42,6 +46,11 @@ project.import.wizard.name.batch = Batch Trace Import
 project.import.wizard.name.tracepkg = Trace Package Import
 project.export.wizard.name.tracepkg = Trace Package Export
 
+# Project model elements
+project.model.trace_folder = Trace Folder
+project.model.experiment_folder = Trace Experiment Folder
+project.model.linked_trace = Linked Trace
+
 # Preference page
 preference.page.trace.name = Tracing
 preference.page.uml2sd.name = UML2 Sequence Diagram
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index ef576db2d7..172202b06a 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.eclipse.linuxtools.tmf.ui.uml2SDLoader" name="TMF UML 2 Sequence Diagram Loader" schema="schema/org.eclipse.linuxtools.tmf.ui.uml2SDLoader.exsd"/>
-   <extension-point id="org.eclipse.linuxtools.tmf.ui.tracetypeui" name="Tmf Trace Type UI Elements" schema="schema/org.eclipse.linuxtools.tmf.ui.tracetypeui.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.ui.uml2SDLoader" name="%extensionpoint.sequence_diagram_loader.name" schema="schema/org.eclipse.linuxtools.tmf.ui.uml2SDLoader.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.ui.tracetypeui" name="%extensionpoint.trace_type_ui.name" schema="schema/org.eclipse.linuxtools.tmf.ui.tracetypeui.exsd"/>
 
     <extension
          point="org.eclipse.ui.perspectives">
@@ -292,7 +292,7 @@
       <decorator
             icon="icons/ovr16/trace_folder_ovr.png"
             id="org.eclipse.linuxtools.tmf.ui.trace_folder.decorator"
-            label="Trace Folder"
+            label="%project.model.trace_folder"
             lightweight="true"
             location="TOP_RIGHT"
             state="true">
@@ -305,7 +305,7 @@
       <decorator
             icon="icons/ovr16/experiment_folder_ovr.png"
             id="org.eclipse.linuxtools.tmf.ui.experiment_folder.decorator"
-            label="Trace Experiment Folder"
+            label="%project.model.experiment_folder"
             lightweight="true"
             location="TOP_RIGHT"
             state="true">
@@ -318,7 +318,7 @@
       <decorator
             icon="icons/ovr16/link_ovr.gif"
             id="org.eclipse.linuxtools.tmf.ui.linked_trace.decorator"
-            label="Linked Trace"
+            label="%project.model.linked_trace"
             lightweight="true"
             location="BOTTOM_RIGHT"
             state="true">
@@ -812,7 +812,7 @@
                label="%command.select_traces"
                mnemonic="%command.select_traces.mnemonic"
                style="push"
-               tooltip="%commands.select_traces.description">
+               tooltip="%command.select_traces.description">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -836,7 +836,7 @@
                label="%command.synchronize_traces"
                mnemonic="%command.synchronize_traces.mnemonic"
                style="push"
-               tooltip="%commands.synchronize_traces.description">
+               tooltip="%command.synchronize_traces.description">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -1010,17 +1010,17 @@
             name="%command.select_trace_type">
          <commandParameter
                id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.bundle"
-               name="%commands.trace.select_trace_type.bundle"
+               name="%command.select_trace_type.bundle"
                optional="false">
          </commandParameter>
          <commandParameter
                id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.type"
-               name="%commands.trace.select_trace_type.type"
+               name="%command.select_trace_type.type"
                optional="false">
          </commandParameter>
          <commandParameter
                id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.icon"
-               name="%commands.trace.select_trace_type.icon"
+               name="%command.select_trace_type.icon"
                optional="false">
          </commandParameter>
       </command>
diff --git a/org.eclipse.linuxtools.tracing.examples/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tracing.examples/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tracing.examples/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tracing.examples/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs
index 97b4320800..d92b94fd4b 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
+compilers.p.not-externalized-att=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
-- 
2.34.1