consistent feature names

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

8 files changed, 12 insertions, 8 deletions

diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
index 0e8ed1ba..bf9f47e0 100644
--- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Feb 08 09:45:35 CET 2011
+#Sat May 14 21:55:08 EDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -181,9 +181,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/org.eclipse.m2e.core/about.ini b/org.eclipse.m2e.core/about.ini
index 3a6b91f9..f2d79c5f 100644
--- a/org.eclipse.m2e.core/about.ini
+++ b/org.eclipse.m2e.core/about.ini
@@ -5,7 +5,7 @@
 # This file does not need to be translated.
 
 # Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
+aboutText=M2E - Maven Integration for Eclipse
 
 # Property "featureImage" contains path to feature image (32x32)
 featureImage=m2eclipse.gif
diff --git a/org.eclipse.m2e.core/build.properties b/org.eclipse.m2e.core/build.properties
index 6188acf8..a54ef0b0 100644
--- a/org.eclipse.m2e.core/build.properties
+++ b/org.eclipse.m2e.core/build.properties
@@ -16,7 +16,8 @@ bin.includes = plugin.xml,\
                .options,\
                .,\
                schema/,\
-               about.html
+               about.html,\
+               m2eclipse.gif
 jars.compile.order = .
 output.. = target/classes
 source.. = src/,\
diff --git a/org.eclipse.m2e.core/m2eclipse.gif b/org.eclipse.m2e.core/m2eclipse.gif
new file mode 100644
index 00000000..585a2aba
--- /dev/null
+++ b/org.eclipse.m2e.core/m2eclipse.gif
diff --git a/org.eclipse.m2e.feature/feature.properties b/org.eclipse.m2e.feature/feature.properties
index c230f53f..0dcaa40a 100644
--- a/org.eclipse.m2e.feature/feature.properties
+++ b/org.eclipse.m2e.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=m2e - Maven Integration for Eclipse (Incubation)
+featureName=M2E - Maven Integration for Eclipse (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - m2e
diff --git a/org.eclipse.m2e.logback.feature/feature.properties b/org.eclipse.m2e.logback.feature/feature.properties
index 05c9d4d8..35361b01 100644
--- a/org.eclipse.m2e.logback.feature/feature.properties
+++ b/org.eclipse.m2e.logback.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Maven Integration for Eclipse - slf4j over logback logging (Optional)
+featureName=M2E - slf4j over logback logging (Incubation, Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - m2e
diff --git a/org.eclipse.m2e.sdk.feature/feature.properties b/org.eclipse.m2e.sdk.feature/feature.properties
index bb33e126..2244fab1 100644
--- a/org.eclipse.m2e.sdk.feature/feature.properties
+++ b/org.eclipse.m2e.sdk.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=M2Eclipse Extensions Development Support (Optional)
+featureName=M2E - Extensions Development Support (Incubation, Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org - m2e
diff --git a/org.eclipse.m2e.site/feature.xml b/org.eclipse.m2e.site/feature.xml
index cc0721d4..d45ffe2b 100644
--- a/org.eclipse.m2e.site/feature.xml
+++ b/org.eclipse.m2e.site/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.m2e.site"
-      label="m2e - Maven Integration for Eclipse Update Site"
+      label="M2E - Maven Integration for Eclipse Update Site"
       version="0.13.0.qualifier"
       provider-name="Eclipse.org">