Bug 315895 - Names and descriptions of CDT features are confusing.

30 files changed, 54 insertions, 54 deletions

diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.properties b/build/org.eclipse.cdt.gnu.build-feature/feature.properties
index d1495817a56..09d64e931a6 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.properties
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GNU Toolchain Build Support
+featureName=C/C++ GNU Toolchain Build Support
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=GNU Toolchain Build Support for CDT
+description=Build support for C/C++ GNU toolchain. Included in C/C++ Development Tools.
 
 # copyright
 copyright=\
diff --git a/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.properties b/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.properties
index dab158e7c90..746913801b0 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.properties
+++ b/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GNU Toolchain Build Support Source
+featureName=C/C++ GNU Toolchain Build Support Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=GNU Toolchain Build Support and source code for CDT
+description=Build support for C/C++ GNU toolchain. Source code. Included in C/C++ Development Tools SDK.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/codan/org.eclipse.cdt.codan-feature/feature.properties b/codan/org.eclipse.cdt.codan-feature/feature.properties
index a8df168621d..687e276ddba 100644
--- a/codan/org.eclipse.cdt.codan-feature/feature.properties
+++ b/codan/org.eclipse.cdt.codan-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Code Analysis Framework (Codan)
+featureName=C/C++ Code Analysis Framework (Codan)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ Code Analysis Framework (Codan)
+description=Static analysis framework for C/C++ code.
 
 # copyright
 copyright=\
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties
index 7df3f6e31d7..cf47252a2de 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GCC Cross Compiler Support
+featureName=C/C++ GCC Cross Compiler Support
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Build integration and new project wizard support for GCC cross compilers.
+description=Build integration and new project wizard support for gcc cross compilers.
 
 # copyright
 copyright=\
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties
index 10ce6133572..879525615bc 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GCC Cross Compiler Support Source
+featureName=C/C++ GCC Cross Compiler Support Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Build integration and new project wizard support for GCC cross compilers.
+description=Build integration and new project wizard support for gcc cross compilers. Source code.
 
 # copyright
 copyright=\
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
index 7e8be9ec64a..e68003213bf 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Remote Launch
+featureName=C/C++ Remote Launch
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
index 7d24ed8f2b8..2158e95c7ab 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
+++ b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Remote Launch Source
+featureName=C/C++ Remote Launch Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=GNU RSE Remote Launch source code
+description=Launch configuration for running C/C++ executables on remote machines using the Remote System Explorer, and debugging through gdbserver. Source code.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.properties b/debug/org.eclipse.cdt.gnu.debug-feature/feature.properties
index acabe380714..f2a95052fc9 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.properties
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GNU Toolchain Debug Support
+featureName=C/C++ GNU Toolchain Debug Support
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=GNU Toolchain Debug Support for CDT
+description=Debug support for C/C++ GNU toolchain. Included in C/C++ Development Tools.
 
 # copyright
 copyright=\
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.properties b/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.properties
index c12a6ce197e..a8cb4287097 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.properties
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT GNU Toolchain Debug Support Source
+featureName=C/C++ GNU Toolchain Debug Support Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=GNU Toolchain Debug Support for CDT
+description=Debug support for C/C++ GNU toolchain. Source code. Included in C/C++ Development Tools SDK.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
index 78ae4ade797..c6e6b5d7c15 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ DSF gdb Debugger Integration
+featureName=C/C++ DSF GDB Debugger Integration
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=GDB DSF Debugger Integration
+description=DSF integration with gdb debugger. Included in C/C++ Development Tools.
 
 # copyright
 copyright=\
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/sourceTemplateFeature/feature.properties b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/sourceTemplateFeature/feature.properties
index 8c598ee6be4..2a48045707a 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/sourceTemplateFeature/feature.properties
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ DSF gdb Debugger Integration Source
+featureName=C/C++ DSF GDB Debugger Integration Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=GDB DSF Debugger Integration source code.
+description=DSF integration with gdb debugger. Source code. Included in C/C++ Development Tools SDK.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.properties b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.properties
index a5f8eb3e6d7..0bd1ebc02b7 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.properties
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT Debugger Services Framework (DSF) Examples
+featureName=C/C++ Debugger Services Framework (DSF) Examples
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=DSF Examples including basic framework feature tutorial examples and the PDA debugger integration.
+description=Includes basic framework feature tutorial examples and an example of the PDA debugger integration.
 
 # copyright
 copyright=\
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.properties b/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.properties
index e29d4d0c9f5..9eb73975074 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.properties
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Tooling Source
+featureName=C/C++ Debugger Services Framework (DSF) Examples Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=API documentation and source code zips for Eclipse C/C++ development tools.
+description=Includes basic framework feature tutorial examples and an example of the PDA debugger integration. Source code.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.properties b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.properties
index 71afc89c09a..d877aa418aa 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.properties
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=LR Parser
+featureName=C99 LR Parser
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/sourceTemplateFeature/feature.properties b/lrparser/org.eclipse.cdt.core.lrparser.feature/sourceTemplateFeature/feature.properties
index a557e2154a6..f5ad72c1810 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/sourceTemplateFeature/feature.properties
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=LR Parser Source
+featureName=C99 LR Parser Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Parser and language support for the C99 variant of the C programming language.
+description=Parser and language support for the C99 variant of the C programming language. Source code.
 
 # copyright
 copyright=\
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.properties b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.properties
index c3fe09fae66..7353a43a5d8 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.properties
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=LR Parser SDK Feature
+featureName=C99 LR Parser SDK
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Parser and language support for the C99 variant of the C programming language.
+description=Parser and language support for the C99 variant of the C programming language. Software development kit including source code and developer documentation.
 
 # copyright
 copyright=\
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.properties b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.properties
index 86b15d52c29..b19a1f44e49 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.properties
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.properties
@@ -20,7 +20,7 @@ http://www.eclipse.org/legal/epl-v10.html\n
 
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Memory View Enhancements
+featureName=C/C++ Memory View Enhancements
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -29,7 +29,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Traditional Rendering, Find/Replace, Import/Export
+description=Additional features for debug Memory View - traditional rendering, Find/Replace, Import/Export.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties b/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties
index e6446f31cbd..8408790df7b 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Memory View Enhancements Source
+featureName=C/C++ Memory View Enhancements Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT update site
 
 # "description" property - description of the feature
