From 98c951d9ecebee4ddbacd89a06e40281a1abf6db Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Mon, 20 Jul 2009 04:17:40 +0000
Subject: Bug 490783: UI should use "Search" everywhere instead of "Find" Patch
 by Max Kanat-Alexander <mkanat@bugzilla.org> r=pyrzak, r=LpSolit, a=LpSolit

---
 template/en/default/account/profile-activity.html.tmpl | 2 +-
 template/en/default/admin/params/query.html.tmpl       | 8 +++++---
 template/en/default/global/common-links.html.tmpl      | 3 ++-
 template/en/default/pages/quicksearch.html.tmpl        | 2 +-
 template/en/default/pages/quicksearchhack.html.tmpl    | 2 +-
 template/en/default/search/search-specific.html.tmpl   | 2 +-
 template/en/default/search/tabs.html.tmpl              | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl
index bcb81f849..c6fd45c65 100644
--- a/template/en/default/account/profile-activity.html.tmpl
+++ b/template/en/default/account/profile-activity.html.tmpl
@@ -75,7 +75,7 @@
 <p><a href="editusers.cgi?action=edit&amp;userid=
   [%- otheruser.id FILTER url_quote %]"
   title="Edit user '[% otheruser.login FILTER html %]'">Edit this user</a> or
-  <a title="Search For Users" href="editusers.cgi">find other accounts</a>
+  <a title="Search For Users" href="editusers.cgi">search for other accounts</a>
   [% IF listselectionvalues.matchtype != 'exact' %]
     or go <a title="Return to the user list"
        href="editusers.cgi?action=list[% INCLUDE listselectionurlparams %]">back
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index ffee4e1a8..34ea04381 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -51,6 +51,8 @@
                   "access the advanced query page. It's in URL parameter " _
                   "format, which makes it hard to read. Sorry!",
 
-  specific_search_allow_empty_words => "Whether to allow a search on the 'Find a Specific " _
-                                       "Bug' page with an empty 'Words' field." }
-%]
+  specific_search_allow_empty_words => 
+    "Whether to allow a search on the 'Simple Search' page with an empty"
+    _ " 'Words' field.",
+
+} %]
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index b775da3e8..bc8556a11 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -33,7 +33,8 @@
                   { alert('Please enter one or more search terms first.');
                     return false; } return true;">
     <input class="txt" type="text" id="quicksearch[% qs_suffix FILTER html %]" name="quicksearch">
-    <input class="btn" type="submit" value="Find" id="find[% qs_suffix FILTER html %]">
+    <input class="btn" type="submit" value="Search" 
+           id="find[% qs_suffix FILTER html %]">
     [%-# Work around FF bug: keep this on one line %]</form></li>
 
   <li><span class="separator">| </span><a href="report.cgi">Reports</a></li>
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index d551e7a74..3fd7c45b9 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -39,7 +39,7 @@
                 { alert('Please enter one or more search terms first.');
                   return false; } return true;">
   <input type="text" size="40" name="quicksearch">
-  <input type="submit" value="Find" id="find">
+  <input type="submit" value="Search" id="find">
 </form>
 
 <h2>Getting Started</h2>
diff --git a/template/en/default/pages/quicksearchhack.html.tmpl b/template/en/default/pages/quicksearchhack.html.tmpl
index 4d96f5d05..06f8c6dbd 100644
--- a/template/en/default/pages/quicksearchhack.html.tmpl
+++ b/template/en/default/pages/quicksearchhack.html.tmpl
@@ -31,7 +31,7 @@
                 { alert('Please enter one or more search terms first.');
                   return false; } return true;">
   <input type="text" size="40" name="quicksearch">
-  <input type="submit" value="Find" id="find">
+  <input type="submit" value="Search" id="find">
   <input type="submit" name="load" value="Load Search Form" id="load">
 </form>
 
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index d35d60030..78e5506a0 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -21,7 +21,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl 
-  title = "Find a Specific " _ terms.Bug
+  title = "Simple Search"
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]
diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index 6676f055c..119b30fde 100644
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -24,7 +24,7 @@
   #%]
 
 [% WRAPPER global/tabs.html.tmpl
-     tabs = [ { name => 'specific', label => "Find a Specific $terms.Bug",
+     tabs = [ { name => 'specific', label => "Simple Search",
                 link => "query.cgi?format=specific" },
               { name => 'advanced', label => "Advanced Search",
                 link => "query.cgi?format=advanced" } ]
-- 
cgit v1.2.3-24-g4f1b