Bug 234293 - complete the conversion from "query" terminology to "search" terminology...

diff --git a/template/en/default/account/prefs/footer.html.tmpl b/template/en/default/account/prefs/footer.html.tmpl
index a040765b7410b2f4c0308ce471c20fe901fae704..e4046217a855438a066d7ed28b6803e31f2d2cc9 100644 (file)
--- a/template/en/default/account/prefs/footer.html.tmpl
+++ b/template/en/default/account/prefs/footer.html.tmpl
@@ -22,8 +22,8 @@
 [%# INTERFACE:
   # mybugslink: boolean. True if the user wishes the My Bugs link to appear.
   # queries: array of hashes. May be empty. Each hash has two members:
-  #   name:   string. The name of the query.
-  #   footer: boolean. True if the query appears in the footer.
+  #   name:   string. The name of the search.
+  #   footer: boolean. True if the search appears in the footer.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
@@ -45,10 +45,10 @@
   [% IF queries.size %]
     [% FOREACH query = queries %]
       <tr>
-        <th align="right">Your query named '[% query.name FILTER html %]':</th>
+        <th align="right">Your search named '[% query.name FILTER html %]':</th>
         <td>
           <select name="query-[% loop.index %]">
-            <option value="0">should only appear in the query page</option>
+            <option value="0">should only appear in the search page</option>
             <option value="1"
               [% " selected" IF query.footer %]>
               should appear on the footer of every page
@@ -66,7 +66,7 @@
       <td colspan="4">
         <br>
         If you create remembered queries using the
-        <a href="query.cgi">query page</a>,
+        <a href="query.cgi">search page</a>,
         you can then come to this page and choose to have some of them
         appear in the footer of each [% terms.Bugzilla %] page.
         <br>

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index d7c8d507db3d4adc7fab5ca1d6654ed7f30c92e6..68b894b0c5f53b9d216a9045e0074519265e275b 100644 (file)
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -56,5 +56,5 @@
   &nbsp;&nbsp;<a href="buglist.cgi?regetlastlist=1">Show list</a>
 [% END %]
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="query.cgi">Query page</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="query.cgi">Search page</a>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="enter_bug.cgi">Enter new [% terms.bug %]</a>

diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index 297cad1f61e961b3edc34c4b969cfb606fb0cfe0..33acceebe5c6d398dc77f42684822ff88079692c 100644 (file)
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -102,7 +102,7 @@
 
 </form>
 <hr>
-<a href="query.cgi">Cancel and Return to the Query Page</a>
+<a href="query.cgi">Cancel and Return to the Search Page</a>
 
 [% PROCESS global/footer.html.tmpl %]
 

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index de518dc0a53a094454756a1ca1406e6d71bbc231..2dfe74c5f352427ec801ac34a276538e7f82c083 100644 (file)
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -29,29 +29,29 @@
 
 [% message = BLOCK %]
   [% IF    message_tag == "buglist_adding_field" %]
-    [% title = "Adding field to query page..." %]
+    [% title = "Adding field to search page..." %]
     [% link  = "Click here if the page does not redisplay automatically." %]
 
   [% ELSIF message_tag == "buglist_load_named_query" %]
     [% title = BLOCK %]
-      Loading your query named [% namedcmd FILTER html %]
+      Loading your search named [% namedcmd FILTER html %]
     [% END %]
     [% link  = "Click here if the page does not redisplay automatically." %]
 
   [% ELSIF message_tag == "buglist_updated_named_query" %]
-    OK, your query named <code>[% queryname FILTER html %]</code> is updated.
+    OK, your search named <code>[% queryname FILTER html %]</code> is updated.
 
   [% ELSIF message_tag == "buglist_new_default_query" %]
-    OK, you now have a new default query.  You may
-    also bookmark the result of any individual query.
+    OK, you now have a new default search.  You may
+    also bookmark the result of any individual search.
 
   [% ELSIF message_tag == "buglist_new_named_query" %]
-    OK, you have a new query named <code>[% queryname FILTER html %]</code>.
+    OK, you have a new search named <code>[% queryname FILTER html %]</code>.
 
   [% ELSIF message_tag == "buglist_query_gone" %]
-    [% title = "Query is gone" %]
-    [% link  = "Go back to the query page." %]
-    OK, the <b>[% namedcmd FILTER html %]</b> query is gone.
+    [% title = "Search is gone" %]
+    [% link  = "Go back to the search page." %]
+    OK, the <b>[% namedcmd FILTER html %]</b> search is gone.
 
   [% ELSIF message_tag == "buglist_sorted_by_relevance" %]
     [% terms.Bugs %] on this list are sorted by relevance, with the most
@@ -60,7 +60,7 @@
 
   [% ELSIF message_tag == "change_columns" %]
     [% title = "Change columns" %]
-    Resubmitting your query with new columns...
+    Resubmitting your search with new columns...
     Click <a href="[% redirect_url FILTER html %]">here</a>
     if the page does not automatically refresh.
 

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 9f01f44a02be44c35f68158dcc003b3283be9f24..b06cf2baf217964b2ff959de536bcaece8cf94e4 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -238,7 +238,7 @@
     It cannot be <em>[% sortkey FILTER html %]</em>.
   
   [% ELSIF error == "illegal_at_least_x_votes" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Your Search Makes No Sense" %]
     The <em>At least ___ votes</em> field must be a simple number. 
     You entered <tt>[% value FILTER html %]</tt>, which isn't.
     
@@ -252,7 +252,7 @@
     [%+ bug_id FILTER html %].
          
   [% ELSIF error == "illegal_attachment_is_patch" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Your Search Makes No Sense" %]
     The only legal values for the <em>Attachment is patch</em> field are
     0 and 1.
          
@@ -266,7 +266,7 @@
     sufficiently empowered user, may change that field.
   
   [% ELSIF error == "illegal_changed_in_last_x_days" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Your Search Makes No Sense" %]
     The <em>Changed in last ___ days</em> field must be a simple number. 
     You entered <tt>[% value FILTER html %]</tt>, which isn't.
     
@@ -293,13 +293,13 @@
     [% groupname FILTER html %]&quot; is illegal.
 
   [% ELSIF error == "illegal_is_obsolete" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Your Search Makes No Sense" %]
     The only legal values for the <em>Attachment is obsolete</em> field are
     0 and 1.
 
   [% ELSIF error == "illegal_query_name" %]
-    [% title = "Illegal Query Name" %]
-    The name of your query cannot contain any of the following characters: 
+    [% title = "Illegal Search Name" %]
+    The name of your search cannot contain any of the following characters: 
     &lt;, &gt;, &amp;.
 
   [% ELSIF error == "illegal_series_creation" %]
@@ -458,7 +458,7 @@
     You must specify one or more datasets to plot.
     
   [% ELSIF error == "missing_email_type" %]
-    [% title = "Your Query Makes No Sense" %]
+    [% title = "Your Search Makes No Sense" %]
     You must specify one or more fields in which to search for
     <tt>[% email FILTER html %]</tt>.
     
@@ -471,8 +471,8 @@
     You did not specify a name for this series.
                 
   [% ELSIF error == "missing_query" %]
-    [% title = "Missing Query" %]
-    The query named <em>[% queryname FILTER html %]</em> does not
+    [% title = "Missing Search" %]
+    The search named <em>[% queryname FILTER html %]</em> does not
     exist.
         
   [% ELSIF error == "must_be_patch" %]
@@ -612,8 +612,8 @@
     [% product FILTER html %].
 
   [% ELSIF error == "query_name_missing" %]
-    [% title = "No Query Name Specified" %]
-    You must enter a name for your query.
+    [% title = "No Search Name Specified" %]
+    You must enter a name for your search.
 
   [% ELSIF error == "quips_disabled" %]
     [% title = "Quips Disabled" %]

diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 605d811f6dfb2e01778a204b500b483e0b1891fc..5422061fdd1e3623be666f3d26177545846de07a 100644 (file)
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -60,7 +60,7 @@ function addSidebar() {
 
   But it all boils down to a choice of:
   <p>
-  <a href="query.cgi">Query existing [% terms.bug %] reports</a><br>
+  <a href="query.cgi">Search existing [% terms.bug %] reports</a><br>
   <a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a><br>
   <a href="report.cgi">Summary reports and charts</a><br>
   </p><p>

diff --git a/template/en/default/list/server-push.html.tmpl b/template/en/default/list/server-push.html.tmpl
index 162818e94c6c759c90851587bbfad594ad34adac..4fb88e9b441656005fa888674730519344290a32 100644 (file)
--- a/template/en/default/list/server-push.html.tmpl
+++ b/template/en/default/list/server-push.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [%# INTERFACE:
-  # debug: boolean. True if we want the query displayed while we wait.
+  # debug: boolean. True if we want the search displayed while we wait.
   # query: string. The SQL query which makes the buglist.
   #%]
 
@@ -28,7 +28,7 @@
 
 <html>
   <head>
-    <title>[% terms.Bugzilla %] is pondering your query</title>
+    <title>[% terms.Bugzilla %] is pondering your search</title>
   </head>
   <body>
     <h1 style="margin-top: 20%; text-align: center;">Please stand by ...</h1>

diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index 292c62eeb10bc19785d2ee5c760ff1d5f440b8ed..ba88b67b4c22a4575807fd2291bdf995e73f3f4c 100644 (file)
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -46,7 +46,7 @@
   <p>
     <strong>
       <a name="chart" href="queryhelp.cgi#advancedquerying">
-      Advanced Querying Using Boolean Charts</a>:
+      Advanced Searching Using Boolean Charts</a>:
     </strong>
   </p>
 

diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl
index b94f8e3ce42086b36f3c3e7ffbe42508c79870fc..c92ad92cc12fb5ad86a704dd99b32debd538246d 100644 (file)
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
@@ -60,6 +60,6 @@
 [% IF userdefaultquery %]
   <p>
     <a href="query.cgi?nukedefaultquery=1">
-      Set my default query back to the system default</a>.
+      Set my default search back to the system default</a>.
   </p>
 [% END %]

diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index 0d91b8401e22ef7c4da2a854d5f9507c74e5f04e..3e467b199e8f471cf59ec04a691a07523fe5291e 100644 (file)
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -64,13 +64,13 @@ function normal_keypress_handler( aEvent ) {
 
 ]]></script>
 
-  <textbox id="query-field" class="descriptive-content" value="enter query" onfocus="this.setSelectionRange(0,this.value.length)"/>
+  <textbox id="query-field" class="descriptive-content" value="enter search" onfocus="this.setSelectionRange(0,this.value.length)"/>
 
   <separator class="groove"/>
 
   <box autostretch="never" valign="top">
     <box orient="vertical" flex="1">
-      <text class="text-link" onclick="load_relative_url('query.cgi')" value="new query"/>
+      <text class="text-link" onclick="load_relative_url('query.cgi')" value="new search"/>
       <text class="text-link" onclick="load_relative_url('report.cgi')" value="reports"/>
       <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new [% terms.bug %]"/>
       <separator class="thin"/>