-description=Traditional Rendering, Find/Replace, Import/Export
+description=Additional features for debug Memory View - traditional rendering, Find/Replace, Import/Export. Source code.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
diff --git a/p2/org.eclipse.cdt.p2-feature/feature.properties b/p2/org.eclipse.cdt.p2-feature/feature.properties
index 726cc00c81e..d946821ded8 100644
--- a/p2/org.eclipse.cdt.p2-feature/feature.properties
+++ b/p2/org.eclipse.cdt.p2-feature/feature.properties
@@ -16,7 +16,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse CDT p2 Toolchain Installer
+featureName=P2 C/C++ Toolchain Installer
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -25,7 +25,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse p2-based installer for toolchains and libraries.
+description=Eclipse p2-based installer for toolchains and libraries. Included in C/C++ Development Tools.
 
 # copyright
 copyright=\
diff --git a/releng/org.eclipse.cdt-feature/feature.properties b/releng/org.eclipse.cdt-feature/feature.properties
index 40f42ee7dec..33da98b0c83 100644
--- a/releng/org.eclipse.cdt-feature/feature.properties
+++ b/releng/org.eclipse.cdt-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Tools
+featureName=C/C++ Development Tools
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ development tools. (Binary runtime and user documentation.)
+description=Eclipse C/C++ development tools. Binary runtime and user documentation.
 
 # copyright
 copyright=\
