Merge pull request #800 from ndeloof/pronoun

offer better pronouns for common job types

core/src/main/java/hudson/matrix/MatrixProject.java

@@ -41,6 +41,7 @@ import hudson.model.Descriptor;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Node;
 import hudson.slaves.WorkspaceList;
+import hudson.util.AlternativeUiTextProvider;
 import jenkins.model.Jenkins;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
@@ -194,6 +195,11 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> im
         super(parent, name);
     }
 
+    @Override
+    public String getPronoun() {
+        return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MatrixProject_Pronoun());
+    }
+
     /**
      * Gets the workspace location that {@link MatrixConfiguration} uses.
      *

core/src/main/resources/hudson/matrix/Messages.properties

@@ -22,6 +22,7 @@
 
 MatrixBuild.depends_on_this={0} depends on this.
 MatrixProject.DisplayName=Build multi-configuration project
+MatrixProject.Pronoun=Multi-configuration project
 MatrixProject.DuplicateAxisName=Duplicate axis name
 
 MatrixBuild.Triggering=Triggering {0}

core/src/main/resources/hudson/model/Messages.properties

@@ -119,7 +119,7 @@ Descriptor.From=(from <a href="{1}">{0}</a>)
 Executor.NotAvailable=N/A
 
 ExternalJob.DisplayName=Monitor an external job
-ExternalJob.Pronoun=Job
+ExternalJob.Pronoun=External Job
 
 FreeStyleProject.DisplayName=Build a free-style software project
 

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -67,6 +67,7 @@ import hudson.tasks.Maven.MavenInstallation;
 import hudson.tasks.Publisher;
 import hudson.tasks.JavadocArchiver;
 import hudson.tasks.junit.JUnitResultArchiver;
+import hudson.util.AlternativeUiTextProvider;
 import hudson.util.CopyOnWriteMap;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
@@ -446,6 +447,12 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
         return getItem(name);
     }
 
+    @Override
+    public String getPronoun() {
+        return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MavenModuleSet_Pronoun());
+    }
+
+
     @Override   // to make this accessible from MavenModuleSetBuild
     protected void updateTransientActions() {
         super.updateTransientActions();

maven-plugin/src/main/resources/hudson/maven/Messages.properties

@@ -31,6 +31,7 @@ MavenBuilder.Waiting=Waiting for Jenkins to finish collecting data
 MavenModule.Pronoun=Module
 
 MavenModuleSet.DiplayName=Build a maven2/3 project
+MavenModuleSet.Pronoun=Maven2/3 project
 
 # XXX obsolete keys?
 MavenModuleSet.AlternateSettingsRelativePath=Alternate settings file must be a relative path.