Merge remote-tracking branch 'bmo/master'

16 files changed, 20 insertions, 20 deletions

diff --git a/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl b/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl
index 0bd81eae1..4c2609609 100644
--- a/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
index fde6434de..8fa43734b 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
@@ -14,16 +14,16 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
-[% DEFAULT 
+[% DEFAULT
   product.maxvotesperbug = constants.DEFAULT_VOTES_PER_BUG
   product.votesperuser = 0
   product.votestoconfirm = 0
 %]
-  
+
 <tr>
   <th align="right">Maximum votes per person:</th>
   <td><input size="5" maxlength="5" name="votesperuser" id="votesperuser"
diff --git a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
index 15fb1efe0..01005d776 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
index bbf0350a1..ad475a76b 100644
--- a/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl b/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl
index a753e3a66..5a9d315c2 100644
--- a/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
index b57a5cb27..e502c1e3a 100644
--- a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 [% IF bug.product_obj.votesperuser %]
@@ -23,7 +23,7 @@
       with
       <a href="page.cgi?id=voting/bug.html&amp;bug_id=
                [%- bug.id FILTER uri %]">
-        [%- bug.votes FILTER html %] 
+        [%- bug.votes FILTER html %]
         [% IF bug.votes == 1 %]
             vote
         [% ELSE %]
diff --git a/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl b/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl
index ebba6fcab..59c8eeedc 100644
--- a/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl b/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl
index a4530653b..b4dd16e90 100644
--- a/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl b/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl
index ae0d465dc..fd8a4cadd 100644
--- a/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl b/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl
index 2e2c2d995..55d3bf468 100644
--- a/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl
index 50e915941..7763f15d8 100644
--- a/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl b/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl
index 1becab4da..ba43380f0 100644
--- a/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl b/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl
index 3a1f5a189..9aedcd50c 100644
--- a/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl
@@ -14,10 +14,10 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
 [% reason_descs.${constants.REL_VOTER} = "You voted for the ${terms.bug}." %]
-[% watch_reason_descs.${constants.REL_VOTER} = 
+[% watch_reason_descs.${constants.REL_VOTER} =
   "You are watching a voter for the ${terms.bug}." %]
diff --git a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
index c2ff70728..057aa1d79 100644
--- a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl b/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl
index dca1dba00..b91c14dfe 100644
--- a/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
diff --git a/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl b/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl
index ca74f6d2d..c58db3800 100644
--- a/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl
@@ -14,7 +14,7 @@
   # Portions created by the Initial Developer are Copyright (C) 2010
   # the Initial Developer. All Rights Reserved.
   #
-  # Contributor(s): 
+  # Contributor(s):
   #   Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]