Improve listing in "Report Bug or Enhancement" dialog

msohn · msohn · commit 456621e157a0 · 2016-09-23T11:02:59.000+02:00
Also improve feature names and descriptions to no longer use Eclipse
internal terms.

Bug: 496101
Change-Id: Ifa1c860b212781815ff83f06ac44acd6bf2a314b
Signed-off-by: Matthias Sohn &lt;matthias.sohn@sap.com&gt;
diff --git a/org.eclipse.egit-feature/feature.properties b/org.eclipse.egit-feature/feature.properties
@@ -6,14 +6,13 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 
-featureName=Eclipse Git Team Provider
+featureName=Git integration for Eclipse
 providerName=Eclipse EGit
 
 updateSiteName=Eclipse EGit Update Site
 
 # description property - text of the "Feature Descrption"
-description=\
-An Eclipse Git Team provider in pure Java.\n
+description=Versioning with Git, integration with Gerrit, GitHub, Gitflow, and Task repositories
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/org.eclipse.egit.core/plugin.properties b/org.eclipse.egit.core/plugin.properties
@@ -6,7 +6,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 ###############################################################################
-plugin_name=Git Team Provider Core
+plugin_name=Git integration for Eclipse - Core
 provider_name=Eclipse EGit
 patch_ContentTypeName=Patch File
 
diff --git a/org.eclipse.egit.doc/plugin.properties b/org.eclipse.egit.doc/plugin.properties
@@ -6,7 +6,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 Bundle-Vendor = Eclipse EGit
-Bundle-Name = Git Team Provider Documentation
+Bundle-Name = Git integration for Eclipse - Documentation
 cheatsheet.category = Team/Git
 cheatsheet.clone.name = Cloning a Git Repository
 cheatsheet.clone.desc = With the Git Clone Wizard you can clone repositories using different transport protocols.
diff --git a/org.eclipse.egit.gitflow-feature/feature.properties b/org.eclipse.egit.gitflow-feature/feature.properties
@@ -6,14 +6,13 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 
-featureName=Eclipse Git Team Provider - Gitflow support
+featureName=Git integration for Eclipse - Gitflow support
 providerName=Eclipse EGit
 
 updateSiteName=Eclipse EGit GitFlow Update Site
 
 # description property - text of the "Feature Descrption"
-description=\
-A GitFlow extension to Eclipse Git Team provider.\n
+description=GitFlow support for Git integration in Eclipse
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/org.eclipse.egit.gitflow.ui/plugin.properties b/org.eclipse.egit.gitflow.ui/plugin.properties
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
-plugin_name=Git Team Provider - UI for Gitflow support
+plugin_name=Git integration for Eclipse - UI for Gitflow support
 provider_name=Eclipse EGit
 TeamGitFlowInit.name = Init Git Flow
 TeamGitFlowMenu.name = Git Flow
diff --git a/org.eclipse.egit.gitflow/plugin.properties b/org.eclipse.egit.gitflow/plugin.properties
@@ -6,5 +6,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
-plugin_name=Git Team Provider - Gitflow support
+plugin_name=Git integration for Eclipse - Gitflow support
 provider_name=Eclipse EGit
diff --git a/org.eclipse.egit.mylyn-feature/feature.properties b/org.eclipse.egit.mylyn-feature/feature.properties
@@ -6,14 +6,13 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 
-featureName=Eclipse Git Team Provider - Task focused interface
+featureName=Git integration for Eclipse - Task focused interface
 providerName=Eclipse EGit
 
 updateSiteName=Eclipse EGit Update Site
 
-# description property - text of the "Feature Descrption"
-description=\
-Mylyn-EGit integration providing a task-focused interface for Eclipse Git Team Provider.\n
+# description property - text of the "Feature Description"
+description=Task-focused interface for Git integration in Eclipse
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
@@ -4,13 +4,13 @@
       This is a pure Java implementation of the Git version control system and integrates it into Eclipse.
    </description>
    <feature url="features/org.eclipse.egit_0.0.0.qualifier.jar" id="org.eclipse.egit" version="0.0.0" patch="true">
-      <category name="Eclipse Git Team Provider"/>
+      <category name="EGit"/>
    </feature>
    <feature url="features/org.eclipse.egit.sources_0.0.0.qualifier.jar" id="org.eclipse.egit.source" version="0.0.0" patch="true">
-      <category name="Eclipse Git Team Provider"/>
+      <category name="EGit"/>
    </feature>
    <feature url="features/org.eclipse.egit.mylyn_0.0.0.qualifier.jar" id="org.eclipse.egit.mylyn" version="0.0.0">
-      <category name="Eclipse Git Team Provider"/>
+      <category name="EGit"/>
    </feature>
    <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true">
       <category name="JGit"/>
@@ -28,24 +28,24 @@
       <category name="JGit"/>
    </feature>
    <feature url="features/org.eclipse.egit.gitflow.feature_0.0.0.qualifier.jar" id="org.eclipse.egit.gitflow.feature" version="0.0.0">
-      <category name="Eclipse Git Team Provider - experimental features (incubation)"/>
+      <category name="EGit.experimental"/>
    </feature>
    <feature url="features/org.eclipse.jgit.lfs_0.0.0.qualifier.jar" id="org.eclipse.jgit.lfs" version="0.0.0">
       <category name="JGit"/>
    </feature>
    <bundle id="org.eclipse.egit.ui.smartimport" version="0.0.0">
