merge of add-jquery gloda-facet
authorAndrew Sutherland <asutherland@asutherland.org>
Wed, 09 Sep 2009 18:05:03 -0700
branchgloda-facet
changeset 7191 513200a0c052
parent 7172 562c393bba41 (current diff)
parent 7190 62cc71583f40 (diff)
child 7192 b530568f1b39
push idunknown
push userunknown
push dateunknown
merge of add-jquery X-Channel-Repo: comm-central X-Channel-Converted-Revision: 442b5ddeb70a1bc9eaad5dee83f3ed0d1296a5cd
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/gloda.properties
@@ -0,0 +1,138 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Thunderbird Global Database
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Andrew Sutherland <asutherland@asutherland.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# LOCALIZATION NOTE (*.facetLabel): These are the labels used to label the facet
+#  displays in the global search facet display mechanism.
+
+# LOCALIZATION NOTE (*.includeLabel): The label to use for the included group
+#  in the facet display.  If not provided, we will fall back to
+#  "glodaFacetView.facets.included.fallbackLabel".
+
+# LOCALIZATION NOTE (*.excludeLabel): The label to use for the excluded group
+#  in the facet display.  If not provided, we will fall back to
+#  "glodaFacetView.facets.excluded.fallbackLabel".
+
+# LOCALIZATION NOTE (*.remainderLabel): The label to use for the remaining items
+#  that are neither part of the included group or the excluded group in the
+#  facet display.  If not provided, we will fall back to
+#  "glodaFacetView.facets.remainder.fallbackLabel".
+
+# LOCALIZATION NOTE (gloda.message.attr.folder.*): Stores the message folder in
+#  which the message is stored.
+gloda.message.attr.folder.facetLabel=Mail Folder
+
+# LOCALIZATION NOTE (gloda.message.attr.fromMe.*): Stores everyone involved
+#  with the message.  This means from/to/cc/bcc.
+gloda.message.attr.fromMe.facetLabel=From Me
+
+# LOCALIZATION NOTE (gloda.message.attr.toMe.*): Stores everyone involved
+#  with the message.  This means from/to/cc/bcc.
+gloda.message.attr.toMe.facetLabel=To Me
+
+
+# LOCALIZATION NOTE (gloda.message.attr.involves.*): Stores everyone involved
+#  with the message.  This means from/to/cc/bcc.
+gloda.message.attr.involves.facetLabel=People
+gloda.message.attr.involves.includeLabel=involving any of:
+gloda.message.attr.involves.excludeLabel=not involving:
+gloda.message.attr.involves.remainderLabel=other participants:
+
+# LOCALIZATION NOTE (gloda.message.attr.date.*): Stores the date of the message.
+#  Thunderbird normally stores the date the message claims it was composed
+#  according to the "Date" header.  This is not the same as when the message
+#  was sent or when it was eventually received by the user.  In the future we
+#  may change this to be one of the other dates, but not anytime soon.
+gloda.message.attr.date.facetLabel=Date
+
+# LOCALIZATION NOTE (gloda.message.attr.attachmentTypes.*): Stores the list of
+#  MIME types (ex: image/png, text/plain) of real attachments (not just part of
+#  the message content but explicitly named attachments) on the message.
+#  Although we hope to be able to provide localized human-readable explanations
+#  of the MIME type (ex: "PowerPoint document"), I don't know if that is going
+#  to happen.
+gloda.message.attr.attachmentTypes.facetLabel=Attachments
+
+# LOCALIZATION NOTE (gloda.message.attr.mailing-list.*): Stores the mailing
+#  lists detected in the message.  This will normally be the e-mail address of
+#  the mailing list and only be detected in messages received from the mailing
+#  list.  Extensions may contribute additional detected mailing-list-like
+#  things.
+gloda.message.attr.mailing-list.facetLabel=Mail List Involved
+
+# LOCALIZATION NOTE (gloda.message.attr.tag.*): Stores the tags applied to the
+#  message.  Notably, gmail's labels are not currently exposed via IMAP and we
+#  do not do anything clever with gmail, so this is indepdendent of gmail
+#  labels.  This may change in the future, but it's a safe bet it's not
+#  happening on Thunderbird's side prior to 3.0.
+gloda.message.attr.tag.facetLabel=Tags
+
+# LOCALIZATION NOTE (gloda.message.attr.tag.*): Stores whether the message is
+#  starred or not, as indicated by a pretty star icon.  In the past, the icon
+#  used to be a flag.  The IMAP terminology continues to be "flagged".
+gloda.message.attr.star.facetLabel=Starred
+
+# LOCALIZATION NOTE (gloda.message.attr.read.*): Stores whether the user has
+#  read the message or not.
+gloda.message.attr.read.facetLabel=Read
+
+# LOCALIZATION NOTE (gloda.message.attr.repliedTo.*): Stores whether we believe
+#  the user has ever replied to the message.  We normally show a little icon in
+#  the thread pane when this is the case.
+gloda.message.attr.repliedTo.facetLabel=Replied To
+
+# LOCALIZATION NOTE (gloda.message.attr.forwarded.*): Stores whether we believe
+#  the user has ever forwarded the message.  We normally show a little icon in
+#  the thread pane when this is the case.
+gloda.message.attr.forwarded.facetLabel=Forwarded
+
+# LOCALIZATION NOTE (gloda.mimetype.category.*.label): Map categories of MIME
+#  types defined in mimeTypeCategories.js to labels.
+# LOCALIZATION NOTE (gloda.mimetype.category.archives.label): Archive is
+#  referring to things like zip files, tar files, tar.gz files, etc.
+gloda.mimetype.category.archives.label=Archives
+gloda.mimetype.category.documents.label=Documents
+gloda.mimetype.category.images.label=Images
+# LOCALIZATION NOTE (gloda.mimetype.category.media.label): Media is meant to
+#  encompass both audio and video.  This is because video and audio streams are
+#  frequently stored in the same type of container and we cannot rely on the
+#  sending e-mail client to have been clever enough to figure out what was
+#  really in the file.  So we group them together.
+gloda.mimetype.category.media.label=Media (Audio, Video)
+gloda.mimetype.category.pdf.label=PDF Files
+# LOCALIZATION NOTE (gloda.mimetype.category.other.label): Other is the category
+#  for MIME types that we don't really know what it is.
+gloda.mimetype.category.other.label=Other
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/glodaComplete.properties
@@ -0,0 +1,57 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Thunderbird Global Database
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   David Ascher <dascher@mozillamessaging.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# LOCALIZATION NOTE (glodaComplete.messagesTagged.label): The label used
+#  in the autocomplete widget to refer to a query for all messages tagged
+#  by a particular tag (replacing #1).
+glodaComplete.messagesTagged.label=Messages tagged: #1
+
+# LOCALIZATION NOTE (glodaComplete.messagesMentioning.label): The label used
+#  in the autocomplete widget to refer to a search for all messages mentioning
+#  a particular word (replacing #1).
+glodaComplete.messagesMentioning.label=Messages mentioning: #1
+
+# LOCALIZATION NOTE (glodaComplete.messagesWithAny.label): The label used
+#  in the autocomplete widget to refer to a search for all messages mentioning
+#  any one of a set of words
+glodaComplete.messagesWithAny.label=messages with ANY of:
+
+# LOCALIZATION NOTE (glodaComplete.messagesWithAll.label): The label used
+#  in the autocomplete widget to refer to a search for all messages mentioning
+#  all of a set of words
+glodaComplete.messagesWithAll.label=messages with ALL of:
+
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/glodaFacetView.dtd
@@ -0,0 +1,8 @@
+<!-- LOCALIZATION NOTE (glodaFacetView.filters.label): Label at the top of the
+     faceting sidebar.  Serves as a header both for the checkboxes under it as
+     well for labeled facets with multiple options. -->
+<!ENTITY glodaFacetView.filters.label "Filter by:">
+
+<!-- LOCALIZATION NOTE (glodaFacetView.showMore.label): Label at the bottom
+     of the results list to show more hits. -->
+<!ENTITY glodaFacetView.showMore.label "Show more hits">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/glodaFacetView.properties
@@ -0,0 +1,150 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Thunderbird Global Database
+#
+# The Initial Developer of the Original Code is
+# Mozilla Messaging, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Andrew Sutherland <asutherland@asutherland.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# LOCALIZATION NOTE (glodaFacetView.tab.query.label): The title to display for
+#  tabs that are based on a gloda (global database) query or collection rather
+#  than a user search.  In the case of a user search, we just display the
+#  search string they entered.  At some point we might try and explain what
+#  the query/collection is an automatic fashion, but not today.
+glodaFacetView.tab.query.label=Search
+
+# LOCALIZATION NOTE(glodaFacetView.constraints.query.fulltext.label):
+#  The label to display to describe when our base query was a fulltext search
+#  across messages.  The value is displayed following the label.
+glodaFacetView.constraints.query.fulltext.label=Searching for #1
+glodaFacetView.constraints.query.fulltext.andJoinWord=and
+glodaFacetView.constraints.query.fulltext.orJoinWord=or
+glodaFacetView.constraints.query.fulltext.changeToAndLabel=require all terms instead
+glodaFacetView.constraints.query.fulltext.changeToOrLabel=require any of the terms instead
+
+# LOCALIZATION NOTE(glodaFacetView.constraints.query.initial):
+#  The label to display to describe when our base query is not a full-text
+#  search.  Additional labels are appended describing each constraint.
+glodaFacetView.constraints.query.initial=Searching for messages
+
+# LOCALIZATION NOTE(glodaFacetView.constraints.query.involves.label):
+#  The label to display to describe when our base query was on messages
+#  involving a given contact from the address book.  The value is displayed
+#  where the #1 is.
+glodaFacetView.constraints.query.involves.label=involving #1
+
+# LOCALIZATION NOTE(glodaFacetView.constraints.query.contact.label):
+#  The label to display to describe when our base query was on messages
+#  tagged with a specific tag.  The tag is displayed following the label.
+glodaFacetView.constraints.query.tagged.label=tagged:
+
+
+# LOCALIZATION NOTE (glodaFacetView.facets.mode.top.moreLabel): The label to
+#  use when we are only displaying the top entries for a facet.  When the
+#  label is clicked on, it results in us displaying all of the values for that
+#  facet.  The value "#1" (if present) is replaced with the total number of
+#  values that will be displayed (rather than the number currently hidden).
+glodaFacetView.facets.mode.top.moreLabel=List all #1
+
+# LOCALIZATION NOTE (glodaFacetView.facets.included.fallbackLabel): The label to
+#  use for groups in a facet that have been explicitly included by the user if
+#  there is no explicit attribute "includeLabel" defined.  (The explicit label
+#  would be named "gloda.message.attr.ATTRIBUTE.includeLabel".)
+glodaFacetView.facets.included.fallbackLabel=including any of:
+# LOCALIZATION NOTE (glodaFacetView.facets.excluded.fallbackLabel): The label to
+#  use for groups in a facet that have been explicitly excluded by the user if
+#  there is no explicit attribute "excludeLabel" defined.  (The explicit label
+#  would be named "gloda.message.attr.ATTRIBUTE.excludeLabel".)
+glodaFacetView.facets.excluded.fallbackLabel=excluding:
+# LOCALIZATION NOTE (glodaFacetView.facets.remainder.fallbackLabel): The label
+#  to use for groups in a facet that are neither part of the included group or
+#  the excluded group if there is no explicit attribute "remainderLabel"
+#  defined.  (The explicit label would be named
+#  "gloda.message.attr.ATTRIBUTE.remainderLabel".)
+glodaFacetView.facets.remainder.fallbackLabel=other:
+
+# LOCALIZATION NOTE (glodaFacetView.facets.noneLabel): The text to display when
+#  a facet needs to indicate that an attribute omitted a value or was otherwise
+#  empty.
+glodaFacetView.facets.noneLabel=None
+
+# LOCALIZATION NOTE (glodaFacetView.facets.filter.attachmentTypes.allLabel):
+#  The label to use when all types of attachments are being displayed.
+glodaFacetView.facets.filter.attachmentTypes.allLabel=Any Kind
+
+# LOCALIZATION NOTE (glodaFacetView.result.message.fromLabel): Used in the
+#  faceted search message display to indicate the author of a message.
+# An example usage is  "from: Bob".
+glodaFacetView.result.message.fromLabel=from:
+
+# LOCALIZATION NOTE (glodaFacetView.result.message.toLabel): Used in the
+#  faceted search message display to indicate the recipients of a message.
+# An example usage is  "to: Bob, Chuck, Don".
+glodaFacetView.result.message.toLabel=to:
+
+# LOCALIZATION NOTE(glodaFacetView.results.message.countLabel): Displays the
+#  number of messages displayed in the result area out of the number of
+#  messages in the active set (the set of messages remaining after the
+#  application of the facet constraints.)  It takes the following arguments,
+#  you do not have to use all of them.
+# #1: The number of messages displayed in the result area.
+# #2: The pluralized form of "messages" (or whatever you provide in
+#      glodaFacetView.results.message.countLabelMessagePlurals) as it
+#      applies to #1 (the number of messages in the result area.)
+# #3: The number of messages in the active set.
+# #4: The pluralized form of "messages" as it applies to #3.
+glodaFacetView.results.message.countLabel=Top #1 #2 out of #3
+# LOCALIZATION NOTE(glodaFacetView.results.message.countLabelMessagePlurals):
+#  The plural forms of "messages" or whatever you choose.  See
+#  https://developer.mozilla.org/en/Localization_and_Plurals for details on
+#  how this stuff works.
+glodaFacetView.results.message.countLabelMessagePlurals=message;messages
+# LOCALIZATION NOTE(glodaFacetView.results.message.showAllInList.label): The
+#  label for the button/link that causes us to display all of the messages in
+#  the active set in a new thread pane display tab, closing the current faceting
+#  tab.
+glodaFacetView.results.message.showAllInList.label=Show all as list
+# LOCALIZATION NOTE(glodaFacetView.results.message.showAllInList.tooltip): The
+#  tooltip to display when hovering over the showAllInList label.
+glodaFacetView.results.message.showAllInList.tooltip=Show all of the messages in the active set in a new tab, closing this tab.
+
+# LOCALIZATION NOTE(glodaFacetView.results.message.sort.label): The
+#  label next to the choice of sort order
+glodaFacetView.results.message.sort.label=sort by:
+# LOCALIZATION NOTE(glodaFacetView.results.message.sort.relevance):
+# a clickable label causing the sort to be done by most relevant messages first.
+glodaFacetView.results.message.sort.relevance=relevance
+# LOCALIZATION NOTE(glodaFacetView.results.message.sort.date):
+# a clickable label causing the sort to be done by most recent messages first.
+glodaFacetView.results.message.sort.date=date
+
+glodaFacetView.results.message.andNOthers=and #1 other;and #1 others
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -563,38 +563,16 @@ you can use these alternative items. Oth
 <!ENTITY folderContextSettings.accesskey "e">
 
 <!-- Search Bar -->
 <!ENTITY SearchNameOrEmail.label "Name or Email contains:">
 <!ENTITY SearchNameOrEmail.accesskey "N">
 
 <!-- Gloda Search Bar -->
 <!ENTITY glodaSearchBar.emptyText "Search messages…">
