Bug 363910: "Add a new query" should be renamed

docs/en/xml/using.xml

@@ -1922,7 +1922,7 @@
 
       <para>
          Each whining event is associated with zero or more schedules.  A 
-         schedule is used to specify when the query (specified below) is to be
+         schedule is used to specify when the search (specified below) is to be
          run.  A new event starts out with no schedules (which means it will 
          never run, as it is not scheduled to run).  To add a schedule, press
          the "Add a new schedule" button.
@@ -1981,7 +1981,7 @@
         is any saved search to be run as part of the specified schedule (see
         above).  You start out without any searches associated with the event
         (which means that the event will not run, as there will never be any
-        results to return).  To add a search, press the "Include search" button.
+        results to return).  To add a search, press the "Add a search" button.
       </para>
 
       <para>
@@ -2004,29 +2004,29 @@
 
       <note>
         <para>
-          When running queries, the whining system acts as if you are the user
-          executing the query.  This means that the whining system will ignore
-          bugs that match your query, but that you cannot access.
+          When running searches, the whining system acts as if you are the user
+          executing the search.  This means that the whining system will ignore
+          bugs that match your search, but that you cannot access.
         </para>
       </note>
 
       <para>
-        Once you have chosen the saved search to be executed, give the query a 
+        Once you have chosen the saved search to be executed, give the search a 
         descriptive title.  This title will appear in the email, above the 
-        results of the query.  If you choose "One message per bug", the query 
+        results of the search.  If you choose "One message per bug", the search 
         title will appear at the top of each email that contains a bug matching
-        your query.
+        your search.
       </para>
 
       <para>
-        Finally, decide if the results of the query should be sent in a single
+        Finally, decide if the results of the search should be sent in a single
         email, or if each bug should appear in its own email.
       </para>
 
       <warning>
         <para>
           Think carefully before checking the "One message per bug" box.  If
-          you create a query that matches thousands of bugs, you will receive 
+          you create a search that matches thousands of bugs, you will receive 
           thousands of emails!
         </para>
       </warning>
@@ -2037,7 +2037,7 @@
 
       <para>
         Once you have defined at least one schedule, and created at least one 
-        query, go ahead and "Update/Commit".  This will save your Event and make
+        search, go ahead and "Update/Commit".  This will save your Event and make
         it available for immediate execution.
       </para>
 

template/en/default/whine/schedule.html.tmpl

@@ -27,7 +27,7 @@
 %]
 
 <p>
-  "Whining" is when [% terms.Bugzilla %] executes a saved query at a regular interval
+  "Whining" is when [% terms.Bugzilla %] executes a saved search at a regular interval
   and sends the resulting list of [% terms.bugs %] via email.
 </p>
 
@@ -48,8 +48,8 @@
 <p>
   Searches come from saved searches, which are created by executing a <a
   href="query.cgi">search</a>, then telling [% terms.Bugzilla %] to remember
-  the search under a particular name.  Add a query by clicking "Add a new
-  query", and select the desired saved search name under "Search" and add a
+  the search under a particular name.  Add a search by clicking "Add a 
+  search", and select the desired saved search name under "Search" and add a
   title for the [% terms.bug %] table.  The optional number entered under
   "Sort" will determine the execution order (lowest to highest) if multiple
   queries are listed.  If you check "One message per [% terms.bug %]," each [%
@@ -216,7 +216,7 @@
       </td>
       <td align="left">
         No searches <br>
-        <input type="submit" value="Add a new query"
+        <input type="submit" value="Add a search"
                name="add_query_[% event.key %]"
                id="add_query_[% event.key %]">
       </td>
@@ -282,7 +282,7 @@
 
           <tr>
             <td colspan="3">
-              <input type="submit" value="Add a new query"
+              <input type="submit" value="Add a search"
                      name="add_query_[% event.key %]"
                      id="add_query_[% event.key %]">
             </td>
@@ -322,7 +322,7 @@
     </select>
 
   [% ELSE %]
-    Please visit the <a href="query.cgi">Search</a> page and save a query
+    Please visit the <a href="query.cgi">Search</a> page and save a search
   [% END %]
 
 [%+ END %]