diff --git a/releng/org.eclipse.cdt-feature/sourceTemplateFeature/feature.properties b/releng/org.eclipse.cdt-feature/sourceTemplateFeature/feature.properties
index d05cb7e204f..a1ed11f87bd 100644
--- a/releng/org.eclipse.cdt-feature/sourceTemplateFeature/feature.properties
+++ b/releng/org.eclipse.cdt-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Tooling Source
+featureName=C/C++ Development Tools Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.properties b/releng/org.eclipse.cdt.platform-feature/feature.properties
index e4e372b4c98..fe25c95a9d8 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.properties
+++ b/releng/org.eclipse.cdt.platform-feature/feature.properties
@@ -15,13 +15,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Platform
+featureName=C/C++ Development Platform
 
 # "updateSiteName" property - label for the update site
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ Development Platform. It contains no toolchain integrations.
+description=Eclipse C/C++ development platform. Contains no toolchain integrations. Included in C/C++ Development Tools.
 
 # copyright
 copyright=\
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.properties b/releng/org.eclipse.cdt.sdk-feature/feature.properties
index 5c0651b1771..2d1518be98f 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Tools SDK
+featureName=C/C++ Development Tools SDK
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ Development Tools  SDK. (Software Development Kit including source code and developer documentation.)
+description=Eclipse C/C++ development tools. Software development kit including source code and developer documentation.
 
 # copyright
 copyright=\
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.properties b/releng/org.eclipse.cdt.testing-feature/feature.properties
index bdf224b1bc2..37099231ceb 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.properties
+++ b/releng/org.eclipse.cdt.testing-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse CDT Testing Feature
+featureName=CDT Tests
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ development tools testing feature.
+description=Tests for CDT.
 
 # copyright
 copyright=\
diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.properties b/upc/org.eclipse.cdt.bupc-feature/feature.properties
index 87fc60423e7..d4dbeea5bbb 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.properties
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Berkeley UPC Tool Chain Support
+featureName=Unified Parallel C Berkeley UPC Toolchain Support
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Berkeley Unified Parallel C (UPC) Tool Chain Support
+description=Support for Berkeley Unified Parallel C (UPC) toolchain.
 
 # copyright
 copyright=\
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
index 64606fa45b6..46650ced6f0 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Support for the Unified Parallel C variant of the C programming language.
+description=Support for the Unified Parallel C variant of the C programming language. Source code.
 
 # copyright
 copyright=\
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.properties
index 62e6767e6fd..fa84d04e020 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.properties
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Unified Parallel C Support SDK Feature
+featureName=Unified Parallel C Support SDK
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Support for the Unified Parallel C variant of the C programming language.
+description=Support for the Unified Parallel C variant of the C programming language. Software development kit including source code and developer documentation.
 
 # copyright
 copyright=\
diff --git a/util/org.eclipse.cdt.util-feature/feature.properties b/util/org.eclipse.cdt.util-feature/feature.properties
index ac1297925ee..a28248cbf55 100644
--- a/util/org.eclipse.cdt.util-feature/feature.properties
+++ b/util/org.eclipse.cdt.util-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=CDT Utilities
+featureName=Miscellaneous C/C++ Utilities
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Utilities for the C/C++ Development Tools.
+description=Miscellaneous and experimental utilities not intended for wide audience.
 
 # copyright
 copyright=\
diff --git a/xlc/org.eclipse.cdt.xlc.feature/sourceTemplateFeature/feature.properties b/xlc/org.eclipse.cdt.xlc.feature/sourceTemplateFeature/feature.properties
index 6703b479de4..b14813d03fc 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/sourceTemplateFeature/feature.properties
+++ b/xlc/org.eclipse.cdt.xlc.feature/sourceTemplateFeature/feature.properties
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Support for the IBM XL C/C++ compilers.
+description=Support for the IBM XL C/C++ compilers. Source code.
 
 # copyright
 copyright=\
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.properties b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.properties
index aeae8f18c38..4a23e2e8680 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.properties
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.properties
@@ -24,7 +24,7 @@ providerName=Eclipse CDT
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Support for the IBM XL C/C++ compilers.
+description=Support for the IBM XL C/C++ compilers. Software development kit including source code and developer documentation.
 
 # copyright
 copyright=\