Merge remote-tracking branch 'bmo/master'

5 files changed, 18 insertions, 18 deletions

diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index 068e8e254..1d47610df 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -63,20 +63,20 @@
 </table>
 
 <h2>Confirmation</h2>
-  
+
 [% IF milestone.bug_count %]
 
   <table border="0" cellpadding="20" width="70%" bgcolor="red">
   <tr><td>
     There
-    [% IF milestone.bug_count > 1 %] 
-      are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] 
+    [% IF milestone.bug_count > 1 %]
+      are [% milestone.bug_count FILTER none %] [%+ terms.bugs %]
     [% ELSE %]
       is 1 [% terms.bug %]
     [% END %]
     entered for this milestone! When you delete this milestone,
     <b><blink>ALL</blink></b> of these [% terms.bugs %] will be retargeted
-    to [% product.default_milestone FILTER html %], the default milestone for 
+    to [% product.default_milestone FILTER html %], the default milestone for
     the [% product.name FILTER html %] product.
   </td></tr>
   </table>
@@ -95,4 +95,4 @@
 
 [% PROCESS admin/milestones/footer.html.tmpl %]
 
-[% PROCESS global/footer.html.tmpl %] 
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl
index d7c2f580f..740ef2e67 100644
--- a/template/en/default/admin/milestones/create.html.tmpl
+++ b/template/en/default/admin/milestones/create.html.tmpl
@@ -22,7 +22,7 @@
   # product: object; Bugzilla::Product object representing the product to
   #               which the milestone belongs.
   #%]
-  
+
 [% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %]
 [% subheader = BLOCK %]This page allows you to add a new milestone to product
                 '[% product.name FILTER html %]'.[% END %]
diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl
index 1cae69e17..f35283d6f 100644
--- a/template/en/default/admin/milestones/footer.html.tmpl
+++ b/template/en/default/admin/milestones/footer.html.tmpl
@@ -40,11 +40,11 @@
 [% UNLESS no_add_milestone_link %]
   <a title="Add a milestone to product '[% product.name FILTER html %]'"
      href="editmilestones.cgi?action=add&amp;product=
-          [%- product.name FILTER uri %]">Add</a> a milestone. 
+          [%- product.name FILTER uri %]">Add</a> a milestone.
 [% END %]
 
 [% IF milestone.name && !no_edit_milestone_link %]
-  Edit milestone <a 
+  Edit milestone <a
   title="Edit Milestone '[% milestone.name FILTER html %]' of product '
          [%- product.name FILTER html %]'"
   href="editmilestones.cgi?action=edit&amp;product=
@@ -54,13 +54,13 @@
 [% END %]
 
 [% UNLESS no_edit_other_milestones_link %]
-  Edit other milestones of product <a 
+  Edit other milestones of product <a
   href="editmilestones.cgi?product=
         [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>.
 
 [% END %]
 
-  Edit product <a 
+  Edit product <a
   href="editproducts.cgi?action=edit&amp;product=
         [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>.
 
diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl
index 6392f567f..4a79b9c31 100644
--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -45,12 +45,12 @@
 
 
 [% columns = [
-     { 
+     {
        name => "name"
        heading => "Edit milestone..."
        contentlink => edit_contentlink
      },
-     { 
+     {
        name => "sortkey"
        heading => "Sortkey"
      },
@@ -88,8 +88,8 @@
      content => "(Default milestone)"
      override_contentlink => 1
      contentlink => undef
-   } 
-%] 
+   }
+%]
 
 [% Hook.process('before_table') %]
 
diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl
index 587db6d65..ab052377b 100644
--- a/template/en/default/admin/milestones/select-product.html.tmpl
+++ b/template/en/default/admin/milestones/select-product.html.tmpl
@@ -32,14 +32,14 @@
 %]
 
 [% columns = [
-     { 
+     {
        name => "name"
        heading => "Edit milestones of..."
-       contentlink => "editmilestones.cgi?product=%%name%%" 
+       contentlink => "editmilestones.cgi?product=%%name%%"
      },
-     { 
+     {
        name => "description"
-       heading => "Description" 
+       heading => "Description"
        allow_html_content => 1
      }
    ]