13 files changed, 12 insertions, 12 deletions
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index dd624dbdd..92fa47a53 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -39,7 +39,7 @@
   #%]
 
 [% # use the global field descs %]
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% IF matchsuccess == 1 %]
   [% PROCESS global/header.html.tmpl title="Confirm Match" %]
diff --git a/template/en/default/global/field-descs.html.tmpl b/template/en/default/global/field-descs.none.tmpl
index 6d8086423..6d8086423 100644
--- a/template/en/default/global/field-descs.html.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 965a3fb27..33ebb9472 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -29,7 +29,7 @@
   # alphabetical order by error tag, and leave a blank line between errors.
   #%]  
   
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
   
 [% DEFAULT title = "Error" %]
 
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index d049d0c6c..097a886bb 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -28,7 +28,7 @@
   this feature requires cookies to work.
 </p>
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 [% field_descs.short_short_desc     = "Summary (first 60 characters)" %]
 [% field_descs.short_desc           = "Full Summary" %]
 [% field_descs.assigned_to_realname = "Assignee Realname" %]
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 455cf1222..8a5d3ac57 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -32,7 +32,7 @@
   # by the browser.
   #%]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 [% field_descs.short_short_desc     = field_descs.short_desc  %]
 [% field_descs.assigned_to_realname = field_descs.assigned_to %]
 [% field_descs.reporter_realname    = field_descs.reporter    %]
diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index e199f115c..143768a25 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -21,7 +21,7 @@
 
 [% y_label = "Bugs" %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl
index 1c84e1bf1..5fe7663d0 100644
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
@@ -21,7 +21,7 @@
 
 [% y_label = "Bugs" %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl
index 76a717779..38cc56cc4 100644
--- a/template/en/default/reports/report-pie.png.tmpl
+++ b/template/en/default/reports/report-pie.png.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 175479d84..f28c39590 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -31,7 +31,7 @@
   # tbl: Name of a hash in data which is the table to be plotted.
   #%]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 [% row_field_disp = field_descs.$row_field || row_field %]
diff --git a/template/en/default/reports/report.csv.tmpl b/template/en/default/reports/report.csv.tmpl
index 727acb311..6c3ad46d1 100644
--- a/template/en/default/reports/report.csv.tmpl
+++ b/template/en/default/reports/report.csv.tmpl
@@ -18,7 +18,7 @@
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 [% FOREACH tbl = tbl_names %]
   [% PROCESS "reports/report-table.csv.tmpl" %] 
 
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 494dd796f..00d589541 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -42,7 +42,7 @@
   [% row_field = "" %]
 [% END %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% tbl_field_disp = field_descs.$tbl_field || tbl_field %]
 [% col_field_disp = field_descs.$col_field || col_field %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index bdd90d54b..0b80bdb26 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -327,7 +327,7 @@ function selectProduct(f) {
   { value => "regexp", description => "matches the regexp" },
   { value => "notregexp", description => "doesn't match the regexp" } ] %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [%# If we resubmit to ourselves, we need to know if we are using a format. %]
 <input type="hidden" name="query_format" value="[% format %]">
diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl
index 9af620d34..cec33089a 100644
--- a/template/en/default/search/search-report-select.html.tmpl
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -24,7 +24,7 @@
   # default.$name.0: string. The default value for the block, if any.
   #%]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 
 [% BLOCK select %]
   [% rep_fields = ["product", "component", "version", "rep_platform",