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

14 files changed, 42 insertions, 42 deletions

diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index bd265ca9f..90cbc7e25 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -28,7 +28,7 @@
   #               Array of users watching this user's account.
   # excludeself:  boolean.
   #               True if user is not receiving self-generated mail.
-  # <rolename>:   Multiple hashes, one for each rolename (e.g. owner; see
+  # <rolename>:   Multiple hashes, one for each rolename (e.g. assignee; see
   #               below), keyed by reasonname (e.g. comments; again, see
   #               below). The value is a boolean - true if the user is
   #               receiving mail for that reason when in that role.
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'
   }
 %]
 
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index cf354ad05..11a29a223 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -223,7 +223,7 @@ function set_assign_to() {
          size => 32
          emptyok => 1
        %]
-      <noscript>(Leave blank to assign to default component owner)</noscript>
+      <noscript>(Leave blank to assign to component's default assignee)</noscript>
     </td>
   </tr>
   
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 15bbcbacd..2ade9a373 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -118,7 +118,7 @@
 
         <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent">
         <label for="knob-reassign-cmp">
-          Reassign [% terms.bug %] to owner
+          Reassign [% terms.bug %] to default assignee
           [% " and QA contact" IF Param('useqacontact') %]
           of selected component
         </label>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index d01af2375..f19ecbe33 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -280,17 +280,17 @@
     '[% name FILTER html %]' is too long ([% name.size %] characters).
 
   [% ELSIF error == "component_need_initialowner" %]
-    [% title = "Component Requires Initial Owner" %]
-    You must enter an initial owner for component '[% name FILTER html %]'.
+    [% title = "Component Requires Default Assignee" %]
+    You must enter a default assignee for component '[% name FILTER html %]'.
 
   [% ELSIF error == "component_need_valid_initialowner" %]
-    [% title = "Component Requires A Valid Initial Owner" %]
-    You must use an existing [% terms.Bugzilla %] account as initial owner for
+    [% title = "Component Requires A Valid Default Assignee" %]
+    You must use an existing [% terms.Bugzilla %] account as the default assignee for
     component '[% name FILTER html %]'.
 
   [% ELSIF error == "component_need_valid_initialqacontact" %]
-    [% title = "Component Requires A Valid Initial QA Contact" %]
-    You must use an existing [% terms.Bugzilla %] account as initial QA contact for
+    [% title = "Component Requires A Valid Default QA Contact" %]
+    You must use an existing [% terms.Bugzilla %] account as default QA contact for
     component '[% name FILTER html %]'.
      
   [% ELSIF error == "product_not_specified" %]
@@ -516,7 +516,7 @@
     from <em>[% oldvalue FILTER html %]</em> to 
     <em>[% newvalue FILTER html %]</em>, but only
     [% IF privs < 3 %]
-      the owner
+      the assignee
       [% IF privs < 2 %] or reporter [% END %]
       of the [% terms.bug %], or
     [% END %]
@@ -797,12 +797,12 @@
                 
   [% ELSIF error == "need_component" %]
     [% title = "Component Required" %]
-    You must specify a component to help determine the new owner of these 
+    You must specify a component to help determine the new assignee of these 
     [% terms.bugs %].
 
   [% ELSIF error == "need_product" %]
     [% title = "Product Required" %]
-    You must specify a product to help determine the new owner of these [% terms.bugs %].
+    You must specify a product to help determine the new assignee of these [% terms.bugs %].
 
   [% ELSIF error == "need_quip" %]
     [% title = "Quip Required" %]
@@ -958,7 +958,7 @@
   [% ELSIF error == "reassign_to_empty" %]
     [% title = "Illegal Reassignment" %]
     To reassign [% terms.abug %], you must provide an address for
-    the new owner. If you did not intentionally clear out the 
+    the new assignee. If you did not intentionally clear out the 
     "Reassign [% terms.bug %] to" field, [% Param("browserbugmessage") %]
 
   [% ELSIF error == "report_access_denied" %]
@@ -1088,8 +1088,8 @@
 
   [% ELSIF error == "user_has_responsibility" %]
     [% title = "Can't Delete User Account" %]
-    The user you want to delete is set up for roles as initial [% terms.bug %]
-    owner or QA contact for at least one component.
+    The user you want to delete is set up for roles as default [% terms.bug %]
+    assignee or QA contact for at least one component.
     For this reason, you cannot delete the account at this time.
 
   [% ELSIF error == "user_login_required" %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 64131e973..1bee75f54 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -317,7 +317,7 @@
        name="knob"
        value="reassignbycomponent">
 <label for="knob-reassignbycomponent">
-  Reassign [% terms.bugs %] to owner of selected component
+  Reassign [% terms.bugs %] to default assignee of selected component
 </label><br>
 
 <input type="submit" value="Commit">
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 0d3a38d5e..9961bb1b3 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -170,7 +170,7 @@
 
         [% IF bugowners %]
           <a href="mailto:
-            [% bugowners FILTER html %]">Send&nbsp;Mail&nbsp;to&nbsp;[% terms.Bug %]&nbsp;Owners</a> |
+            [% bugowners FILTER html %]">Send&nbsp;Mail&nbsp;to&nbsp;[% terms.Bug %]&nbsp;Assignees</a> |
         [% END %]
 
         [%# Links to more things users can do with this bug list. %]
diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index ae969171b..3578a86e4 100644
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -24,8 +24,8 @@
   # components: List of hashes. May be empty. Each hash has four members:
   #   name: string. Name of the component.
   #   description: string. Description of the component. May contain HTML.
-  #   initialowner: string. Component's initial owner.
-  #   initialqacontact: string. Component's initial QA contact.
+  #   initialowner: string. Component's default assignee.
+  #   initialqacontact: string. Component's default QA contact.
   #%]
   
 [% filtered_product = product FILTER html %]
@@ -45,7 +45,7 @@
   <table>
     <tr>
       <th align="left">Component</th>
-      <th align="left">Default Owner</th>
+      <th align="left">Default Assignee</th>
       [% IF Param("useqacontact") %]
         <th align="left">Default QA Contact</th>
       [% END %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index cc33c4f96..a8905cc09 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -441,7 +441,7 @@ function doOnSelectProduct(selectmode) {
              id="emailassigned_to[% n %]" value="1"
              [% " checked" IF default.emailassigned_to.$n %]>
       <label for="emailassigned_to[% n %]">
-        the [% terms.bug %] owner
+        the [% terms.bug %] assignee
       </label>
     </td>
   </tr>