From 430baf5048c7ad3a2f405d627d5b0d03f60416df Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 15 Aug 2013 23:17:02 +0000
Subject: [PATCH] Bug 365499 - admin/products/groupcontrol/confirm-edit uses p
 as br r=sgreen, a=sgreen

git-svn-id: svn://10.0.0.236/trunk@264971 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev             |  2 +-
 .../groupcontrol/confirm-edit.html.tmpl       | 47 +++++++++++--------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index c892f3bda1e..4aa6b2049c7 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8702
\ No newline at end of file
+8703
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
index fc3ad9b82cf..354673c3da2 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -11,32 +11,41 @@
 [% END %]
 
 [% PROCESS global/header.html.tmpl title = title %]
+
 [% FOREACH group = mandatory_groups %]
-<P>
-group '[% group.name FILTER html %]' impacts [% group.count %] 
-[%+ terms.bugs %] for
-which the group is newly mandatory and will be added.
+  <p>
+    Group '[% group.name FILTER html %]' impacts 
+    [% IF group.count == 1 %]
+       one [%+ terms.bug %]
+    [% ELSE %]
+      [% group.count %] [%+ terms.bugs %]
+    [% END %]
+    for which this group is mandatory and will be added.
+  </p>
 [% END %]
 
 [% FOREACH group = na_groups %]
-<P>
-group '[% group.name FILTER html %]' impacts [% group.count %]&nbsp;
-[% terms.bugs %] for which the group is no longer applicable and will
-be removed.[% END %]
-<form action="editproducts.cgi" method="post" >
-
-  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
-
-  <br>
-     Click "Continue" to proceed with the change including the changes
-     indicated above.  If you do not want these changes, use "back" to
-     return to the previous page.
   <p>
-    <input type="hidden" name="confirmed" value="confirmed">
-    <input type="submit" id="update" value="Continue">
+    Group '[% group.name FILTER html %]' impacts 
+    [% IF group.count == 1 %]
+       one [%+ terms.bug %]
+    [% ELSE %]
+      [% group.count %] [%+ terms.bugs %]
+    [% END %]  
+    for which this group is no longer applicable and will be removed.
   </p>
+[% END %]
 
+<form action="editproducts.cgi" method="post" >
+  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+  <p>
+    <br>
+    Click "Continue" to proceed with the change including the changes
+    indicated above.  If you do not want these changes, use "back" to
+    return to the previous page.
+  </p>
+  <input type="hidden" name="confirmed" value="confirmed">
+  <input type="submit" id="update" value="Continue">
 </form>
 
-
 [% PROCESS global/footer.html.tmpl %]