-<!ENTITY glodaSearchBar.facet.label "Search:">
-<!-- LOCALIZATION NOTE (glodaSearchFacet.*) labels specify search constraints.
-       "everything" searches over subject, involves, body, and attachments.
-       "subject" searches only messages subjects.
-       "involves" searches only message to/from/cc/bcc.
-       "to" searches only message to/cc.
-       "from" searches only message using "from" (the message author).
-       "body" searches only message bodies, which does not include message
-           attachment names or the content of the attachments.  Message body
-           basically means a message part with a content-type of text/*.
-    -->
-<!ENTITY glodaSearchFacet.everything.label "Everything">
-<!ENTITY glodaSearchFacet.subject.label "Subject">
-<!ENTITY glodaSearchFacet.involves.label "Involves (from,to,cc,bcc)">
-<!ENTITY glodaSearchFacet.to.label "To, CC">
-<!ENTITY glodaSearchFacet.from.label "From">
-<!ENTITY glodaSearchFacet.body.label "Message Text">
-<!ENTITY glodaSearchFacet.attachmentNames.label "Attachment Names">
-
-<!ENTITY glodaSearchBar.location.label "Location:">
-<!ENTITY glodaSearchFacet.everywhere.label "All Folders">
-<!ENTITY glodaSearchFacet.folder.label "In a specific folder…">
 
 <!-- Quick Search Menu Bar -->
 <!ENTITY searchSubjectMenu.label "Subject">
 <!ENTITY searchFromMenu.label "From">
 <!ENTITY searchSubjectOrFromMenu.label "Subject or From">
 <!ENTITY searchRecipient.label "To or Cc">
 <!ENTITY searchSubjectOrRecipientMenu.label "Subject, To or Cc">
 <!ENTITY searchMessageBody.label "Entire Message">
@@ -615,25 +593,16 @@ you can use these alternative items. Oth
 <!ENTITY unreadColumn.label "Unread">
 <!ENTITY totalColumn.label "Total">
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY starredColumn.label "Starred">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 <!ENTITY attachmentColumn.label "Attachments">
-<!-- LOCALIZATION NOTE (glodaWhyColumn.label): explains why a message is
-     present in the gloda search results.  The values can be found in
-     messenger.properties with a prefix of "glodaSearch_results_why_". -->
-<!ENTITY glodaWhyColumn.label "Why">
-<!-- LOCALIZATION NOTE (glodaScoreColumn.label): provides the numerical
-     score assigned to the message as a result of the search.  The column
-     primarily exists to be sorted by, and its contents will probably have
-     little meaning for most users. -->
-<!ENTITY glodaScoreColumn.label "Score">
 
 <!-- Thread Pane Tooltips -->
 <!ENTITY columnChooser.tooltip "Click to select columns to display">
 <!ENTITY threadColumn.tooltip "Click to display message threads">
 <!ENTITY fromColumn.tooltip "Click to sort by from">
 <!ENTITY recipientColumn.tooltip "Click to sort by recipient">
 <!ENTITY subjectColumn.tooltip "Click to sort by subject">
 <!ENTITY dateColumn.tooltip "Click to sort by date">
@@ -646,18 +615,16 @@ you can use these alternative items. Oth
 <!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
 <!ENTITY totalColumn.tooltip "Total number of messages in thread">
 <!ENTITY readColumn.tooltip "Click to sort by read">
 <!ENTITY receivedColumn.tooltip "Click to sort by date received">
 <!ENTITY starredColumn.tooltip "Click to sort by star">
 <!ENTITY locationColumn.tooltip "Click to sort by location">
 <!ENTITY idColumn.tooltip "Click to sort by order received">
 <!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
-<!ENTITY glodaWhyColumn.tooltip "Click to sort by why the message is in your search results">
-<!ENTITY glodaScoreColumn.tooltip "Click to sort by the search score">
 
 <!-- Thread Pane Context Menu -->
 <!ENTITY contextOpenNewWindow.label "Open Message in New Window">
 <!ENTITY contextOpenNewWindow.accesskey "W">
 <!ENTITY contextOpenNewTab.label "Open Message in New Tab">
 <!ENTITY contextOpenNewTab.accesskey "T">
 <!ENTITY contextEditAsNew.label "Edit As New…">
 <!ENTITY contextEditAsNew.accesskey "E">
@@ -710,16 +677,17 @@ you can use these alternative items. Oth
 <!ENTITY removePhishingBarButton1.label "Ignore Warning">
 <!ENTITY reportPhishingError1.label "This message doesn't appear to be a scam.">
 
 <!-- Message Header Button Box (to show hidden email addresses) -->
 <!ENTITY more.label "more">
 
 <!-- Quick Search Bar -->
 <!ENTITY quickSearchCmd.key "k">
+<!ENTITY searchEverywhere.label "Search everywhere">
 
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
 <!ENTITY EditContact.label "Edit Contact…">
 <!ENTITY EditContact.accesskey "E">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -511,28 +511,16 @@ headerbccFieldYou=You
 # Shown when content tabs are being loaded.
 loadingTab=Loading…
 
 applyToCollapsedMsgsTitle=Confirm Delete of Messages in Collapsed Thread(s)
 applyToCollapsedMsgs=Warning - this will delete messages in collapsed thread(s)
 applyToCollapsedAlwaysAskCheckbox=Always ask me before deleting messages in collapsed threads
 applyNowButton=Apply
 
-#LOCALIZATION NOTE (glodaSearch_results_why_*):  These strings populate the
-# glodaWhyColumn when performing a gloda-backed search, explaining why a
-# specific result is present in the search.  Because of how the message grouping
-# mechanism works, this value is both the value in the "Why" column as well as
-# the header for the group (when sorting/grouping on the why column.)  Short
-# strings are preferable so the why column can be understood without taking up
-# too much space.
-glodaSearch_results_why_contact=Contact
-glodaSearch_results_why_subject=Subject
-glodaSearch_results_why_body=Body
-glodaSearch_results_why_attachment=Attachment
-
 mailServerLoginFailedTitle=Login Failed
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed=Login to server %S failed.
 mailServerLoginFailedRetryButton=&Retry
 mailServerLoginFailedEnterNewPasswordButton=&Enter New Password
 
--- a/mail/chrome/messenger/multimessageview.properties
+++ b/mail/chrome/messenger/multimessageview.properties
@@ -7,10 +7,9 @@ NConversations=#1 conversation; #1 conve
 numMsgs=#1 message;#1 messages
 countUnread=, #1 unread;, #1 unread
 Nmessages=(#1 message);(#1 messages)
 
 noSubject=(no subject)
 
 # thread and multiple message selection summaries
 messagesSize=These messages take up: #1 #2.
-yesterday=yesterday
 noticeText= (Note: #1 messages are selected, the first #2 are shown)
--- a/mail/chrome/messenger/search.properties
+++ b/mail/chrome/messenger/search.properties
@@ -16,12 +16,8 @@ searchSuccessMessages=%S matches found
 searchFailureMessage=No matches found
 labelForStopButton=Stop
 labelForSearchButton=Search
 labelForStopButton.accesskey=S
 labelForSearchButton.accesskey=S
 
 moreButtonTooltipText=Add a new rule
 lessButtonTooltipText=Remove this rule
-
-# LOCALIZATION NOTE (glodaSearchTabTitle): The title to use for global database
-#  search tabs.  Include "%S" where you want the search string to be inserted.
-glodaSearchTabTitle=Search: %S
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/templateUtils.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE yesterday: used in various places where we compute
+# a "friendly" date, e.g. displaying that a message was from yesterday.
+
+yesterday=yesterday
+