-      <category name="Eclipse Git Team Provider - experimental features (incubation)"/>
+      <category name="EGit.experimental"/>
    </bundle>
-   <category-def name="Eclipse Git Team Provider" label="Eclipse Git Team Provider">
+   <category-def name="EGit" label="Git integration for Eclipse">
       <description>
-         Eclipse Git Team Provider
+         Versioning with Git, integration with Gerrit, GitHub, Gitflow, and Task repositories
       </description>
    </category-def>
-   <category-def name="JGit" label="JGit">
+   <category-def name="JGit" label="Java implementation of Git">
       <description>
-         JGit
+         Java implementation of Git
       </description>
    </category-def>
-   <category-def name="Eclipse Git Team Provider - experimental features (incubation)" label="Eclipse Git Team Provider - experimental features  (incubation)"/>
+   <category-def name="EGit.experimental" label="Git integration for Eclipse - experimental features  (incubation)"/>
    <repository-reference location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" />
 </site>
diff --git a/org.eclipse.egit.source-feature/feature.properties b/org.eclipse.egit.source-feature/feature.properties
@@ -6,7 +6,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 
-featureName=Eclipse Git Team Provider - Source Code
+featureName=Git integration for Eclipse - Source Code
 providerName=Eclipse EGit
 
 updateSiteName=Eclipse EGit Update Site
diff --git a/org.eclipse.egit.ui.smartimport/fragment.properties b/org.eclipse.egit.ui.smartimport/fragment.properties
@@ -1,4 +1,4 @@
-fragment_name=Git Team Provider - auto-import for Eclipse >= 4.6
+fragment_name=Git integration for Eclipse - auto-import for Eclipse >= 4.6
 provider_name=Eclipse EGit
 EasymportGitWizard_label=Projects from Git (with smart import)
 EasymportGitWizard_description=Allow to detect, configure and import projects (and nested projects) from a Git repository into workspace
diff --git a/org.eclipse.egit.ui/icons/egit.png b/org.eclipse.egit.ui/icons/egit.png
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
@@ -10,9 +10,12 @@
 #    Daniel Megert <daniel_megert@ch.ibm.com> - Removed two duplicate keys - http://bugs.eclipse.org/364013
 ###############################################################################
 
-plugin_name=Git Team Provider UI
+plugin_name=Git integration for Eclipse - UI
 provider_name=Eclipse EGit
 
+support.egit.name=Git integration for Eclipse
+support.egit.description=Versioning with Git, integration with Gerrit, GitHub, Gitflow, and Task repositories
+
 Git=Git
 
 Git_clone_category=Git
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
@@ -6141,7 +6141,13 @@
   </extension>
   <extension
         point="org.eclipse.mylyn.tasks.bugs.support">
-        <product featureId="org.eclipse.egit" id="org.eclipse.egit" providerId="org.eclipse"/>
+        <product
+              description="%support.egit.description"
+              id="org.eclipse.egit"
+              name="%support.egit.name"
+              icon="icons/egit.png"
+              providerId="org.eclipse"
+              url="https://www.eclipse.org/egit"/>
 		<mapping namespace="org.eclipse.egit.ui" productId="org.eclipse.egit">
 			<property name="product" value="EGit"/>
 			<property name="component" value="UI"/>
@@ -6154,6 +6160,18 @@
 			<property name="product" value="EGit"/>
 			<property name="component" value="Mylyn"/>
 		</mapping>
+		<mapping namespace="org.eclipse.egit.github" productId="org.eclipse.egit">
+			<property name="product" value="EGit"/>
+			<property name="component" value="GitHub"/>
+		</mapping>
+		<mapping namespace="org.eclipse.egit.mylyn.internal.github" productId="org.eclipse.egit">
+			<property name="product" value="EGit"/>
+			<property name="component" value="GitHub"/>
+		</mapping>
+		<mapping namespace="org.eclipse.egit.gitflow" productId="org.eclipse.egit">
+			<property name="product" value="EGit"/>
+			<property name="component" value="Gitflow"/>
+		</mapping>
   </extension>
   <extension
         point="org.eclipse.egit.ui.cloneSourceProvider">
diff --git a/org.eclipse.egit/about.ini b/org.eclipse.egit/about.ini
@@ -5,7 +5,7 @@
 # This file does not need to be translated.
 
 # Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=Eclipse Git is an Eclipse Team provider based on JGit, a pure Java implementation of the Git version control system.\n\
+aboutText=Eclipse Git is the Git integration for Eclipse based on JGit, a pure Java implementation of the Git version control system.\n\
 \n\Copyright (c) 2005, 2009 EGit project committers and others.  All rights reserved.\n\
 Visit http://eclipse.org/egit
 
diff --git a/org.eclipse.egit/plugin.properties b/org.eclipse.egit/plugin.properties
@@ -6,5 +6,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
-plugin_name=Git Team Provider
+plugin_name=Git integration for Eclipse
 provider_name=Eclipse EGit

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# http://www.eclipse.org/legal/epl-v10.html`
`7`	`7`	`#`
`8`	`8`	`###############################################################################`
`9`		`-plugin_name=Git Team Provider Core`
	`9`	`+plugin_name=Git integration for Eclipse - Core`
`10`	`10`	`provider_name=Eclipse EGit`
`11`	`11`	`patch_ContentTypeName=Patch File`
`12`	`12`