State label name as well in order to disambiguate when used from Form… (#2349)

* State label name as well in order to disambiguate when used from FormValidation#aggregate

core/src/main/java/hudson/model/AbstractProject.java

@@ -2098,7 +2098,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                 }
             }
             return FormValidation.okWithMarkup(Messages.AbstractProject_LabelLink(
-                    j.getRootUrl(), l.getUrl(), l.getNodes().size(), l.getClouds().size())
+                    j.getRootUrl(), Util.escape(l.getName()), l.getUrl(), l.getNodes().size(), l.getClouds().size())
             );
         }
 

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

@@ -74,7 +74,7 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
 AbstractProject.AssignedLabelString.NoMatch=\
   There's no agent/cloud that matches this assignment
 AbstractProject.CustomWorkspaceEmpty=Custom workspace is empty.
-AbstractProject.LabelLink=<a href="{0}{1}">Label</a> is serviced by {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds}
+AbstractProject.LabelLink=<a href="{0}{2}">Label {1}</a> is serviced by {3,choice,0#no nodes|1#1 node|1<{3} nodes}{4,choice,0#|1# and 1 cloud|1< and {4} clouds}
 
 Api.MultipleMatch=XPath "{0}" matched {1} nodes. \
     Create XPath that only matches one, or use the "wrapper" query parameter to wrap them all under a root element.

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

@@ -106,8 +106,8 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
 AbstractProject.CustomWorkspaceEmpty=\
  \u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u043e\u0442\u043e \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u0435 \u043f\u0440\u0430\u0437\u043d\u043e.
 AbstractProject.LabelLink=\
- <a href="{0}{1}">\u0415\u0442\u0438\u043a\u0435\u0442\u044a\u0442</a> \u0441\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0432\u0430 \u043e\u0442\
- {2,choice,0#\u043d\u0438\u043a\u043e\u043b\u043a\u043e \u043c\u0430\u0448\u0438\u043d\u0438|1#1 \u043c\u0430\u0448\u0438\u043d\u0430|1<{2} \u043c\u0430\u0448\u0438\u043d\u0438}{3,choice,0#|1# \u0438 1 \u043e\u0431\u043b\u0430\u043a|1< \u0438 {3} \u043e\u0431\u043b\u0430\u043a\u0430}
+ <a href="{0}{2}">\u0415\u0442\u0438\u043a\u0435\u0442\u044a\u0442 {1}</a> \u0441\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0432\u0430 \u043e\u0442\
+ {3,choice,0#\u043d\u0438\u043a\u043e\u043b\u043a\u043e \u043c\u0430\u0448\u0438\u043d\u0438|1#1 \u043c\u0430\u0448\u0438\u043d\u0430|1<{3} \u043c\u0430\u0448\u0438\u043d\u0438}{4,choice,0#|1# \u0438 1 \u043e\u0431\u043b\u0430\u043a|1< \u0438 {4} \u043e\u0431\u043b\u0430\u043a\u0430}
 
 Api.MultipleMatch=\
  \u0418\u0437\u0440\u0430\u0437\u044a\u0442 \u0447\u0440\u0435\u0437 XPath \u201e{0}\u201c \u043e\u0442\u0433\u043e\u0432\u0430\u0440\u044f \u043d\u0430 {1} \u043c\u0430\u0448\u0438\u043d\u0438. \u0417\u0430\u0434\u0430\u0439\u0442\u0435 \u0438\u0437\u0440\u0430\u0437, \u043a\u043e\u0439\u0442\u043e \u0434\u0430

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

@@ -50,7 +50,7 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
 AbstractProject.AssignedLabelString.NoMatch=\
   N\u0117ra \u0161io priskyrimo atitinkan\u010dio agento/debesies
 AbstractProject.CustomWorkspaceEmpty=Savas darbalaukis tu\u0161\u010dias.
-AbstractProject.LabelLink=<a href="{0}{1}">Etiket\u0119</a> aptarnauja {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds}
+AbstractProject.LabelLink=<a href="{0}{2}">Etiket\u0119 {1}</a> aptarnauja {3,choice,0#no nodes|1#1 node|1<{3} nodes}{4,choice,0#|1# and 1 cloud|1< and {4} clouds}
 
 Api.MultipleMatch=XPath "{0}" atitiko {1} mazgus. \
     Sukurkite XPath, kuris atitinka tik vien\u0105 mazg\u0105 arba naudokite \u201eapgaubiant\u012f\u201c u\u017eklausos parametr\u0105, kuris visus juos apgaubt\u0173 po \u0161akniniu elementu.