8 files changed, 15 insertions, 11 deletions
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 9c01e2342..484933231 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -217,7 +217,7 @@ function PutDescription() {
 
   <tr bgcolor="[% tablecolour %]">
     <td align="right" valign="top">
-      <b>Hardware Platform</b>
+      <b>[% field_descs.rep_platform FILTER html %]</b>
     </td>
     <td valign="top">
       [% PROCESS select sel = 'rep_platform' %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 6a7f76c87..99b231c8e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -297,7 +297,8 @@
     [%############%]    
     <tr>
       <td class="field_label">
-        <label for="rep_platform" accesskey="h"><b>Platform</b></label>:
+        <label for="rep_platform" accesskey="h">
+          <b>[% field_descs.rep_platform FILTER html %]</b></label>:
       </td>
       <td class="field_value">
        [% INCLUDE bug/field.html.tmpl
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index c51dc233a..e1ffa8770 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -95,7 +95,8 @@
 
     <th>
       <label for="rep_platform">
-        <a href="page.cgi?id=fields.html#rep_platform">Platform</a>:
+        <a href="page.cgi?id=fields.html#rep_platform">
+          [% field_descs.rep_platform FILTER html %]</a>:
       </label>
     </th>
     <td>
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 2b266d4ce..80ea38773 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -46,7 +46,7 @@
   {
     "bug_severity"         => { maxlength => 3 , title => "Sev" } , 
     "priority"             => { maxlength => 7 , title => "Pri" } , 
-    "rep_platform"         => { maxlength => 3 , title => "Plt" } , 
+    "rep_platform"         => { maxlength => 3 , title => "HW" } , 
     "bug_status"           => { maxlength => 4 } , 
     "assigned_to"          => { maxlength => 30 , ellipsis => "..." } , 
     "assigned_to_realname" => { maxlength => 20 , ellipsis => "..." } , 
diff --git a/template/en/default/pages/bug-writing.html.tmpl b/template/en/default/pages/bug-writing.html.tmpl
index ec997be0a..171699ffe 100644
--- a/template/en/default/pages/bug-writing.html.tmpl
+++ b/template/en/default/pages/bug-writing.html.tmpl
@@ -139,7 +139,8 @@ The window should scroll downwards. Scrolled content should be selected.
 </pre>
       </blockquote>
 
-      <p><b>Build Date &amp; Platform:</b> Date and platform of the build
+      <p><b>Build Date &amp; [% field_descs.rep_platform FILTER html %]:</b>
+      Date and [% field_descs.rep_platform FILTER lower FILTER html %] of the build
       in which you first encountered the [% terms.bug %].</p>
 
       <blockquote>
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index e21ce2ed7..54a3c37b2 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -1271,10 +1271,11 @@
   <li>Searching the Priority field if you typed something that exactly
     matched the name of a priority. You can explicitly search the
     Priority field if you want to find [% terms.bugs %] by priority.</li>
-  <li>Searching the Platform and OS fields if you typed in one of a
-    certain hard-coded list of strings (like "pc", "windows", etc.).
-    You can explicitly search these fields, instead, if you want to
-    find [% terms.bugs %] with a specific Platform or OS set.</li>
+  <li>Searching the [% field_descs.rep_platform FILTER html %] and OS fields
+    if you typed in one of a certain hard-coded list of strings (like "pc",
+    "windows", etc.). You can explicitly search these fields, instead, if you want
+    to find [% terms.bugs %] with a specific [% field_descs.rep_platform
+    FILTER html %] or OS set.</li>
 </ul>
 
 <h3 id="v36_feat_browse">Simple "Browse" Interface</h3>
diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl
index ae4f00cfc..ae51ffed7 100644
--- a/template/en/default/whine/mail.html.tmpl
+++ b/template/en/default/whine/mail.html.tmpl
@@ -63,7 +63,7 @@
         <th align="left">ID</th>
         <th align="left">Sev</th>
         <th align="left">Pri</th> 
-        <th align="left">Plt</th>
+        <th align="left">HW</th>
         <th align="left">Assignee</th>
         <th align="left">Status</th>
         <th align="left">Resolution</th>
diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl
index aa830243d..d6b43de6b 100644
--- a/template/en/default/whine/mail.txt.tmpl
+++ b/template/en/default/whine/mail.txt.tmpl
@@ -48,7 +48,7 @@
   [%+ urlbase %]show_bug.cgi?id=[% bug.bug_id +%]
   Priority: [%+ display_value("priority", bug.priority) -%]
   [% field_descs.bug_severity %]: [%+ display_value("bug_severity", bug.bug_severity) -%]
-  Platform: [%+ display_value("rep_platform", bug.rep_platform) %]
+  [%+ field.descs.rep_platform %]: [%+ display_value("rep_platform", bug.rep_platform) %]
   Assignee: [%+ bug.assigned_to %]
     Status: [%+ display_value("bug_status", bug.bug_status) %]
             [%- IF bug.resolution -%] Resolution: [% display_value("resolution", bug.resolution) -%]