add new search criteria properties file

mailnews/base/search/resources/locale/en-US/MANIFEST

@@ -4,3 +4,4 @@ SearchDialog.dtd
 SearchOptions.dtd
 search-attributes.properties
 search-operators.properties
+search.properties

mailnews/base/search/resources/locale/en-US/Makefile.in

@@ -35,6 +35,7 @@ EXPORT_RESOURCE_SAMPLES = \
 		SearchOptions.dtd \
 		search-attributes.properties \
 		search-operators.properties \
+		search.properties \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mailnews/base/search/resources/locale/en-US/makefile.win

@@ -30,6 +30,7 @@ install::
 	$(MAKE_INSTALL) .\FilterEditor.dtd		$(DIST)\bin\chrome\messenger\locale
 	$(MAKE_INSTALL) .\search-attributes.properties	$(DIST)\bin\chrome\messenger\locale
 	$(MAKE_INSTALL) .\search-operators.properties	$(DIST)\bin\chrome\messenger\locale
+	$(MAKE_INSTALL) .\search.properties		$(DIST)\bin\chrome\messenger\locale
 
 clobber::
 	rm -f $(DIST)\chrome\messenger\locale\SearchDialog.dtd

mailnews/base/search/resources/locale/en-US/search.properties

@@ -0,0 +1,27 @@
+# these are the fields that get inserted in the search line
+# for "and" searches, this looks like:
+#
+# preSearchAttrAnd0 <attribute> preSearchOpAnd0 <operator> preSearchValueAnd0 <value> postSearchValueAnd0
+# preSearchAttrAnd <attribute> preSearchOpAnd <operator> preSearchValueAnd <value> postSearchValueAnd
+#
+# for example, in english this looks like:
+#     the [Sender ] [contains       ] [Smith]
+# and the [Sender ] [doesn't contain] [John]
+#
+# note that english uses "the" and "and the" for preSearchAttr0/preSearchAttr,
+# and does not use any of the other strings.
+#
+
+preSearchAttrAnd0=the
+preSearchAttrAnd=and the
+preSearchOpAnd0=
+preSearchOpAnd=
+preSearchValueAnd0=
+preSearchValueAnd=
+
+preSearchAttrOr0=the
+preSearchAttrOr=or the
+preSearchOpOr0=
+preSearchOpOr=
+preSearchValueOr0=
+preSearchValueOr=