summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2004-03-19 06:51:16 +0100
committergerv%gerv.net <>2004-03-19 06:51:16 +0100
commitb6a027866fe1b287515221b85b363de3f990122c (patch)
tree2764d500a03c0aa43dc0f0a477fbfeb5e7da85ef
parent2478a13d479563c23347de222e3da2ed34d71508 (diff)
downloadbugzilla-b6a027866fe1b287515221b85b363de3f990122c.tar.gz
bugzilla-b6a027866fe1b287515221b85b363de3f990122c.tar.xz
Bug 234293 - complete the conversion from "query" terminology to "search" terminology. Patch by gerv; r=justdave, kiko, a=justdave.
-rw-r--r--template/en/default/account/prefs/footer.html.tmpl10
-rw-r--r--template/en/default/bug/navigate.html.tmpl2
-rw-r--r--template/en/default/bug/process/verify-new-product.html.tmpl2
-rw-r--r--template/en/default/global/messages.html.tmpl20
-rw-r--r--template/en/default/global/user-error.html.tmpl22
-rw-r--r--template/en/default/index.html.tmpl2
-rw-r--r--template/en/default/list/server-push.html.tmpl4
-rw-r--r--template/en/default/search/boolean-charts.html.tmpl2
-rw-r--r--template/en/default/search/knob.html.tmpl2
-rw-r--r--template/en/default/sidebar.xul.tmpl4
10 files changed, 35 insertions, 35 deletions
diff --git a/template/en/default/account/prefs/footer.html.tmpl b/template/en/default/account/prefs/footer.html.tmpl
index a040765b7..e4046217a 100644
--- 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 d7c8d507d..68b894b0c 100644
--- 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 297cad1f6..33acceebe 100644
--- 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 de518dc0a..2dfe74c5f 100644
--- 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 9f01f44a0..b06cf2baf 100644
--- 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 605d811f6..5422061fd 100644
--- 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 162818e94..4fb88e9b4 100644
--- 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 292c62eeb..ba88b67b4 100644
--- 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 b94f8e3ce..c92ad92cc 100644
--- 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 0d91b8401..3e467b199 100644
--- 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"/>