Bug 76507: Replace "owner" by "assignee" (and "initial" by "default") - Patch by Tiago R. Mello <timello@async.com.br> r=LpSolit a=myk

6 files changed, 21 insertions, 21 deletions

diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index e2c77cca2..5e108e7a8 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -26,9 +26,9 @@
   #
   # bug_count: number; The number of bugs belonging to the component
   #
-  # initialowner: string; initial owner, may be empty
+  # initialowner: string; default assignee, may be empty
   #
-  # initialqacontact: string; if system parameter is set to use the initial
+  # initialqacontact: string; if system parameter is set to use the default
   #                           qa contact field, then this will be it, 
   #                           may be empty
   #
@@ -63,13 +63,13 @@
   <td valign="top">[% description FILTER html %]</td>
 </tr>
 <tr>
-  <td valign="top">Initial owner:</td>
+  <td valign="top">Default assignee:</td>
   <td valign="top">[% initialowner FILTER html %]</td>
   
 [% IF Param('useqacontact') %]
 </tr>
 <tr>
-  <td valign="top">Initial QA contact:</td>
+  <td valign="top">Default QA contact:</td>
   <td valign="top">[% initialqacontact FILTER html %]</td>
 [% END %]
   
diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index c8838eea6..769b61ca1 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -45,7 +45,7 @@
       </td>
     </tr>
     <tr>
-      <th align="right"><label for="initialowner">Initial Owner:</label></th>
+      <th align="right"><label for="initialowner">Default Assignee:</label></th>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialowner"
@@ -59,7 +59,7 @@
 [% IF Param('useqacontact') %]
     <tr>
       <th align="right">
-        <label for="initialqacontact">Initial QA Contact:</label></th>
+        <label for="initialqacontact">Default QA Contact:</label></th>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialqacontact"
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 580008008..64959ad96 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -24,9 +24,9 @@
   #
   # description: string; Component description, may be empty
   #
-  # initialowner: string; initial owner, may be empty
+  # initialowner: string; default assignee, may be empty
   #
-  # initialqacontact: string; initial qa contact, may be empty
+  # initialqacontact: string; default qa contact, may be empty
   #
   # product: string; The product the component belongs to
   #
@@ -55,7 +55,7 @@
       </td>
     </tr>
     <tr>
-      <td valign="top"><label for="initialowner">Initial owner:</label></td>
+      <td valign="top"><label for="initialowner">Default Assignee:</label></td>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialowner"
@@ -69,7 +69,7 @@
 [% IF Param('useqacontact') %]
     </tr>
     <tr>
-      <td valign="top"><label for="initialqacontact">Initial QA contact:</label></td>
+      <td valign="top"><label for="initialqacontact">Default QA contact:</label></td>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialqacontact"
diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl
index 027e1e028..c321219fc 100644
--- a/template/en/default/admin/components/list.html.tmpl
+++ b/template/en/default/admin/components/list.html.tmpl
@@ -23,7 +23,7 @@
   # components: array of hashes having the properties:
   #   - name: string; The name of the component.
   #   - description: string; The description of the component.
-  #   - initialowner: string; The initial owner of the component.
+  #   - initialowner: string; The default assignee of the component.
   #   - initialqacontact: string; The qa_contact of the component.
   #   - bug_count: number; The number of bugs in the component
   #                        (if showbugcounts defined).
@@ -65,7 +65,7 @@
      },
      { 
        name => "initialowner"
-       heading => "Initial owner"
+       heading => "Default Assignee"
      },
    ]
 %]
diff --git a/template/en/default/admin/components/updated.html.tmpl b/template/en/default/admin/components/updated.html.tmpl
index 2382814df..b4c4fea3c 100644
--- a/template/en/default/admin/components/updated.html.tmpl
+++ b/template/en/default/admin/components/updated.html.tmpl
@@ -30,9 +30,9 @@
   #
   # description & updated_description: the component description
   #
-  # initialowner & updated_initialowner: the initial owner
+  # initialowner & updated_initialowner: the default assignee
   #
-  # initialqacontact & updated_initialqacontact: the initial qa contact
+  # initialqacontact & updated_initialqacontact: the default qa contact
   #
   # product: string; the name of the product the component belongs to
   #%]
@@ -54,15 +54,15 @@
 [% END %]
 
 [% IF updated_initialowner %]
-  <p>Updated Initial Owner to: '[% initialowner FILTER html %]'.</p>
+  <p>Updated Default Assignee to: '[% initialowner FILTER html %]'.</p>
 [% END %]
 
 [% IF updated_initialqacontact %]
   <p>
   [% IF initialqacontact %]
-    Updated Initial QA Contact to '[% initialqacontact FILTER html %]'.
+    Updated Default QA Contact to '[% initialqacontact FILTER html %]'.
   [% ELSE %]
-    Removed initial QA Contact.
+    Removed Default QA Contact.
   [% END %]
   </p>
 [% END %]
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 91b9395b8..4e5fd9c10 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -24,8 +24,8 @@
   # product_responsibilities: list of hashes, one entry per Bugzilla component.
   #                           productname:      Name of the product.
   #                           componentname:    Name of the component.
-  #                           initialowner:     User ID of initial owner.
-  #                           initialqacontact: User ID of initial QA contact.
+  #                           initialowner:     User ID of default assignee.
+  #                           initialqacontact: User ID of default QA contact.
   # bugs:                     number of bugs the viewed user has a role in
   # bug_activity:             number of bugs the viewed user has activity
   #                           entries on
@@ -57,8 +57,8 @@
 %]
 
 [% responsibilityterms = {
-  'initialowner'     => 'Initial Owner',
-  'initialqacontact' => 'Initial QA Contact'
+  'initialowner'     => 'Default Assignee',
+  'initialqacontact' => 'Default QA Contact'
   }
 %]