Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

83 files changed, 8660 insertions, 0 deletions

diff --git a/comm/mail/locales/en-US/messenger/about3Pane.ftl b/comm/mail/locales/en-US/messenger/about3Pane.ftl
new file mode 100644
index 0000000000..267570aac9
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/about3Pane.ftl
@@ -0,0 +1,482 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Message List Header Bar
+
+quick-filter-button =
+  .title = Toggle the Quick Filter Bar
+quick-filter-button-label = Quick Filter
+
+thread-pane-header-display-button =
+  .title = Message list display options
+
+# Variables:
+# $count (Number) - The number of messages in this folder.
+thread-pane-folder-message-count =
+  { $count ->
+    [one] { $count } Message
+    *[other] { $count } Messages
+  }
+
+# Variables:
+# $count (Number) - The number of messages currently selected.
+thread-pane-folder-selected-count =
+  { $count ->
+    *[other] { $count } Selected
+  }
+
+thread-pane-header-context-table-view =
+  .label = Table View
+
+thread-pane-header-context-cards-view =
+  .label = Cards View
+
+thread-pane-header-context-hide =
+  .label = Hide Message List Header
+
+## Quick Filter Bar
+
+# The tooltip to display when the user hovers over the sticky button
+# (currently displayed as a push-pin). When active, the sticky button
+# causes the current filter settings to be retained when the user changes
+# folders or opens new tabs. (When inactive, only the state of the text
+# filters are propagated between folder changes and when opening new tabs.)
+quick-filter-bar-sticky =
+    .title = Keep filters applied when switching folders
+
+# The tooltip for the filter button that replaces the quick filter buttons with
+# a dropdown menu.
+quick-filter-bar-dropdown =
+    .title = Quick filter menu
+
+quick-filter-bar-dropdown-unread =
+    .label = Unread
+
+quick-filter-bar-dropdown-starred =
+    .label = Starred
+
+quick-filter-bar-dropdown-inaddrbook =
+    .label = Contact
+
+quick-filter-bar-dropdown-tags =
+    .label = Tags
+
+quick-filter-bar-dropdown-attachment =
+    .label = Attachment
+
+# The tooltip for the filter button that causes us to filter results to only
+# include unread messages.
+quick-filter-bar-unread =
+    .title = Show only unread messages
+# The label for the filter button that causes us to filter results to only
+# include unread messages.
+quick-filter-bar-unread-label = Unread
+
+# The tooltip for the filter button that causes us to filter results to only
+# include messages that have been starred/flagged.
+quick-filter-bar-starred =
+    .title = Show only starred messages
+# The label for the filter button that causes us to filter results to only
+# include messages that have been starred/flagged.
+quick-filter-bar-starred-label = Starred
+
+# The tooltip for the filter button that causes us to filter results to only
+# include messages from contacts in one of the user's non-remote address
+# books.
+quick-filter-bar-inaddrbook =
+    .title = Show only messages from people in your address book
+# The label for the filter button that causes us to filter results to only
+# include messages from contacts in one of the user's non-remote address
+# books.
+quick-filter-bar-inaddrbook-label = Contact
+
+# The tooltip for the filter button that causes us to filter results to only
+# include messages with at least one tag on them.
+quick-filter-bar-tags =
+    .title = Show only messages with tags on them
+# The label for the filter button that causes us to filter results to only
+# include messages with at least one tag on them.
+quick-filter-bar-tags-label = Tags
+
+# The tooltip for the filter button that causes us to filter results to only
+# include messages with attachments.
+quick-filter-bar-attachment =
+    .title = Show only messages with attachments
+# The label for the filter button that causes us to filter results to only
+# include messages with attachments.
+quick-filter-bar-attachment-label = Attachment
+
+# The contents of the results box when there is a filter active but there
+# are no messages matching the filter.
+quick-filter-bar-no-results = No results
+
+# This is used to populate the results box; it either displays the
+# number of messages found using this string, that there are no messages
+# (using quick-filter-bar-no-results), or the box is hidden.
+# Variables:
+# $count (Number) - The number of messages that match selected filters.
+quick-filter-bar-results =
+    { $count ->
+         [one] { $count } message
+        *[other] { $count } messages
+    }
+
+# Keyboard shortcut for the text search box.
+# This should match quick-filter-bar-show in messenger.ftl.
+quick-filter-bar-textbox-shortcut =
+    { PLATFORM() ->
+        [macos] ⇧ ⌘ K
+       *[other] Ctrl+Shift+K
+    }
+
+# This is the empty text for the text search box.
+# The goal is to convey to the user that typing in the box will filter
+# the messages and that there is a hotkey they can press to get to the
+# box faster.
+quick-filter-bar-textbox =
+    .placeholder = Filter these messages <{ quick-filter-bar-textbox-shortcut }>
+
+# Tooltip of the Any-of/All-of tagging mode selector.
+quick-filter-bar-boolean-mode =
+    .title = Tag filtering mode
+# The Any-of tagging mode.
+quick-filter-bar-boolean-mode-any =
+    .label = Any of
+    .title = At least one of the selected tag criteria should match
+# The All-of tagging mode.
+quick-filter-bar-boolean-mode-all =
+    .label = All of
+    .title = All of the selected tag criteria must match
+
+# This label explains what the sender/recipients/subject/body buttons do.
+# This string should ideally be kept short because the label and the text
+# filter buttons share their bar (that appears when there is text in the text
+# filter box) with the list of tags when the tag filter is active, and the
+# tag sub-bar wants as much space as possible. (Overflow is handled by an
+# arrow scroll box.)
+quick-filter-bar-text-filter-explanation = Filter messages by:
+# The button label that toggles whether the text filter searches the message
+# sender for the string.
+quick-filter-bar-text-filter-sender = Sender
+# The button label that toggles whether the text filter searches the message
+# recipients (to, cc) for the string.
+quick-filter-bar-text-filter-recipients = Recipients
+# The button label that toggles whether the text filter searches the message
+# subject for the string.
+quick-filter-bar-text-filter-subject = Subject
+# The button label that toggles whether the text filter searches the message
+# body for the string.
+quick-filter-bar-text-filter-body = Body
+
+# The first line of the panel popup that tells the user we found no matches
+# but we can convert to a global search for them.
+quick-filter-bar-gloda-upsell-line1 = Continue this search across all folders
+# The second line of the panel popup that tells the user we found no matches.
+# Variables:
+# $text (String) - What the user has typed so far.
+quick-filter-bar-gloda-upsell-line2 = Press ‘Enter’ again to continue your search for: { $text }
+
+## Folder pane
+
+folder-pane-get-messages-button =
+  .title = Get Messages
+
+folder-pane-get-all-messages-menuitem =
+  .label = Get All New Messages
+  .accesskey = G
+
+folder-pane-write-message-button = New Message
+  .title = Compose a new message
+
+folder-pane-more-menu-button =
+  .title = Folder pane options
+
+# Context menu item to show/hide different folder types in the folder pane
+folder-pane-header-folder-modes =
+  .label = Folder Modes
+
+# Context menu item to toggle display of "Get messages" button in folder pane header
+folder-pane-header-context-toggle-get-messages =
+  .label = Show “Get Messages”
+
+# Context menu item to toggle display of "New Message" button in folder pane header
+folder-pane-header-context-toggle-new-message =
+  .label = Show “New Message”
+
+folder-pane-header-context-hide =
+  .label = Hide Folder Pane Header
+
+folder-pane-show-total-toggle =
+  .label = Show Total Message Count
+
+# Context menu item to show or hide folder sizes
+folder-pane-header-toggle-folder-size =
+  .label = Show Folder Size
+
+folder-pane-header-hide-local-folders =
+  .label = Hide Local Folders
+
+folder-pane-mode-context-button =
+  .title = Folder mode options
+
+folder-pane-mode-context-toggle-compact-mode =
+  .label = Compact View
+  .accesskey = C
+
+folder-pane-mode-move-up =
+  .label = Move Up
+
+folder-pane-mode-move-down =
+  .label = Move Down
+
+# Variables:
+# $count (Number) - Number of unread messages.
+folder-pane-unread-aria-label =
+  { $count ->
+    [one] 1 unread message
+    *[other] { $count } unread messages
+  }
+
+# Variables:
+# $count (Number) - Number of total messages.
+folder-pane-total-aria-label =
+  { $count ->
+    [one] 1 total message
+    *[other] { $count } total messages
+  }
+
+## Message thread pane
+
+threadpane-column-header-select =
+  .title = Toggle select all messages
+threadpane-column-header-select-all =
+  .title = Select all messages
+threadpane-column-header-deselect-all =
+  .title = Deselect all messages
+threadpane-column-label-select =
+  .label = Select Messages
+threadpane-cell-select =
+  .aria-label = Select message
+
+threadpane-column-header-thread =
+  .title = Toggle message threads
+threadpane-column-label-thread =
+  .label = Thread
+threadpane-cell-thread =
+  .aria-label = Thread status
+
+threadpane-column-header-flagged =
+  .title = Sort by star
+threadpane-column-label-flagged =
+  .label = Starred
+threadpane-cell-flagged =
+  .aria-label = Starred
+
+threadpane-flagged-cell-label = Starred
+
+threadpane-column-header-attachments =
+  .title = Sort by attachments
+threadpane-column-label-attachments =
+  .label = Attachments
+threadpane-cell-attachments =
+  .aria-label = Attachments
+
+threadpane-attachments-cell-label = Attachments
+
+threadpane-column-header-spam =
+  .title = Sort by spam status
+threadpane-column-label-spam =
+  .label = Spam
+threadpane-cell-spam =
+  .aria-label = Spam status
+
+threadpane-spam-cell-label = Spam
+
+threadpane-column-header-unread-button =
+  .title = Sort by read status
+threadpane-column-label-unread-button =
+  .label = Read status
+
+threadpane-cell-read-status =
+  .aria-label = Read status
+
+threadpane-read-cell-label = Read
+threadpane-unread-cell-label = Unread
+
+threadpane-column-header-sender = From
+  .title = Sort by from
+threadpane-column-label-sender =
+  .label = From
+threadpane-cell-sender =
+  .aria-label = From
+
+threadpane-column-header-recipient = Recipient
+  .title = Sort by recipient
+threadpane-column-label-recipient =
+  .label = Recipient
+threadpane-cell-recipient =
+  .aria-label = Recipient
+
+threadpane-column-header-correspondents = Correspondents
+  .title = Sort by correspondents
+threadpane-column-label-correspondents =
+  .label = Correspondents
+threadpane-cell-correspondents =
+  .aria-label = Correspondents
+
+threadpane-column-header-subject = Subject
+  .title = Sort by subject
+threadpane-column-label-subject =
+  .label = Subject
+threadpane-cell-subject =
+  .aria-label = Subject
+
+threadpane-column-header-date = Date
+  .title = Sort by date
+threadpane-column-label-date =
+  .label = Date
+threadpane-cell-date =
+  .aria-label = Date
+
+threadpane-column-header-received = Received
+  .title = Sort by date received
+threadpane-column-label-received =
+  .label = Received
+threadpane-cell-received =
+  .aria-label = Date received
+
+threadpane-column-header-status = Status
+  .title = Sort by status
+threadpane-column-label-status =
+  .label = Status
+threadpane-cell-status =
+  .aria-label = Status
+
+threadpane-column-header-size = Size
+  .title = Sort by size
+threadpane-column-label-size =
+  .label = Size
+threadpane-cell-size =
+  .aria-label = Size
+
+threadpane-column-header-tags = Tags
+  .title = Sort by tags
+threadpane-column-label-tags =
+  .label = Tags
+threadpane-cell-tags =
+  .aria-label = Tags
+
+threadpane-column-header-account = Account
+  .title = Sort by account
+threadpane-column-label-account =
+  .label = Account
+threadpane-cell-account =
+  .aria-label = Account
+
+threadpane-column-header-priority = Priority
+  .title = Sort by priority
+threadpane-column-label-priority =
+  .label = Priority
+threadpane-cell-priority =
+  .aria-label = Priority
+
+threadpane-column-header-unread = Unread
+  .title = Number of unread messages in thread
+threadpane-column-label-unread =
+  .label = Unread
+threadpane-cell-unread =
+  .aria-label = Number of unread messages
+
+threadpane-column-header-total = Total
+  .title = Total number of messages in thread
+threadpane-column-label-total =
+  .label = Total
+threadpane-cell-total =
+  .aria-label = Total number of messages
+
+threadpane-column-header-location = Location
+  .title = Sort by location
+threadpane-column-label-location =
+  .label = Location
+threadpane-cell-location =
+  .aria-label = Location
+
+threadpane-column-header-id = Order Received
+  .title = Sort by order received
+threadpane-column-label-id =
+  .label = Order Received
+threadpane-cell-id =
+  .aria-label = Order received
+
+threadpane-column-header-delete =
+  .title = Delete a message
+threadpane-column-label-delete =
+  .label = Delete
+threadpane-cell-delete =
+  .aria-label = Delete
+
+## Message state variations
+
+threadpane-message-new =
+  .alt = New message indicator
+  .title = New message
+
+threadpane-message-replied =
+  .alt = Replied indicator
+  .title = Message replied
+
+threadpane-message-redirected =
+  .alt = Redirected indicator
+  .title = Message redirected
+
+threadpane-message-forwarded =
+  .alt = Forwarded indicator
+  .title = Message forwarded
+
+threadpane-message-replied-forwarded =
+  .alt = Replied and forwarded indicator
+  .title = Message replied and forwarded
+
+threadpane-message-replied-redirected =
+  .alt = Replied and redirected indicator
+  .title = Message replied and redirected
+
+threadpane-message-forwarded-redirected =
+  .alt = Forwarded and redirected indicator
+  .title = Message forwarded and redirected
+
+threadpane-message-replied-forwarded-redirected =
+  .alt = Replied, forwarded, and redirected indicator
+  .title = Message replied, forwarded, and redirected
+
+apply-columns-to-menu =
+  .label = Apply columns to…
+
+apply-current-view-to-menu =
+  .label = Apply current view to…
+
+apply-current-view-to-folder =
+  .label = Folder…
+
+apply-current-view-to-folder-children =
+  .label = Folder and its children…
+
+## Apply columns confirmation dialog
+
+apply-changes-to-folder-title = Apply Changes?
+
+# Variables:
+#  $name (String): The name of the folder to apply to.
+apply-current-columns-to-folder-message = Apply the current folder’s columns to { $name }?
+
+# Variables:
+#  $name (String): The name of the folder to apply to.
+apply-current-columns-to-folder-with-children-message = Apply the current folder’s columns to { $name } and its children?
+
+# Variables:
+#  $name (String): The name of the folder to apply to.
+apply-current-view-to-folder-message = Apply the current folder’s view to { $name }?
+# Variables:
+#  $name (String): The name of the folder to apply to.
+apply-current-view-to-folder-with-children-message = Apply the current folder’s view to { $name } and its children?
diff --git a/comm/mail/locales/en-US/messenger/aboutAddonsExtra.ftl b/comm/mail/locales/en-US/messenger/aboutAddonsExtra.ftl
new file mode 100644
index 0000000000..991a75695c
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutAddonsExtra.ftl
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+add-on-options-button =
+    .title = Add-on Options
+
+add-on-search-alternative-button-label = Find an alternative add-on
+
+atn-addons-heading-search-input =
+    .placeholder = Search addons.thunderbird.net
diff --git a/comm/mail/locales/en-US/messenger/aboutDialog.ftl b/comm/mail/locales/en-US/messenger/aboutDialog.ftl
new file mode 100644
index 0000000000..e14777deee
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutDialog.ftl
@@ -0,0 +1,74 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+about-update-whats-new = What’s New
+
+about-dialog-title = About { -brand-full-name }
+
+release-notes-link = Release notes
+
+update-internal-error = Unable to check for updates due to internal error. Updates available at <a data-l10n-name="manual-link"/>
+
+update-check-for-updates-button = Check for Updates
+    .accesskey = C
+
+update-update-button = Restart to update { -brand-shorter-name }
+    .accesskey = R
+
+update-checking-for-updates = Checking for updates…
+
+update-downloading-message = Downloading update — <span data-l10n-name="download-status"></span>
+
+update-applying = Applying update…
+
+update-downloading = <img data-l10n-name="icon"/>Downloading update — <span data-l10n-name="download-status"></span>
+
+update-failed = Update failed. <a data-l10n-name="failed-link">Download the latest version</a>
+
+update-admin-disabled = Updates disabled by your system administrator
+
+update-no-updates-found = { -brand-short-name } is up to date
+
+update-other-instance-handling-updates = { -brand-short-name } is being updated by another instance
+
+update-manual = Updates available at <a data-l10n-name="manual-link"/>
+
+update-unsupported = You can not perform further updates on this system. <a data-l10n-name="unsupported-link">Learn more</a>
+
+update-restarting = Restarting…
+
+# Variables:
+#   $channel (String): description of the update channel (e.g. "release", "beta", "nightly" etc.)
+channel-description = You are currently on the <span data-l10n-name="current-channel">{ $channel }</span> update channel.
+
+warning-desc-version = { -brand-short-name } is experimental and may be unstable.
+
+warning-desc-telemetry = It automatically sends information about performance, hardware, usage and customizations back to { -vendor-short-name } to help make { -brand-short-name } better.
+
+# Example of resulting string: 66.0.1 (64-bit)
+# Variables:
+#   $version (String): version of Thunderbird, e.g. 66.0.1
+#   $bits (Number): bits of the architecture (32 or 64)
+aboutDialog-version = { $version } ({ $bits }-bit)
+
+# Example of resulting string: 66.0a1 (2019-01-16) (64-bit)
+# Variables:
+#   $version (String): version of Thunderbird for Daily builds, e.g. 66.0a1
+#   $isodate (String): date in ISO format, e.g. 2019-01-16
+#   $bits (Number): bits of the architecture (32 or 64)
+aboutDialog-version-nightly = { $version } ({ $isodate }) ({ $bits }-bit)
+
+aboutdialog-update-checking-failed = Failed to check for updates.
+
+community-experimental = <a data-l10n-name="community-exp-mozilla-link">{ -vendor-short-name }</a> is a <a data-l10n-name="community-exp-credits-link">global community</a> working together to keep the Web open, public and accessible to all.
+
+community-desc = { -brand-short-name } is designed by <a data-l10n-name="community-mozilla-link">{ -vendor-short-name }</a>, a <a data-l10n-name="community-credits-link">global community</a> working together to keep the Web open, public and accessible to all.
+
+about-donation = Want to help? <a data-l10n-name="helpus-donate-link">Make a donation</a> or <a data-l10n-name="helpus-get-involved-link">get involved!</a>
+
+bottom-links-license = Licensing Information
+bottom-links-rights = End-User Rights
+bottom-links-privacy = Privacy Policy
+cmd-close-mac-command-key =
+    .key = w
diff --git a/comm/mail/locales/en-US/messenger/aboutImport.ftl b/comm/mail/locales/en-US/messenger/aboutImport.ftl
new file mode 100644
index 0000000000..3cf62f0c7b
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutImport.ftl
@@ -0,0 +1,283 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+import-page-title = Import
+
+export-page-title = Export
+
+## Header
+
+import-start = Import Tool
+
+import-start-title = Import settings or data from an application or a file.
+
+import-start-description = Select the source from which you want to import. You will later be asked to choose which data needs to be imported.
+
+import-from-app = Import from Application
+
+import-file = Import from a file
+
+import-file-title = Select a file to import its content.
+
+import-file-description = Choose to import a previously backed up profile, address books or calendars.
+
+import-address-book-title = Import Address Book file
+
+import-calendar-title = Import Calendar file
+
+export-profile = Export
+
+## Buttons
+
+button-back = Back
+
+button-continue = Continue
+
+button-export = Export
+
+button-finish = Finish
+
+## Import from app steps
+
+app-name-thunderbird = Thunderbird
+
+app-name-seamonkey = SeaMonkey
+
+app-name-outlook = Outlook
+
+app-name-becky = Becky! Internet Mail
+
+app-name-apple-mail = Apple Mail
+
+source-thunderbird = Import from another { app-name-thunderbird } installation
+
+source-thunderbird-description = Import settings, filters, messages, and other data from a { app-name-thunderbird } profile.
+
+source-seamonkey = Import from a { app-name-seamonkey } installation
+
+source-seamonkey-description = Import settings, filters, messages, and other data from a { app-name-seamonkey } profile.
+
+source-outlook = Import from { app-name-outlook }
+
+source-outlook-description = Import accounts, address books, and messages from { app-name-outlook }.
+
+source-becky = Import from { app-name-becky }
+
+source-becky-description = Import address books and messages from { app-name-becky }.
+
+source-apple-mail = Import from { app-name-apple-mail }
+
+source-apple-mail-description = Import messages from { app-name-apple-mail }.
+
+source-file2 = Import from a file
+
+source-file-description = Select a file to import address books, calendars, or a profile backup (ZIP file).
+
+## Import from file selections
+
+file-profile2 = Import Backed-up Profile
+
+file-profile-description = Select a previously backed up Thunderbird profile (.zip)
+
+file-calendar = Import Calendars
+
+file-calendar-description = Select a file containing exported Calendars or Events (.ics)
+
+file-addressbook = Import Address Books
+
+file-addressbook-description = Select a file containing exported Address Books and Contacts
+
+## Import from app profile steps
+
+from-app-thunderbird = Import from a { app-name-thunderbird } profile
+
+from-app-seamonkey = Import from a { app-name-seamonkey } profile
+
+from-app-outlook = Import from { app-name-outlook }
+
+from-app-becky = Import from { app-name-becky }
+
+from-app-apple-mail = Import from { app-name-apple-mail }
+
+profiles-pane-title-thunderbird = Import Settings and Data from a { app-name-thunderbird } profile.
+
+profiles-pane-title-seamonkey = Import Settings and Data from a { app-name-seamonkey } profile.
+
+profiles-pane-title-outlook = Import Data from { app-name-outlook }.
+
+profiles-pane-title-becky = Import Data from { app-name-becky }.
+
+profiles-pane-title-apple-mail = Import Messages from { app-name-apple-mail }.
+
+profile-source = Import from profile
+
+# $profileName (string) - name of the profile
+profile-source-named = Import from profile <strong>"{ $profileName }"</strong>
+
+profile-file-picker-directory = Choose a profile folder
+
+profile-file-picker-archive = Choose a <strong>ZIP</strong> file
+
+profile-file-picker-archive-description = The ZIP file must be smaller than 2GB.
+
+profile-file-picker-archive-title = Choose a ZIP file (smaller than 2GB)
+
+items-pane-title2 = Choose what to import:
+
+items-pane-directory = Directory:
+
+items-pane-profile-name = Profile name:
+
+items-pane-checkbox-accounts = Accounts and Settings
+
+items-pane-checkbox-address-books = Address Books
+
+items-pane-checkbox-calendars = Calendars
+
+items-pane-checkbox-mail-messages = Mail Messages
+
+items-pane-override = Any existing or identical data will not be overwritten.
+
+## Import from address book file steps
+
+import-from-addr-book-file-description = Choose the file format containing your Address Book data.
+
+addr-book-csv-file = Comma or tab separated file (.csv, .tsv)
+
+addr-book-ldif-file = LDIF file (.ldif)
+
+addr-book-vcard-file = vCard file (.vcf, .vcard)
+
+addr-book-sqlite-file = SQLite database file (.sqlite)
+
+addr-book-mab-file = Mork database file (.mab)
+
+addr-book-file-picker = Select an address book file
+
+addr-book-csv-field-map-title = Match field names
+
+addr-book-csv-field-map-desc = Select address book fields corresponding to the source fields. Uncheck fields you do not want to import.
+
+addr-book-directories-title = Select where to import the chosen data
+
+addr-book-directories-pane-source = Source file:
+
+# $addressBookName (string) - name of the new address book that would be created.
+addr-book-import-into-new-directory2 = Create a new directory called <strong>"{ $addressBookName }"</strong>
+
+# $addressBookName (string) - name of the address book to import into
+addr-book-summary-title = Import the chosen data into the "{ $addressBookName }" directory
+
+# $addressBookName (string) - name of the address book that will be created.
+addr-book-summary-description = A new address book called "{ $addressBookName }" will be created.
+
+## Import from calendar file steps
+
+import-from-calendar-file-desc = Select the iCalendar (.ics) file you would like to import.
+
+calendar-items-title = Select which items to import.
+
+calendar-items-loading = Loading items…
+
+calendar-items-filter-input =
+  .placeholder = Filter items…
+
+calendar-select-all-items = Select all
+
+calendar-deselect-all-items = Deselect all
+
+calendar-target-title = Select where to import the chosen items.
+
+# $targetCalendar (string) - name of the new calendar that would be created
+calendar-import-into-new-calendar2 = Create a new calendar called <strong>"{ $targetCalendar }"</strong>
+
+# $itemCount (number) - count of selected items (tasks, events) that will be imported
+# $targetCalendar (string) - name of the calendar the items will be imported into
+calendar-summary-title =
+  { $itemCount ->
+    [one] Import one item into the "{ $targetCalendar }" calendar
+    *[other] Import { $itemCount } items into the "{ $targetCalendar }" calendar
+  }
+
+# $targetCalendar (string) - name of the calendar that will be created
+calendar-summary-description = A new calendar called "{ $targetCalendar }" will be created.
+
+## Import dialog
+
+# $progressPercent (string) - percent formatted progress (for example "10%")
+progress-pane-importing2 = Importing… { $progressPercent }
+
+# $progressPercent (string) - percent formatted progress (for example "10%")
+progress-pane-exporting2 = Exporting… { $progressPercent }
+
+progress-pane-finished-desc2 = Complete.
+
+error-pane-title = Error
+
+error-message-zip-file-too-big2 = The selected ZIP file is larger than 2GB. Please extract it first, then import from the extracted folder instead.
+
+error-message-extract-zip-file-failed2 = Failed to extract the ZIP file. Please extract it manually, then import from the extracted folder instead.
+
+error-message-failed = Import failed unexpectedly, more information may be available in the Error Console.
+
+error-failed-to-parse-ics-file = No importable items found in the file.
+
+error-export-failed = Export failed unexpectedly, more information may be available in the Error Console.
+
+error-message-no-profile = No profile found.
+
+## <csv-field-map> element
+
+csv-first-row-contains-headers = First row contains field names
+
+csv-source-field = Source field
+
+csv-source-first-record = First record
+
+csv-source-second-record = Second record
+
+csv-target-field = Address book field
+
+## Export tab
+
+export-profile-title = Export accounts, messages, address books, and settings to a ZIP file.
+
+export-profile-description = If your current profile is larger than 2GB, we suggest you back it up by yourself.
+
+export-open-profile-folder = Open profile folder
+
+export-file-picker2 = Export to a ZIP file
+
+export-brand-name = { -brand-product-name }
+
+## Summary pane
+
+summary-pane-title = Data to be imported
+
+summary-pane-start = Start Import
+
+summary-pane-warning = { -brand-product-name } will need to be restarted when importing is complete.
+
+summary-pane-start-over = Restart Import Tool
+
+## Footer area
+
+footer-help = Need help?
+
+footer-import-documentation = Import documentation
+
+footer-export-documentation = Export documentation
+
+footer-support-forum = Support forum
+
+## Step navigation on top of the wizard pages
+
+step-list =
+  .aria-label = Import steps
+
+step-confirm = Confirm
+
+# Variables:
+# $number (number) - step number
+step-count = { $number }
diff --git a/comm/mail/locales/en-US/messenger/aboutProfilesExtra.ftl b/comm/mail/locales/en-US/messenger/aboutProfilesExtra.ftl
new file mode 100644
index 0000000000..fe428ad56b
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutProfilesExtra.ftl
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+profiles-launch-profile-plain = Launch profile
diff --git a/comm/mail/locales/en-US/messenger/aboutRights.ftl b/comm/mail/locales/en-US/messenger/aboutRights.ftl
new file mode 100644
index 0000000000..7888f0f098
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutRights.ftl
@@ -0,0 +1,122 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+rights-title = About Your Rights
+rights-intro =
+    { -brand-full-name } is free and open source software, built by a community
+    of thousands from all over the world. There are a few things you should
+    know:
+rights-intro-point-1 =
+    { -brand-short-name } is made available to you under the terms of the
+    <a data-l10n-name="mozilla-public-license-link">Mozilla Public License</a>.
+    This means you may use, copy and distribute { -brand-short-name } to
+    others. You are also welcome to modify the source code of
+    { -brand-short-name } as you want to meet your needs. The Mozilla Public
+    License also gives you the right to distribute your modified versions.
+rights-intro-point-2 =
+    You are not granted any trademark rights or licenses to the trademarks of
+    the Mozilla Foundation or any party, including without limitation the
+    Thunderbird name or logo. Additional information on trademarks may be found
+    <a data-l10n-name="mozilla-trademarks-link">here</a>.
+rights-intro-point-3 =
+    Some features in { -brand-short-name }, such as the Crash Reporter, give
+    you the option to provide feedback to { -vendor-short-name }. By choosing
+    to submit feedback, you give { -vendor-short-name } permission to use the
+    feedback to improve its products, to publish the feedback on its websites,
+    and to distribute the feedback.
+rights-intro-point-4 =
+    How we use your personal information and feedback submitted to
+    { -vendor-short-name } through { -brand-short-name } is described in the
+    <a data-l10n-name="mozilla-privacy-policy-link">{ -brand-short-name }
+    Privacy Policy</a>.
+rights-intro-point-4-unbranded =
+    Any applicable privacy policies for this product should be listed here.
+rights-intro-point-5 =
+    Some { -brand-short-name } features make use of web-based information
+    services, however, we cannot guarantee they are 100% accurate or
+    error-free. More details, including information on how to disable the
+    features that use these services, can be found in the
+    <a data-l10n-name="mozilla-service-terms-link">service terms</a>.
+rights-intro-point-5-unbranded =
+    If this product incorporates web services, any applicable service terms for
+    the service(s) should be linked to the
+    <a data-l10n-name="mozilla-website-services-link"> Website Services</a>
+    section.
+rights-intro-point-6 =
+    In order to play back certain types of video content, { -brand-short-name }
+    downloads certain content decryption modules from third parties.
+rights-webservices-header = { -brand-full-name } Web-Based Information Services
+rights-webservices2 =
+    { -brand-full-name } uses web-based information services (“Services”) to
+    provide some of the features provided for your use with this binary version
+    of { -brand-short-name } under the terms described below. If you do not
+    want to use one or more of the Services or the terms below are
+    unacceptable, you may disable the feature or Service(s). Instructions on
+    how to disable a particular feature or Service may be found
+    <a data-l10n-name="mozilla-disable-service-link">here</a>. Other features
+    and Services can be disabled in the application settings.
+rights-locationawarebrowsing =
+    <strong>Location Aware Browsing: </strong>is always opt-in. No location
+    information is ever sent without your permission. If you wish to disable
+    the feature completely, follow these steps:
+rights-locationawarebrowsing-term-1 =
+    Open the Config Editor
+rights-locationawarebrowsing-term-2 = Type geo.enabled
+rights-locationawarebrowsing-term-3 =
+    Double click on the geo.enabled preference
+rights-locationawarebrowsing-term-4 = Location-Aware Browsing is now disabled
+rights-webservices-unbranded =
+    An overview of the website services the product incorporates, along with
+    instructions on how to disable them, if applicable, should be included
+    here.
+rights-webservices-term-unbranded =
+    Any applicable service terms for this product should be listed here.
+rights-webservices-term-1 =
+    { -vendor-short-name } and its contributors, licensors and partners work to
+    provide the most accurate and up-to-date Services. However, we cannot
+    guarantee that this information is comprehensive and error-free. For
+    example, the Safe Browsing Service may not identify some risky sites and
+    may identify some safe sites in error and the Location Aware Service all
+    locations returned by our service providers are estimates only and neither
+    we nor our service providers guarantee the accuracy of the locations
+    provided.
+rights-webservices-term-2 =
+    { -vendor-short-name } may discontinue or change the Services at its
+    discretion.
+rights-webservices-term-3 =
+    You are welcome to use these Services with the accompanying version of
+    { -brand-short-name }, and { -vendor-short-name } grants you its rights to
+    do so. { -vendor-short-name } and its licensors reserve all other rights in
+    the Services. These terms are not intended to limit any rights granted
+    under open source licenses applicable to { -brand-short-name } and to
+    corresponding source code versions of { -brand-short-name }.
+rights-webservices-term-4 =
+    <strong>The Services are provided “as-is.” { -vendor-short-name }, its
+    contributors, licensors, and distributors, disclaim all warranties, whether
+    express or implied, including without limitation, warranties that the
+    Services are merchantable and fit for your particular purposes. You bear
+    the entire risk as to selecting the Services for your purposes and as to
+    the quality and performance of the Services. Some jurisdictions do not
+    allow the exclusion or limitation of implied warranties, so this disclaimer
+    may not apply to you.</strong>
+rights-webservices-term-5 =
+    <strong>Except as required by law, { -vendor-short-name }, its
+    contributors, licensors, and distributors will not be liable for any
+    indirect, special, incidental, consequential, punitive, or exemplary
+    damages arising out of or in any way relating to the use of
+    { -brand-short-name } and the Services. The collective liability under
+    these terms will not exceed $500 (five hundred dollars). Some jurisdictions
+    do not allow the exclusion or limitation of certain damages, so this
+    exclusion and limitation may not apply to you.</strong>
+rights-webservices-term-6 =
+    { -vendor-short-name } may update these terms as necessary from time to
+    time. These terms may not be modified or canceled without
+    { -vendor-short-name }’s written agreement.
+rights-webservices-term-7 =
+    These terms are governed by the laws of the state of California, U.S.A.,
+    excluding its conflict of law provisions. If any portion of these terms is
+    held to be invalid or unenforceable, the remaining portions will remain in
+    full force and effect. In the event of a conflict between a translated
+    version of these terms and the English language version, the English
+    language version shall control.
diff --git a/comm/mail/locales/en-US/messenger/aboutSupportCalendar.ftl b/comm/mail/locales/en-US/messenger/aboutSupportCalendar.ftl
new file mode 100644
index 0000000000..50073f91bd
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutSupportCalendar.ftl
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+calendars-title = Calendar Settings
+calendars-table-heading-property = Name
+calendars-table-heading-value = Value
+calendars-table-name = Name
+calendars-table-type = Type
+calendars-table-disabled = Disabled
+calendars-table-username = Username
+calendars-table-uri = URI
+calendars-table-refreshinterval = Refresh Interval
+calendars-table-readonly = Read-only
+calendars-table-suppressalarms = Suppress Alarms
+calendars-table-cache-enabled = Cache Enabled
+calendars-table-imip-identity = iMIP Identity
+calendars-table-imip-identity-disabled = iMIP Disabled
+calendars-table-imip-identity-account = iMIP Account
+calendars-table-organizerid = Organizer Id
+calendars-table-forceemailscheduling = Force Email Scheduling
+calendars-table-capabilities-alarms-popup-supported = Popup Alarms Supported
+calendars-table-capabilities-alarms-oninviations-supported = Alarms on Invitation Supported
+calendars-table-capabilities-alarms-maxcount = Max Alarms Per Event
+calendars-table-capabilities-attachments-supported = Attachment Supported
+calendars-table-capabilities-categories-maxcount = Max Categories
+calendars-table-capabilities-privacy-supported = Privacy State Supported
+calendars-table-capabilities-priority-supported = Priority Supported
+calendars-table-capabilities-events-supported = Event Supported
+calendars-table-capabilities-tasks-supported = Task Supported
+calendars-table-capabilities-timezones-floating-supported = Local Time Supported
+calendars-table-capabilities-timezones-utc-supported = UTC/GMT Supported
+calendars-table-capabilities-autoschedule-supported = Auto-Scheduling Supported
diff --git a/comm/mail/locales/en-US/messenger/aboutSupportChat.ftl b/comm/mail/locales/en-US/messenger/aboutSupportChat.ftl
new file mode 100644
index 0000000000..7731079ba6
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutSupportChat.ftl
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chat-title = Chat Accounts
+chat-table-heading-account = ID
+chat-table-heading-protocol = Protocol
+chat-table-heading-name = Name
+chat-table-heading-actions = Actions
+chat-table-copy-debug-log = Copy Debug Log
+    .title = Copy errors and other logging from this chat account to the clipboard. May contain personal information like chat messages.
diff --git a/comm/mail/locales/en-US/messenger/aboutSupportMail.ftl b/comm/mail/locales/en-US/messenger/aboutSupportMail.ftl
new file mode 100644
index 0000000000..e7b0e45cca
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/aboutSupportMail.ftl
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+accounts-title = Mail and News Accounts
+show-private-data-main-text = Include account names
+show-private-data-explanation-text = (possibly identifying information)
+accounts-ID = ID
+accounts-name = Name
+accounts-incoming-server = Incoming server
+accounts-outgoing-servers = Outgoing servers
+accounts-server-name = Name
+accounts-conn-security = Connection security
+accounts-auth-method = Authentication method
+accounts-default = Default?
+identity-name = Identity
+
+send-via-email = Send via email
+
+app-basics-telemetry = Telemetry Data
+app-basics-cache-use = Cache Use
+
+mail-libs-title = Libraries
+libs-table-heading-library = Library
+libs-table-heading-expected-version = Expected minimum version
+libs-table-heading-loaded-version = Version in use
+libs-table-heading-path = Path
+libs-table-heading-status = Status
+
+libs-rnp-status-ok = OK
+libs-rnp-status-load-failed = Failed to load. OpenPGP will not work.
+libs-rnp-status-incompatible = Incompatible version. OpenPGP will not work.
+libs-rnp-status-unofficial = Unofficial version. OpenPGP might not work as expected.
diff --git a/comm/mail/locales/en-US/messenger/accountCentral.ftl b/comm/mail/locales/en-US/messenger/accountCentral.ftl
new file mode 100644
index 0000000000..24141189af
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/accountCentral.ftl
@@ -0,0 +1,68 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-central-title = Welcome to { -brand-full-name }
+account-settings = Account Settings
+
+#   $accounts (Number) - the number of configured accounts
+setup-title = { $accounts ->
+    [0]      Choose What to Set Up
+    *[other] Set Up Another Account
+}
+about-title = About { -brand-full-name }
+resources-title = Resources
+
+release-notes =
+    .title = About { -brand-full-name }
+
+email-label = Email
+    .aria-label = Connect to your existing email account
+email-description = { -brand-short-name } lets you connect to your existing email account, to read your emails conveniently and efficiently from within the application.
+
+calendar-label = Calendar
+    .aria-label = Create a new calendar
+calendar-description = { -brand-short-name } lets you handle events and keeps you organized. Connecting to a remote calendar will keep all your events in sync across all your devices.
+
+chat-label = Chat
+    .aria-label = Connect to your chat account
+chat-description = { -brand-short-name } lets you connect to multiple instant messaging accounts, offering support for various platforms.
+
+filelink-label = Filelink
+    .aria-label = Set up Filelink
+filelink-description = { -brand-short-name } lets you set up a convenient filelink cloud account to easily send large attachments.
+
+addressbook-label = Address Book
+    .aria-label = Create a new address book
+addressbook-description = { -brand-short-name } lets you organize all your contacts in an address book. You can also connect to a remote address book to keep all your contacts in sync.
+
+feeds-label = Feeds
+    .aria-label = Connect to feeds
+feeds-description = { -brand-short-name } lets you connect to RSS/Atom feeds to get news and updates from all around.
+
+newsgroups-label = Newsgroups
+    .aria-label = Connect to a newsgroup
+newsgroups-description = { -brand-short-name } lets you connect to all the newsgroups you want.
+
+import-title = Import from Another Program
+import-paragraph2 = { -brand-short-name } lets you import mail messages, address book entries, feed subscriptions, settings, and/or filters from other mail programs and common address book formats.
+
+import-label = Import
+    .aria-label = Import data from other programs
+
+about-paragraph = Thunderbird is the leading open source, cross-platform email and calendaring client, free for business and personal use. We want it to stay secure and become even better. A donation will allow us to hire developers, pay for infrastructure, and continue to improve.
+
+about-paragraph-consider-donation = <b>Thunderbird is funded by users like you! If you like Thunderbird, please consider making a donation.</b> The best way for you to ensure Thunderbird remains available is to <a data-l10n-name="donation-link"> make a donation</a>.
+
+explore-link = Explore Features
+support-link = Support
+involved-link = Get Involved
+developer-link = Developer Documentation
+
+read = Read messages
+compose = Write a new message
+search = Search messages
+filter = Manage message filters
+nntp-subscription = Manage newsgroup subscriptions
+rss-subscription = Manage feed subscriptions
+e2e = End-to-end Encryption
diff --git a/comm/mail/locales/en-US/messenger/accountManager.ftl b/comm/mail/locales/en-US/messenger/accountManager.ftl
new file mode 100644
index 0000000000..607c22e94a
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/accountManager.ftl
@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+open-preferences-sidebar-button2 = { -brand-short-name } Settings
+
+open-addons-sidebar-button = Add-ons and Themes
+
+account-action-add-newsgroup-account =
+    .label = Add Newsgroup Account…
+    .accesskey = N
+
+server-change-restart-required = Restart is required to apply the server name or username change.
+
+edit-vcard-dialog-accept-button = Save
+    .accesskey = S
+edit-vcard-dialog-cancel-button = Cancel
+    .accesskey = C
diff --git a/comm/mail/locales/en-US/messenger/accountProvisioner.ftl b/comm/mail/locales/en-US/messenger/accountProvisioner.ftl
new file mode 100644
index 0000000000..ac60ba5939
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/accountProvisioner.ftl
@@ -0,0 +1,80 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-provisioner-tab-title = Get a new email address from a service provider
+
+provisioner-searching-icon =
+    .alt = Searching…
+
+account-provisioner-title = Create a new email address
+
+account-provisioner-description = Use our trusted partners to get a new private and secure email address.
+
+account-provisioner-start-help = The search terms used are sent to { -vendor-short-name } (<a data-l10n-name="mozilla-privacy-link">Privacy Policy</a>) and 3rd party email providers <strong>mailfence.com</strong> (<a data-l10n-name="mailfence-privacy-link">Privacy Policy</a>, <a data-l10n-name="mailfence-tou-link">Terms of Use</a>) and <strong>gandi.net</strong> (<a data-l10n-name="gandi-privacy-link">Privacy Policy</a>, <a data-l10n-name="gandi-tou-link">Terms of Use</a>) to find available email addresses.
+
+account-provisioner-mail-account-title = Buy a new email address
+
+account-provisioner-mail-account-description = Thunderbird partnered with <a data-l10n-name="mailfence-home-link">Mailfence</a> to offer you a new private and secure email. We believe everyone should have a secure email.
+
+account-provisioner-domain-title = Buy an email and domain of your own
+
+account-provisioner-domain-description = Thunderbird partnered with <a data-l10n-name="gandi-home-link">Gandi</a> to offer you a custom domain. This lets you use any address on that domain.
+
+## Forms
+
+account-provisioner-mail-input =
+    .placeholder = Your name, nickname, or other search term
+
+account-provisioner-domain-input =
+    .placeholder = Your name, nickname, or other search term
+
+account-provisioner-search-button = Search
+
+account-provisioner-button-cancel = Cancel
+
+account-provisioner-button-existing = Use an existing email account
+
+account-provisioner-button-back = Go back
+
+## Notifications
+
+account-provisioner-fetching-provisioners = Retrieving provisioners…
+
+account-provisioner-connection-issues = Unable to communicate with our sign-up servers. Please check your connection.
+
+account-provisioner-searching-email = Searching for available email accounts…
+
+account-provisioner-searching-domain = Searching for available domains…
+
+account-provisioner-searching-error = Could not find any addresses to suggest. Try changing the search terms.
+
+## Illustrations
+
+account-provisioner-step1-image =
+    .title = Choose which account to create
+
+## Search results
+
+# Variables:
+# $count (Number) - The number of domains found during search.
+account-provisioner-results-title =
+    { $count ->
+        [one] One available address found for:
+        *[other] { $count } available addresses found for:
+    }
+
+account-provisioner-mail-results-caption = You can try to search for nicknames or any other term to find more emails.
+
+account-provisioner-domain-results-caption = You can try to search for nicknames or any other term to find more domains.
+
+account-provisioner-free-account = Free
+
+# Variables:
+# $price (String) - Yearly fee for the mail account. For example "US $9.99".
+account-provision-price-per-year = { $price } a year
+
+account-provisioner-all-results-button = Show all results
+
+account-provisioner-open-in-tab-img =
+    .title = Opens in a new Tab
diff --git a/comm/mail/locales/en-US/messenger/accountcreation/accountHub.ftl b/comm/mail/locales/en-US/messenger/accountcreation/accountHub.ftl
new file mode 100644
index 0000000000..b26305a689
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/accountcreation/accountHub.ftl
@@ -0,0 +1,60 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### Account Hub
+### Account hub is where user can setup new accounts in Thunderbird.
+
+## Header
+
+account-hub-brand = { -brand-full-name }
+
+account-hub-welcome-line = Welcome to <span data-l10n-name="brand-name">{ -brand-full-name }</span>
+
+account-hub-title = Account Hub
+
+## Footer
+
+account-hub-release-notes = Release notes
+
+account-hub-support = Support
+
+account-hub-donate = Donate
+
+## Initial setup page
+
+account-hub-email-setup-button = Email Account
+    .title = Set up an email account
+
+account-hub-calendar-setup-button = Calendar
+    .title = Set up a local or remote calendar
+
+account-hub-address-book-setup-button = Address Book
+    .title = Set up a local or remote address book
+
+account-hub-chat-setup-button = Chat
+    .title = Set up a chat account
+
+account-hub-feed-setup-button = RSS feed
+    .title = Set up an RSS feed account
+
+account-hub-newsgroup-setup-button = Newsgroup
+    .title = Set up a newsgroup account
+
+account-hub-import-setup-button = Import
+    .title = Import a backed up profile
+
+# Note: "Sync" represents the Firefox Sync product so it shouldn't be translated.
+account-hub-sync-button = Sign in to Sync…
+
+## Email page
+
+account-hub-email-title = Set up your email account
+
+account-hub-email-cancel-button = Cancel
+
+account-hub-email-back-button = Back
+
+account-hub-email-continue-button = Continue
+
+account-hub-email-confirm-button = Confirm
diff --git a/comm/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl b/comm/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl
new file mode 100644
index 0000000000..f36d924d60
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl
@@ -0,0 +1,428 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-setup-tab-title = Account Setup
+
+## Header
+
+account-setup-title = Set Up Your Existing Email Address
+
+account-setup-description = To use your current email address fill in your credentials.
+
+account-setup-secondary-description = { -brand-product-name } will automatically search for a working and recommended server configuration.
+
+account-setup-success-title = Account successfully created
+
+account-setup-success-description = You can now use this account with { -brand-short-name }.
+
+account-setup-success-secondary-description = You can improve the experience by connecting related services and configuring advanced account settings.
+
+## Form fields
+
+account-setup-name-label = Your full name
+    .accesskey = n
+
+# Note: "John Doe" is a multiple-use name that is used when the true name of a person is unknown. We use this fake name as an input placeholder. Translators should update this to reflect the placeholder name of their language/country.
+account-setup-name-input =
+    .placeholder = John Doe
+
+account-setup-name-info-icon =
+    .title = Your name, as shown to others
+
+
+account-setup-name-warning-icon =
+    .title = Please enter your name
+
+account-setup-email-label = Email address
+    .accesskey = E
+
+account-setup-email-input =
+    .placeholder = john.doe@example.com
+
+account-setup-email-info-icon =
+    .title = Your existing email address
+
+account-setup-email-warning-icon =
+    .title = Invalid email address
+
+account-setup-password-label = Password
+    .accesskey = P
+    .title = Optional, will only be used to validate the username
+
+account-provisioner-button = Get a new email address
+    .accesskey = G
+
+account-setup-password-toggle-show =
+    .title = Show password in clear text
+
+account-setup-password-toggle-hide =
+    .title = Hide password
+
+account-setup-remember-password = Remember password
+    .accesskey = m
+
+account-setup-exchange-label = Your login
+    .accesskey = l
+
+#   YOURDOMAIN refers to the Windows domain in ActiveDirectory. yourusername refers to the user's account name in Windows.
+account-setup-exchange-input =
+    .placeholder = YOURDOMAIN\yourusername
+
+#   Domain refers to the Windows domain in ActiveDirectory. We mean the user's login in Windows at the local corporate network.
+account-setup-exchange-info-icon =
+    .title = Domain login
+
+## Action buttons
+
+account-setup-button-cancel = Cancel
+    .accesskey = a
+
+account-setup-button-manual-config = Configure manually
+    .accesskey = m
+
+account-setup-button-stop = Stop
+    .accesskey = S
+
+account-setup-button-retest = Re-test
+    .accesskey = t
+
+account-setup-button-continue = Continue
+    .accesskey = C
+
+account-setup-button-done = Done
+    .accesskey = D
+
+## Notifications
+
+account-setup-looking-up-settings = Looking up configuration…
+
+account-setup-looking-up-settings-guess = Looking up configuration: Trying common server names…
+
+account-setup-looking-up-settings-half-manual = Looking up configuration: Probing server…
+
+account-setup-looking-up-disk = Looking up configuration: { -brand-short-name } installation…
+
+account-setup-looking-up-isp = Looking up configuration: Email provider…
+
+# Note: Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
+account-setup-looking-up-db = Looking up configuration: Mozilla ISP database…
+
+account-setup-looking-up-mx = Looking up configuration: Incoming mail domain…
+
+account-setup-looking-up-exchange = Looking up configuration: Exchange server…
+
+account-setup-checking-password = Checking password…
+
+account-setup-installing-addon = Downloading and installing add-on…
+
+account-setup-success-half-manual = The following settings were found by probing the given server:
+
+account-setup-success-guess = Configuration found by trying common server names.
+
+account-setup-success-guess-offline = You are offline. We guessed some settings but you will need to enter the right settings.
+
+account-setup-success-password = Password OK
+
+account-setup-success-addon = Successfully installed the add-on
+
+# Note: Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
+account-setup-success-settings-db = Configuration found in Mozilla ISP database.
+
+account-setup-success-settings-disk = Configuration found on { -brand-short-name } installation.
+
+account-setup-success-settings-isp = Configuration found at email provider.
+
+# Note: Microsoft Exchange is a product name.
+account-setup-success-settings-exchange = Configuration found for a Microsoft Exchange server.
+
+## Illustrations
+
+account-setup-step1-image =
+    .title = Initial setup
+
+account-setup-step2-image =
+    .title = Loading…
+
+account-setup-step3-image =
+    .title = Configuration found
+
+account-setup-step4-image =
+    .title = Connection error
+
+account-setup-step5-image =
+    .title = Account created
+
+account-setup-privacy-footnote2 = Your credentials will only be stored locally on your computer.
+
+account-setup-selection-help = Not sure what to select?
+
+account-setup-selection-error = Need help?
+
+account-setup-success-help = Not sure about your next steps?
+
+account-setup-documentation-help = Setup documentation
+
+account-setup-forum-help = Support forum
+
+account-setup-privacy-help = Privacy policy
+
+account-setup-getting-started = Getting started
+
+## Results area
+
+# Variables:
+#  $count (Number) - Number of available protocols.
+account-setup-results-area-title =
+    { $count ->
+        [one] Available configuration
+        *[other] Available configurations
+    }
+
+account-setup-result-imap-description = Keep your folders and emails synced on your server
+
+account-setup-result-pop-description = Keep your folders and emails on your computer
+
+# Note: Exchange, Office365 are the name of products.
+account-setup-result-exchange2-description = Use the Microsoft Exchange server or Office365 cloud services
+
+account-setup-incoming-title = Incoming
+
+account-setup-outgoing-title = Outgoing
+
+account-setup-username-title = Username
+
+account-setup-exchange-title = Server
+
+account-setup-result-no-encryption = No Encryption
+
+account-setup-result-ssl = SSL/TLS
+
+account-setup-result-starttls = STARTTLS
+
+account-setup-result-outgoing-existing = Use existing outgoing SMTP server
+
+# Variables:
+#  $incoming (String): The email/username used to log into the incoming server
+#  $outgoing (String): The email/username used to log into the outgoing server
+account-setup-result-username-different = Incoming: { $incoming }, Outgoing: { $outgoing }
+
+## Error messages
+
+# Note: The reference to "janedoe" (Jane Doe) is the name of an example person. You will want to translate it to whatever example persons would be named in your language. In the example, AD is the name of the Windows domain, and this should usually not be translated.
+account-setup-credentials-incomplete = Authentication failed. Either the entered credentials are incorrect or a separate username is required for logging in. This username is usually your Windows domain login with or without the domain (for example, janedoe or AD\\janedoe)
+
+account-setup-credentials-wrong = Authentication failed. Please check the username and password
+
+account-setup-find-settings-failed = { -brand-short-name } failed to find the settings for your email account
+
+account-setup-exchange-config-unverifiable = Configuration could not be verified. If your username and password are correct, it’s likely that the server administrator has disabled the selected configuration for your account. Try selecting another protocol.
+
+account-setup-provisioner-error = An error occurred while setting up your new account in { -brand-short-name }. Please, try to manually set up your account with your credentials.
+
+## Manual configuration area
+
+account-setup-manual-config-title = Manual configuration
+
+account-setup-incoming-server-legend = Incoming server
+
+account-setup-protocol-label = Protocol:
+
+account-setup-hostname-label = Hostname:
+
+account-setup-port-label = Port:
+    .title = Set the port number to 0 for autodetection
+
+account-setup-auto-description = { -brand-short-name } will attempt to auto-detect fields that are left blank.
+
+account-setup-ssl-label = Connection security:
+
+account-setup-outgoing-server-legend = Outgoing server
+
+## Incoming/Outgoing SSL Authentication options
+
+ssl-autodetect-option = Autodetect
+
+ssl-no-authentication-option = No authentication
+
+ssl-cleartext-password-option = Normal password
+
+ssl-encrypted-password-option = Encrypted password
+
+## Incoming/Outgoing SSL options
+
+ssl-noencryption-option = None
+
+account-setup-auth-label = Authentication method:
+
+account-setup-username-label = Username:
+
+account-setup-advanced-setup-button = Advanced config
+    .accesskey = A
+
+## Warning insecure server dialog
+
+account-setup-insecure-title = Warning!
+
+account-setup-insecure-incoming-title = Incoming settings:
+
+account-setup-insecure-outgoing-title = Outgoing settings:
+
+# Variables:
+#  $server (String): The name of the hostname of the server the user was trying to connect to.
+account-setup-warning-cleartext = <b>{ $server }</b> does not use encryption.
+
+account-setup-warning-cleartext-details = Insecure mail servers do not use encrypted connections to protect your passwords and private information. By connecting to this server you could expose your password and private information.
+
+account-setup-insecure-server-checkbox = I understand the risks
+    .accesskey = u
+
+account-setup-insecure-description = { -brand-short-name } can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the <a data-l10n-name="thunderbird-faq-link">Thunderbird FAQ</a> for more information.
+
+insecure-dialog-cancel-button = Change Settings
+    .accesskey = S
+
+insecure-dialog-confirm-button = Confirm
+    .accesskey = C
+
+## Warning Exchange confirmation dialog
+
+# Variables:
+#  $domain (String): The name of the server where the configuration was found, e.g. rackspace.com.
+exchange-dialog-question = { -brand-short-name } found your account setup information on { $domain }. Do you want to proceed and submit your credentials?
+
+exchange-dialog-confirm-button = Login
+
+exchange-dialog-cancel-button = Cancel
+
+## Dismiss account creation dialog
+
+exit-dialog-title = No Email Account Configured
+
+exit-dialog-description = Are you sure you want to cancel the setup process? { -brand-short-name } can still be used without an email account, but many features will not be available.
+
+account-setup-no-account-checkbox = Use { -brand-short-name } without an email account
+    .accesskey = U
+
+exit-dialog-cancel-button = Continue Setup
+    .accesskey = C
+
+exit-dialog-confirm-button = Exit Setup
+    .accesskey = E
+
+## Alert dialogs
+
+account-setup-creation-error-title = Error Creating Account
+
+account-setup-error-server-exists = Incoming server already exists.
+
+account-setup-confirm-advanced-title = Confirm Advanced Configuration
+
+account-setup-confirm-advanced-description = This dialog will be closed and an account with the current settings will be created, even if the configuration is incorrect. Do you want to proceed?
+
+## Addon installation section
+
+account-setup-addon-install-title = Install
+
+account-setup-addon-install-intro = A third-party add-on can allow you to access your email account on this server:
+
+account-setup-addon-no-protocol = This email server unfortunately does not support open protocols. { account-setup-addon-install-intro }
+
+## Success view
+
+account-setup-settings-button = Account settings
+
+account-setup-encryption-button = End-to-end encryption
+
+account-setup-signature-button = Add a signature
+
+account-setup-dictionaries-button = Download dictionaries
+
+account-setup-address-book-carddav-button = Connect to a CardDAV address book
+
+account-setup-address-book-ldap-button = Connect to an LDAP address book
+
+account-setup-calendar-button = Connect to a remote calendar
+
+account-setup-linked-services-title = Connect your linked services
+
+account-setup-linked-services-description = { -brand-short-name } detected other services linked to your email account.
+
+account-setup-no-linked-description = Setup other services to get the most out of your { -brand-short-name } experience.
+
+# Variables:
+# $count (Number) - The number of address books found during autoconfig.
+account-setup-found-address-books-description =
+    { $count ->
+        [one] { -brand-short-name } found one address book linked to your email account.
+        *[other] { -brand-short-name } found { $count } address books linked to your email account.
+    }
+
+# Variables:
+# $count (Number) - The number of calendars found during autoconfig.
+account-setup-found-calendars-description =
+    { $count ->
+        [one] { -brand-short-name } found one calendar linked to your email account.
+        *[other] { -brand-short-name } found { $count } calendars linked to your email account.
+    }
+
+account-setup-button-finish = Finish
+    .accesskey = F
+
+account-setup-looking-up-address-books = Looking up address books…
+
+account-setup-looking-up-calendars = Looking up calendars…
+
+account-setup-address-books-button = Address Books
+
+account-setup-calendars-button = Calendars
+
+account-setup-connect-link = Connect
+
+account-setup-existing-address-book = Connected
+    .title = Address book already connected
+
+account-setup-existing-calendar = Connected
+    .title = Calendar already connected
+
+account-setup-connect-all-calendars = Connect all calendars
+
+account-setup-connect-all-address-books = Connect all address books
+
+## Calendar synchronization dialog
+
+calendar-dialog-title = Connect calendar
+
+calendar-dialog-cancel-button = Cancel
+    .accesskey = C
+
+calendar-dialog-confirm-button = Connect
+    .accesskey = n
+
+account-setup-calendar-name-label = Name
+
+account-setup-calendar-name-input =
+    .placeholder = My calendar
+
+account-setup-calendar-color-label = Color
+
+account-setup-calendar-refresh-label = Refresh
+
+account-setup-calendar-refresh-manual = Manually
+
+# Variables:
+# $count (Number) - Number of minutes in the calendar refresh interval.
+account-setup-calendar-refresh-interval =
+    { $count ->
+        [one] Every minute
+        *[other] Every { $count } minutes
+    }
+
+account-setup-calendar-read-only = Read only
+    .accesskey = R
+
+account-setup-calendar-show-reminders = Show reminders
+    .accesskey = S
+
+account-setup-calendar-offline-support = Offline support
+    .accesskey = O
diff --git a/comm/mail/locales/en-US/messenger/addonNotifications.ftl b/comm/mail/locales/en-US/messenger/addonNotifications.ftl
new file mode 100644
index 0000000000..a2451e41ab
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addonNotifications.ftl
@@ -0,0 +1,130 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+xpinstall-prompt = { -brand-short-name } prevented this site from asking you to install software on your computer.
+
+## Variables:
+##   $host (String): The hostname of the site the add-on is being installed from.
+
+xpinstall-prompt-header = Allow { $host } to install an add-on?
+xpinstall-prompt-message = You are attempting to install an add-on from { $host }. Make sure you trust this site before continuing.
+
+##
+
+xpinstall-prompt-header-unknown = Allow an unknown site to install an add-on?
+xpinstall-prompt-message-unknown = You are attempting to install an add-on from an unknown site. Make sure you trust this site before continuing.
+
+xpinstall-prompt-dont-allow =
+    .label = Don’t Allow
+    .accesskey = D
+xpinstall-prompt-never-allow =
+    .label = Never Allow
+    .accesskey = N
+# Long text in this context make the dropdown menu extend awkwardly to the left,
+# avoid a localization that's significantly longer than the English version.
+xpinstall-prompt-never-allow-and-report =
+    .label = Report Suspicious Site
+    .accesskey = R
+# Accessibility Note:
+# Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
+# See https://website-archive.mozilla.org/www.mozilla.org/access/access/keyboard/ for details
+xpinstall-prompt-install =
+    .label = Continue to Installation
+    .accesskey = C
+
+# These messages are shown when a website invokes navigator.requestMIDIAccess.
+
+site-permission-install-first-prompt-midi-header = This site is requesting access to your MIDI (Musical Instrument Digital Interface) devices. Device access can be enabled by installing an add-on.
+site-permission-install-first-prompt-midi-message = This access is not guaranteed to be safe. Only continue if you trust this site.
+
+##
+
+xpinstall-disabled-locked = Software installation has been disabled by your system administrator.
+xpinstall-disabled = Software installation is currently disabled. Click Enable and try again.
+xpinstall-disabled-button =
+    .label = Enable
+    .accesskey = n
+
+# This message is shown when the installation of an add-on is blocked by enterprise policy.
+# Variables:
+#   $addonName (String): the name of the add-on.
+#   $addonId (String): the ID of add-on.
+addon-install-blocked-by-policy = { $addonName } ({ $addonId }) is blocked by your system administrator.
+# This message is shown when the installation of add-ons from a domain is blocked by enterprise policy.
+addon-domain-blocked-by-policy = Your system administrator prevented this site from asking you to install software on your computer.
+addon-install-full-screen-blocked = Add-on installation is not allowed while in or before entering fullscreen mode.
+
+# Variables:
+#   $addonName (String): the localized name of the sideloaded add-on.
+webext-perms-sideload-menu-item = { $addonName } added to { -brand-short-name }
+# Variables:
+#   $addonName (String): the localized name of the extension which has been updated.
+webext-perms-update-menu-item = { $addonName } requires new permissions
+
+## Add-on removal warning
+
+# Variables:
+#  $name (String): The name of the add-on that will be removed.
+addon-removal-title = Remove { $name }?
+# Variables:
+#   $name (String): the name of the extension which is about to be removed.
+addon-removal-message = Remove { $name } from { -brand-shorter-name }?
+addon-removal-button = Remove
+addon-removal-abuse-report-checkbox = Report this extension to { -vendor-short-name }
+
+# Variables:
+#   $addonCount (Number): the number of add-ons being downloaded
+addon-downloading-and-verifying =
+    { $addonCount ->
+        [1] Downloading and verifying add-on…
+       *[other] Downloading and verifying { $addonCount } add-ons…
+    }
+addon-download-verifying = Verifying
+
+addon-install-cancel-button =
+    .label = Cancel
+    .accesskey = C
+addon-install-accept-button =
+    .label = Add
+    .accesskey = A
+
+## Variables:
+##   $addonCount (Number): the number of add-ons being installed
+
+addon-confirm-install-message =
+    { $addonCount ->
+        [1] This site would like to install an add-on in { -brand-short-name }:
+       *[other] This site would like to install { $addonCount } add-ons in { -brand-short-name }:
+    }
+addon-confirm-install-unsigned-message =
+    { $addonCount ->
+        [1] Caution: This site would like to install an unverified add-on in { -brand-short-name }. Proceed at your own risk.
+       *[other] Caution: This site would like to install { $addonCount } unverified add-ons in { -brand-short-name }. Proceed at your own risk.
+    }
+# Variables:
+#   $addonCount (Number): the number of add-ons being installed (at least 2)
+addon-confirm-install-some-unsigned-message =
+    { $addonCount ->
+       *[other] Caution: This site would like to install { $addonCount } add-ons in { -brand-short-name }, some of which are unverified. Proceed at your own risk.
+    }
+
+## Add-on install errors
+## Variables:
+##   $addonName (String): the add-on name.
+
+addon-install-error-network-failure = The add-on could not be downloaded because of a connection failure.
+addon-install-error-incorrect-hash = The add-on could not be installed because it does not match the add-on { -brand-short-name } expected.
+addon-install-error-corrupt-file = The add-on downloaded from this site could not be installed because it appears to be corrupt.
+addon-install-error-file-access = { $addonName } could not be installed because { -brand-short-name } cannot modify the needed file.
+addon-install-error-not-signed = { -brand-short-name } has prevented this site from installing an unverified add-on.
+addon-install-error-invalid-domain = The add-on { $addonName } can not be installed from this location.
+addon-local-install-error-network-failure = This add-on could not be installed because of a filesystem error.
+addon-local-install-error-incorrect-hash = This add-on could not be installed because it does not match the add-on { -brand-short-name } expected.
+addon-local-install-error-corrupt-file = This add-on could not be installed because it appears to be corrupt.
+addon-local-install-error-file-access = { $addonName } could not be installed because { -brand-short-name } cannot modify the needed file.
+addon-local-install-error-not-signed = This add-on could not be installed because it has not been verified.
+# Variables:
+#   $appVersion (String): the application version.
+addon-install-error-incompatible = { $addonName } could not be installed because it is not compatible with { -brand-short-name } { $appVersion }.
+addon-install-error-blocklisted = { $addonName } could not be installed because it has a high risk of causing stability or security problems.
diff --git a/comm/mail/locales/en-US/messenger/addressbook/abCardDAVDialog.ftl b/comm/mail/locales/en-US/messenger/addressbook/abCardDAVDialog.ftl
new file mode 100644
index 0000000000..8558b4a2d9
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addressbook/abCardDAVDialog.ftl
@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+carddav-window-title = New CardDAV Address Book
+
+carddav-dialog =
+    .buttonlabelaccept = Continue
+    .buttonaccesskeyaccept = C
+
+carddav-username-label =
+    .value = Username:
+    .accesskey = U
+carddav-location-label =
+    .value = Location:
+    .accesskey = L
+carddav-location =
+    .default-placeholder = URL or host name of the address book server
+
+carddav-loading = Looking up configuration…
+
+# Variables:
+# $url (String) - CardDAV endpoint hostname. For example "example.com".
+carddav-known-incompatible = { $url } is known to be incompatible with { -brand-short-name }.
+carddav-connection-error = Failed to connect.
+carddav-none-found = Found no address books to add for the specified account.
+carddav-already-added = All address books for the specified account have already been added.
+
+carddav-available-books = Available address books:
diff --git a/comm/mail/locales/en-US/messenger/addressbook/abCardDAVProperties.ftl b/comm/mail/locales/en-US/messenger/addressbook/abCardDAVProperties.ftl
new file mode 100644
index 0000000000..4306c8bf78
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addressbook/abCardDAVProperties.ftl
@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+carddav-url-label =
+    .value = CardDAV URL:
+    .accesskey = V
+
+carddav-refreshinterval-label =
+    .label = Synchronize:
+    .accesskey = S
+
+# Variables:
+#   $minutes (integer) - Number of minutes between address book synchronizations
+carddav-refreshinterval-minutes-value =
+    .label = { $minutes ->
+        [one] every minute
+       *[other] every { $minutes } minutes
+    }
+
+# Variables:
+#   $hours (integer) - Number of hours between address book synchronizations
+carddav-refreshinterval-hours-value =
+    .label = { $hours ->
+        [one] every hour
+       *[other] every { $hours } hours
+    }
+
+carddav-readonly-label =
+    .label = Read-only
+    .accesskey = R
diff --git a/comm/mail/locales/en-US/messenger/addressbook/aboutAddressBook.ftl b/comm/mail/locales/en-US/messenger/addressbook/aboutAddressBook.ftl
new file mode 100644
index 0000000000..cd3e13fd05
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addressbook/aboutAddressBook.ftl
@@ -0,0 +1,299 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+about-addressbook-title = Address Book
+
+## Toolbar
+
+about-addressbook-toolbar-new-address-book =
+  .label = New Address Book
+about-addressbook-toolbar-add-carddav-address-book =
+  .label = Add CardDAV Address Book
+about-addressbook-toolbar-add-ldap-address-book =
+  .label = Add LDAP Address Book
+about-addressbook-toolbar-new-contact =
+  .label = New Contact
+about-addressbook-toolbar-new-list =
+  .label = New List
+about-addressbook-toolbar-import =
+  .label = Import
+
+## Books
+
+all-address-books-row =
+  .title = All Address Books
+all-address-books = All Address Books
+
+# Variables:
+# $name (String) - The name of the selected book/list.
+# $count (Number) - The number of contacts in the selected book/list.
+about-addressbook-card-count = Total contacts in { $name }: { $count }
+# Variables:
+# $count (Number) - The number of contacts in all address books.
+about-addressbook-card-count-all = Total contacts in all address books: { $count }
+
+about-addressbook-books-context-properties =
+  .label = Properties
+about-addressbook-books-context-edit-list =
+  .label = Edit list
+about-addressbook-books-context-synchronize =
+  .label = Synchronize
+about-addressbook-books-context-edit =
+  .label = Edit
+about-addressbook-books-context-print =
+  .label = Print…
+about-addressbook-books-context-export =
+  .label = Export…
+about-addressbook-books-context-delete =
+  .label = Delete
+about-addressbook-books-context-remove =
+  .label = Remove
+about-addressbook-books-context-startup-default =
+  .label = Default startup directory
+
+about-addressbook-confirm-delete-book-title = Delete Address Book
+# Variables:
+# $name (String) - Name of the address book to be deleted.
+about-addressbook-confirm-delete-book =
+  Are you sure you want to delete { $name } and all of its contacts?
+about-addressbook-confirm-remove-remote-book-title = Remove Address Book
+# Variables:
+# $name (String) - Name of the remote address book to be removed.
+about-addressbook-confirm-remove-remote-book =
+  Are you sure you want to remove { $name }?
+
+## Cards
+
+# Variables:
+# $name (String) - Name of the address book that will be searched.
+about-addressbook-search =
+  .placeholder = Search { $name }
+about-addressbook-search-all =
+  .placeholder = Search all address books
+
+about-addressbook-sort-button2 =
+  .title = List display options
+
+about-addressbook-name-format-display =
+  .label = Display Name
+about-addressbook-name-format-firstlast =
+  .label = First Last
+about-addressbook-name-format-lastfirst =
+  .label = Last, First
+
+about-addressbook-sort-name-ascending =
+  .label = Sort by name (A > Z)
+about-addressbook-sort-name-descending =
+  .label = Sort by name (Z > A)
+about-addressbook-sort-email-ascending =
+  .label = Sort by email address (A > Z)
+about-addressbook-sort-email-descending =
+  .label = Sort by email address (Z > A)
+
+about-addressbook-table-layout =
+  .label = Table layout
+
+## Card column headers
+## Each string is listed here twice, and the values should match.
+
+about-addressbook-column-header-generatedname2 = Name
+  .title = Sort by name
+about-addressbook-column-label-generatedname2 =
+  .label = Name
+
+about-addressbook-column-header-emailaddresses2 = Email Addresses
+  .title = Sort by email addresses
+about-addressbook-column-label-emailaddresses2 =
+  .label = Email Addresses
+
+about-addressbook-column-header-nickname2 = Nickname
+  .title = Sort by nickname
+about-addressbook-column-label-nickname2 =
+  .label = Nickname
+
+about-addressbook-column-header-phonenumbers2 = Phone Numbers
+  .title = Sort by phone numbers
+about-addressbook-column-label-phonenumbers2 =
+  .label = Phone Numbers
+
+about-addressbook-column-header-addresses2 = Addresses
+  .title = Sort by addresses
+about-addressbook-column-label-addresses2 =
+  .label = Addresses
+
+about-addressbook-column-header-title2 = Title
+  .title = Sort by title
+about-addressbook-column-label-title2 =
+  .label = Title
+
+about-addressbook-column-header-department2 = Department
+  .title = Sort by department
+about-addressbook-column-label-department2 =
+  .label = Department
+
+about-addressbook-column-header-organization2 = Organization
+  .title = Sort by organization
+about-addressbook-column-label-organization2 =
+  .label = Organization
+
+about-addressbook-column-header-addrbook2 = Address Book
+  .title = Sort by address book
+about-addressbook-column-label-addrbook2 =
+  .label = Address Book
+
+about-addressbook-cards-context-write =
+  .label = Write
+
+about-addressbook-confirm-delete-mixed-title = Delete Contacts and Lists
+# Variables:
+# $count (Number) - The number of contacts and lists to be deleted. Always greater than 1.
+about-addressbook-confirm-delete-mixed =
+  Are you sure you want to delete these { $count } contacts and lists?
+# Variables:
+# $count (Number) - The number of lists to be deleted.
+about-addressbook-confirm-delete-lists-title =
+  { $count ->
+     [one] Delete List
+    *[other] Delete Lists
+  }
+# Variables:
+# $count (Number) - The number of lists to be deleted.
+# $name (String) - The name of the list to be deleted, if $count is 1.
+about-addressbook-confirm-delete-lists =
+  { $count ->
+     [one] Are you sure you want to delete the list { $name }?
+    *[other] Are you sure you want to delete these { $count } lists?
+  }
+# Variables:
+# $count (Number) - The number of contacts to be removed.
+about-addressbook-confirm-remove-contacts-title =
+  { $count ->
+     [one] Remove Contact
+    *[other] Remove Contacts
+  }
+# Variables:
+# $name (String) - The name of the contact to be removed.
+# $list (String) - The name of the list that contacts will be removed from.
+about-addressbook-confirm-remove-contacts-single =
+  Are you sure you want to remove { $name } from { $list }?
+# Variables:
+# $count (Number) - The number of contacts to be removed.
+# $list (String) - The name of the list that contacts will be removed from.
+about-addressbook-confirm-remove-contacts-multi =
+  { $count ->
+    *[other] Are you sure you want to remove these { $count } contacts from { $list }?
+  }
+# Variables:
+# $count (Number) - The number of contacts to be deleted.
+about-addressbook-confirm-delete-contacts-title =
+  { $count ->
+     [one] Delete Contact
+    *[other] Delete Contacts
+  }
+# Variables:
+# $name (String) - The name of the contact to be deleted.
+about-addressbook-confirm-delete-contacts-single =
+  Are you sure you want to delete the contact { $name }?
+# Variables:
+# $count (Number) - The number of contacts to be deleted.
+about-addressbook-confirm-delete-contacts-multi =
+  { $count ->
+    *[other] Are you sure you want to delete these { $count } contacts?
+  }
+
+## Card list placeholder
+## Shown when there are no cards in the list
+
+about-addressbook-placeholder-empty-book = No contacts available
+about-addressbook-placeholder-new-contact = New Contact
+about-addressbook-placeholder-search-only = This address book shows contacts only after a search
+about-addressbook-placeholder-searching = Searching…
+about-addressbook-placeholder-no-search-results = No contacts found
+
+## Details
+
+# Variables:
+# $count (Number) - The number of selected items (will never be fewer than 2).
+about-addressbook-selection-mixed-header2 =
+    { $count ->
+       *[other] { $count } selected address book entries
+    }
+# Variables:
+# $count (Number) - The number of selected contacts
+about-addressbook-selection-contacts-header2 =
+    { $count ->
+       [one] { $count } selected contact
+       *[other] { $count } selected contacts
+    }
+# Variables:
+# $count (Number) - The number of selected lists
+about-addressbook-selection-lists-header2 =
+    { $count ->
+       [one] { $count } selected list
+       *[other] { $count } selected lists
+    }
+
+about-addressbook-details-edit-photo =
+  .title = Edit contact photo
+
+about-addressbook-new-contact-header = New Contact
+
+about-addressbook-prefer-display-name = Prefer display name over message header
+
+about-addressbook-write-action-button = Write
+about-addressbook-event-action-button = Event
+about-addressbook-search-action-button = Search
+about-addressbook-new-list-action-button = New List
+
+about-addressbook-begin-edit-contact-button = Edit
+about-addressbook-delete-edit-contact-button = Delete
+about-addressbook-cancel-edit-contact-button = Cancel
+about-addressbook-save-edit-contact-button = Save
+
+about-addressbook-add-contact-to = Add to:
+
+about-addressbook-details-email-addresses-header = Email Addresses
+about-addressbook-details-phone-numbers-header = Phone Numbers
+about-addressbook-details-addresses-header = Addresses
+about-addressbook-details-notes-header = Notes
+about-addressbook-details-impp-header = Instant Messaging
+about-addressbook-details-websites-header = Websites
+about-addressbook-details-other-info-header = Other Information
+
+about-addressbook-entry-type-work = Work
+about-addressbook-entry-type-home = Home
+about-addressbook-entry-type-fax = Fax
+# Or "Mobile"
+about-addressbook-entry-type-cell = Cell
+about-addressbook-entry-type-pager = Pager
+
+about-addressbook-entry-name-birthday = Birthday
+about-addressbook-entry-name-anniversary = Anniversary
+about-addressbook-entry-name-title = Title
+about-addressbook-entry-name-role = Role
+about-addressbook-entry-name-organization = Organization
+about-addressbook-entry-name-website = Website
+about-addressbook-entry-name-time-zone = Time Zone
+about-addressbook-entry-name-custom1 = Custom 1
+about-addressbook-entry-name-custom2 = Custom 2
+about-addressbook-entry-name-custom3 = Custom 3
+about-addressbook-entry-name-custom4 = Custom 4
+
+about-addressbook-unsaved-changes-prompt-title = Unsaved Changes
+about-addressbook-unsaved-changes-prompt = Do you want to save your changes before leaving the edit view?
+
+# Photo dialog
+
+about-addressbook-photo-drop-target = Drop or paste a photo here, or click to select a file.
+about-addressbook-photo-drop-loading = Loading photo…
+about-addressbook-photo-drop-error = Failed to load photo.
+about-addressbook-photo-filepicker-title = Select an image file
+
+about-addressbook-photo-discard = Discard existing photo
+about-addressbook-photo-cancel = Cancel
+about-addressbook-photo-save = Save
+
+# Keyboard shortcuts
+
+about-addressbook-new-contact-key = N
diff --git a/comm/mail/locales/en-US/messenger/addressbook/fieldMapImport.ftl b/comm/mail/locales/en-US/messenger/addressbook/fieldMapImport.ftl
new file mode 100644
index 0000000000..5e39bf05ea
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addressbook/fieldMapImport.ftl
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import-ab-csv-dialog-title = Import Address Book from Text File
+
+#   $recordNumber (Number) - The current record number of the preview data.
+import-ab-csv-preview-record-number = Preview of the data import for record { $recordNumber }
+
+import-ab-csv-dialog =
+    .buttonlabelaccept = Import
+    .buttonaccesskeyaccept = I
diff --git a/comm/mail/locales/en-US/messenger/addressbook/vcard.ftl b/comm/mail/locales/en-US/messenger/addressbook/vcard.ftl
new file mode 100644
index 0000000000..febae64507
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/addressbook/vcard.ftl
@@ -0,0 +1,189 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Display Name
+
+vcard-displayname = Display name
+
+vcard-displayname-placeholder =
+    .placeholder = { vcard-displayname }
+
+# Type selection
+
+vcard-entry-type-label = Type
+
+vcard-entry-type-home = Home
+
+vcard-entry-type-work = Work
+
+vcard-entry-type-none = None
+
+vcard-entry-type-custom = Custom
+
+# N vCard field
+
+vcard-name-header = Name
+
+vcard-n-prefix = Prefix
+
+vcard-n-add-prefix =
+    .title = Add prefix
+
+vcard-n-firstname = First name
+
+vcard-n-add-firstname =
+    .title = Add first name
+
+vcard-n-middlename = Middle name
+
+vcard-n-add-middlename =
+    .title = Add middle name
+
+vcard-n-lastname = Last name
+
+vcard-n-add-lastname =
+    .title = Add last name
+
+vcard-n-suffix = Suffix
+
+vcard-n-add-suffix =
+    .title = Add suffix
+
+# Nickname
+
+vcard-nickname = Nickname
+
+# Email vCard field
+
+vcard-email-header = Email Addresses
+
+vcard-email-add = Add email address
+
+vcard-email-label = Email address
+
+vcard-primary-email-label = Default
+
+# URL vCard field
+
+vcard-url-header = Websites
+
+vcard-url-add = Add website
+
+vcard-url-label = Website
+
+# Tel vCard field
+
+vcard-tel-header = Phone Numbers
+
+vcard-tel-add = Add phone number
+
+vcard-tel-label = Phone number
+
+# Or "Mobile"
+vcard-entry-type-cell = Cell
+
+vcard-entry-type-fax = Fax
+
+vcard-entry-type-pager = Pager
+
+# TZ vCard field
+
+vcard-tz-header = Time Zone
+
+vcard-tz-add = Add time zone
+
+# IMPP vCard field
+
+vcard-impp2-header = Instant Messaging
+
+vcard-impp-add = Add chat account
+
+vcard-impp-label = Chat account
+
+vcard-impp-select = Protocol
+vcard-impp-option-other = Other
+
+vcard-impp-input-label = URI
+vcard-impp-input-title = URI for instant messaging
+
+# BDAY and ANNIVERSARY vCard field
+
+vcard-bday-anniversary-header = Special Dates
+
+vcard-bday-anniversary-add = Add special date
+
+vcard-bday-label = Birthday
+
+vcard-anniversary-label = Anniversary
+
+vcard-date-day = Day
+
+vcard-date-month = Month
+
+vcard-date-year = Year
+
+# ADR vCard field
+
+vcard-adr-header = Addresses
+
+vcard-adr-add = Add address
+
+vcard-adr-label = Address
+
+vcard-adr-delivery-label = Delivery label
+
+vcard-adr-street = Street address
+
+# Or "Locality"
+vcard-adr-locality = City
+
+# Or "Region"
+vcard-adr-region = State/Province
+
+# The term "ZIP code" only applies in USA. Most locales should use "Postal code" only.
+vcard-adr-code = ZIP/Postal code
+
+vcard-adr-country = Country
+
+# NOTE vCard field
+
+vcard-note-header = Notes
+
+vcard-note-add = Add note
+
+# TITLE, ROLE and ORGANIZATION vCard fields
+
+vcard-org-header = Organizational Properties
+
+vcard-org-add = Add organizational properties
+
+vcard-org-title = Title
+vcard-org-title-input =
+    .title = Position or job
+    .placeholder = Job title
+
+vcard-org-role = Role
+vcard-org-role-input =
+    .title = Function or part played in a particular situation
+    .placeholder = Role in a project
+
+vcard-org-org = Organization
+vcard-org-org-input =
+    .title = Organizational name
+    .placeholder = Company name
+vcard-org-org-unit = Department
+vcard-org-org-unit-input =
+    .title = Organizational unit name
+    .placeholder = Department
+
+# Custom properties
+
+vcard-custom-header = Custom Properties
+
+vcard-custom-add = Add custom properties
+
+vcard-remove-button-title =
+    .title = Remove
+
+vcard-remove-button = Remove
diff --git a/comm/mail/locales/en-US/messenger/appmenu.ftl b/comm/mail/locales/en-US/messenger/appmenu.ftl
new file mode 100644
index 0000000000..c8a8d394c3
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/appmenu.ftl
@@ -0,0 +1,267 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Sync
+
+appmenu-sync-panel-title =
+  .title = Sync
+
+appmenu-signin-panel =
+  .label = Sign in to Sync
+  .accesskey = i
+
+appmenu-sync-sync =
+  .value = Account Sync
+  .accesskey = A
+
+appmenu-sync-manage =
+  .value = Manage Account
+  .accesskey = M
+
+appmenu-sync-account =
+  .value = example@example.com
+
+appmenu-sync-now =
+  .label = Sync Now
+  .accesskey = N
+
+appmenu-sync-settings =
+  .label = Sync Settings
+  .accesskey = S
+
+appmenu-sync-sign-out =
+  .label = Sign Out…
+  .accesskey = O
+
+## New Account
+
+appmenu-new-account-panel-title =
+  .title = New Account
+
+appmenu-new-account-panel =
+  .label = New Account
+  .accesskey = N
+
+appmenu-create-new-mail-account =
+  .label = Get a New Email
+  .accesskey = G
+
+appmenu-new-mail-account =
+  .label = Existing Email
+  .accesskey = E
+
+appmenu-new-calendar =
+  .label = Calendar
+  .accesskey = C
+
+appmenu-new-chat-account =
+  .label = Chat
+  .accesskey = h
+
+appmenu-new-feed =
+  .label = Feed
+  .accesskey = F
+
+appmenu-new-newsgroup =
+  .label = Newsgroup
+  .accesskey = N
+
+## New Account / Address Book
+
+appmenu-newab-panel-title =
+  .title = New Address Book
+
+appmenu-newab-panel =
+  .label = New Address Book
+  .accesskey = A
+
+appmenu-new-addressbook =
+  .label = Local Address Book
+  .accesskey = A
+
+appmenu-new-carddav =
+  .label = CardDav Address Book
+  .accesskey = C
+
+appmenu-new-ldap =
+  .label = LDAP Address Book
+  .accesskey = L
+
+## Create
+
+appmenu-create-panel-title =
+  .title = Create
+
+appmenu-create-panel =
+  .label = Create
+  .accesskey = C
+
+appmenu-create-message =
+  .label = Message
+  .accesskey = M
+
+appmenu-create-event =
+  .label = Event
+  .accesskey = E
+
+appmenu-create-task =
+  .label = Task
+  .accesskey = T
+
+appmenu-create-contact =
+  .label = Contact
+  .accesskey = C
+
+## Open
+
+appmenu-open-file-panel =
+  .label = Open from File
+  .accesskey = O
+
+appmenu-open-file-panel-title =
+  .title = Open from File
+
+appmenu-open-message =
+  .label = Message…
+  .accesskey = M
+
+appmenu-open-calendar =
+  .label = Calendar…
+  .accesskey = C
+
+## View / Layout
+
+appmenu-view-panel-title =
+  .title = View
+
+appmenu-view-panel =
+  .label = View
+  .accesskey = V
+
+appmenuitem-toggle-thread-pane-header =
+  .label = Message List Header
+
+appmenu-font-size-value = Font Size
+
+appmenu-mail-uidensity-value = Density
+
+appmenu-uidensity-compact =
+  .tooltiptext = Compact
+
+appmenu-uidensity-default =
+  .tooltiptext = Default
+
+appmenu-uidensity-relaxed =
+  .tooltiptext = Relaxed
+
+appmenuitem-font-size-enlarge =
+  .tooltiptext = Increase Font Size
+
+appmenuitem-font-size-reduce =
+  .tooltiptext = Reduce Font Size
+
+# Variables:
+# $size (String) - The current font size.
+appmenuitem-font-size-reset =
+  .label = { $size }px
+  .tooltiptext = Reset Font Size
+
+## Tools
+
+appmenu-tools-panel-title =
+  .title = Tools
+
+appmenu-tools-panel =
+  .label = Tools
+  .accesskey = T
+
+appmenu-tools-import =
+  .label = Import
+  .accesskey = I
+
+appmenu-tools-export =
+  .label = Export
+  .accesskey = E
+
+appmenu-tools-message-search =
+  .label = Search Messages
+  .accesskey = S
+
+appmenu-tools-message-filters =
+  .label = Message Filters
+  .accesskey = F
+
+appmenu-tools-download-manager =
+  .label = Download Manager
+  .accesskey = D
+
+appmenu-tools-activity-manager =
+  .label = Activity Manager
+  .accesskey = A
+
+appmenu-tools-dev-tools =
+  .label = Developer Tools
+  .accesskey = T
+
+## Help
+
+appmenu-help-panel-title =
+  .title = Help
+
+appmenu-help-get-help =
+  .label = Get Help
+  .accesskey = H
+
+appmenu-help-explore-features =
+  .label = Explore Features
+  .accesskey = F
+
+appmenu-help-shortcuts =
+  .label = Keyboard Shortcuts
+  .accesskey = K
+
+appmenu-help-get-involved =
+  .label = Get Involved
+  .accesskey = G
+
+appmenu-help-donation =
+  .label = Make a Donation
+  .accesskey = D
+
+appmenu-help-share-feedback =
+  .label = Share Ideas and Feedback
+  .accesskey = S
+
+appmenu-help-enter-troubleshoot-mode2 =
+  .label = Troubleshoot Mode…
+  .accesskey = M
+
+appmenu-help-exit-troubleshoot-mode2 =
+  .label = Turn Troubleshoot Mode Off
+  .accesskey = M
+
+appmenu-help-troubleshooting-info =
+  .label = Troubleshooting Information
+  .accesskey = T
+
+appmenu-help-about-product =
+  .label = About { -brand-short-name }
+  .accesskey = A
+
+## Application Update
+
+appmenuitem-banner-update-downloading =
+    .label = Downloading { -brand-shorter-name } update
+
+appmenuitem-banner-update-available =
+    .label = Update available — download now
+
+appmenuitem-banner-update-manual =
+    .label = Update available — download now
+
+appmenuitem-banner-update-unsupported =
+    .label = Unable to update — system incompatible
+
+appmenuitem-banner-update-restart =
+    .label = Update available — restart now
diff --git a/comm/mail/locales/en-US/messenger/chat-verifySession.ftl b/comm/mail/locales/en-US/messenger/chat-verifySession.ftl
new file mode 100644
index 0000000000..f231654bfa
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/chat-verifySession.ftl
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+verify-window-title = Verify Identity
+
+# Variables:
+#   $subject (String) - a human readable identifier for the other side of the verification flow.
+verify-window-subject-title = Verify Identity of { $subject }
+
+verify-dialog =
+    .buttonlabelaccept = They Match
+    .buttonaccesskeyaccept = M
+    .buttonlabelextra2 = They don’t match
+    .buttonaccesskeyextra2 = D
+
+challenge-label = Verify the displayed string matches the display on the other end.
diff --git a/comm/mail/locales/en-US/messenger/chat.ftl b/comm/mail/locales/en-US/messenger/chat.ftl
new file mode 100644
index 0000000000..49573e7d58
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/chat.ftl
@@ -0,0 +1,47 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chat-joining-chat-icon2 =
+  .alt = Joining chat
+
+chat-left-chat-icon2 =
+  .alt = Left chat
+
+chat-participant-owner-role-icon2 =
+  .alt = Owner
+
+chat-participant-administrator-role-icon2 =
+  .alt = Administrator
+
+chat-participant-moderator-role-icon2 =
+  .alt = Moderator
+
+chat-participant-voiced-role-icon2 =
+  .alt = Participant can post messages
+
+chat-verify-identity =
+  .label = Verify Identity
+  .accesskey = I
+
+chat-identity-verified =
+  .label = Identity already verified
+
+chat-buddy-identity-status = Encryption Trust
+chat-buddy-identity-status-verified = Verified
+chat-buddy-identity-status-unverified = Unverified
+
+## Conversation invite notification box
+
+# This string appears in a notification bar at the top of the Contacts window
+# when someone invited the user to a multi user chat conversation, to request
+# the user to confirm they want to join the chat.
+# Variables:
+#   $conversation (String) - Name of the conversation the user is invited to.
+chat-conv-invite-label = You have been invited to chat in { $conversation }
+chat-conv-invite-accept =
+  .label = Accept
+  .accesskey = A
+chat-conv-invite-deny =
+  .label = Reject
+  .accesskey = R
diff --git a/comm/mail/locales/en-US/messenger/compactFoldersDialog.ftl b/comm/mail/locales/en-US/messenger/compactFoldersDialog.ftl
new file mode 100644
index 0000000000..322a78ec76
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/compactFoldersDialog.ftl
@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+compact-dialog-window-title =
+    .title = Compact folders
+
+compact-dialog =
+    .buttonlabelaccept = Compact now
+    .buttonaccesskeyaccept = C
+    .buttonlabelcancel = Remind me later
+    .buttonaccesskeycancel = R
+    .buttonlabelextra1 = Learn more…
+    .buttonaccesskeyextra1 = L
+
+# Variables:
+#  $data (String): The amount of space to be freed, formatted byte, MB, GB, etc., based on the size.
+compact-dialog-message = { -brand-short-name } needs to do regular file maintenance to improve the performance of your mail folders. This will recover { $data } of disk space without changing your messages. To let { -brand-short-name } do this automatically in the future without asking, check the box below before choosing ‘{ compact-dialog.buttonlabelaccept }’.
+
+compact-dialog-never-ask-checkbox =
+    .label = Compact folders automatically in the future
+    .accesskey = a
diff --git a/comm/mail/locales/en-US/messenger/exportDialog.ftl b/comm/mail/locales/en-US/messenger/exportDialog.ftl
new file mode 100644
index 0000000000..554e627e34
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/exportDialog.ftl
@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+export-dialog-brand-name = { -brand-product-name }
+
+export-dialog-title = Export
+
+export-dialog =
+  .buttonlabelaccept = Next
+
+export-dialog-button-finish = Finish
+
+export-dialog-file-picker = Export to a zip file
+
+export-dialog-description1 = Export mail accounts, mail messages, address books, settings to a zip file.
+
+export-dialog-desc2 = When needed, you can import the zip file to restore your profile.
+
+export-dialog-exporting = Exporting…
+
+export-dialog-exported = Exported!
diff --git a/comm/mail/locales/en-US/messenger/extensionPermissions.ftl b/comm/mail/locales/en-US/messenger/extensionPermissions.ftl
new file mode 100644
index 0000000000..10caa835e6
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/extensionPermissions.ftl
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Extension permission description keys are derived from permission names.
+## Permissions for which the message has been changed and the key updated
+## must have a corresponding entry in the `PERMISSION_L10N_ID_OVERRIDES` map.
+
+webext-perms-description-accountsFolders=Create, rename, or delete your mail account folders
+webext-perms-description-accountsIdentities=Create, modify or delete your mail account identities
+webext-perms-description-accountsRead = See your mail accounts, their identities and their folders
+webext-perms-description-addressBooks=Read and modify your address books and contacts
+webext-perms-description-compose=Read and modify your email messages as you compose and send them
+webext-perms-description-compose-send=Send composed email messages on your behalf
+webext-perms-description-compose-save=Save composed email messages as drafts or templates
+webext-perms-description-experiment=Have full, unrestricted access to { -brand-short-name }, and your computer
+webext-perms-description-messagesImport=Import messages into Thunderbird
+webext-perms-description-messagesModify=Read and modify your email messages as they are displayed to you
+webext-perms-description-messagesMove = Copy or move your email messages (including moving them to the trash folder)
+webext-perms-description-messagesDelete=Permanently delete your email messages
+webext-perms-description-messagesRead=Read your email messages and mark or tag them
+webext-perms-description-messagesTags=Create, modify and delete message tags
+webext-perms-description-sensitiveDataUpload=Transfer sensitive user data (if access has been granted) to a remote server for further processing
diff --git a/comm/mail/locales/en-US/messenger/extensions/popup.ftl b/comm/mail/locales/en-US/messenger/extensions/popup.ftl
new file mode 100644
index 0000000000..0e6908ef87
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/extensions/popup.ftl
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+close-shortcut =
+    .key = w
+
+# Variables:
+#   $title (String): the title of the popup window
+extension-popup-title = { PLATFORM() ->
+    [macos] { $title }
+    *[other] { $title } - { -brand-full-name }
+}
+extension-popup-default-title = { -brand-full-name }
diff --git a/comm/mail/locales/en-US/messenger/extensionsUI.ftl b/comm/mail/locales/en-US/messenger/extensionsUI.ftl
new file mode 100644
index 0000000000..9a6ac822b8
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/extensionsUI.ftl
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+webext-experiment-warning = Malicious add-ons can steal your private information or compromise your computer. Only install this add-on if you trust the source.
+
+webext-perms-learn-more = Learn more
+
+# Variables:
+#   $addonName (String): localized named of the extension that was just installed.
+addon-post-install-message = { $addonName } was added.
diff --git a/comm/mail/locales/en-US/messenger/firefoxAccounts.ftl b/comm/mail/locales/en-US/messenger/firefoxAccounts.ftl
new file mode 100644
index 0000000000..669fd166f3
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/firefoxAccounts.ftl
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+# “Account” can be localized, “Firefox” must be treated as a brand,
+# and kept in English.
+-fxaccount-brand-name =
+    { $capitalization ->
+        [sentence] Firefox account
+       *[title] Firefox Account
+    }
+
+## These strings are shown in a desktop notification after the user requests we resend a verification email.
+
+fxa-verification-sent-title = Verification Sent
+# Variables:
+# $userEmail (String) - Email address of user's Firefox Account.
+fxa-verification-sent-body = A verification link has been sent to { $userEmail }.
+fxa-verification-not-sent-title = Unable to Send Verification
+fxa-verification-not-sent-body = We are unable to send a verification mail at this time, please try again later.
+
+## These strings are shown in a confirmation dialog when the user chooses to sign out.
+
+fxa-signout-dialog-title = Sign out of { -fxaccount-brand-name(capitalization: "sentence") }?
+fxa-signout-dialog-body = Synced data will remain in your account.
+fxa-signout-dialog-button = Sign out
+
+## These strings are shown in a confirmation dialog when the user chooses to stop syncing.
+
+sync-disconnect-dialog-title = Disconnect?
+sync-disconnect-dialog-body = { -brand-product-name } will stop syncing but won’t delete any of your data on this device.
+sync-disconnect-dialog-button = Disconnect
diff --git a/comm/mail/locales/en-US/messenger/flatpak.ftl b/comm/mail/locales/en-US/messenger/flatpak.ftl
new file mode 100644
index 0000000000..b96d09dfe3
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/flatpak.ftl
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### These messages are used by the Thunderbird Linux Flatpak "desktop" file.
+### An end user will see them associated with the application launcher icon
+
+# This is the label on the icon
+flatpak-desktop-name = { -brand-short-name }
+
+# Appears as a tooltip when hovering over application menu entry
+flatpak-desktop-comment = Send and receive mail with { -brand-product-name }
+
+# A generic description of Thunderbird
+flatpak-desktop-generic-name = Mail Client
+
+## Actions Section
+## These are alternative ways of starting Thunderbird, such as open the compose
+## window to write a message. Visible in a context menu after right clicking a
+## Thunderbird taskbar icon, possibly other places depending on the environment.
+
+flatpak-desktop-action-compose = Write New Message
+
+flatpak-desktop-action-addressbook = Open the Address Book
+
+flatpak-desktop-action-calendar = Open the Calendar
+
+flatpak-desktop-action-keymanager = Open the OpenPGP Key Manager
diff --git a/comm/mail/locales/en-US/messenger/folderprops.ftl b/comm/mail/locales/en-US/messenger/folderprops.ftl
new file mode 100644
index 0000000000..8610bf91d0
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/folderprops.ftl
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Quota tab
+
+# Variables:
+#   $percent (Number) - Usage percentage of the assigned IMAP quota.
+quota-percent-used = { $percent }% full
diff --git a/comm/mail/locales/en-US/messenger/importDialog.ftl b/comm/mail/locales/en-US/messenger/importDialog.ftl
new file mode 100644
index 0000000000..679d02e0a1
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/importDialog.ftl
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Short name of the import module
+thunderbird-import-name = Thunderbird
+
+# Description of the import module
+thunderbird-import-description = Import mail from a Thunderbird profile directory.
+
+import-from-thunderbird-zip =
+  .label = Thunderbird (exported profile backup; zip file smaller than 2GB)
+  .accesskey = Z
+
+import-from-thunderbird-dir =
+  .label = Thunderbird (profile folder)
+  .accesskey = T
+
+import-select-profile-zip = Select a zipped profile directory
+
+import-select-profile-dir = Select a profile directory
+
+zip-file-too-big-title = Zip File Too Big
+
+zip-file-too-big-message = The selected zip file is larger than 2GB. Please extract it first, then import from the extracted folder instead.
+
+wizardpage-failed =
+  .label = Import Failed
+
+wizardpage-failed-message = Import failed unexpectedly, more information may be available in the Error Console.
diff --git a/comm/mail/locales/en-US/messenger/mailWidgets.ftl b/comm/mail/locales/en-US/messenger/mailWidgets.ftl
new file mode 100644
index 0000000000..0df738f354
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/mailWidgets.ftl
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+apply-current-view-to-menu =
+    .label = Apply current view to…
+
+threadpane-apply-changes-prompt-title = Apply Changes?
+# Variables:
+#  $name (String): The name of the folder to apply to.
+threadpane-apply-changes-prompt-no-children-text = Apply the current folder’s view to { $name }?
+# Variables:
+#  $name (String): The name of the folder to apply to.
+threadpane-apply-changes-prompt-with-children-text = Apply the current folder’s view to { $name } and its children?
diff --git a/comm/mail/locales/en-US/messenger/menubar.ftl b/comm/mail/locales/en-US/messenger/menubar.ftl
new file mode 100644
index 0000000000..3da55dd14a
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/menubar.ftl
@@ -0,0 +1,161 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+toolbar-context-menu-menu-bar =
+    .toolbarname = Menu Bar
+    .accesskey = M
+
+## Tools Menu
+
+menu-tools-settings =
+    .label = Settings
+    .accesskey = e
+
+menu-addons-and-themes =
+    .label = Add-ons and Themes
+    .accesskey = A
+
+## Help Menu
+
+menu-help-help-title =
+    .label = Help
+    .accesskey = H
+
+menu-help-get-help =
+    .label = Get Help
+    .accesskey = H
+
+menu-help-explore-features =
+    .label = Explore Features
+    .accesskey = F
+
+menu-help-shortcuts =
+    .label = Keyboard Shortcuts
+    .accesskey = K
+
+menu-help-get-involved =
+    .label = Get Involved
+    .accesskey = G
+
+menu-help-donation =
+    .label = Make a Donation
+    .accesskey = D
+
+menu-help-share-feedback =
+    .label = Share Ideas and Feedback
+    .accesskey = S
+
+menu-help-enter-troubleshoot-mode =
+    .label = Troubleshoot Mode…
+    .accesskey = M
+
+menu-help-exit-troubleshoot-mode =
+    .label = Turn Troubleshoot Mode Off
+    .accesskey = M
+
+menu-help-troubleshooting-info =
+    .label = Troubleshooting Information
+    .accesskey = T
+
+menu-help-about-product =
+    .label = About { -brand-short-name }
+    .accesskey = A
+
+# These menu-quit strings are only used on Windows and Linux.
+menu-quit =
+    .label =
+        { PLATFORM() ->
+            [windows] Exit
+           *[other] Quit
+        }
+    .accesskey =
+        { PLATFORM() ->
+            [windows] x
+           *[other] Q
+        }
+
+# This menu-quit-mac string is only used on macOS.
+menu-quit-mac =
+    .label = Quit { -brand-shorter-name }
+
+# Localization note: Do not translate unless your locale's keyboard layout
+# does not include this key, as it determines the keyboard shortcut for
+# shutting down the application.
+quit-app-shortcut =
+    .key = Q
+
+## Mail Toolbar
+
+toolbar-junk-button =
+    .label = Junk
+    .tooltiptext = Mark the selected messages as junk
+toolbar-not-junk-button =
+    .label = Not Junk
+    .tooltiptext = Mark the selected messages as not junk
+toolbar-delete-button =
+    .label = Delete
+    .tooltiptext = Delete selected messages or folder
+toolbar-undelete-button =
+    .label = Undelete
+    .tooltiptext = Undelete selected messages
+
+## View
+
+menu-view-repair-text-encoding =
+    .label = Repair Text Encoding
+    .accesskey = c
+
+## View / Folders
+
+menu-view-folders-toggle-header =
+    .label = Folder Pane Header
+    .accesskey = F
+
+## View / Layout
+
+menu-view-toggle-thread-pane-header =
+    .label = Message List Header
+    .accesskey = H
+
+menu-font-size-label =
+    .label = Font Size
+    .accesskey = o
+
+menuitem-font-size-enlarge =
+    .label = Increase Font Size
+    .accesskey = I
+
+menuitem-font-size-reduce =
+    .label = Reduce Font Size
+    .accesskey = D
+
+menuitem-font-size-reset =
+    .label = Reset Font Size
+    .accesskey = R
+
+mail-uidensity-label =
+    .label = Density
+    .accesskey = D
+
+mail-uidensity-compact =
+    .label = Compact
+    .accesskey = C
+
+mail-uidensity-default =
+    .label = Default
+    .accesskey = D
+
+mail-uidensity-relaxed =
+    .label = Relaxed
+    .accesskey = R
+
+menu-spaces-toolbar-button =
+    .label = Spaces Toolbar
+    .accesskey = S
+
+## File
+
+file-new-newsgroup-account =
+    .label = Newsgroup Account…
+    .accesskey = N
diff --git a/comm/mail/locales/en-US/messenger/messageheader/headerFields.ftl b/comm/mail/locales/en-US/messenger/messageheader/headerFields.ftl
new file mode 100644
index 0000000000..e74cc5a865
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/messageheader/headerFields.ftl
@@ -0,0 +1,69 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Header lists
+
+message-header-to-list-name = To
+
+message-header-from-list-name = From
+
+message-header-sender-list-name = Sender
+
+message-header-reply-to-list-name = Reply to
+
+message-header-cc-list-name = Cc
+
+message-header-bcc-list-name = Bcc
+
+message-header-newsgroups-list-name = Newsgroups
+
+message-header-followup-to-list-name = Followup to
+
+message-header-tags-list-name = Tags
+
+## Other message headers.
+## The field-separator is for screen readers to separate the field name from the field value.
+
+message-header-author-field = Author<span data-l10n-name="field-separator">:</span>
+
+message-header-organization-field = Organization<span data-l10n-name="field-separator">:</span>
+
+message-header-subject-field = Subject<span data-l10n-name="field-separator">:</span>
+
+message-header-date-field = Date<span data-l10n-name="field-separator">:</span>
+
+message-header-user-agent-field = User agent<span data-l10n-name="field-separator">:</span>
+
+message-header-references-field = References<span data-l10n-name="field-separator">:</span>
+
+message-header-message-id-field = Message ID<span data-l10n-name="field-separator">:</span>
+
+message-header-in-reply-to-field = In reply to<span data-l10n-name="field-separator">:</span>
+
+message-header-website-field = Website<span data-l10n-name="field-separator">:</span>
+
+# An additional email header field that the user has chosen to display. Unlike
+# the other headers, the name of this header is not expected to be localised
+# because it is generated from the raw field name found in the email header.
+#   $fieldName (String) - The field name.
+message-header-custom-field = { $fieldName }<span data-l10n-name="field-separator">:</span>
+
+##
+
+message-header-address-in-address-book-icon2 =
+  .alt = In the Address Book
+
+message-header-address-not-in-address-book-icon2 =
+  .alt = Not in the Address Book
+
+message-header-address-not-in-address-book-button =
+    .title = Save this address in the Address Book
+
+message-header-address-in-address-book-button =
+    .title = Edit contact
+
+message-header-field-show-more = More
+    .title = Show all recipients
+
+message-ids-field-show-all = Show all
diff --git a/comm/mail/locales/en-US/messenger/messenger.ftl b/comm/mail/locales/en-US/messenger/messenger.ftl
new file mode 100644
index 0000000000..1ef66fb6a4
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/messenger.ftl
@@ -0,0 +1,484 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Window controls
+
+messenger-window-minimize-button =
+    .tooltiptext = Minimize
+messenger-window-maximize-button =
+    .tooltiptext = Maximize
+messenger-window-restore-down-button =
+    .tooltiptext = Restore Down
+messenger-window-close-button =
+    .tooltiptext = Close
+
+# Variables:
+# $count (Number) - Number of unread messages.
+unread-messages-os-tooltip =
+  { $count ->
+     [one] 1 unread message
+    *[other] { $count } unread messages
+  }
+
+about-rights-notification-text = { -brand-short-name } is free and open source software, built by a community of thousands from all over the world.
+
+## Content tabs
+
+content-tab-page-loading-icon =
+    .alt = The page is loading
+content-tab-security-high-icon =
+    .alt = The connection is secure
+content-tab-security-broken-icon =
+    .alt = The connection is not secure
+
+# Back
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the Go Back command.
+content-tab-menu-back =
+    .tooltiptext = Go back one page ({ $shortcut })
+    .aria-label = Back
+    .accesskey = B
+
+# This menuitem is only visible on macOS
+content-tab-menu-back-mac =
+    .label = Back
+    .accesskey = B
+
+# Forward
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the Go Forward command.
+content-tab-menu-forward =
+    .tooltiptext = Go forward one page ({ $shortcut })
+    .aria-label = Forward
+    .accesskey = F
+
+# This menuitem is only visible on macOS
+content-tab-menu-forward-mac =
+    .label = Forward
+    .accesskey = F
+
+# Reload
+
+content-tab-menu-reload =
+    .tooltiptext = Reload page
+    .aria-label = Reload
+    .accesskey = R
+
+# This menuitem is only visible on macOS
+content-tab-menu-reload-mac =
+    .tooltiptext = Reload page
+    .label = Reload
+    .accesskey = R
+
+# Stop
+
+content-tab-menu-stop =
+    .tooltiptext = Stop page loading
+    .aria-label = Stop
+    .accesskey = S
+
+# This menuitem is only visible on macOS
+content-tab-menu-stop-mac =
+    .tooltiptext = Stop page loading
+    .label = Stop
+    .accesskey = S
+
+## Toolbar
+
+addons-and-themes-toolbarbutton =
+    .label = Add-ons and Themes
+    .tooltiptext = Manage your add-ons
+
+quick-filter-toolbarbutton =
+    .label = Quick Filter
+    .tooltiptext = Filter messages
+
+redirect-msg-button =
+    .label = Redirect
+    .tooltiptext = Redirect selected message
+
+## Folder Pane
+
+folder-pane-toolbar =
+    .toolbarname = Folder Pane Toolbar
+    .accesskey = F
+
+folder-pane-toolbar-options-button =
+    .tooltiptext = Folder Pane Options
+
+folder-pane-header-label = Folders
+
+## Folder Toolbar Header Popup
+
+folder-toolbar-hide-toolbar-toolbarbutton =
+    .label = Hide Toolbar
+    .accesskey = H
+
+show-all-folders-label =
+    .label = All Folders
+    .accesskey = A
+
+show-unread-folders-label =
+    .label = Unread Folders
+    .accesskey = n
+
+show-favorite-folders-label =
+    .label = Favorite Folders
+    .accesskey = F
+
+show-smart-folders-label =
+    .label = Unified Folders
+    .accesskey = U
+
+show-recent-folders-label =
+    .label = Recent Folders
+    .accesskey = R
+
+show-tags-folders-label =
+    .label = Tags
+    .accesskey = T
+
+folder-toolbar-toggle-folder-compact-view =
+    .label = Compact View
+    .accesskey = C
+
+## File Menu
+
+menu-file-save-as-file =
+    .label = File…
+    .accesskey = F
+
+## Edit Menu
+
+menu-edit-delete-folder =
+    .label = Delete Folder
+    .accesskey = D
+
+menu-edit-unsubscribe-newsgroup =
+    .label = Unsubscribe Newsgroup
+    .accesskey = b
+
+# Variables:
+# $count (Number) - Number of selected messages.
+menu-edit-delete-messages =
+    .label =
+        { $count ->
+            [one] Delete Message
+           *[other] Delete Selected Messages
+        }
+    .accesskey = D
+
+# Variables:
+# $count (Number) - Number of selected messages.
+menu-edit-undelete-messages =
+    .label =
+        { $count ->
+            [one] Undelete Message
+           *[other] Undelete Selected Messages
+        }
+    .accesskey = d
+
+menu-edit-properties =
+    .label = Properties
+    .accesskey = o
+
+menu-edit-folder-properties =
+    .label = Folder Properties
+    .accesskey = o
+
+menu-edit-newsgroup-properties =
+    .label = Newsgroup Properties
+    .accesskey = o
+
+## Message Menu
+
+redirect-msg-menuitem =
+    .label = Redirect
+    .accesskey = D
+
+## AppMenu
+
+appmenu-save-as-file =
+    .label = File…
+
+appmenu-settings =
+    .label = Settings
+
+appmenu-addons-and-themes =
+    .label = Add-ons and Themes
+
+## Context menu
+
+context-menu-redirect-msg =
+    .label = Redirect
+
+# This menu item is for canceling an NNTP message
+context-menu-cancel-msg =
+    .label = Cancel Message
+
+# Variables:
+# $count (Number) - Number of selected messages.
+mail-context-delete-messages =
+    .label =
+        { $count ->
+            [one] Delete Message
+           *[other] Delete Selected Messages
+        }
+
+# Variables:
+# $count (Number) - Number of selected messages.
+mail-context-undelete-messages =
+    .label =
+        { $count ->
+            [one] Undelete Message
+           *[other] Undelete Selected Messages
+        }
+
+context-menu-decrypt-to-folder2 =
+    .label = Create Decrypted Copy In
+    .accesskey = y
+
+## Message header pane
+
+other-action-redirect-msg =
+    .label = Redirect
+
+message-header-msg-flagged =
+    .title = Starred
+    .aria-label = Starred
+
+# Variables:
+# $address (String) - The email address of the recipient this picture belongs to.
+message-header-recipient-avatar =
+    .alt = Profile picture of { $address }.
+
+## Message header cutomize panel
+
+message-header-customize-panel-title = Message Header Settings
+
+message-header-customize-button-style =
+    .value = Button style
+    .accesskey = B
+
+message-header-button-style-default =
+    .label = Icons and text
+
+message-header-button-style-text =
+    .label = Text
+
+message-header-button-style-icons =
+    .label = Icons
+
+message-header-show-sender-full-address =
+    .label = Always show sender’s full address
+    .accesskey = f
+
+message-header-show-sender-full-address-description = The email address will be shown underneath the display name.
+
+message-header-show-recipient-avatar =
+    .label = Show sender’s profile picture
+    .accesskey = p
+
+message-header-show-big-avatar =
+    .label = Larger profile picture
+    .accesskey = g
+
+message-header-hide-label-column =
+    .label = Hide labels column
+    .accesskey = l
+
+message-header-large-subject =
+    .label = Large subject
+    .accesskey = s
+
+message-header-all-headers =
+    .label = Show all headers
+    .accesskey = a
+
+## Action Button Context Menu
+
+toolbar-context-menu-manage-extension =
+    .label = Manage Extension
+    .accesskey = E
+toolbar-context-menu-remove-extension =
+    .label = Remove Extension
+    .accesskey = v
+
+## Add-on removal warning
+
+# Variables:
+#  $name (String): The name of the add-on that will be removed.
+addon-removal-title = Remove { $name }?
+addon-removal-confirmation-button = Remove
+# Variables:
+#  $name (String): The name of the add-on that will be removed.
+addon-removal-confirmation-message = Remove { $name } as well as its configuration and data from { -brand-short-name }?
+
+caret-browsing-prompt-title = Caret Browsing
+caret-browsing-prompt-text = Pressing F7 turns Caret Browsing on or off. This feature places a moveable cursor within some content, allowing you to select text with the keyboard. Do you want to turn Caret Browsing on?
+caret-browsing-prompt-check-text = Do not ask again.
+
+repair-text-encoding-button =
+  .label = Repair Text Encoding
+  .tooltiptext = Guess correct text encoding from message content
+
+## no-reply handling
+
+no-reply-title = Reply Not Supported
+# Variables:
+# $email (String) - Email address the reply will be sent to. Example: "noreply@example.com"
+no-reply-message = The reply address ({ $email }) does not appear to be a monitored address. Messages to this address will likely not be read by anyone.
+no-reply-reply-anyway-button = Reply Anyway
+
+## error messages
+
+# Variables:
+# $failures (Number) - Number of messages that could not be decrypted.
+# $total (Number) - Total number of messages that were attempted to be decrypted.
+decrypt-and-copy-failures-multiple =
+    { $failures ->
+      [one] { $failures } of { $total } messages could not be decrypted and was not copied.
+      *[other] { $failures } of { $total } messages could not be decrypted and were not copied.
+    }
+
+## Spaces toolbar
+
+spaces-toolbar-element =
+    .toolbarname = Spaces Toolbar
+    .aria-label = Spaces Toolbar
+    .aria-description = Vertical toolbar for switching between different spaces. Use the arrow keys to navigate the available buttons.
+
+spaces-toolbar-button-mail2 =
+    .title = Mail
+
+spaces-toolbar-button-address-book2 =
+    .title = Address Book
+
+spaces-toolbar-button-calendar2 =
+    .title = Calendar
+
+spaces-toolbar-button-tasks2 =
+    .title = Tasks
+
+spaces-toolbar-button-chat2 =
+    .title = Chat
+
+spaces-toolbar-button-overflow =
+    .title = More spaces…
+
+spaces-toolbar-button-settings2 =
+    .title = Settings
+
+spaces-toolbar-button-hide =
+    .title = Hide Spaces Toolbar
+
+spaces-toolbar-button-show =
+    .title = Show Spaces Toolbar
+
+spaces-context-new-tab-item =
+    .label = Open in new tab
+
+spaces-context-new-window-item =
+    .label = Open in new window
+
+# Variables:
+# $tabName (String) - The name of the tab this item will switch to.
+spaces-context-switch-tab-item =
+    .label = Switch to { $tabName }
+
+settings-context-open-settings-item2 =
+    .label = Settings
+
+settings-context-open-account-settings-item2 =
+    .label = Account Settings
+
+settings-context-open-addons-item2 =
+    .label = Add-ons and Themes
+
+## Spaces toolbar pinned tab menupopup
+
+spaces-toolbar-pinned-tab-button =
+    .tooltiptext = Spaces Menu
+
+spaces-pinned-button-menuitem-mail2 =
+    .label = { spaces-toolbar-button-mail2.title }
+
+spaces-pinned-button-menuitem-address-book2 =
+    .label = { spaces-toolbar-button-address-book2.title }
+
+spaces-pinned-button-menuitem-calendar2 =
+    .label = { spaces-toolbar-button-calendar2.title }
+
+spaces-pinned-button-menuitem-tasks2 =
+    .label = { spaces-toolbar-button-tasks2.title }
+
+spaces-pinned-button-menuitem-chat2 =
+    .label = { spaces-toolbar-button-chat2.title }
+
+spaces-pinned-button-menuitem-settings2 =
+    .label = { spaces-toolbar-button-settings2.title }
+
+spaces-pinned-button-menuitem-show =
+    .label = { spaces-toolbar-button-show.title }
+
+# Variables:
+# $count (Number) - Number of unread messages.
+chat-button-unread-messages = { $count }
+    .title = { $count ->
+        [one] One unread message
+        *[other] { $count } unread messages
+    }
+
+## Spaces toolbar customize panel
+
+menuitem-customize-label =
+    .label = Customize…
+
+spaces-customize-panel-title = Spaces Toolbar Settings
+
+spaces-customize-background-color = Background color
+
+spaces-customize-icon-color = Button color
+
+# The background color used on the buttons of the spaces toolbar when they are
+# `current`, meaning the related space/tab is active and visible.
+spaces-customize-accent-background-color = Selected button background color
+
+# The icon color used on the buttons of the spaces toolbar when they are
+# `current`, meaning the related space/tab is active and visible.
+spaces-customize-accent-text-color = Selected button color
+
+spaces-customize-button-restore = Restore Defaults
+    .accesskey = R
+
+customize-panel-button-save = Done
+    .accesskey = D
+
+## Quick Filter Bar
+
+# The label to display for the "View... Toolbars..." menu item that controls
+# whether the quick filter bar is visible.
+quick-filter-bar-toggle =
+  .label = Quick Filter Bar
+  .accesskey = Q
+
+# This is the key used to show the quick filter bar.
+# This should match quick-filter-bar-textbox-shortcut in about3Pane.ftl.
+quick-filter-bar-show =
+  .key = k
+
+## OpenPGP
+
+openpgp-forget = Forget OpenPGP passphrases
+
+## Quota panel.
+
+# Variables:
+#   $percent (Number) - Usage percentage of the assigned IMAP quota.
+#   $usage (String) - Current quota usage (may include unit)
+#   $limit (String) - Current quota limit (may include unit)
+quota-panel-percent-used = { $percent }% full
+  .title = IMAP quota: { $usage } used of { $limit } total
diff --git a/comm/mail/locales/en-US/messenger/messengercompose/messengercompose.ftl b/comm/mail/locales/en-US/messenger/messengercompose/messengercompose.ftl
new file mode 100644
index 0000000000..8d7c39cdc4
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/messengercompose/messengercompose.ftl
@@ -0,0 +1,492 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Send Format
+
+compose-send-format-menu =
+    .label = Sending Format
+    .accesskey = F
+
+compose-send-auto-menu-item =
+    .label = Automatic
+    .accesskey = A
+
+compose-send-both-menu-item =
+    .label = Both HTML and Plain Text
+    .accesskey = B
+
+compose-send-html-menu-item =
+    .label = Only HTML
+    .accesskey = H
+
+compose-send-plain-menu-item =
+    .label = Only Plain Text
+    .accesskey = P
+
+## Addressing widget
+
+#   $type (String) - the type of the addressing row
+remove-address-row-button =
+    .title = Remove the { $type } field
+
+#   $type (String) - the type of the addressing row
+#   $count (Number) - the number of address pills currently present in the addressing row
+address-input-type-aria-label = { $count ->
+    [0]     { $type }
+    [one]   { $type } with one address, use left arrow key to focus on it.
+    *[other] { $type } with { $count } addresses, use left arrow key to focus on them.
+}
+
+#   $email (String) - the email address
+#   $count (Number) - the number of address pills currently present in the addressing row
+pill-aria-label = { $count ->
+    [one]   { $email }: press Enter to edit, Delete to remove.
+    *[other] { $email }, 1 of { $count }: press Enter to edit, Delete to remove.
+}
+
+#   $email (String) - the email address
+pill-tooltip-invalid-address = { $email } is not a valid email address
+
+#   $email (String) - the email address
+pill-tooltip-not-in-address-book = { $email } is not in your address book
+
+pill-action-edit =
+    .label = Edit Address
+    .accesskey = E
+
+#   $type (String) - the type of the addressing row, e.g. Cc, Bcc, etc.
+pill-action-select-all-sibling-pills =
+    .label = Select All Addresses in { $type }
+    .accesskey = A
+
+pill-action-select-all-pills =
+    .label = Select All Addresses
+    .accesskey = S
+
+pill-action-move-to =
+    .label = Move to To
+    .accesskey = T
+
+pill-action-move-cc =
+    .label = Move to Cc
+    .accesskey = C
+
+pill-action-move-bcc =
+    .label = Move to Bcc
+    .accesskey = B
+
+pill-action-expand-list =
+    .label = Expand List
+    .accesskey = x
+
+## Attachment widget
+
+ctrl-cmd-shift-pretty-prefix = {
+  PLATFORM() ->
+    [macos] ⇧ ⌘{" "}
+   *[other] Ctrl+Shift+
+}
+
+trigger-attachment-picker-key = A
+toggle-attachment-pane-key = M
+
+menuitem-toggle-attachment-pane =
+    .label = Attachment Pane
+    .accesskey = m
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key }
+
+toolbar-button-add-attachment =
+    .label = Attach
+    .tooltiptext = Add an Attachment ({ ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key })
+
+add-attachment-notification-reminder2 =
+    .label = Add Attachment…
+    .accesskey = A
+    .tooltiptext = { toolbar-button-add-attachment.tooltiptext }
+
+menuitem-attach-files =
+    .label = File(s)…
+    .accesskey = F
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key }
+
+context-menuitem-attach-files =
+    .label = Attach File(s)…
+    .accesskey = F
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key }
+
+# Note: Do not translate the term 'vCard'.
+context-menuitem-attach-vcard =
+    .label = My vCard
+    .accesskey = C
+
+context-menuitem-attach-openpgp-key =
+    .label = My OpenPGP Public Key
+    .accesskey = K
+
+#   $count (Number) - the number of attachments in the attachment bucket
+attachment-bucket-count-value = { $count ->
+    [1]      { $count } Attachment
+    *[other] { $count } Attachments
+}
+
+attachment-area-show =
+    .title = Show the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
+
+attachment-area-hide =
+    .title = Hide the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
+
+## Variables:
+## $count (Number) - Number of files being dropped onto the composer.
+
+drop-file-label-attachment = { $count ->
+    [one]   Add as attachment
+   *[other] Add as attachments
+}
+
+drop-file-label-inline = { $count ->
+    [one]   Insert inline
+   *[other] Insert inline
+}
+
+## Reorder Attachment Panel
+
+move-attachment-first-panel-button =
+    .label = Move First
+move-attachment-left-panel-button =
+    .label = Move Left
+move-attachment-right-panel-button =
+    .label = Move Right
+move-attachment-last-panel-button =
+    .label = Move Last
+
+button-return-receipt =
+    .label = Receipt
+    .tooltiptext = Request a return receipt for this message
+
+## Encryption
+
+encryption-menu =
+  .label = Security
+  .accesskey = c
+
+encryption-toggle =
+  .label = Encrypt
+  .tooltiptext = Use end-to-end encryption for this message
+
+encryption-options-openpgp =
+  .label = OpenPGP
+  .tooltiptext = View or change OpenPGP encryption settings
+
+encryption-options-smime =
+  .label = S/MIME
+  .tooltiptext = View or change S/MIME encryption settings
+
+signing-toggle =
+  .label = Sign
+  .tooltiptext = Use digital signing for this message
+
+menu-openpgp =
+    .label = OpenPGP
+    .accesskey = O
+
+menu-smime =
+    .label = S/MIME
+    .accesskey = S
+
+menu-encrypt =
+    .label = Encrypt
+    .accesskey = E
+
+menu-encrypt-subject =
+    .label = Encrypt Subject
+    .accesskey = B
+
+menu-sign =
+    .label = Digitally Sign
+    .accesskey = i
+
+menu-manage-keys =
+    .label = Key Assistant
+    .accesskey = A
+
+menu-view-certificates =
+    .label = View Certificates Of Recipients
+    .accesskey = V
+
+menu-open-key-manager =
+    .label = Key Manager
+    .accesskey = M
+
+# Variables:
+# $addr (String) - Email address (which related to the currently selected
+#                  from address) which isn't set up to end-to-end encryption.
+openpgp-key-issue-notification-from =
+    You are not set up to send end-to-end encrypted messages from { $addr }.
+
+# Variables:
+# $addr (String) - Email address with key issues.
+openpgp-key-issue-notification-single = End-to-end encryption requires resolving key issues for { $addr }.
+
+# Variables:
+# $count (Number) - Number of recipients with key issues.
+openpgp-key-issue-notification-multi =
+    { $count ->
+       *[other] End-to-end encryption requires resolving key issues for { $count } recipients.
+    }
+
+# Variables:
+# $addr (String) - mail address with certificate issues.
+smime-cert-issue-notification-single = End-to-end encryption requires resolving certificate issues for { $addr }.
+
+# Variables:
+# $count (Number) - Number of recipients with certificate issues.
+smime-cert-issue-notification-multi =
+    { $count ->
+       *[other] End-to-end encryption requires resolving certificate issues for { $count } recipients.
+    }
+
+key-notification-disable-encryption =
+    .label = Do Not Encrypt
+    .accesskey = D
+    .tooltiptext = Disable end-to-end encryption
+
+key-notification-resolve =
+    .label = Resolve…
+    .accesskey = R
+    .tooltiptext = Open the OpenPGP Key Assistant
+
+can-encrypt-smime-notification =
+    S/MIME end-to-end encryption is possible.
+
+can-encrypt-openpgp-notification =
+    OpenPGP end-to-end encryption is possible.
+
+can-e2e-encrypt-button =
+    .label = Encrypt
+    .accesskey = E
+
+## Addressing Area
+
+to-address-row-label =
+    .value = To
+
+#   $key (String) - the shortcut key for this field
+show-to-row-main-menuitem =
+    .label = To Field
+    .accesskey = T
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
+
+# No acceltext should be shown.
+# The label should match the show-to-row-button text.
+show-to-row-extra-menuitem =
+    .label = To
+    .accesskey = T
+
+#   $key (String) - the shortcut key for this field
+show-to-row-button = To
+    .title = Show To Field ({ ctrl-cmd-shift-pretty-prefix }{ $key })
+
+
+cc-address-row-label =
+    .value = Cc
+
+#   $key (String) - the shortcut key for this field
+show-cc-row-main-menuitem =
+    .label = Cc Field
+    .accesskey = C
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
+
+# No acceltext should be shown.
+# The label should match the show-cc-row-button text.
+show-cc-row-extra-menuitem =
+    .label = Cc
+    .accesskey = C
+
+#   $key (String) - the shortcut key for this field
+show-cc-row-button = Cc
+    .title = Show Cc Field ({ ctrl-cmd-shift-pretty-prefix }{ $key })
+
+
+bcc-address-row-label =
+    .value = Bcc
+
+#   $key (String) - the shortcut key for this field
+show-bcc-row-main-menuitem =
+    .label = Bcc Field
+    .accesskey = B
+    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
+
+# No acceltext should be shown.
+# The label should match the show-bcc-row-button text.
+show-bcc-row-extra-menuitem =
+    .label = Bcc
+    .accesskey = B
+
+#   $key (String) - the shortcut key for this field
+show-bcc-row-button = Bcc
+    .title = Show Bcc Field ({ ctrl-cmd-shift-pretty-prefix }{ $key })
+
+extra-address-rows-menu-button =
+    .title = Other addressing fields to show
+
+public-recipients-notice-single =
+    Your message has a public recipient. You can avoid disclosing the recipient by using Bcc instead.
+
+# Variables:
+# $count (Number) - the count of addresses in the "To" and "Cc" fields.
+public-recipients-notice-multi = { $count ->
+  *[other] The { $count } recipients in To and Cc will see each other’s address. You can avoid disclosing recipients by using Bcc instead.
+}
+
+many-public-recipients-bcc =
+  .label = Use Bcc Instead
+  .accesskey = U
+
+many-public-recipients-ignore =
+  .label = Keep Recipients Public
+  .accesskey  = K
+
+many-public-recipients-prompt-title = Too Many Public Recipients
+
+#   $count (Number) - the count of addresses in the public recipients fields.
+many-public-recipients-prompt-msg = { $count ->
+  [one] Your message has a public recipient. This may be a privacy concern. You can avoid this by moving the recipient from To/Cc to Bcc instead.
+  *[other] Your message has { $count } public recipients, who will be able to see each other’s addresses. This may be a privacy concern. You can avoid disclosing recipients by moving recipients from To/Cc to Bcc instead.
+}
+
+many-public-recipients-prompt-cancel = Cancel Sending
+many-public-recipients-prompt-send = Send Anyway
+
+## Notifications
+
+# Variables:
+# $identity (string) - The name of the used identity, most likely an email address.
+compose-missing-identity-warning = A unique identity matching the From address was not found. The message will be sent using the current From field and settings from identity { $identity }.
+
+encrypted-bcc-warning = When sending an encrypted message, recipients in Bcc are not fully hidden. All recipients may be able to identify them.
+
+encrypted-bcc-ignore-button = Understood
+
+auto-disable-e2ee-warning = End-to-end encryption for this message was automatically disabled.
+
+## Editing
+
+# Tools
+
+compose-tool-button-remove-text-styling =
+  .tooltiptext = Remove Text Styling
+
+## Filelink
+
+# A text used in a tooltip of Filelink attachments, whose account has been
+# removed or is unknown.
+cloud-file-unknown-account-tooltip = Uploaded to an unknown Filelink account.
+
+# Placeholder file
+
+# Title for the html placeholder file.
+# $filename - name of the file
+cloud-file-placeholder-title = { $filename } - Filelink Attachment
+
+# A text describing that the file was attached as a Filelink and can be downloaded
+# from the link shown below.
+# $filename - name of the file
+cloud-file-placeholder-intro = The file { $filename } was attached as a Filelink. It can be downloaded from the link below.
+
+# Template
+
+# A line of text describing how many uploaded files have been appended to this
+# message. Emphasis should be on sharing as opposed to attaching. This item is
+# used as a header to a list, hence the colon.
+# Variables:
+# $count (Number) - Number of files.
+cloud-file-count-header = { $count ->
+  [one] I’ve linked { $count } file to this email:
+  *[other] I’ve linked { $count } files to this email:
+}
+
+# A text used in a footer, instructing the reader where to find additional
+# information about the used service provider.
+# $link (string) - html a-tag for a link pointing to the web page of the provider
+cloud-file-service-provider-footer-single = Learn more about { $link }.
+
+# A text used in a footer, instructing the reader where to find additional
+# information about the used service providers. Links for the used providers are
+# split into a comma separated list of the first n-1 providers and a single entry
+# at the end.
+# $firstLinks (string) - comma separated list of html a-tags pointing to web pages
+#                        of the first n-1 used providers
+# $lastLink (string) - html a-tag pointing the web page of the n-th used provider
+cloud-file-service-provider-footer-multiple = Learn more about { $firstLinks } and { $lastLink }.
+
+# Tooltip for an icon, indicating that the link is protected by a password.
+cloud-file-tooltip-password-protected-link = Password protected link
+
+# Used in a list of stats about a specific file
+# Service - the used service provider to host the file (Filelink Service: BOX.com)
+# Size - the size of the file (Size: 4.2 MB)
+# Link - the link to the file (Link: https://some.provider.com)
+# Expiry Date - stating the date the link will expire (Expiry Date: 12.12.2022)
+# Download Limit - stating the maximum allowed downloads, before the link becomes invalid
+#                  (Download Limit: 6)
+cloud-file-template-service-name = Filelink Service:
+cloud-file-template-size = Size:
+cloud-file-template-link = Link:
+cloud-file-template-password-protected-link = Password Protected Link:
+cloud-file-template-expiry-date = Expiry Date:
+cloud-file-template-download-limit = Download Limit:
+
+# Messages
+
+cloud-file-connection-error-title = Connection Error
+# Variables:
+# $provider (string) - name of the online storage service that reported the error
+cloud-file-connection-error = { -brand-short-name } is offline. Could not connect to { $provider }.
+
+# Variables:
+# $provider (string) - name of the online storage service that reported the error
+# $filename (string) - name of the file that was uploaded and caused the error
+cloud-file-upload-error-with-custom-message-title = Uploading { $filename } to { $provider } Failed
+
+cloud-file-rename-error-title = Rename Error
+
+# Variables:
+# $provider (string) - name of the online storage service that reported the error
+# $filename (string) - name of the file that was renamed and caused the error
+cloud-file-rename-error = There was a problem renaming { $filename } on { $provider }.
+
+# Variables:
+# $provider (string) - name of the online storage service that reported the error
+# $filename (string) - name of the file that was renamed and caused the error
+cloud-file-rename-error-with-custom-message-title = Renaming { $filename } on { $provider } Failed
+
+# Variables:
+# $provider (string) - name of the online storage service that reported the error
+cloud-file-rename-not-supported = { $provider } does not support renaming already uploaded files.
+
+cloud-file-attachment-error-title = Filelink Attachment Error
+
+# Variables:
+# $filename (string) - name of the file that was renamed and caused the error
+cloud-file-attachment-error = Failed to update the Filelink attachment { $filename }, because its local file has been moved or deleted.
+
+cloud-file-account-error-title = Filelink Account Error
+
+# Variables:
+# $filename (string) - name of the file that was renamed and caused the error
+cloud-file-account-error = Failed to update the Filelink attachment { $filename }, because its Filelink account has been deleted.
+
+## Link Preview
+
+link-preview-title = Link Preview
+link-preview-description = { -brand-short-name } can add an embedded preview when pasting links.
+link-preview-autoadd = Automatically add link previews when possible
+link-preview-replace-now = Add a Link Preview for this link?
+link-preview-yes-replace = Yes
+
+## Dictionary selection popup
+
+spell-add-dictionaries =
+    .label = Add Dictionaries…
+    .accesskey = A
diff --git a/comm/mail/locales/en-US/messenger/migration.ftl b/comm/mail/locales/en-US/messenger/migration.ftl
new file mode 100644
index 0000000000..9690fe9b34
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/migration.ftl
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+migration-progress-header = Getting { -brand-short-name } ready…
+
+## Migration tasks
+
+# These strings are displayed to the user if a migration is taking a long time.
+# They should be short (no more than a handful of words) and in the present tense.
diff --git a/comm/mail/locales/en-US/messenger/multimessageview.ftl b/comm/mail/locales/en-US/messenger/multimessageview.ftl
new file mode 100644
index 0000000000..4dce968837
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/multimessageview.ftl
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+multi-message-window-title =
+    .title = Message Summary
+
+selected-messages-label =
+    .label = Selected Messages
+
+multi-message-archive-button =
+    .label = Archive
+    .tooltiptext = Archive
+
+multi-message-delete-button =
+    .label = Delete
+    .tooltiptext = Delete
diff --git a/comm/mail/locales/en-US/messenger/openpgp/backupKeyPassword.ftl b/comm/mail/locales/en-US/messenger/openpgp/backupKeyPassword.ftl
new file mode 100644
index 0000000000..264ad1aa68
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/backupKeyPassword.ftl
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+set-password-window-title = Choose a password to backup your OpenPGP Key
+
+set-password-legend = Choose a Password
+
+set-password-message = The password you set here protects the OpenPGP secret key backup file that you are about to create. You must set this password to proceed with the backup.
+
+set-password-backup-pw-label = Secret Key backup password:
+
+set-password-backup-pw2-label = Secret Key backup password (again):
+
+set-password-reminder = <b>Important!</b> If you forget your secret key backup password, you will not be able to restore this backup later. Please record it in a safe location.
+
+password-quality-meter = Password quality meter
diff --git a/comm/mail/locales/en-US/messenger/openpgp/changeExpiryDlg.ftl b/comm/mail/locales/en-US/messenger/openpgp/changeExpiryDlg.ftl
new file mode 100644
index 0000000000..58155e866c
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/changeExpiryDlg.ftl
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+openpgp-change-expiry-title = Change Key Expiration
+
+# Variables:
+# $date (String) - Date the key is expiring on.
+info-will-expire = This key is currently configured to expire on { $date }.
+info-already-expired = This key has already expired.
+info-does-not-expire = This key is currently configured to never expire.
+
+info-explanation-1 = <b>After a key expires</b>, it’s no longer possible to use it for encryption or digital signing.
+
+info-explanation-2 = To use this key for a longer period of time, change its expiration date, and then share the public key with your conversation partners again.
+
+expire-no-change-label = Do not change the expiry date
+expire-in-time-label = Key will expire in:
+expire-never-expire-label = Key will never expire
diff --git a/comm/mail/locales/en-US/messenger/openpgp/composeKeyStatus.ftl b/comm/mail/locales/en-US/messenger/openpgp/composeKeyStatus.ftl
new file mode 100644
index 0000000000..cd3abc5f86
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/composeKeyStatus.ftl
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+openpgp-compose-key-status-intro-need-keys = To send an end-to-end encrypted message, you must obtain and accept a public key for each recipient.
+openpgp-compose-key-status-keys-heading = Availability of OpenPGP keys:
+openpgp-compose-key-status-title =
+    .title = OpenPGP Message Security
+openpgp-compose-key-status-recipient =
+    .label = Recipient
+openpgp-compose-key-status-status =
+    .label = Status
+openpgp-compose-key-status-open-details = Manage keys for selected recipient…
+openpgp-recip-good = ok
+openpgp-recip-missing = no key available
+openpgp-recip-none-accepted = no accepted key
+openpgp-compose-general-info-alias = { -brand-short-name} normally requires that the recipient’s public key contains a user ID with a matching email address. This can be overridden by using OpenPGP recipient alias rules.
+openpgp-compose-general-info-alias-learn-more = Learn more
+# Variables:
+# $count (Number) - Number of alias keys for a recipient.
+openpgp-compose-alias-status-direct = { $count ->
+               [one] mapped to an alias key
+               *[other] mapped to {$count} alias keys
+             }
+openpgp-compose-alias-status-error = unusable/unavailable alias key
diff --git a/comm/mail/locales/en-US/messenger/openpgp/keyAssistant.ftl b/comm/mail/locales/en-US/messenger/openpgp/keyAssistant.ftl
new file mode 100644
index 0000000000..ece7c8e127
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/keyAssistant.ftl
@@ -0,0 +1,160 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+openpgp-key-assistant-title = OpenPGP Key Assistant
+
+openpgp-key-assistant-rogue-warning = Avoid accepting a counterfeit key. To ensure you have obtained the right key you should verify it. <a data-l10n-name="openpgp-link">Learn more…</a>
+
+## Encryption status
+
+openpgp-key-assistant-recipients-issue-header = Cannot Encrypt
+
+# Variables:
+# $count (Number) - The number of recipients that need attention.
+openpgp-key-assistant-recipients-issue-description =
+    { $count ->
+        [one] To encrypt, you must obtain and accept a usable key for one recipient. <a data-l10n-name="openpgp-link">Learn more…</a>
+        *[other] To encrypt, you must obtain and accept usable keys for { $count } recipients. <a data-l10n-name="openpgp-link">Learn more…</a>
+    }
+
+openpgp-key-assistant-info-alias = { -brand-short-name } normally requires that the recipient’s public key contains a user ID with a matching email address. This can be overridden by using OpenPGP recipient alias rules. <a data-l10n-name="openpgp-link">Learn more…</a>
+
+# Variables:
+# $count (Number) - The number of recipients that need attention.
+openpgp-key-assistant-recipients-description =
+    { $count ->
+        [one] You already have a usable and accepted key for one recipient.
+        *[other] You already have usable and accepted keys for { $count } recipients.
+    }
+
+openpgp-key-assistant-recipients-description-no-issues = This message can be encrypted. You have usable and accepted keys for all recipients.
+
+## Resolve section
+
+# Variables:
+# $recipient (String) - The email address of the recipient needing resolution.
+# $numKeys (Number) - The number of keys.
+openpgp-key-assistant-resolve-title =
+    { $numKeys ->
+        [one] { -brand-short-name } found the following key for { $recipient }.
+        *[other] { -brand-short-name } found the following keys for { $recipient }.
+    }
+
+openpgp-key-assistant-valid-description = Select the key that you want to accept
+
+# Variables:
+# $numKeys (Number) - The number of available keys.
+openpgp-key-assistant-invalid-title =
+    { $numKeys ->
+        [one] The following key cannot be used, unless you obtain an update.
+        *[other] The following keys cannot be used, unless you obtain an update.
+    }
+
+openpgp-key-assistant-no-key-available = No key available.
+
+openpgp-key-assistant-multiple-keys = Multiple keys are available.
+
+# Variables:
+# $count (Number) - The number of unaccepted keys.
+openpgp-key-assistant-key-unaccepted =
+    { $count ->
+        [one] A key is available, but it hasn’t been accepted yet.
+        *[other] Multiple keys are available, but none of them have been accepted yet.
+    }
+
+# Variables:
+# $date (String) - The expiration date of the key.
+openpgp-key-assistant-key-accepted-expired = An accepted key has expired on { $date }.
+
+openpgp-key-assistant-keys-accepted-expired = Multiple accepted keys have expired.
+
+# Variables:
+# $date (String) - The expiration date of the key.
+openpgp-key-assistant-this-key-accepted-expired = This key was previously accepted but expired on { $date }.
+
+# Variables:
+# $date (String) - The expiration date of the key.
+openpgp-key-assistant-key-unaccepted-expired-one =
+    The key expired on { $date }.
+openpgp-key-assistant-key-unaccepted-expired-many =
+    Multiple keys have expired.
+
+openpgp-key-assistant-key-fingerprint = Fingerprint
+
+# Variables:
+# $count (Number) - Number of key sources.
+openpgp-key-assistant-key-source =
+  { $count ->
+      [one] Source
+      *[other] Sources
+  }
+
+openpgp-key-assistant-key-collected-attachment = email attachment
+# Autocrypt is the name of a standard.
+openpgp-key-assistant-key-collected-autocrypt = Autocrypt header
+openpgp-key-assistant-key-collected-keyserver = keyserver
+# Web Key Directory (WKD) is a concept.
+openpgp-key-assistant-key-collected-wkd = Web Key Directory
+# Do not translate GnuPG, it's a name of other software.
+openpgp-key-assistant-key-collected-gnupg = GnuPG keyring
+
+# Variables:
+# $count (Number) - Number of found keys.
+openpgp-key-assistant-keys-has-collected =
+  { $count ->
+      [one] A key was found, but it hasn’t been accepted yet.
+      *[other] Multiple keys were found, but none of them have been accepted yet.
+  }
+
+openpgp-key-assistant-key-rejected = This key has been previously rejected.
+openpgp-key-assistant-key-accepted-other = This key has been previously accepted for a different email address.
+
+# Variables:
+# $recipient (String) - The email address of the recipient needing resolution.
+openpgp-key-assistant-resolve-discover-info =
+  Discover additional or updated keys for { $recipient } online, or import them from a file.
+
+## Discovery section
+
+openpgp-key-assistant-discover-title = Online discovery in progress.
+
+# Variables:
+# $recipient (String) - The email address which we're discovering keys.
+openpgp-key-assistant-discover-keys = Discovering keys for { $recipient }…
+
+# Variables:
+# $recipient (String) - The email address which we're discovering keys.
+openpgp-key-assistant-expired-key-update =
+    An update was found for one of the previously accepted keys for { $recipient }.
+    It can now be used as it is no longer expired.
+
+## Dialog buttons
+
+openpgp-key-assistant-discover-online-button = Discover Public Keys Online…
+
+openpgp-key-assistant-import-keys-button = Import Public Keys From File…
+
+openpgp-key-assistant-issue-resolve-button = Resolve…
+
+openpgp-key-assistant-view-key-button = View Key…
+
+openpgp-key-assistant-recipients-show-button = Show
+
+openpgp-key-assistant-recipients-hide-button = Hide
+
+openpgp-key-assistant-cancel-button = Cancel
+
+openpgp-key-assistant-back-button = Back
+
+openpgp-key-assistant-accept-button = Accept
+
+openpgp-key-assistant-close-button = Close
+
+openpgp-key-assistant-disable-button = Disable Encryption
+
+openpgp-key-assistant-confirm-button = Send Encrypted
+
+# Variables:
+# $date (String) - The key creation date.
+openpgp-key-assistant-key-created = created on { $date }
diff --git a/comm/mail/locales/en-US/messenger/openpgp/keyWizard.ftl b/comm/mail/locales/en-US/messenger/openpgp/keyWizard.ftl
new file mode 100644
index 0000000000..59382143b5
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/keyWizard.ftl
@@ -0,0 +1,198 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#   $identity (String) - the email address of the currently selected identity
+key-wizard-dialog-window =
+    .title = Add a Personal OpenPGP Key for { $identity }
+
+key-wizard-dialog =
+    .buttonlabelaccept = Continue
+    .buttonlabelextra1 = Go back
+
+key-wizard-warning = <b>If you have an existing personal key</b> for this email address, you should import it. Otherwise you will not have access to your archives of encrypted emails, nor be able to read incoming encrypted emails from people who are still using your existing key.
+
+key-wizard-learn-more = Learn more
+
+radio-create-key =
+    .label = Create a new OpenPGP Key
+    .accesskey = C
+
+radio-import-key =
+    .label = Import an existing OpenPGP Key
+    .accesskey = I
+
+radio-gnupg-key =
+    .label = Use your external key through GnuPG (e.g. from a smartcard)
+    .accesskey = U
+
+## Generate key section
+
+openpgp-generate-key-title = Generate OpenPGP Key
+
+openpgp-keygen-secret-protection = Secret Key Protection
+
+radio-keygen-no-protection =
+    .label = Unprotected
+radio-keygen-protect-primary-pass =
+    .label = Protect with the Primary Password
+
+radio-keygen-passphrase-protection =
+    .label = Protect with a passphrase:
+openpgp-passphrase-repeat = Confirm the passphrase:
+
+openpgp-generate-key-info = <b>Key generation may take up to several minutes to complete.</b> Do not exit the application while key generation is in progress. Actively browsing or performing disk-intensive operations during key generation will replenish the ‘randomness pool’ and speed-up the process. You will be alerted when key generation is completed.
+
+openpgp-keygen-expiry-title = Key expiry
+
+openpgp-keygen-expiry-description = Define the expiration time of your newly generated key. You can later control the date to extend it if necessary.
+
+radio-keygen-expiry =
+    .label = Key expires in
+    .accesskey = e
+
+radio-keygen-no-expiry =
+    .label = Key does not expire
+    .accesskey = d
+
+openpgp-keygen-days-label =
+    .label = days
+openpgp-keygen-months-label =
+    .label = months
+openpgp-keygen-years-label =
+    .label = years
+
+openpgp-keygen-advanced-title = Advanced settings
+
+openpgp-keygen-advanced-description = Control the advanced settings of your OpenPGP Key.
+
+openpgp-keygen-keytype =
+    .value = Key type:
+    .accesskey = t
+
+openpgp-keygen-keysize =
+    .value = Key size:
+    .accesskey = s
+
+openpgp-keygen-type-rsa =
+    .label = RSA
+
+openpgp-keygen-type-ecc =
+    .label = ECC (Elliptic Curve)
+
+openpgp-keygen-button = Generate key
+
+openpgp-keygen-progress-title = Generating your new OpenPGP Key…
+
+openpgp-keygen-import-progress-title = Importing your OpenPGP Keys…
+
+openpgp-import-success = OpenPGP Keys successfully imported!
+
+openpgp-import-success-title = Complete the import process
+
+openpgp-import-success-description = To start using your imported OpenPGP key for email encryption, close this dialog and access your Account Settings to select it.
+
+openpgp-keygen-confirm =
+    .label = Confirm
+
+openpgp-keygen-dismiss =
+    .label = Cancel
+
+openpgp-keygen-cancel =
+    .label = Cancel process…
+
+openpgp-keygen-import-complete =
+    .label = Close
+    .accesskey = C
+
+openpgp-keygen-missing-username = There is no name specified for the current account. Please enter a value in the field  “Your name” in the account settings.
+openpgp-keygen-long-expiry = You cannot create a key that expires in more than 100 years.
+openpgp-keygen-short-expiry = Your key must be valid for at least one day.
+
+openpgp-keygen-ongoing = Key generation already in progress!
+
+openpgp-keygen-error-core = Unable to initialize OpenPGP Core Service
+
+openpgp-keygen-error-failed = OpenPGP Key generation unexpectedly failed
+
+#   $key (String) - the ID of the newly generated OpenPGP key
+openpgp-keygen-error-revocation = OpenPGP Key created successfully, but failed to obtain revocation for key { $key }
+
+openpgp-keygen-abort-title = Abort key generation?
+openpgp-keygen-abort = OpenPGP Key generation currently in progress, are you sure you want to cancel it?
+
+#   $identity (String) - the name and email address of the currently selected identity
+openpgp-key-confirm = Generate public and secret key for { $identity }?
+
+## Import Key section
+
+openpgp-import-key-title = Import an existing personal OpenPGP Key
+
+openpgp-import-key-legend = Select a previously backed up file.
+
+openpgp-import-key-description = You may import personal keys that were created with other OpenPGP software.
+
+openpgp-import-key-info = Other software might describe a personal key using alternative terms such as your own key, secret key, private key or key pair.
+
+#   $count (Number) - the number of keys found in the selected files
+openpgp-import-key-list-amount-2 = { $count ->
+    [one]   { -brand-short-name } found one key that can be imported.
+   *[other] { -brand-short-name } found { $count } keys that can be imported.
+}
+
+openpgp-import-key-list-description = Confirm which keys may be treated as your personal keys. Only keys that you created yourself and that show your own identity should be used as personal keys. You can change this option later in the Key Properties dialog.
+
+openpgp-import-key-list-caption = Keys marked to be treated as Personal Keys will be listed in the End-To-End Encryption section. The others will be available inside the Key Manager.
+
+openpgp-import-keep-passphrases =
+    .label = Keep passphrase protection for imported secret keys
+
+openpgp-passphrase-prompt-title = Passphrase required
+
+openpgp-import-key-button =
+    .label = Select File to Import…
+    .accesskey = S
+
+import-key-file = Import OpenPGP Key File
+
+import-key-personal-checkbox =
+    .label = Treat this key as a Personal Key
+
+gnupg-file = GnuPG Files
+
+import-error-file-size = <b>Error!</b> Files larger than 5MB are not supported.
+
+#   $error (String) - the reported error from the failed key import method
+import-error-failed = <b>Error!</b> Failed to import file. { $error }
+
+#   $error (String) - the reported error from the failed key import method
+openpgp-import-keys-failed = <b>Error!</b> Failed to import keys. { $error }
+
+openpgp-import-identity-label = Identity
+
+openpgp-import-fingerprint-label = Fingerprint
+
+openpgp-import-created-label = Created
+
+openpgp-import-bits-label = Bits
+
+openpgp-import-key-props =
+    .label = Key Properties
+    .accesskey = K
+
+## External Key section
+
+openpgp-external-key-title = External GnuPG Key
+
+openpgp-external-key-description = Configure an external GnuPG key by entering the Key ID
+
+openpgp-external-key-info = In addition, you must use Key Manager to import and accept the corresponding Public Key.
+
+openpgp-external-key-warning = <b>You may configure only one external GnuPG Key.</b> Your previous entry will be replaced.
+
+openpgp-save-external-button = Save key ID
+
+openpgp-external-key-label = Secret Key ID:
+
+openpgp-external-key-input =
+    .placeholder = 123456789341298340
diff --git a/comm/mail/locales/en-US/messenger/openpgp/msgReadStatus.ftl b/comm/mail/locales/en-US/messenger/openpgp/msgReadStatus.ftl
new file mode 100644
index 0000000000..13db8ac6f6
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/msgReadStatus.ftl
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Message Header Encryption Button
+
+message-header-show-security-info-key = S
+
+#   $type (String) - the shortcut key defined in the message-header-show-security-info-key
+message-security-button =
+    .title = { PLATFORM() ->
+        [macos] Show Message Security (⌃ ⌘ { message-header-show-security-info-key })
+        *[other] Show Message Security (Ctrl+Alt+{ message-header-show-security-info-key })
+    }
+
+openpgp-view-signer-key =
+    .label = View signer key
+openpgp-view-your-encryption-key =
+    .label = View your decryption key
+openpgp-openpgp = OpenPGP
+
+openpgp-no-sig = No Digital Signature
+openpgp-no-sig-info = This message does not include the sender’s digital signature. The absence of a digital signature means that the message could have been sent by someone pretending to have this email address. It is also possible that the message has been altered while in transit over the network.
+openpgp-uncertain-sig = Uncertain Digital Signature
+# Variables:
+# $date (String) - Date with time the signature was made in a short format.
+openpgp-uncertain-sig-with-date = Uncertain Digital Signature - Signed on { $date }
+openpgp-invalid-sig = Invalid Digital Signature
+# Variables:
+# $date (String) - Date with time the signature was made in a short format.
+openpgp-invalid-sig-with-date = Invalid Digital Signature - Signed on { $date }
+openpgp-good-sig = Good Digital Signature
+# Variables:
+# $date (String) - Date with time the signature was made in a short format.
+openpgp-good-sig-with-date = Good Digital Signature - Signed on { $date }
+
+openpgp-sig-uncertain-no-key = This message contains a digital signature, but it is uncertain if it is correct. To verify the signature, you need to obtain a copy of the sender’s public key.
+openpgp-sig-uncertain-uid-mismatch = This message contains a digital signature, but a mismatch was detected. The message was sent from an email address that doesn’t match the signer’s public key.
+openpgp-sig-uncertain-not-accepted = This message contains a digital signature, but you haven’t yet decided if the signer’s key is acceptable to you.
+openpgp-sig-invalid-rejected = This message contains a digital signature, but you have previously decided to reject the signer key.
+openpgp-sig-invalid-technical-problem = This message contains a digital signature, but a technical error was detected. Either the message has been corrupted, or the message has been modified by someone else.
+openpgp-sig-valid-unverified = This message includes a valid digital signature from a key that you have already accepted. However, you have not yet verified that the key is really owned by the sender.
+openpgp-sig-valid-verified = This message includes a valid digital signature from a verified key.
+openpgp-sig-valid-own-key = This message includes a valid digital signature from your personal key.
+
+# Variables:
+# $key (String) - The ID of the OpenPGP key used to create the signature.
+openpgp-sig-key-id = Signer key ID: { $key }
+# Variables:
+# $key (String) - The primary ID of the OpenPGP key used to create the signature.
+# $subkey (String) - A subkey of the primary key was used to create the signature, and this is the ID of that subkey.
+openpgp-sig-key-id-with-subkey-id = Signer key ID: { $key } (Sub key ID: { $subkey })
+
+# Variables:
+# $key (String) - The ID of the user's OpenPGP key used to decrypt the message.
+openpgp-enc-key-id = Your decryption key ID: { $key }
+# Variables:
+# $key (String) - The primary ID of the user's OpenPGP key used to decrypt the message.
+# $subkey (String) - A subkey of the primary key was used to decrypt the message, and this is the ID of that subkey.
+openpgp-enc-key-with-subkey-id = Your decryption key ID: { $key } (Sub key ID: { $subkey })
+
+openpgp-enc-none = Message Is Not Encrypted
+openpgp-enc-none-label = This message was not encrypted before it was sent. Information sent over the Internet without encryption can be seen by other people while in transit.
+
+openpgp-enc-invalid-label = Message Cannot Be Decrypted
+openpgp-enc-invalid = This message was encrypted before it was sent to you, but it cannot be decrypted.
+
+openpgp-enc-clueless = There are unknown problems with this encrypted message.
+
+openpgp-enc-valid-label = Message Is Encrypted
+openpgp-enc-valid = This message was encrypted before it was sent to you. Encryption ensures the message can only be read by the recipients it was intended for.
+
+openpgp-unknown-key-id = Unknown key
+
+openpgp-other-enc-additional-key-ids = In addition, the message was encrypted to the owners of the following keys:
+openpgp-other-enc-all-key-ids = The message was encrypted to the owners of the following keys:
+
+openpgp-message-header-encrypted-ok-icon =
+    .alt = Decryption successful
+openpgp-message-header-encrypted-notok-icon =
+    .alt = Decryption failed
+
+openpgp-message-header-signed-ok-icon =
+    .alt = Good signature
+# Mismatch icon is used for notok state as well
+openpgp-message-header-signed-mismatch-icon =
+    .alt = Bad signature
+openpgp-message-header-signed-unknown-icon =
+    .alt = Unknown signature status
+openpgp-message-header-signed-verified-icon =
+    .alt = Verified signature
+openpgp-message-header-signed-unverified-icon =
+    .alt = Unverified signature
diff --git a/comm/mail/locales/en-US/messenger/openpgp/oneRecipientStatus.ftl b/comm/mail/locales/en-US/messenger/openpgp/oneRecipientStatus.ftl
new file mode 100644
index 0000000000..6d5e858ab6
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/oneRecipientStatus.ftl
@@ -0,0 +1,60 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+openpgp-one-recipient-status-title =
+    .title = OpenPGP Message Security
+openpgp-one-recipient-status-status =
+    .label = Status
+openpgp-one-recipient-status-key-id =
+    .label = Key ID
+openpgp-one-recipient-status-created-date =
+    .label = Created
+openpgp-one-recipient-status-expires-date =
+    .label = Expires
+openpgp-one-recipient-status-open-details =
+    .label = Open details and edit acceptance…
+openpgp-one-recipient-status-discover =
+    .label = Discover new or updated key
+
+openpgp-one-recipient-status-instruction1 = To send an end-to-end encrypted message to a recipient, you need to obtain their OpenPGP public key and mark it as accepted.
+openpgp-one-recipient-status-instruction2 = To obtain their public key, import them from email they have sent to you and that includes it. Alternatively, you can try to discover their public key on a directory.
+
+openpgp-key-own = Accepted (personal key)
+openpgp-key-secret-not-personal = Not usable
+openpgp-key-verified = Accepted (verified)
+openpgp-key-unverified = Accepted (unverified)
+openpgp-key-undecided = Not accepted (undecided)
+openpgp-key-rejected = Not accepted (rejected)
+openpgp-key-expired = Expired
+
+# Variables:
+# $key (String) - Recipient email address.
+openpgp-intro = Available public keys for { $key }
+
+# Variables:
+# $kid (String) - Public key id to import.
+openpgp-pubkey-import-id = ID: { $kid }
+# Variables:
+# $fpr (String) - Fingerprint of the public key to import.
+openpgp-pubkey-import-fpr = Fingerprint: { $fpr }
+
+# Variables:
+# $num (Number) - Number of public keys contained in the key file.
+openpgp-pubkey-import-intro =
+    { $num ->
+      [one] The file contains one public key as shown below:
+      *[other] The file contains {$num} public keys as shown below:
+    }
+
+# Variables:
+# $num (Number) - Number of keys to accept.
+openpgp-pubkey-import-accept =
+    { $num ->
+      [one] Do you accept this key for verifying digital signatures and for encrypting messages, for all shown email addresses?
+      *[other] Do you accept these keys for verifying digital signatures and for encrypting messages, for all shown email addresses?
+    }
+
+pubkey-import-button =
+    .buttonlabelaccept = Import
+    .buttonaccesskeyaccept = I
diff --git a/comm/mail/locales/en-US/messenger/openpgp/openpgp-frontend.ftl b/comm/mail/locales/en-US/messenger/openpgp/openpgp-frontend.ftl
new file mode 100644
index 0000000000..88011ce2ab
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/openpgp-frontend.ftl
@@ -0,0 +1,71 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+openpgp-manage-keys-openpgp-cmd =
+    .label = OpenPGP Key Manager
+    .accesskey = O
+
+openpgp-ctx-decrypt-open =
+    .label = Decrypt and Open
+    .accesskey = D
+openpgp-ctx-decrypt-save =
+    .label = Decrypt and Save As…
+    .accesskey = C
+openpgp-ctx-import-key =
+    .label = Import OpenPGP Key
+    .accesskey = I
+openpgp-ctx-verify-att =
+    .label = Verify Signature
+    .accesskey = V
+
+openpgp-has-sender-key = This message claims to contain the sender’s OpenPGP public key.
+# Variables:
+# $email (String) - Email address with the problematic public key.
+openpgp-be-careful-new-key =
+    Warning: The new OpenPGP public key in this message differs from the public keys that you previously accepted for { $email }.
+
+openpgp-import-sender-key =
+    .label = Import…
+
+openpgp-search-keys-openpgp =
+    .label = Discover OpenPGP Key
+
+openpgp-missing-signature-key = This message was signed with a key that you don’t yet have.
+
+openpgp-search-signature-key =
+    .label = Discover…
+
+# Don't translate the terms "OpenPGP" and "MS-Exchange"
+openpgp-broken-exchange-opened = This is an OpenPGP message that was apparently corrupted by MS-Exchange and it can’t be repaired because it was opened from a local file. Copy the message into a mail folder to try an automatic repair.
+openpgp-broken-exchange-info = This is an OpenPGP message that was apparently corrupted by MS-Exchange. If the message contents isn’t shown as expected, you can try an automatic repair.
+openpgp-broken-exchange-repair =
+    .label = Repair message
+openpgp-broken-exchange-wait = Please wait…
+
+openpgp-has-nested-encrypted-parts = This message includes additional encrypted parts.
+openpgp-show-encrypted-parts = Decrypt and Show
+
+openpgp-cannot-decrypt-because-mdc =
+    This is an encrypted message that uses an old and vulnerable mechanism.
+    It could have been modified while in transit, with the intention to steal its contents.
+    To prevent this risk, the contents are not shown.
+
+openpgp-cannot-decrypt-because-missing-key =
+    The secret key that is required to decrypt this message is not available.
+
+openpgp-partially-signed =
+    Only a subset of this message was digitally signed using OpenPGP.
+    If you click the verify button, the unprotected parts will be hidden, and the status of the digital signature will be shown.
+
+openpgp-partially-encrypted =
+    Only a subset of this message was encrypted using OpenPGP.
+    The readable parts of the message that are already shown were not encrypted.
+    If you click the decrypt button, the contents of the encrypted parts will be shown.
+
+openpgp-reminder-partial-display = Reminder: The message shown below is only a subset of the original message.
+
+openpgp-partial-verify-button = Verify
+openpgp-partial-decrypt-button = Decrypt
+
+openpgp-unexpected-key-for-you = Warning: This message contains an unknown OpenPGP key that refers to one of your own email addresses. If this isn’t one of your own keys, it could be an attempt to trick other correspondents.
diff --git a/comm/mail/locales/en-US/messenger/openpgp/openpgp.ftl b/comm/mail/locales/en-US/messenger/openpgp/openpgp.ftl
new file mode 100644
index 0000000000..8804e0cd05
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/openpgp/openpgp.ftl
@@ -0,0 +1,856 @@
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+e2e-intro-description = To send encrypted or digitally signed messages, you need to configure an encryption technology, either OpenPGP or S/MIME.
+e2e-intro-description-more = Select your personal key to enable the use of OpenPGP, or your personal certificate to enable the use of S/MIME. For a personal key or certificate you own the corresponding secret key.
+
+e2e-signing-description = A digital signature allows recipients to verify that the message was sent by you and its content was not changed. Encrypted messages are always signed by default.
+
+e2e-sign-message =
+    .label = Sign unencrypted messages
+    .accesskey = u
+
+e2e-disable-enc =
+    .label = Disable encryption for new messages
+    .accesskey = D
+e2e-enable-enc =
+    .label = Enable encryption for new messages
+    .accesskey = n
+e2e-enable-description = You will be able to disable encryption for individual messages.
+
+e2e-advanced-section = Advanced settings
+e2e-attach-key =
+    .label = Attach my public key when adding an OpenPGP digital signature
+    .accesskey = p
+e2e-encrypt-subject =
+    .label = Encrypt the subject of OpenPGP messages
+    .accesskey = b
+e2e-encrypt-drafts =
+    .label = Store draft messages in encrypted format
+    .accesskey = r
+
+# Do not translate "Autocrypt", it's the name of a standard.
+e2e-autocrypt-headers =
+    .label = Send OpenPGP public key(s) in the email headers for compatibility with Autocrypt
+    .accesskey = t
+
+openpgp-key-created-label =
+    .label = Created
+
+openpgp-key-expiry-label =
+    .label = Expiry
+
+openpgp-key-id-label =
+    .label = Key ID
+
+openpgp-cannot-change-expiry = This is a key with a complex structure, changing its expiry date isn’t supported.
+
+openpgp-key-man-title =
+    .title = OpenPGP Key Manager
+openpgp-key-man-generate =
+    .label = New Key Pair
+    .accesskey = K
+openpgp-key-man-gen-revoke =
+  .label = Revocation Certificate
+  .accesskey = R
+openpgp-key-man-ctx-gen-revoke-label =
+    .label = Generate & Save Revocation Certificate
+
+openpgp-key-man-file-menu =
+    .label = File
+    .accesskey = F
+openpgp-key-man-edit-menu =
+    .label = Edit
+    .accesskey = E
+openpgp-key-man-view-menu =
+    .label = View
+    .accesskey = V
+openpgp-key-man-generate-menu =
+    .label = Generate
+    .accesskey = G
+openpgp-key-man-keyserver-menu =
+    .label = Keyserver
+    .accesskey = K
+
+openpgp-key-man-import-public-from-file =
+    .label = Import Public Key(s) From File
+    .accesskey = I
+openpgp-key-man-import-secret-from-file =
+    .label = Import Secret Key(s) From File
+openpgp-key-man-import-sig-from-file =
+    .label = Import Revocation(s) From File
+openpgp-key-man-import-from-clipbrd =
+    .label = Import Key(s) From Clipboard
+    .accesskey = I
+openpgp-key-man-import-from-url =
+    .label = Import Key(s) From URL
+    .accesskey = U
+openpgp-key-man-export-to-file =
+    .label = Export Public Key(s) To File
+    .accesskey = E
+openpgp-key-man-send-keys =
+    .label = Send Public Key(s) By Email
+    .accesskey = S
+openpgp-key-man-backup-secret-keys =
+    .label = Backup Secret Key(s) To File
+    .accesskey = B
+
+openpgp-key-man-discover-cmd =
+    .label = Discover Keys Online
+    .accesskey = D
+openpgp-key-man-publish-cmd =
+    .label = Publish
+    .accesskey = P
+openpgp-key-publish = Publish
+openpgp-key-man-discover-prompt = To discover OpenPGP keys online, on keyservers or using the WKD protocol, enter either an email address or a key ID.
+openpgp-key-man-discover-progress = Searching…
+
+# Variables:
+# $keyserver (String) - The address of a server that contains a directory of OpenPGP public keys
+openpgp-key-publish-ok = Public key sent to "{ $keyserver }".
+
+# Variables:
+# $keyserver (String) - The address of a server that contains a directory of OpenPGP public keys
+openpgp-key-publish-fail = Failed to send your public key to "{ $keyserver }".
+
+openpgp-key-copy-key =
+    .label = Copy Public Key
+    .accesskey = C
+
+openpgp-key-export-key =
+    .label = Export Public Key To File
+    .accesskey = E
+
+openpgp-key-backup-key =
+    .label = Backup Secret Key To File
+    .accesskey = B
+
+openpgp-key-send-key =
+    .label = Send Public Key Via Email
+    .accesskey = S
+
+# Variables:
+# $count (Number) - Number of keys ids to copy.
+openpgp-key-man-copy-key-ids =
+    .label = { $count ->
+               [one] Copy Key ID To Clipboard
+               *[other] Copy Key IDs To Clipboard
+             }
+    .accesskey = K
+
+# Variables:
+# $count (Number) - Number of fingerprints to copy.
+openpgp-key-man-copy-fprs =
+    .label = { $count ->
+               [one] Copy Fingerprint To Clipboard
+               *[other] Copy Fingerprints To Clipboard
+             }
+    .accesskey = F
+
+# Variables:
+# $count (Number) - Number of public keys to copy.
+openpgp-key-man-copy-to-clipboard =
+    .label = { $count ->
+               [one] Copy Public Key To Clipboard
+               *[other] Copy Public Keys To Clipboard
+             }
+    .accesskey = P
+
+openpgp-key-man-ctx-copy =
+    .label = Copy
+    .accesskey = C
+
+# Variables:
+# $count (Number) - Number of fingerprints.
+openpgp-key-man-ctx-copy-fprs =
+    .label = { $count ->
+               [one] Fingerprint
+               *[other] Fingerprints
+             }
+    .accesskey = F
+
+# Variables:
+# $count (Number) - Number of key ids.
+openpgp-key-man-ctx-copy-key-ids =
+    .label = { $count ->
+               [one] Key ID
+               *[other] Key IDs
+             }
+    .accesskey = K
+
+# Variables:
+# $count (Number) - Number of public keys.
+openpgp-key-man-ctx-copy-public-keys =
+    .label = { $count ->
+               [one] Public Key
+               *[other] Public Keys
+             }
+    .accesskey = P
+
+openpgp-key-man-close =
+    .label = Close
+openpgp-key-man-reload =
+    .label = Reload Key Cache
+    .accesskey = R
+openpgp-key-man-change-expiry =
+    .label = Change Expiration Date
+    .accesskey = E
+openpgp-key-man-refresh-online =
+    .label = Refresh Online
+    .accesskey = R
+openpgp-key-man-ignored-ids =
+    .label = Email addresses
+openpgp-key-man-del-key =
+    .label = Delete Key(s)
+    .accesskey = D
+openpgp-delete-key =
+    .label = Delete Key
+    .accesskey = D
+openpgp-key-man-revoke-key =
+    .label = Revoke Key
+    .accesskey = R
+openpgp-key-man-key-props =
+    .label = Key Properties
+    .accesskey = K
+openpgp-key-man-key-more =
+    .label = More
+    .accesskey = M
+openpgp-key-man-view-photo =
+    .label = Photo ID
+    .accesskey = P
+openpgp-key-man-ctx-view-photo-label =
+    .label = View Photo ID
+openpgp-key-man-show-invalid-keys =
+    .label = Display invalid keys
+    .accesskey = D
+openpgp-key-man-show-others-keys =
+    .label = Display Keys From Other People
+    .accesskey = O
+openpgp-key-man-user-id-label =
+    .label = Name
+openpgp-key-man-fingerprint-label =
+    .label = Fingerprint
+openpgp-key-man-select-all =
+    .label = Select All Keys
+    .accesskey = A
+openpgp-key-man-empty-tree-tooltip =
+    .label = Enter search terms in the box above
+openpgp-key-man-nothing-found-tooltip =
+    .label = No keys match your search terms
+openpgp-key-man-please-wait-tooltip =
+    .label = Please wait while keys are being loaded…
+
+openpgp-key-man-filter-label =
+    .placeholder = Search for keys
+
+openpgp-key-man-select-all-key =
+    .key = A
+openpgp-key-man-key-details-key =
+    .key = I
+
+openpgp-ign-addr-intro =
+    You accept using this key for the following selected email addresses:
+
+openpgp-key-details-doc-title = Key Properties
+openpgp-key-details-signatures-tab =
+    .label = Certifications
+openpgp-key-details-structure-tab =
+    .label = Structure
+openpgp-key-details-uid-certified-col =
+    .label = User ID / Certified by
+openpgp-key-details-key-id-label = Key ID
+openpgp-key-details-user-id3-label = Claimed Key Owner
+openpgp-key-details-id-label =
+    .label = ID
+openpgp-key-details-key-type-label = Type
+openpgp-key-details-key-part-label =
+    .label = Key Part
+
+openpgp-key-details-attr-ignored = Warning: This key might not work as expected, because some of its properties are unsafe and might be ignored.
+openpgp-key-details-attr-upgrade-sec = You should upgrade the unsafe properties.
+openpgp-key-details-attr-upgrade-pub = You should ask the owner of this key to upgrade the unsafe properties.
+
+openpgp-key-details-upgrade-unsafe =
+    .label = Upgrade Unsafe Properties
+    .accesskey = P
+
+openpgp-key-details-upgrade-ok = The key was successfully upgraded. You should share the upgraded public key with your correspondents.
+
+openpgp-key-details-algorithm-label =
+    .label = Algorithm
+openpgp-key-details-size-label =
+    .label = Size
+openpgp-key-details-created-label =
+    .label = Created
+openpgp-key-details-created-header = Created
+openpgp-key-details-expiry-label =
+    .label = Expiry
+openpgp-key-details-expiry-header = Expiry
+openpgp-key-details-usage-label =
+    .label = Usage
+openpgp-key-details-fingerprint-label = Fingerprint
+openpgp-key-details-legend-secret-missing =
+    For keys marked with (!) the secret key is not available.
+openpgp-key-details-sel-action =
+  .label = Select action…
+  .accesskey = S
+openpgp-card-details-close-window-label =
+    .buttonlabelaccept = Close
+openpgp-acceptance-label =
+    .label = Your Acceptance
+openpgp-acceptance-rejected-label =
+    .label = No, reject this key.
+openpgp-acceptance-undecided-label =
+    .label = Not yet, maybe later.
+openpgp-acceptance-unverified-label =
+    .label = Yes, but I have not verified that it is the correct key.
+openpgp-acceptance-verified-label =
+    .label = Yes, I’ve verified in person this key has the correct fingerprint.
+key-accept-personal =
+    For this key, you have both the public and the secret part. You may use it as a personal key.
+    If this key was given to you by someone else, then don’t use it as a personal key.
+openpgp-personal-no-label =
+    .label = No, don’t use it as my personal key.
+openpgp-personal-yes-label =
+    .label = Yes, treat this key as a personal key.
+
+openpgp-passphrase-protection =
+  .label = Passphrase Protection
+
+openpgp-passphrase-status-unprotected = Unprotected
+openpgp-passphrase-status-primary-password = Protected by { -brand-short-name }’s Primary Password
+openpgp-passphrase-status-user-passphrase = Protected by a passphrase
+
+openpgp-passphrase-instruction-unprotected = Set a passphrase to protect this key
+openpgp-passphrase-instruction-primary-password = Alternatively protect this key with a separate passphrase
+openpgp-passphrase-instruction-user-passphrase = Unlock this key to change its protection.
+
+openpgp-passphrase-unlock = Unlock
+openpgp-passphrase-unlocked = Key successfully unlocked.
+
+openpgp-remove-protection = Remove passphrase protection
+openpgp-use-primary-password = Remove passphrase and protect with Primary Password
+
+openpgp-passphrase-new = New passphrase
+openpgp-passphrase-new-repeat = Confirm new passphrase
+
+openpgp-passphrase-set = Set passphrase
+openpgp-passphrase-change = Change passphrase
+
+openpgp-copy-cmd-label =
+    .label = Copy
+
+## e2e encryption settings
+
+#   $identity (String) - the email address of the currently selected identity
+openpgp-description-no-key = { -brand-short-name } doesn’t have a personal OpenPGP key for <b>{ $identity }</b>
+
+#   $count (Number) - the number of configured keys associated with the current identity
+#   $identity (String) - the email address of the currently selected identity
+openpgp-description-has-keys = { $count ->
+    [one]   { -brand-short-name } found { $count } personal OpenPGP key associated with <b>{ $identity }</b>
+   *[other] { -brand-short-name } found { $count } personal OpenPGP keys associated with <b>{ $identity }</b>
+}
+
+#   $key (String) - the currently selected OpenPGP key
+openpgp-selection-status-have-key = Your current configuration uses key ID <b>{ $key }</b>
+
+#   $key (String) - the currently selected OpenPGP key
+openpgp-selection-status-error = Your current configuration uses the key <b>{ $key }</b>, which has expired.
+
+openpgp-add-key-button =
+    .label = Add Key…
+    .accesskey = A
+
+e2e-learn-more = Learn more
+
+openpgp-keygen-success = OpenPGP Key created successfully!
+
+openpgp-keygen-import-success = OpenPGP Keys imported successfully!
+
+openpgp-keygen-external-success = External GnuPG Key ID saved!
+
+## OpenPGP Key selection area
+
+openpgp-radio-none =
+    .label = None
+
+openpgp-radio-none-desc = Do not use OpenPGP for this identity.
+
+openpgp-radio-key-not-usable = This key is not usable as a personal key, because the secret key is missing!
+openpgp-radio-key-not-accepted = To use this key you must approve it as a personal key!
+openpgp-radio-key-not-found = This key could not be found! If you want to use it you must import it to { -brand-short-name }.
+
+#   $date (String) - the future expiration date of when the OpenPGP key will expire
+openpgp-radio-key-expires = Expires on: { $date }
+
+#   $date (String) - the past expiration date of when the OpenPGP key expired
+openpgp-radio-key-expired = Expired on: { $date }
+
+openpgp-key-expires-within-6-months-icon =
+    .title = Key is expiring in less than 6 months
+
+openpgp-key-has-expired-icon =
+    .title = Key expired
+
+openpgp-suggest-publishing-key = Publishing the public key on a keyserver allows others to discover it.
+
+openpgp-key-expand-section =
+  .tooltiptext = More information
+
+openpgp-key-revoke-title = Revoke Key
+
+openpgp-key-edit-title = Change OpenPGP Key
+
+openpgp-key-edit-date-title = Extend Expiration Date
+
+openpgp-manager-description = Use the OpenPGP Key Manager to view and manage public keys of your correspondents and all other keys not listed above.
+
+openpgp-manager-button =
+    .label = OpenPGP Key Manager
+    .accesskey = K
+
+openpgp-key-remove-external =
+    .label = Remove External Key ID
+    .accesskey = E
+
+key-external-label = External GnuPG Key
+
+## Strings in keyDetailsDlg.xhtml
+
+key-type-public = public key
+key-type-primary = primary key
+key-type-subkey = subkey
+key-type-pair = key pair (secret key and public key)
+key-expiry-never = never
+key-usage-encrypt = Encrypt
+key-usage-sign = Sign
+key-usage-certify = Certify
+key-usage-authentication = Authentication
+key-does-not-expire = The key does not expire
+# Variables:
+# $keyExpiry (String) - Date the key expired on.
+key-expired-date = The key expired on { $keyExpiry }
+key-expired-simple = The key has expired
+key-revoked-simple = The key was revoked
+key-do-you-accept = Do you accept this key for verifying digital signatures and for encrypting messages?
+# Variables:
+# $addr (String) - Email address the key claims it belongs to.
+key-verification = Verify the fingerprint of the key using a secure communication channel other than email to make sure that it’s really the key of { $addr }.
+
+## Strings enigmailMsgComposeOverlay.js
+
+# Variables:
+# $problem (String) - Error message from key usability check.
+cannot-use-own-key-because = Unable to send the message, because there is a problem with your personal key. { $problem }
+window-locked = Compose window is locked; send cancelled
+
+## Strings in keyserver.jsm
+
+keyserver-error-aborted = Aborted
+keyserver-error-unknown = An unknown error occurred
+keyserver-error-server-error = The keyserver reported an error.
+keyserver-error-import-error = Failed to import the downloaded key.
+keyserver-error-unavailable = The keyserver is not available.
+keyserver-error-security-error = The keyserver does not support encrypted access.
+keyserver-error-certificate-error = The keyserver’s certificate is not valid.
+keyserver-error-unsupported = The keyserver is not supported.
+
+## Strings in mimeWkdHandler.jsm
+
+wkd-message-body-req =
+    Your email provider processed your request to upload your public key to the OpenPGP Web Key Directory.
+    Please confirm to complete the publishing of your public key.
+wkd-message-body-process =
+    This is an email related to the automatic processing to upload your public key to the OpenPGP Web Key Directory.
+    You do not need to take any manual action at this point.
+
+## Strings in persistentCrypto.jsm
+
+# Variables:
+# $subject (String) - Subject of the message.
+converter-decrypt-body-failed =
+    Could not decrypt message with subject
+    { $subject }.
+    Do you want to retry with a different passphrase or do you want to skip the message?
+
+## Strings filters.jsm
+
+filter-folder-required = You must select a target folder.
+filter-decrypt-move-warn-experimental =
+    Warning - the filter action “Decrypt permanently” may lead to destroyed messages.
+    We strongly recommend that you first try the “Create decrypted Copy” filter, test the result carefully, and only start using this filter once you are satisfied with the result.
+filter-term-pgpencrypted-label = OpenPGP Encrypted
+filter-key-required = You must select a recipient key.
+# Variables:
+# $desc (String) - Email address to look for a key of.
+filter-key-not-found = Could not find an encryption key for ‘{ $desc }’.
+# Variables:
+# $desc (String) - The ID of a secret key that is required to read the email after the user executes the current action.
+filter-warn-key-not-secret =
+    Warning - the filter action “Encrypt to key” replaces the recipients.
+    If you do not have the secret key for ‘{ $desc }’ you will no longer be able to read the emails.
+
+## Strings filtersWrapper.jsm
+
+filter-decrypt-move-label = Decrypt permanently (OpenPGP)
+filter-decrypt-copy-label = Create decrypted Copy (OpenPGP)
+filter-encrypt-label = Encrypt to key (OpenPGP)
+
+## Strings in enigmailKeyImportInfo.js
+
+import-info-title =
+    .title = Success! Keys imported
+import-info-bits = Bits
+import-info-created = Created
+import-info-fpr = Fingerprint
+import-info-details = View Details and manage key acceptance
+import-info-no-keys = No keys imported.
+
+## Strings in enigmailKeyManager.js
+
+import-from-clip = Do you want to import some key(s) from clipboard?
+import-from-url = Download public key from this URL:
+copy-to-clipbrd-failed = Could not copy the selected key(s) to the clipboard.
+copy-to-clipbrd-ok = Key(s) copied to clipboard
+# Variables:
+# $userId (String) - User id of the key.
+delete-secret-key =
+    WARNING: You are about to delete a secret key!
+
+    If you delete your secret key, you will no longer be able to decrypt any messages encrypted for that key, nor will you be able to revoke it.
+
+    Do you really want to delete BOTH, the secret key and the public key
+    ‘{ $userId }’?
+delete-mix =
+    WARNING: You are about to delete secret keys!
+    If you delete your secret key, you will no longer be able to decrypt any messages encrypted for that key.
+    Do you really want to delete BOTH, the selected secret and public keys?
+# Variables:
+# $userId (String) - User id of the key.
+delete-pub-key =
+    Do you want to delete the public key
+    ‘{ $userId }’?
+delete-selected-pub-key = Do you want to delete the public keys?
+refresh-all-question = You did not select any key. Would you like to refresh ALL keys?
+key-man-button-export-sec-key = Export &Secret Keys
+key-man-button-export-pub-key = Export &Public Keys Only
+key-man-button-refresh-all = &Refresh All Keys
+key-man-loading-keys = Loading keys, please wait…
+ascii-armor-file = ASCII Armored Files (*.asc)
+no-key-selected = You should select at least one key in order to perform the selected operation
+export-to-file = Export Public Key To File
+export-keypair-to-file = Export Secret and Public Key To File
+export-secret-key = Do you want to include the secret key in the saved OpenPGP key file?
+save-keys-ok = The keys were successfully saved
+save-keys-failed = Saving the keys failed
+default-pub-key-filename = Exported-public-keys
+default-pub-sec-key-filename = Backup-of-secret-keys
+refresh-key-warn = Warning: depending on the number of keys and the connection speed, refreshing all keys could be quite a lengthy process!
+preview-failed = Can’t read public key file.
+# Variables:
+# $reason (String) - Error description.
+general-error = Error: { $reason }
+dlg-button-delete = &Delete
+
+## Account settings export output
+
+openpgp-export-public-success = <b>Public Key successfully exported!</b>
+openpgp-export-public-fail = <b>Unable to export the selected public key!</b>
+
+openpgp-export-secret-success = <b>Secret Key successfully exported!</b>
+openpgp-export-secret-fail = <b>Unable to export the selected secret key!</b>
+
+## Strings in keyObj.jsm
+## Variables:
+## $userId (String) - The name and/or email address that is mentioned in the key's information.
+## $keyId (String) - Key id for the key entry.
+
+key-ring-pub-key-revoked = The key { $userId } (key ID { $keyId }) is revoked.
+key-ring-pub-key-expired = The key { $userId } (key ID { $keyId }) has expired.
+key-ring-no-secret-key = You do not seem to have the secret key for { $userId } (key ID { $keyId }) on your keyring; you cannot use the key for signing.
+key-ring-pub-key-not-for-signing = The key { $userId } (key ID { $keyId }) cannot be used for signing.
+key-ring-pub-key-not-for-encryption = The key { $userId } (key ID { $keyId }) cannot be used for encryption.
+key-ring-sign-sub-keys-revoked = All signing-subkeys of key { $userId } (key ID { $keyId }) are revoked.
+key-ring-sign-sub-keys-expired = All signing-subkeys of key { $userId } (key ID { $keyId }) have expired.
+key-ring-enc-sub-keys-revoked = All encryption subkeys of key { $userId } (key ID { $keyId }) are revoked.
+key-ring-enc-sub-keys-expired = All encryption subkeys of key { $userId } (key ID { $keyId }) have expired.
+
+## Strings in gnupg-keylist.jsm
+
+keyring-photo = Photo
+user-att-photo = User attribute (JPEG image)
+
+## Strings in key.jsm
+
+already-revoked = This key has already been revoked.
+
+#   $identity (String) - the id and associated user identity of the key being revoked
+revoke-key-question =
+    You are about to revoke the key ‘{ $identity }’.
+    You will no longer be able to sign with this key, and once distributed, others will no longer be able to encrypt with that key. You can still use the key to decrypt old messages.
+    Do you want to proceed?
+
+#   $keyId (String) - the id of the key being revoked
+revoke-key-not-present =
+    You have no key (0x{ $keyId }) which matches this revocation certificate!
+    If you have lost your key, you must import it (e.g. from a keyserver) before importing the revocation certificate!
+
+#   $keyId (String) - the id of the key being revoked
+revoke-key-already-revoked = The key 0x{ $keyId } has already been revoked.
+
+key-man-button-revoke-key = &Revoke Key
+
+openpgp-key-revoke-success = Key successfully revoked.
+
+after-revoke-info =
+    The key has been revoked.
+    Share this public key again, by sending it by email, or by uploading it to keyservers, to let others know that you revoked your key.
+    As soon as the software used by other people learns about the revocation, it will stop using your old key.
+    If you are using a new key for the same email address, and you attach the new public key to emails you send, then information about your revoked old key will be automatically included.
+
+## Strings in keyRing.jsm & decryption.jsm
+
+key-man-button-import = &Import
+
+delete-key-title = Delete OpenPGP Key
+
+delete-external-key-title = Remove the External GnuPG Key
+
+delete-external-key-description = Do you want to remove this External GnuPG key ID?
+
+key-in-use-title = OpenPGP Key currently in use
+
+delete-key-in-use-description = Unable to proceed! The Key you selected for deletion is currently being used by this identity. Select a different key, or select none, and try again.
+
+revoke-key-in-use-description = Unable to proceed! The Key you selected for revocation is currently being used by this identity. Select a different key, or select none, and try again.
+
+## Strings used in errorHandling.jsm
+
+# Variables:
+# $keySpec (String) - Email address.
+key-error-key-spec-not-found = The email address ‘{ $keySpec }’ cannot be matched to a key on your keyring.
+# $keySpec (String) - Key id.
+key-error-key-id-not-found = The configured key ID ‘{ $keySpec }’ cannot be found on your keyring.
+# $keySpec (String) - Key id.
+key-error-not-accepted-as-personal = You have not confirmed that the key with ID ‘{ $keySpec }’ is your personal key.
+
+## Strings used in enigmailKeyManager.js & windows.jsm
+
+need-online = The function you have selected is not available in offline mode. Please go online and try again.
+
+## Strings used in keyRing.jsm & keyLookupHelper.jsm
+
+no-key-found2 = We couldn’t find any usable key matching the specified search criteria.
+no-update-found = You already have the keys that were discovered online.
+
+## Strings used in keyRing.jsm & GnuPGCryptoAPI.jsm
+
+fail-key-extract = Error - key extraction command failed
+
+## Strings used in keyRing.jsm
+
+fail-cancel = Error - Key receive cancelled by user
+not-first-block = Error - First OpenPGP block not public key block
+import-key-confirm = Import public key(s) embedded in message?
+fail-key-import = Error - key importing failed
+# Variables:
+# $output (String) - File that writing was attempted to.
+file-write-failed = Failed to write to file { $output }
+no-pgp-block = Error - No valid armored OpenPGP data block found
+confirm-permissive-import = Import failed. The key you are trying to import might be corrupt or use unknown attributes. Would you like to attempt to import the parts that are correct? This might result in the import of incomplete and unusable keys.
+
+## Strings used in trust.jsm
+
+key-valid-unknown = unknown
+key-valid-invalid = invalid
+key-valid-disabled = disabled
+key-valid-revoked = revoked
+key-valid-expired = expired
+key-trust-untrusted = untrusted
+key-trust-marginal = marginal
+key-trust-full = trusted
+key-trust-ultimate = ultimate
+key-trust-group = (group)
+
+## Strings used in commonWorkflows.js
+
+import-key-file = Import OpenPGP Key File
+import-rev-file = Import OpenPGP Revocation File
+gnupg-file = GnuPG Files
+import-keys-failed=Importing the keys failed
+
+# Variables:
+# $key (String) - Key id to unlock.
+# $date (String) - The date on which the key was created
+# $username_and_email (String) - The user name, and/or the email address which the key owner has set for the key.
+passphrase-prompt2 = Enter the passphrase to unlock the secret key with ID { $key }, created { $date }, { $username_and_email }
+
+# Variables:
+# $subkey (String) - Key id to unlock, which is a subkey.
+# $key (String) - This is the main key, to which the subkey belongs.
+# $date (String) - The date on which the key was created
+# $username_and_email (String) - The user name, and/or the email address which the key owner has set for the key.
+passphrase-prompt2-sub = Enter the passphrase to unlock the secret key with ID { $subkey }, which is a subkey of key ID { $key }, created { $date }, { $username_and_email }
+
+file-to-big-to-import = This file is too big. Please don’t import a large set of keys at once.
+
+## Strings used in enigmailKeygen.js
+
+save-revoke-cert-as = Create & Save Revocation Certificate
+revoke-cert-ok = The revocation certificate has been successfully created. You can use it to invalidate your public key, e.g. in case you would lose your secret key.
+revoke-cert-failed = The revocation certificate could not be created.
+gen-going = Key generation already in progress!
+keygen-missing-user-name = There is no name specified for the selected account/identity. Please enter a value in the field  “Your name” in the account settings.
+expiry-too-short = Your key must be valid for at least one day.
+expiry-too-long = You cannot create a key that expires in more than 100 years.
+# Variables:
+# $id (String) - Name and/or email address to generate keys for.
+key-confirm = Generate public and secret key for ‘{ $id }’?
+key-man-button-generate-key = &Generate Key
+key-abort = Abort key generation?
+key-man-button-generate-key-abort = &Abort Key Generation
+key-man-button-generate-key-continue = &Continue Key Generation
+
+## Strings used in enigmailMessengerOverlay.js
+
+failed-decrypt = Error - decryption failed
+fix-broken-exchange-msg-failed = Unable to repair this message.
+
+# Variables:
+# $attachment (String) - File name of the signature file.
+attachment-no-match-from-signature = Could not match signature file ‘{ $attachment }’ to an attachment
+# Variables:
+# $attachment (String) - File name of the attachment.
+attachment-no-match-to-signature = Could not match attachment ‘{ $attachment }’ to a signature file
+# Variables:
+# $attachment (String) - File name of the attachment
+signature-verified-ok = The signature for attachment { $attachment } was successfully verified
+# Variables:
+# $attachment (String) - File name of the attachment
+signature-verify-failed = The signature for attachment { $attachment } could not be verified
+decrypt-ok-no-sig =
+    Warning
+    Decryption was successful, but the signature could not be verified correctly
+msg-ovl-button-cont-anyway = &Continue Anyway
+enig-content-note = *Attachments to this message have not been signed nor encrypted*
+
+## Strings used in enigmailMsgComposeOverlay.js
+
+msg-compose-button-send = &Send Message
+msg-compose-details-button-label = Details…
+msg-compose-details-button-access-key = D
+send-aborted = Send operation aborted.
+# Variables:
+# $key (String) - Key id.
+key-not-trusted = Not enough trust for key ‘{ $key }’
+# Variables:
+# $key (String) - Key id.
+key-not-found = Key ‘{ $key }’ not found
+# Variables:
+# $key (String) - Key id.
+key-revoked = Key ‘{ $key }’ revoked
+# Variables:
+# $key (String) - Key id.
+key-expired = Key ‘{ $key }’ expired
+msg-compose-internal-error = An internal error has occurred.
+keys-to-export = Select OpenPGP Keys to Insert
+msg-compose-partially-encrypted-inlinePGP =
+    The message you are replying to contained both unencrypted and encrypted parts. If the sender was not able to decrypt some message parts originally, you may be leaking confidential information that the sender was not able to originally decrypt themselves.
+    Please consider removing all quoted text from your reply to this sender.
+msg-compose-cannot-save-draft = Error while saving draft
+msg-compose-partially-encrypted-short = Beware of leaking sensitive information - partially encrypted email.
+quoted-printable-warn =
+    You have enabled ‘quoted-printable’ encoding for sending messages. This may result in incorrect decryption and/or verification of your message.
+    Do you wish to turn off sending ‘quoted-printable’ messages now?
+# Variables:
+# $width (Number) - Number of characters per line.
+minimal-line-wrapping =
+    You have set line wrapping to { $width } characters. For correct encryption and/or signing, this value needs to be at least 68.
+    Do you wish to change line wrapping to 68 characters now?
+sending-news =
+    Encrypted send operation aborted.
+    This message cannot be encrypted because there are newsgroup recipients. Please re-send the message without encryption.
+send-to-news-warning =
+    Warning: you are about to send an encrypted email to a newsgroup.
+    This is discouraged because it only makes sense if all members of the group can decrypt the message, i.e. the message needs to be encrypted with the keys of all group participants. Please send this message only if you know exactly what you are doing.
+    Continue?
+save-attachment-header = Save decrypted attachment
+possibly-pgp-mime = Possibly PGP/MIME encrypted or signed message; use ‘Decrypt/Verify’ function to verify
+# Variables:
+# $key (String) - Sender email address.
+cannot-send-sig-because-no-own-key = Cannot digitally sign this message, because you haven’t yet configured end-to-end encryption for <{ $key }>
+# Variables:
+# $key (String) - Sender email address.
+cannot-send-enc-because-no-own-key = Cannot send this message encrypted, because you haven’t yet configured end-to-end encryption for <{ $key }>
+
+## Strings used in decryption.jsm
+
+# Variables:
+# $key (String) - Newline separated list of a tab character then name and/or email address mentioned in the key followed by the key id in parenthesis.
+do-import-multiple =
+    Import the following keys?
+    { $key }
+# Variables:
+# $name (String) - Name and/or email address mentioned in the key.
+# $id (String) - Key id of the key.
+do-import-one = Import { $name } ({ $id })?
+cant-import = Error importing public key
+unverified-reply = Indented message part (reply) was probably modified
+key-in-message-body = A key was found in the message body. Click ‘Import Key’ to import the key
+sig-mismatch = Error - Signature mismatch
+invalid-email = Error - invalid email address(es)
+# Variables:
+# $name (String) - File name of the attachment.
+attachment-pgp-key =
+    The attachment ‘{ $name }’ you are opening appears to be an OpenPGP key file.
+    Click ‘Import’ to import the keys contained or ‘View’ to view the file contents in a browser window
+dlg-button-view = &View
+
+## Strings used in enigmailMsgHdrViewOverlay.js
+
+decrypted-msg-with-format-error = Decrypted message (restored broken PGP email format probably caused by an old Exchange server, so that the result might not be perfect to read)
+
+## Strings used in encryption.jsm
+
+not-required = Error - no encryption required
+
+## Strings used in windows.jsm
+
+no-photo-available = No Photo available
+# Variables:
+# $photo (String) - Path of the photo in the key.
+error-photo-path-not-readable = Photo path ‘{ $photo }’ is not readable
+debug-log-title = OpenPGP Debug Log
+
+## Strings used in dialog.jsm
+
+# This string is followed by either repeat-suffix-singular if $count is 1 or else
+# by repeat-suffix-plural.
+# Variables:
+# $count (Number) - Number of times the alert will repeat.
+repeat-prefix = This alert will repeat { $count }
+repeat-suffix-singular = more time.
+repeat-suffix-plural = more times.
+no-repeat = This alert will not be shown again.
+dlg-keep-setting = Remember my answer and do not ask me again
+dlg-button-ok = &OK
+dlg-button-close = &Close
+dlg-button-cancel = &Cancel
+dlg-no-prompt = Do not show me this dialog again
+enig-prompt = OpenPGP Prompt
+enig-confirm = OpenPGP Confirmation
+enig-alert = OpenPGP Alert
+enig-info = OpenPGP Information
+
+## Strings used in persistentCrypto.jsm
+
+dlg-button-retry = &Retry
+dlg-button-skip = &Skip
+
+## Strings used in enigmailMsgBox.js
+
+enig-alert-title =
+    .title = OpenPGP Alert
diff --git a/comm/mail/locales/en-US/messenger/otr/add-finger.ftl b/comm/mail/locales/en-US/messenger/otr/add-finger.ftl
new file mode 100644
index 0000000000..5709168e2b
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/add-finger.ftl
@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+otr-add-finger-title = Add OTR Key Fingerprint
+
+# Variables:
+#   $name (String) - name of a chat contact person
+# Do not translate 'OTR' (name of an encryption protocol)
+otr-add-finger-description = Enter the OTR key fingerprint for { $name }.
+
+otr-add-finger-fingerprint = Fingerprint:
+otr-add-finger-tooltip-error = Invalid character entered. Only letters ABCDEF and numbers are allowed
+
+otr-add-finger-input =
+    .placeholder = The 40 characters long OTR key fingerprint
diff --git a/comm/mail/locales/en-US/messenger/otr/am-im-otr.ftl b/comm/mail/locales/en-US/messenger/otr/am-im-otr.ftl
new file mode 100644
index 0000000000..e156f25cfc
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/am-im-otr.ftl
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-encryption =
+    .label = End-to-end Encryption
+account-otr-label = Off-the-Record Messaging (OTR)
+account-otr-description2 = { -brand-short-name } supports end-to-end encryption of one-to-one conversations based on OTR. This prevents third parties from eavesdropping on a conversation. This kind of end-to-end encryption can only be used when the other person also uses software that supports OTR.
+otr-encryption-title = Verified Encryption
+otr-encryption-caption = To enable others to verify your identity in OTR chats, share your own OTR fingerprint using an outside (out-of-band) communication channel.
+otr-fingerprint-label = Your Fingerprint:
+view-fingerprint-button =
+    .label = Manage Fingerprints of Contacts
+    .accesskey = F
+otr-settings-title = OTR Settings
+otr-require-encryption =
+    .label = Require end-to-end encryption for one-to-one conversations
+otr-require-encryption-info =
+    When requiring end-to-end encryption, messages in one-to-one conversations
+    will not be sent unless they can be encrypted. Received unencrypted messages
+    will not be shown as part of the regular conversation, and not logged either.
+otr-verify-nudge =
+    .label = Always remind me to verify an unverified contact
+
+otr-not-yet-available = not yet available
diff --git a/comm/mail/locales/en-US/messenger/otr/auth.ftl b/comm/mail/locales/en-US/messenger/otr/auth.ftl
new file mode 100644
index 0000000000..9804b6dfed
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/auth.ftl
@@ -0,0 +1,56 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+otr-auth =
+    .title = Verify contact’s identity
+    .buttonlabelaccept = Verify
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+auth-title = Verify the identity of { $name }
+
+# Variables:
+#   $own_name (String) - the user's own screen name
+auth-your-fp-value = Fingerprint for you, { $own_name }:
+
+# Variables:
+#   $their_name (String) - the screen name of a chat contact
+auth-their-fp-value = Fingerprint for { $their_name }:
+
+auth-question-received = This is the question asked by your contact:
+
+auth-yes =
+    .label = Yes
+
+auth-no =
+    .label = No
+
+auth-verified = I have verified that this is in fact the correct fingerprint.
+
+auth-manual-verification = Manual fingerprint verification
+auth-question-and-answer = Question and answer
+auth-shared-secret = Shared secret
+
+auth-manual-verification-label =
+    .label = { auth-manual-verification }
+
+auth-question-and-answer-label =
+    .label = { auth-question-and-answer }
+
+auth-shared-secret-label =
+    .label = { auth-shared-secret }
+
+auth-manual-instruction = Contact your intended conversation partner via some other authenticated channel, such as OpenPGP-signed email or over the phone. You should tell each other your fingerprints. (A fingerprint is a checksum that identifies an encryption key.) If the fingerprint matches, you should indicate in the dialog below that you have verified the fingerprint.
+
+auth-how = How would you like to verify your contact’s identity?
+
+auth-qa-instruction = Think of a question to which the answer is known only to you and your contact. Enter the question and answer, then wait for your contact to enter the answer. If the answers do not match, the communication channel you are using may be under surveillance.
+
+auth-secret-instruction = Think of a secret known only to you and your contact. Do not use the same Internet connection to exchange the secret. Enter the secret, then wait for your contact to enter it. If the secrets do not match, the communication channel you are using may be under surveillance.
+
+auth-question = Enter a question:
+
+auth-answer = Enter the answer (case sensitive):
+
+auth-secret = Enter the secret:
diff --git a/comm/mail/locales/en-US/messenger/otr/chat.ftl b/comm/mail/locales/en-US/messenger/otr/chat.ftl
new file mode 100644
index 0000000000..c7163781d3
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/chat.ftl
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+state-label = Encryption Status:
+
+start-text = Start an encrypted conversation
+
+start-label =
+    .label = { start-text }
+
+start-tooltip =
+    .tooltiptext = { start-text }
+
+end-label =
+    .label = End the encrypted conversation
+
+auth-label =
+    .label = Verify your contact’s identity
diff --git a/comm/mail/locales/en-US/messenger/otr/finger-sync.ftl b/comm/mail/locales/en-US/messenger/otr/finger-sync.ftl
new file mode 100644
index 0000000000..b3e731b979
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/finger-sync.ftl
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+finger-yes = Verified
+finger-no = Unverified
+
+finger-subset-title = Remove Fingerprints
+finger-subset-message = At least one fingerprint couldn’t be removed, because the corresponding key is currently used in an active conversation.
+
+finger-remove-all-title = Remove All Fingerprints
+finger-remove-all-message = Are you sure you want to remove all previously seen fingerprints? All previous OTR identity verifications will be lost.
diff --git a/comm/mail/locales/en-US/messenger/otr/finger.ftl b/comm/mail/locales/en-US/messenger/otr/finger.ftl
new file mode 100644
index 0000000000..f411991085
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/finger.ftl
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+otr-finger-title = Previously Seen OTR Fingerprints
+
+finger-intro = OTR key fingerprints from previous end-to-end encrypted conversations.
+
+finger-screen-name =
+    .label = Contact
+finger-verified =
+    .label = Verification Status
+finger-fingerprint =
+    .label = Fingerprint
+
+finger-remove =
+    .label = Remove Selected
+
+finger-remove-all =
+    .label = Remove All
diff --git a/comm/mail/locales/en-US/messenger/otr/otr.ftl b/comm/mail/locales/en-US/messenger/otr/otr.ftl
new file mode 100644
index 0000000000..4b4e8ea3a4
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/otr.ftl
@@ -0,0 +1,97 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-encryption-required-part1 = You attempted to send an unencrypted message to { $name }. As a policy, unencrypted messages are not allowed.
+
+msgevent-encryption-required-part2 = Attempting to start a private conversation. Your message will be resent when the private conversation starts.
+msgevent-encryption-error = An error occurred when encrypting your message. The message was not sent.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-connection-ended = { $name } has already closed their encrypted connection to you. To avoid that you accidentally send a message without encryption, your message was not sent. Please end your encrypted conversation, or restart it.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-setup-error = An error occurred while setting up a private conversation with { $name }.
+
+# Do not translate 'OTR' (name of an encryption protocol)
+msgevent-msg-reflected = You are receiving your own OTR messages. You are either trying to talk to yourself, or someone is reflecting your messages back at you.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-msg-resent = The last message to { $name } was resent.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-rcvdmsg-not-private = The encrypted message received from { $name } is unreadable, as you are not currently communicating privately.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-rcvdmsg-unreadable = You received an unreadable encrypted message from { $name }.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-rcvdmsg-malformed = You received a malformed data message from { $name }.
+
+# A Heartbeat is a technical message used to keep a connection alive.
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-log-heartbeat-rcvd = Heartbeat received from { $name }.
+
+# A Heartbeat is a technical message used to keep a connection alive.
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-log-heartbeat-sent = Heartbeat sent to { $name }.
+
+# Do not translate 'OTR' (name of an encryption protocol)
+msgevent-rcvdmsg-general-err = An unexpected error occurred while trying to protect your conversation using OTR.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+#   $msg (string) - the message that was received.
+msgevent-rcvdmsg-unencrypted = The following message received from { $name } was not encrypted: { $msg }
+
+# Do not translate 'OTR' (name of an encryption protocol)
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-rcvdmsg-unrecognized = You received an unrecognized OTR message from { $name }.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+msgevent-rcvdmsg-for-other-instance = { $name } has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+context-gone-secure-private = Private conversation with { $name } started.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+context-gone-secure-unverified = Encrypted, but unverified conversation with { $name } started.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+context-still-secure = Successfully refreshed the encrypted conversation with { $name }.
+
+error-enc = An error occurred while encrypting the message.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+error-not-priv = You sent encrypted data to { $name }, who wasn’t expecting it.
+
+error-unreadable = You transmitted an unreadable encrypted message.
+error-malformed = You transmitted a malformed data message.
+
+resent = [resent]
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+tlv-disconnected = { $name } has ended their encrypted conversation with you; you should do the same.
+
+# Do not translate "Off-the-Record" and "OTR" which is the name of an encryption protocol
+# Make sure that this string does NOT contain any numbers, e.g. like "3".
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+query-msg = { $name } has requested an Off-the-Record (OTR) encrypted conversation. However, you do not have a plugin to support that. See https://en.wikipedia.org/wiki/Off-the-Record_Messaging for more information.
diff --git a/comm/mail/locales/en-US/messenger/otr/otrUI.ftl b/comm/mail/locales/en-US/messenger/otr/otrUI.ftl
new file mode 100644
index 0000000000..79e2c890ee
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/otr/otrUI.ftl
@@ -0,0 +1,87 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+start-label = Start an encrypted conversation
+refresh-label = Refresh the encrypted conversation
+auth-label = Verify your contact’s identity
+reauth-label = Reverify your contact’s identity
+
+auth-cancel = Cancel
+auth-cancel-access-key = C
+
+auth-error = An error occurred while verifying the identity of your contact.
+auth-success = Verifying your contact’s identity completed successfully.
+auth-success-them = Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question.
+auth-fail = Failed to verify the identity of your contact.
+auth-waiting = Waiting for the contact to complete the verification…
+
+finger-verify = Verify
+finger-verify-access-key = V
+
+finger-ignore = Ignore
+finger-ignore-access-key = I
+
+# Do not translate 'OTR' (name of an encryption protocol)
+buddycontextmenu-label = Add OTR Fingerprint
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+alert-start = Attempting to start an encrypted conversation with { $name }.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+alert-refresh = Attempting to refresh the encrypted conversation with { $name }.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+alert-gone-insecure = The encrypted conversation with { $name } ended.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+finger-unseen = The identity of { $name } has not been verified yet. Casual eavesdropping is not possible, but with some effort someone could be listening in. Prevent surveillance by verifying this contact’s identity.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+finger-seen={ $name } is contacting you from an unrecognized computer. Casual eavesdropping is not possible, but with some effort someone could be listening in. Prevent surveillance by verifying this contact’s identity.
+
+state-not-private = The current conversation is not private.
+state-generic-not-private = The current conversation is not private.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+state-unverified = The current conversation is encrypted but not private, since the identity of { $name } has not yet been verified.
+
+state-generic-unverified = The current conversation is encrypted but not private, since some identities have not yet been verified.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+state-private = The identity of { $name } has been verified. The current conversation is encrypted and private.
+
+state-generic-private = The current conversation is encrypted and private.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+state-finished = { $name } has ended their encrypted conversation with you; you should do the same.
+
+state-not-private-label = Insecure
+state-unverified-label = Unverified
+state-private-label = Private
+state-finished-label = Finished
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+verify-request = { $name } requested the verification of your identity.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+afterauth-private = You have verified the identity of { $name }.
+
+# Variables:
+#   $name (String) - the screen name of a chat contact person
+afterauth-unverified = The identity of { $name } has not been verified.
+
+# Do not translate 'OTR' (name of an encryption protocol)
+# Variables:
+#   $error (String) - contains an error message that describes the cause of the failure
+otr-genkey-failed = Generating OTR private key failed: { $error }
diff --git a/comm/mail/locales/en-US/messenger/policies/aboutPolicies.ftl b/comm/mail/locales/en-US/messenger/policies/aboutPolicies.ftl
new file mode 100644
index 0000000000..d5ef87a573
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/policies/aboutPolicies.ftl
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+about-policies-title = Enterprise Policies
+
+# 'Active' is used to describe the policies that are currently active
+active-policies-tab = Active
+errors-tab = Errors
+documentation-tab = Documentation
+
+no-specified-policies-message = The Enterprise Policies service is active but there are no policies enabled.
+inactive-message = The Enterprise Policies service is inactive.
+
+policy-name = Policy Name
+policy-value = Policy Value
+policy-errors = Policy Errors
diff --git a/comm/mail/locales/en-US/messenger/policies/policies-descriptions.ftl b/comm/mail/locales/en-US/messenger/policies/policies-descriptions.ftl
new file mode 100644
index 0000000000..44a76052bb
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/policies/policies-descriptions.ftl
@@ -0,0 +1,158 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## The Enterprise Policies feature is aimed at system administrators
+## who want to deploy these settings across several Thunderbird installations
+## all at once. This is traditionally done through the Windows Group Policy
+## feature, but the system also supports other forms of deployment.
+## These are short descriptions for individual policies, to be displayed
+## in the documentation section in about:policies.
+
+policy-3rdparty = Set policies that WebExtensions can access via chrome.storage.managed.
+
+policy-AppAutoUpdate = Enable or disable automatic application update.
+
+policy-AppUpdatePin = Prevent { -brand-short-name } from being updated beyond the specified version.
+
+policy-AppUpdateURL = Set custom app update URL.
+
+policy-Authentication = Configure integrated authentication for websites that support it.
+
+policy-BackgroundAppUpdate2 = Enable or disable the background updater.
+
+policy-BlockAboutAddons = Block access to the Add-ons Manager (about:addons).
+
+policy-BlockAboutConfig = Block access to the about:config page.
+
+policy-BlockAboutProfiles = Block access to the about:profiles page.
+
+policy-BlockAboutSupport = Block access to the about:support page.
+
+policy-CaptivePortal = Enable or disable captive portal support.
+
+policy-CertificatesDescription = Add certificates or use built-in certificates.
+
+policy-Cookies = Allow or deny websites to set cookies.
+
+policy-DisableBuiltinPDFViewer = Disable PDF.js, the built-in PDF viewer in { -brand-short-name }.
+
+policy-DisabledCiphers = Disable ciphers.
+
+policy-DefaultDownloadDirectory = Set the default download directory.
+
+policy-DisableAppUpdate = Prevent { -brand-short-name } from updating.
+
+policy-DisableDefaultClientAgent = Prevent the default client agent from taking any actions. Only applicable to Windows; other platforms don’t have the agent.
+
+policy-DisableDeveloperTools = Block access to the developer tools.
+
+policy-DisableFeedbackCommands = Disable commands to send feedback from the Help menu (Submit Feedback and Report Deceptive Site).
+
+policy-DisableForgetButton = Prevent access to the Forget button.
+
+policy-DisableFormHistory = Don’t remember search and form history.
+
+policy-DisableMasterPasswordCreation = If true, a master password can’t be created.
+
+policy-DisablePasswordReveal = Do not allow passwords to be revealed in saved logins.
+
+policy-DisableProfileImport = Disable the menu command to Import data from another application.
+
+policy-DisableSafeMode = Disable the feature to restart in Safe Mode. Note: the Shift key to enter Safe Mode can only be disabled on Windows using Group Policy.
+
+policy-DisableSecurityBypass = Prevent the user from bypassing certain security warnings.
+
+policy-DisableSystemAddonUpdate = Prevent { -brand-short-name } from installing and updating system add-ons.
+
+policy-DisableTelemetry = Turn off Telemetry.
+
+policy-DisplayMenuBar = Display the Menu Bar by default.
+
+policy-DNSOverHTTPS = Configure DNS over HTTPS.
+
+policy-DontCheckDefaultClient = Disable check for default client on startup.
+
+policy-DownloadDirectory = Set and lock the download directory.
+
+# “lock” means that the user won’t be able to change this setting
+policy-EnableTrackingProtection = Enable or disable Content Blocking and optionally lock it.
+
+# “lock” means that the user won’t be able to change this setting
+policy-EncryptedMediaExtensions = Enable or disable Encrypted Media Extensions and optionally lock it.
+
+# A “locked” extension can’t be disabled or removed by the user. This policy
+# takes 3 keys (“Install”, ”Uninstall”, ”Locked”), you can either keep them in
+# English or translate them as verbs.
+policy-Extensions = Install, uninstall or lock extensions. The Install option takes URLs or paths as parameters. The Uninstall and Locked options take extension IDs.
+
+policy-ExtensionSettings = Manage all aspects of extension installation.
+
+policy-ExtensionUpdate = Enable or disable automatic extension updates.
+
+policy-Handlers = Configure default application handlers.
+
+policy-HardwareAcceleration = If false, turn off hardware acceleration.
+
+policy-InstallAddonsPermission = Allow certain websites to install add-ons.
+
+policy-LegacyProfiles = Disable the feature enforcing a separate profile for each installation.
+
+## Do not translate "SameSite", it's the name of a cookie attribute.
+
+policy-LegacySameSiteCookieBehaviorEnabled = Enable default legacy SameSite cookie behavior setting.
+
+policy-LegacySameSiteCookieBehaviorEnabledForDomainList = Revert to legacy SameSite behavior for cookies on specified sites.
+
+##
+
+policy-LocalFileLinks = Allow specific websites to link to local files.
+
+policy-ManualAppUpdateOnly = Allow manual updates only and do not notify the user about updates.
+
+policy-NetworkPrediction = Enable or disable network prediction (DNS prefetching).
+
+policy-OfferToSaveLogins = Enforce the setting to allow { -brand-short-name } to offer to remember saved logins and passwords. Both true and false values are accepted.
+
+policy-OfferToSaveLoginsDefault = Set the default value for allowing { -brand-short-name } to offer to remember saved logins and passwords. Both true and false values are accepted.
+
+policy-OverrideFirstRunPage = Override the first run page. Set this policy to blank if you want to disable the first run page.
+
+policy-OverridePostUpdatePage = Override the post-update “What’s New” page. Set this policy to blank if you want to disable the post-update page.
+
+policy-PasswordManagerEnabled = Enable saving passwords to the password manager.
+
+# PDF.js and PDF should not be translated
+policy-PDFjs = Disable or configure PDF.js, the built-in PDF viewer in { -brand-short-name }.
+
+policy-Permissions2 = Configure permissions for camera, microphone, location, notifications, and autoplay.
+
+policy-Preferences = Set and lock the value for a subset of preferences.
+
+policy-PrimaryPassword = Require or prevent using a Primary Password.
+
+policy-PromptForDownloadLocation = Ask where to save files when downloading.
+
+policy-Proxy = Configure proxy settings.
+
+policy-RequestedLocales = Set the list of requested locales for the application in order of preference.
+
+policy-SanitizeOnShutdown2 = Clear navigation data on shutdown.
+
+policy-SearchEngines = Configure search engine settings. This policy is only available on the Extended Support Release (ESR) version.
+
+policy-SearchSuggestEnabled = Enable or disable search suggestions.
+
+# For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
+policy-SecurityDevices = Install PKCS #11 modules.
+
+policy-SSLVersionMax = Set the maximum SSL version.
+
+policy-SSLVersionMin = Set the minimum SSL version.
+
+policy-SupportMenu = Add a custom support menu item to the help menu.
+
+policy-UserMessaging = Don’t show certain messages to the user.
+
+# “format” refers to the format used for the value of this policy.
+policy-WebsiteFilter = Block websites from being visited. See documentation for more details on the format.
diff --git a/comm/mail/locales/en-US/messenger/preferences/am-copies.ftl b/comm/mail/locales/en-US/messenger/preferences/am-copies.ftl
new file mode 100644
index 0000000000..24e0b6f29b
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/am-copies.ftl
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-prefs-show-address-row-description = Leave the address field blank to always show the address row when starting a new message.
diff --git a/comm/mail/locales/en-US/messenger/preferences/am-im.ftl b/comm/mail/locales/en-US/messenger/preferences/am-im.ftl
new file mode 100644
index 0000000000..795bc6ae57
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/am-im.ftl
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+account-settings-title = Authentication Settings
+account-channel-title = Default Channels
+
+chat-autologin =
+    .label = Sign-on at startup
+
+chat-encryption-generic = Generic
+chat-encryption-log =
+    .label = Include end-to-end encrypted messages in conversation logs
+chat-encryption-label = Native End-to-end Encryption
+# Variables:
+# $protocol (String) - Name of the chat protocol. Example: Matrix
+chat-encryption-description = { $protocol } provides end-to-end encryption for chat messages. This prevents third parties from eavesdropping on a conversation. Additional setup might be required below for the encryption to be operational.
+chat-encryption-status = Encryption Status
+chat-encryption-placeholder = Encryption not initialized.
+chat-encryption-sessions = Sessions
+chat-encryption-sessions-description = For end-to-end encryption to work correctly, you have to trust the other sessions currently logged in to your account. Interaction with the other client is required to verify a session. Verifying a session might lead to all sessions that it trusts to also be trusted by { -brand-short-name }.
+chat-encryption-session-verify = verify
+    .title = Verify the identity of this session
+chat-encryption-session-trusted = trusted
+    .title = This session’s identity is verified
diff --git a/comm/mail/locales/en-US/messenger/preferences/application-manager.ftl b/comm/mail/locales/en-US/messenger/preferences/application-manager.ftl
new file mode 100644
index 0000000000..40dd34a1e6
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/application-manager.ftl
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+app-manager-window-dialog2 =
+    .title = Application Details
+
+remove-app-button =
+    .label = Remove
+    .accesskey = R
diff --git a/comm/mail/locales/en-US/messenger/preferences/attachment-reminder.ftl b/comm/mail/locales/en-US/messenger/preferences/attachment-reminder.ftl
new file mode 100644
index 0000000000..65ab01a944
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/attachment-reminder.ftl
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+attachment-reminder-window =
+    .title = Attachment Reminder Keywords
+
+attachment-reminder-label = { -brand-short-name } will warn you about missing attachments if you’re about to send an email containing one of these keywords.
+
+keyword-new-button =
+    .label = New…
+    .accesskey = N
+
+keyword-edit-button =
+    .label = Edit…
+    .accesskey = E
+
+keyword-remove-button =
+    .label = Delete
+    .accesskey = D
+
+new-keyword-title = New Keyword
+new-keyword-label = Keyword:
+
+edit-keyword-title = Edit Keyword
+edit-keyword-label = Keyword:
diff --git a/comm/mail/locales/en-US/messenger/preferences/colors.ftl b/comm/mail/locales/en-US/messenger/preferences/colors.ftl
new file mode 100644
index 0000000000..85c50e9e18
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/colors.ftl
@@ -0,0 +1,47 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+colors-dialog-window2 =
+    .title = Colors
+
+colors-dialog-legend = Text and Background
+
+text-color-label =
+    .value = Text:
+    .accesskey = T
+
+background-color-label =
+    .value = Background:
+    .accesskey = B
+
+use-system-colors =
+    .label = Use system colors
+    .accesskey = s
+
+colors-link-legend = Link Colors
+
+link-color-label =
+    .value = Unvisited Links:
+    .accesskey = L
+
+visited-link-color-label =
+    .value = Visited Links:
+    .accesskey = V
+
+underline-link-checkbox =
+    .label = Underline links
+    .accesskey = U
+
+override-color-label =
+    .value = Override the colors specified by the content with my selections above:
+    .accesskey = O
+
+override-color-always =
+    .label = Always
+
+override-color-auto =
+    .label = Only with High Contrast themes
+
+override-color-never =
+    .label = Never
diff --git a/comm/mail/locales/en-US/messenger/preferences/connection.ftl b/comm/mail/locales/en-US/messenger/preferences/connection.ftl
new file mode 100644
index 0000000000..ec1fd76acc
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/connection.ftl
@@ -0,0 +1,115 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+connection-dns-over-https-url-resolver = Use Provider
+    .accesskey = r
+
+# Variables:
+#   $name (String) - Display name or URL for the DNS over HTTPS provider
+connection-dns-over-https-url-item-default =
+    .label = { $name } (Default)
+    .tooltiptext = Use the default URL for resolving DNS over HTTPS
+
+connection-dns-over-https-url-custom =
+    .label = Custom
+    .accesskey = C
+    .tooltiptext = Enter your preferred URL for resolving DNS over HTTPS
+
+connection-dns-over-https-custom-label = Custom
+
+connection-dialog-window2 =
+    .title = Connection Settings
+
+disable-extension-button = Disable Extension
+
+# Variables:
+#   $name (String) - The extension that is controlling the proxy settings.
+#
+# The extension-icon is the extension's icon, or a fallback image. It should be
+# purely decoration for the actual extension name, with alt="".
+proxy-settings-controlled-by-extension = An extension, <img data-l10n-name="extension-icon" alt="" /> { $name }, is controlling how { -brand-short-name } connects to the Internet.
+
+connection-proxy-legend = Configure Proxies to Access the Internet
+
+proxy-type-no =
+    .label = No proxy
+    .accesskey = y
+
+proxy-type-wpad =
+    .label = Auto-detect proxy settings for this network
+    .accesskey = w
+
+proxy-type-system =
+    .label = Use system proxy settings
+    .accesskey = u
+
+proxy-type-manual =
+    .label = Manual proxy configuration:
+    .accesskey = m
+
+proxy-http-label =
+    .value = HTTP Proxy:
+    .accesskey = h
+
+http-port-label =
+    .value = Port:
+    .accesskey = p
+
+proxy-http-sharing =
+    .label = Also use this proxy for HTTPS
+    .accesskey = x
+
+proxy-https-label =
+    .value = HTTPS Proxy:
+    .accesskey = S
+
+ssl-port-label =
+    .value = Port:
+    .accesskey = o
+
+proxy-socks-label =
+    .value = SOCKS Host:
+    .accesskey = c
+
+socks-port-label =
+    .value = Port:
+    .accesskey = t
+
+proxy-socks4-label =
+    .label = SOCKS v4
+    .accesskey = k
+
+proxy-socks5-label =
+    .label = SOCKS v5
+    .accesskey = v
+
+proxy-type-auto =
+    .label = Automatic proxy configuration URL:
+    .accesskey = A
+
+proxy-reload-label =
+    .label = Reload
+    .accesskey = l
+
+no-proxy-label =
+    .value = No proxy for:
+    .accesskey = n
+
+no-proxy-example = Example: .mozilla.org, .net.nz, 192.168.1.0/24
+
+# Do not translate "localhost", "127.0.0.1/8" and "::1". (You can translate "and".)
+connection-proxy-noproxy-localhost-desc-2 = Connections to localhost, 127.0.0.1/8, and ::1 are never proxied.
+
+proxy-password-prompt =
+    .label = Do not prompt for authentication if password is saved
+    .accesskey = i
+    .tooltiptext = This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.
+
+proxy-remote-dns =
+    .label = Proxy DNS when using SOCKS v5
+    .accesskey = d
+
+proxy-enable-doh =
+    .label = Enable DNS over HTTPS
+    .accesskey = b
diff --git a/comm/mail/locales/en-US/messenger/preferences/cookies.ftl b/comm/mail/locales/en-US/messenger/preferences/cookies.ftl
new file mode 100644
index 0000000000..6fc6f9d5bc
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/cookies.ftl
@@ -0,0 +1,54 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+cookies-window-dialog2 =
+    .title = Cookies
+
+window-close-key =
+    .key = w
+
+window-focus-search-key =
+    .key = f
+
+window-focus-search-alt-key =
+    .key = k
+
+filter-search-label =
+    .value = Search:
+    .accesskey = S
+
+cookies-on-system-label = The following cookies are stored on your computer:
+
+treecol-site-header =
+    .label = Site
+
+treecol-name-header =
+    .label = Cookie Name
+
+props-name-label =
+    .value = Name:
+props-value-label =
+    .value = Content:
+props-domain-label =
+    .value = Host:
+props-path-label =
+    .value = Path:
+props-secure-label =
+    .value = Send For:
+props-expires-label =
+    .value = Expires:
+props-container-label =
+    .value = Container:
+
+remove-cookie-button =
+    .label = Remove Cookie
+    .accesskey = R
+
+remove-all-cookies-button =
+    .label = Remove All Cookies
+    .accesskey = A
+
+cookie-close-button =
+    .label = Close
+    .accesskey = C
diff --git a/comm/mail/locales/en-US/messenger/preferences/dock-options.ftl b/comm/mail/locales/en-US/messenger/preferences/dock-options.ftl
new file mode 100644
index 0000000000..436199b392
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/dock-options.ftl
@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+dock-options-window-dialog2 =
+    .title = App icon options
+
+dock-options-show-badge =
+    .label = Show badge icon
+    .accesskey = b
+
+bounce-system-dock-icon =
+    .label = Animate the app icon when a new message arrives
+    .accesskey = i
+
+dock-icon-legend = App icon badge
+
+dock-icon-show-label =
+    .value = Badge app icon with:
+
+count-unread-messages-radio =
+    .label = Count of unread messages
+    .accesskey = u
+
+count-new-messages-radio =
+    .label = Count of new messages
+    .accesskey = n
+
+notification-settings-info2 = You can disable the badge on the Notification pane of System Settings.
diff --git a/comm/mail/locales/en-US/messenger/preferences/fonts.ftl b/comm/mail/locales/en-US/messenger/preferences/fonts.ftl
new file mode 100644
index 0000000000..b62ad94c8c
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/fonts.ftl
@@ -0,0 +1,150 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+fonts-dialog-title = Fonts
+
+fonts-window-close =
+    .key = w
+
+# Variables:
+#   $name {string, "Arial"} - Name of the default font
+fonts-label-default =
+    .label = Default ({ $name })
+fonts-label-default-unnamed =
+    .label = Default
+
+fonts-language-legend =
+    .value = Fonts for:
+    .accesskey = t
+
+fonts-proportional-label =
+    .value = Proportional:
+    .accesskey = P
+
+## Languages
+
+# Note: Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language.
+font-language-group-latin =
+    .label = Latin
+font-language-group-japanese =
+    .label = Japanese
+font-language-group-trad-chinese =
+    .label = Traditional Chinese (Taiwan)
+font-language-group-simpl-chinese =
+    .label = Simplified Chinese
+font-language-group-trad-chinese-hk =
+    .label = Traditional Chinese (Hong Kong)
+font-language-group-korean =
+    .label = Korean
+font-language-group-cyrillic =
+    .label = Cyrillic
+font-language-group-el =
+    .label = Greek
+font-language-group-other =
+    .label = Other Writing Systems
+font-language-group-thai =
+    .label = Thai
+font-language-group-hebrew =
+    .label = Hebrew
+font-language-group-arabic =
+    .label = Arabic
+font-language-group-devanagari =
+    .label = Devanagari
+font-language-group-tamil =
+    .label = Tamil
+font-language-group-armenian =
+    .label = Armenian
+font-language-group-bengali =
+    .label = Bengali
+font-language-group-canadian =
+    .label = Unified Canadian Syllabary
+font-language-group-ethiopic =
+    .label = Ethiopic
+font-language-group-georgian =
+    .label = Georgian
+font-language-group-gujarati =
+    .label = Gujarati
+font-language-group-gurmukhi =
+    .label = Gurmukhi
+font-language-group-khmer =
+    .label = Khmer
+font-language-group-malayalam =
+    .label = Malayalam
+font-language-group-math =
+    .label = Mathematics
+font-language-group-odia =
+    .label = Odia
+font-language-group-telugu =
+    .label = Telugu
+font-language-group-kannada =
+    .label = Kannada
+font-language-group-sinhala =
+    .label = Sinhala
+font-language-group-tibetan =
+    .label = Tibetan
+
+## Default font type
+
+default-font-serif =
+    .label = Serif
+
+default-font-sans-serif =
+    .label = Sans Serif
+
+font-size-proportional-label =
+    .value = Size:
+    .accesskey = e
+
+font-size-monospace-label =
+    .value = Size:
+    .accesskey = i
+
+font-serif-label =
+    .value = Serif:
+    .accesskey = S
+
+font-sans-serif-label =
+    .value = Sans-serif:
+    .accesskey = n
+
+font-monospace-label =
+    .value = Monospace:
+    .accesskey = M
+
+font-min-size-label =
+    .value = Minimum font size:
+    .accesskey = z
+
+min-size-none =
+    .label = None
+
+## Fonts in message
+
+font-control-legend = Font Control
+
+use-document-fonts-checkbox =
+    .label = Allow messages to use other fonts
+    .accesskey = o
+
+use-fixed-width-plain-checkbox =
+    .label = Use fixed width font for plain text messages
+    .accesskey = x
+
+## Language settings
+
+text-encoding-legend = Text Encoding
+
+text-encoding-description = Set the default text encoding for sending and receiving mail
+
+font-outgoing-email-label =
+    .value = Outgoing Mail:
+    .accesskey = u
+
+font-incoming-email-label =
+    .value = Incoming Mail:
+    .accesskey = I
+
+default-font-reply-checkbox =
+    .label = When possible, use the default text encoding in replies
+    .accesskey = h
diff --git a/comm/mail/locales/en-US/messenger/preferences/languages.ftl b/comm/mail/locales/en-US/messenger/preferences/languages.ftl
new file mode 100644
index 0000000000..60cae72388
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/languages.ftl
@@ -0,0 +1,44 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+languages-customize-moveup =
+    .label = Move Up
+    .accesskey = U
+
+languages-customize-movedown =
+    .label = Move Down
+    .accesskey = D
+
+languages-customize-remove =
+    .label = Remove
+    .accesskey = R
+
+languages-customize-select-language =
+    .placeholder = Select a language to add…
+
+languages-customize-add =
+    .label = Add
+    .accesskey = A
+
+messenger-languages-window2 =
+    .title = { -brand-short-name } Language Settings
+
+messenger-languages-description = { -brand-short-name } will display the first language as your default and will display alternate languages if necessary in the order they appear.
+
+messenger-languages-search = Search for more languages…
+
+messenger-languages-searching =
+    .label = Searching for languages…
+
+messenger-languages-downloading =
+    .label = Downloading…
+
+messenger-languages-select-language =
+    .label = Select a language to add…
+    .placeholder = Select a language to add…
+
+messenger-languages-installed-label = Installed languages
+messenger-languages-available-label = Available languages
+
+messenger-languages-error = { -brand-short-name } can’t update your languages right now. Check that you are connected to the internet or try again.
diff --git a/comm/mail/locales/en-US/messenger/preferences/new-tag.ftl b/comm/mail/locales/en-US/messenger/preferences/new-tag.ftl
new file mode 100644
index 0000000000..8bfe3ddd9d
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/new-tag.ftl
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+tag-dialog-window =
+    .title = New Tag
+
+tag-name-label =
+    .value = Tag Name:
+    .accesskey = T
+
+tag-color-label =
+    .value = Color:
+    .accesskey = C
diff --git a/comm/mail/locales/en-US/messenger/preferences/notifications.ftl b/comm/mail/locales/en-US/messenger/preferences/notifications.ftl
new file mode 100644
index 0000000000..b7ec3c9670
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/notifications.ftl
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+notifications-dialog-window =
+    .title = Customize New Mail Alert
+
+customize-alert-description = Choose which fields to show in the alert notification:
+
+preview-text-checkbox =
+    .label = Message Preview Text
+    .accesskey = M
+
+subject-checkbox =
+    .label = Subject
+    .accesskey = S
+
+sender-checkbox =
+    .label = Sender
+    .accesskey = e
+
+## Note: open-time-label-before is displayed first, then there's a field where
+## the user can enter a number, and open-time-label-after is displayed at the end
+## of the line. The translations of the open-time-label-before and open-time-label-after
+## parts don't have to mean the exact same thing as in English; please try instead
+## to translate the whole sentence.
+
+open-time-label-before =
+    .value = Show New Mail Alert for
+    .accesskey = N
+
+open-time-label-after =
+    .value = seconds
diff --git a/comm/mail/locales/en-US/messenger/preferences/offline.ftl b/comm/mail/locales/en-US/messenger/preferences/offline.ftl
new file mode 100644
index 0000000000..97d83c118b
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/offline.ftl
@@ -0,0 +1,56 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+offline-dialog-window =
+    .title = Offline Settings
+
+autodetect-online-label =
+    .label = Automatically follow detected online state
+    .accesskey = d
+
+offline-preference-startup-label = Manual state when starting up:
+
+status-radio-remember =
+    .label = Remember previous online state
+    .accesskey = R
+
+status-radio-ask =
+    .label = Ask me for online state
+    .accesskey = k
+
+status-radio-always-online =
+    .label = Online
+    .accesskey = l
+
+status-radio-always-offline =
+    .label = Offline
+    .accesskey = f
+
+going-online-label = Send unsent messages when going online?
+
+going-online-auto =
+    .label = Yes
+    .accesskey = Y
+
+going-online-not =
+    .label = No
+    .accesskey = N
+
+going-online-ask =
+    .label = Ask me
+    .accesskey = s
+
+going-offline-label = Download messages for offline use when going offline?
+
+going-offline-auto =
+    .label = Yes
+    .accesskey = e
+
+going-offline-not =
+    .label = No
+    .accesskey = o
+
+going-offline-ask =
+    .label = Ask me
+    .accesskey = a
diff --git a/comm/mail/locales/en-US/messenger/preferences/passwordManager.ftl b/comm/mail/locales/en-US/messenger/preferences/passwordManager.ftl
new file mode 100644
index 0000000000..3662eca22c
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/passwordManager.ftl
@@ -0,0 +1,85 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+saved-logins =
+    .title = Saved Logins
+window-close =
+    .key = w
+focus-search-primary-shortcut =
+    .key = f
+focus-search-alt-shortcut =
+    .key = k
+copy-provider-url-cmd =
+    .label = Copy URL
+    .accesskey = y
+copy-username-cmd =
+    .label = Copy Username
+    .accesskey = U
+edit-username-cmd =
+    .label = Edit Username
+    .accesskey = d
+copy-password-cmd =
+    .label = Copy Password
+    .accesskey = C
+edit-password-cmd =
+    .label = Edit Password
+    .accesskey = E
+search-filter =
+    .accesskey = S
+    .placeholder = Search
+column-heading-provider =
+    .label = Provider
+column-heading-username =
+    .label = Username
+column-heading-password =
+    .label = Password
+column-heading-time-created =
+    .label = First Used
+column-heading-time-last-used =
+    .label = Last Used
+column-heading-time-password-changed =
+    .label = Last Changed
+column-heading-times-used =
+    .label = Times Used
+remove =
+    .label = Remove
+    .accesskey = R
+import =
+    .label = Import…
+    .accesskey = I
+password-close-button =
+    .label = Close
+    .accesskey = C
+
+show-passwords =
+    .label = Show Passwords
+    .accesskey = P
+hide-passwords =
+    .label = Hide Passwords
+    .accesskey = P
+logins-description-all = Logins for the following providers are stored on your computer
+logins-description-filtered = The following logins match your search:
+remove-all =
+    .label = Remove All
+    .accesskey = A
+remove-all-shown =
+    .label = Remove All Shown
+    .accesskey = A
+remove-all-passwords-prompt = Are you sure you wish to remove all passwords?
+remove-all-passwords-title = Remove all passwords
+no-master-password-prompt = Are you sure you wish to show your passwords?
+
+## OS Authentication dialog
+
+# This message can be seen by trying to show or copy the passwords.
+password-os-auth-dialog-message = Verify your identity to reveal the saved passwords.
+
+# This message can be seen by trying to show or copy the passwords.
+# The macOS strings are preceded by the operating system with "Thunderbird is trying to "
+# and includes subtitle of "Enter password for the user "xxx" to allow this." These
+# notes are only valid for English. Please test in your locale.
+password-os-auth-dialog-message-macosx = reveal the saved passwords
+
+# Don't change this label.
+password-os-auth-dialog-caption = { -brand-full-name }
diff --git a/comm/mail/locales/en-US/messenger/preferences/permissions.ftl b/comm/mail/locales/en-US/messenger/preferences/permissions.ftl
new file mode 100644
index 0000000000..7b0c931d61
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/permissions.ftl
@@ -0,0 +1,55 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+permissions-reminder-window2 =
+    .title = Exceptions
+
+permission-preferences-close-window =
+    .key = w
+
+website-address-label =
+    .value = Address of website:
+    .accesskey = d
+
+block-button =
+    .label = Block
+    .accesskey = B
+
+allow-session-button =
+    .label = Allow for Session
+    .accesskey = n
+
+allow-button =
+    .label = Allow
+    .accesskey = A
+
+treehead-sitename-label =
+    .label = Site
+
+treehead-status-label =
+    .label = Status
+
+remove-site-button =
+    .label = Remove Site
+    .accesskey = R
+
+remove-all-site-button =
+    .label = Remove All Sites
+    .accesskey = e
+
+cancel-button =
+    .label = Cancel
+    .accesskey = C
+
+save-button =
+    .label = Save Changes
+    .accesskey = S
+
+permission-can-label = Allow
+permission-can-access-first-party-label = Allow first party only
+permission-can-session-label = Allow for Session
+permission-cannot-label = Block
+
+invalid-uri-message = Please enter a valid hostname
+invalid-uri-title = Invalid Hostname Entered
diff --git a/comm/mail/locales/en-US/messenger/preferences/preferences.ftl b/comm/mail/locales/en-US/messenger/preferences/preferences.ftl
new file mode 100644
index 0000000000..592e106cf8
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/preferences.ftl
@@ -0,0 +1,1026 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+close-button =
+    .aria-label = Close
+
+preferences-doc-title2 = Settings
+
+category-list =
+    .aria-label = Categories
+
+pane-general-title = General
+category-general =
+    .tooltiptext = { pane-general-title }
+
+pane-compose-title = Composition
+category-compose =
+    .tooltiptext = Composition
+
+pane-privacy-title = Privacy & Security
+category-privacy =
+    .tooltiptext = Privacy & Security
+
+pane-chat-title = Chat
+category-chat =
+    .tooltiptext = Chat
+
+pane-calendar-title = Calendar
+category-calendar =
+    .tooltiptext = Calendar
+
+pane-sync-title = Sync
+category-sync =
+    .tooltiptext = Sync
+
+general-language-and-appearance-header = Language & Appearance
+
+general-incoming-mail-header = Incoming Mails
+
+general-files-and-attachment-header = Files & Attachments
+
+general-tags-header = Tags
+
+general-reading-and-display-header = Reading & Display
+
+general-updates-header = Updates
+
+general-network-and-diskspace-header = Network & Disk Space
+
+general-indexing-label = Indexing
+
+composition-category-header = Composition
+
+composition-attachments-header = Attachments
+
+composition-spelling-title = Spelling
+
+compose-html-style-title = HTML Style
+
+composition-addressing-header = Addressing
+
+privacy-main-header = Privacy
+
+privacy-passwords-header = Passwords
+
+privacy-junk-header = Junk
+
+collection-header = { -brand-short-name } Data Collection and Use
+
+collection-description = We strive to provide you with choices and collect only what we need to provide and improve { -brand-short-name } for everyone. We always ask permission before receiving personal information.
+collection-privacy-notice = Privacy Notice
+
+collection-health-report-telemetry-disabled = You’re no longer allowing { -vendor-short-name } to capture technical and interaction data. All past data will be deleted within 30 days.
+collection-health-report-telemetry-disabled-link = Learn more
+
+collection-health-report =
+    .label = Allow { -brand-short-name } to send technical and interaction data to { -vendor-short-name }
+    .accesskey = r
+collection-health-report-link = Learn more
+
+# This message is displayed above disabled data sharing options in developer builds
+# or builds with no Telemetry support available.
+collection-health-report-disabled = Data reporting is disabled for this build configuration
+
+collection-backlogged-crash-reports =
+    .label = Allow { -brand-short-name } to send backlogged crash reports on your behalf
+    .accesskey = c
+collection-backlogged-crash-reports-link = Learn more
+
+privacy-security-header = Security
+
+privacy-scam-detection-title = Scam Detection
+
+privacy-anti-virus-title = Antivirus
+
+privacy-certificates-title = Certificates
+
+chat-pane-header = Chat
+
+chat-status-title = Status
+
+chat-notifications-title = Notifications
+
+chat-pane-styling-header = Styling
+
+choose-messenger-language-description = Choose the languages used to display menus, messages, and notifications from { -brand-short-name }.
+manage-messenger-languages-button =
+  .label = Set Alternatives…
+  .accesskey = l
+confirm-messenger-language-change-description = Restart { -brand-short-name } to apply these changes
+confirm-messenger-language-change-button = Apply and Restart
+
+update-setting-write-failure-title = Error saving Update preferences
+
+# Variables:
+#   $path (String) - Path to the configuration file
+# The newlines between the main text and the line containing the path is
+# intentional so the path is easier to identify.
+update-setting-write-failure-message =
+    { -brand-short-name } encountered an error and didn’t save this change. Note that setting this update preference requires permission to write to the file below. You or a system administrator may be able resolve the error by granting the Users group full control to this file.
+
+    Could not write to file: { $path }
+
+update-in-progress-title = Update In Progress
+
+update-in-progress-message = Do you want { -brand-short-name } to continue with this update?
+
+update-in-progress-ok-button = &Discard
+# Continue is the cancel button so pressing escape or using a platform standard
+# method of closing the UI will not discard the update.
+update-in-progress-cancel-button = &Continue
+
+account-button = Account Settings
+open-addons-sidebar-button = Add-ons and Themes
+
+## OS Authentication dialog
+
+# This message can be seen by trying to add a Primary Password.
+primary-password-os-auth-dialog-message-win = To create a Primary Password, enter your Windows login credentials. This helps protect the security of your accounts.
+
+# This message can be seen by trying to add a Primary Password.
+# The macOS strings are preceded by the operating system with "Thunderbird is trying to "
+# and includes subtitle of "Enter password for the user "xxx" to allow this." These
+# notes are only valid for English. Please test in your locale.
+primary-password-os-auth-dialog-message-macosx = create a Primary Password
+
+# Don't change this label.
+master-password-os-auth-dialog-caption = { -brand-full-name }
+
+## General Tab
+
+focus-search-shortcut =
+    .key = f
+focus-search-shortcut-alt =
+    .key = k
+
+general-legend = { -brand-short-name } Start Page
+
+start-page-label =
+    .label = When { -brand-short-name } launches, show the Start Page in the message area
+    .accesskey = W
+
+location-label =
+    .value = Location:
+    .accesskey = o
+restore-default-label =
+    .label = Restore Default
+    .accesskey = R
+
+default-search-engine = Default Search Engine
+add-web-search-engine =
+    .label = Add…
+    .accesskey = A
+remove-search-engine =
+    .label = Remove
+    .accesskey = v
+
+add-opensearch-provider-title = Add OpenSearch Provider
+add-opensearch-provider-text = Enter the URL of the OpenSearch provider to add. Either use the direct URL of the OpenSearch Description file, or a URL where it can be auto-discovered.
+
+adding-opensearch-provider-failed-title = Adding OpenSearch Provider Failed
+# Variables:
+# $url (String) - URL an OpenSearch provider was requested for.
+adding-opensearch-provider-failed-text = Could not add OpenSearch Provider for { $url }.
+
+minimize-to-tray-label =
+    .label = When { -brand-short-name } is minimized, move it to the tray
+    .accesskey = m
+
+new-message-arrival = When new messages arrive:
+mail-play-sound-label =
+    .label = { PLATFORM() ->
+        [macos] Play the following sound file:
+        *[other] Play a sound
+    }
+    .accesskey = d
+mail-play-button =
+    .label = Play
+    .accesskey = P
+
+change-dock-icon = Change preferences for the app icon
+app-icon-options =
+    .label = App Icon Options…
+    .accesskey = n
+
+notification-settings2 = Alerts and the default sound can be disabled on the Notification pane of System Settings.
+
+animated-alert-label =
+    .label = Show an alert
+    .accesskey = S
+customize-alert-label =
+    .label = Customize…
+    .accesskey = C
+
+biff-use-system-alert =
+    .label = Use the system notification
+
+tray-icon-unread-label =
+    .label = Show a tray icon for unread messages
+    .accesskey = t
+
+tray-icon-unread-description = Recommended when using small taskbar buttons
+
+mail-system-sound-label =
+    .label = Default system sound for new mail
+    .accesskey = D
+mail-custom-sound-label =
+    .label = Use the following sound file
+    .accesskey = U
+mail-browse-sound-button =
+    .label = Browse…
+    .accesskey = B
+
+enable-gloda-search-label =
+    .label = Enable Global Search and Indexer
+    .accesskey = G
+
+datetime-formatting-legend = Date and Time Formatting
+language-selector-legend = Language
+
+allow-hw-accel =
+    .label = Use hardware acceleration when available
+    .accesskey = h
+
+store-type-label =
+    .value = Message Store Type for new accounts:
+    .accesskey = T
+
+mbox-store-label =
+    .label = File per folder (mbox)
+maildir-store-label =
+    .label = File per message (maildir)
+
+scrolling-legend = Scrolling
+autoscroll-label =
+    .label = Use autoscrolling
+    .accesskey = U
+smooth-scrolling-label =
+    .label = Use smooth scrolling
+    .accesskey = m
+browsing-gtk-use-non-overlay-scrollbars =
+    .label = Always show scrollbars
+    .accesskey = c
+
+window-layout-legend = Window Layout
+
+draw-in-titlebar-label =
+    .label = Hide system window titlebar
+    .accesskey = H
+
+auto-hide-tabbar-label =
+    .label = Auto hide tab bar
+    .accesskey = A
+auto-hide-tabbar-description = Hide the tab bar when only a single tab is open
+
+system-integration-legend = System Integration
+always-check-default =
+    .label = Always check to see if { -brand-short-name } is the default mail client on startup
+    .accesskey = A
+check-default-button =
+    .label = Check Now…
+    .accesskey = N
+
+# Note: This is the search engine name for all the different platforms.
+# Platforms that don't support it should be left blank.
+search-engine-name = { PLATFORM() ->
+    [macos] Spotlight
+    [windows] Windows Search
+    *[other] { "" }
+}
+
+search-integration-label =
+    .label = Allow { search-engine-name } to search messages
+    .accesskey = S
+
+config-editor-button =
+    .label = Config Editor…
+    .accesskey = C
+
+return-receipts-description = Determine how { -brand-short-name } handles return receipts
+return-receipts-button =
+    .label = Return Receipts…
+    .accesskey = R
+
+update-app-legend = { -brand-short-name } Updates
+
+# Variables:
+#   $version (String): version of Thunderbird, e.g. 68.0.1
+update-app-version = Version { $version }
+
+allow-description = Allow { -brand-short-name } to
+automatic-updates-label =
+    .label = Automatically install updates (recommended: improved security)
+    .accesskey = A
+check-updates-label =
+    .label = Check for updates, but let me choose whether to install them
+    .accesskey = C
+
+update-history-button =
+    .label = Show Update History
+    .accesskey = p
+
+use-service =
+    .label = Use a background service to install updates
+    .accesskey = b
+
+cross-user-udpate-warning = This setting will apply to all Windows accounts and { -brand-short-name } profiles using this installation of { -brand-short-name }.
+
+networking-legend = Connection
+proxy-config-description = Configure how { -brand-short-name } connects to the Internet
+
+network-settings-button =
+    .label = Settings…
+    .accesskey = S
+
+offline-legend = Offline
+offline-settings = Configure offline settings
+
+offline-settings-button =
+    .label = Offline…
+    .accesskey = O
+
+diskspace-legend = Disk Space
+offline-compact-folder =
+    .label = Compact all folders when it will save over
+    .accesskey = a
+
+offline-compact-folder-automatically =
+    .label = Ask every time before compacting
+    .accesskey = b
+
+compact-folder-size =
+    .value = MB in total
+
+## Note: The entities use-cache-before and use-cache-after appear on a single
+## line in preferences as follows:
+## use-cache-before [ textbox for cache size in MB ] use-cache-after
+
+use-cache-before =
+    .value = Use up to
+    .accesskey = U
+
+use-cache-after = MB of space for the cache
+
+##
+
+smart-cache-label =
+    .label = Override automatic cache management
+    .accesskey = v
+
+clear-cache-button =
+    .label = Clear Now
+    .accesskey = C
+
+clear-cache-shutdown-label =
+    .label = Clear cache on shutdown
+    .accesskey = s
+
+fonts-legend = Fonts & Colors
+
+default-font-label =
+    .value = Default font:
+    .accesskey = D
+
+default-size-label =
+    .value = Size:
+    .accesskey = S
+
+font-options-button =
+    .label = Advanced…
+    .accesskey = A
+
+color-options-button =
+    .label = Colors…
+    .accesskey = C
+
+display-width-legend = Plain Text Messages
+
+# Note : convert-emoticons-label 'Emoticons' are also known as 'Smileys', e.g. :-)
+convert-emoticons-label =
+    .label = Display emoticons as graphics
+    .accesskey = e
+
+display-text-label = When displaying quoted plain text messages:
+
+style-label =
+    .value = Style:
+    .accesskey = y
+
+regular-style-item =
+    .label = Regular
+bold-style-item =
+    .label = Bold
+italic-style-item =
+    .label = Italic
+bold-italic-style-item =
+    .label = Bold Italic
+
+size-label =
+    .value = Size:
+    .accesskey = z
+
+regular-size-item =
+    .label = Regular
+bigger-size-item =
+    .label = Bigger
+smaller-size-item =
+    .label = Smaller
+
+quoted-text-color =
+    .label = Color:
+    .accesskey = o
+
+search-handler-table =
+    .placeholder = Filter content types and actions
+
+type-column-header = Content Type
+
+action-column-header = Action
+
+save-to-label =
+    .label = Save files to
+    .accesskey = S
+
+choose-folder-label =
+    .label = { PLATFORM() ->
+        [macos] Choose…
+        *[other] Browse…
+    }
+    .accesskey = { PLATFORM() ->
+        [macos] C
+        *[other] B
+    }
+
+always-ask-label =
+    .label = Always ask me where to save files
+    .accesskey = A
+
+
+display-tags-text = Tags can be used to categorize and prioritize your messages.
+
+new-tag-button =
+    .label = New…
+    .accesskey = N
+
+edit-tag-button =
+    .label = Edit…
+    .accesskey = E
+
+delete-tag-button =
+    .label = Delete
+    .accesskey = D
+
+auto-mark-as-read =
+    .label = Automatically mark messages as read
+    .accesskey = A
+
+mark-read-no-delay =
+    .label = Immediately on display
+    .accesskey = o
+
+view-attachments-inline =
+    .label = View attachments inline
+    .accesskey = V
+
+## Note: This will concatenate to "After displaying for [___] seconds",
+## using (mark-read-delay) and a number (seconds-label).
+
+mark-read-delay =
+    .label = After displaying for
+    .accesskey = d
+
+seconds-label = seconds
+
+##
+
+open-msg-label =
+    .value = Open messages in:
+
+open-msg-tab =
+    .label = A new tab
+    .accesskey = t
+
+open-msg-window =
+    .label = A new message window
+    .accesskey = n
+
+open-msg-ex-window =
+    .label = An existing message window
+    .accesskey = e
+
+close-move-delete =
+    .label = Close message window/tab on move or delete
+    .accesskey = C
+
+display-name-label =
+    .value = Display name:
+
+condensed-addresses-label =
+    .label = Show only display name for people in my address book
+    .accesskey = S
+
+## Compose Tab
+
+forward-label =
+    .value = Forward messages:
+    .accesskey = F
+
+inline-label =
+    .label = Inline
+
+as-attachment-label =
+    .label = As Attachment
+
+extension-label =
+    .label = add extension to file name
+    .accesskey = e
+
+## Note: This will concatenate to "Auto Save every [___] minutes",
+## using (auto-save-label) and a number (auto-save-end).
+
+auto-save-label =
+    .label = Auto Save every
+    .accesskey = A
+
+auto-save-end = minutes
+
+##
+
+warn-on-send-accel-key =
+    .label = Confirm when using keyboard shortcut to send message
+    .accesskey = C
+
+add-link-previews =
+    .label = Add link previews when pasting URLs
+    .accesskey = i
+
+spellcheck-label =
+    .label = Check spelling before sending
+    .accesskey = C
+
+spellcheck-inline-label =
+    .label = Enable spellcheck as you type
+    .accesskey = E
+
+language-popup-label =
+    .value = Language:
+    .accesskey = L
+
+download-dictionaries-link = Download More Dictionaries
+
+font-label =
+    .value = Font:
+    .accesskey = n
+
+font-size-label =
+    .value = Size:
+    .accesskey = z
+
+default-colors-label =
+    .label = Use reader’s default colors
+    .accesskey = d
+
+font-color-label =
+    .value = Text Color:
+    .accesskey = T
+
+bg-color-label =
+    .value = Background Color:
+    .accesskey = B
+
+restore-html-label =
+    .label = Restore Defaults
+    .accesskey = R
+
+default-format-label =
+    .label = Use Paragraph format instead of Body Text by default
+    .accesskey = P
+
+compose-send-format-title = Sending Format
+
+compose-send-automatic-option =
+    .label = Automatic
+
+compose-send-automatic-description = If no styling is used in the message, send Plain Text. Otherwise, send HTML with a Plain Text fallback.
+
+compose-send-both-option =
+    .label = Both HTML and Plain Text
+
+compose-send-both-description = The recipient’s email application will determine which version to show.
+
+compose-send-html-option =
+    .label = Only HTML
+
+compose-send-html-description = Some recipients may not be able to read the message without a Plain Text fallback.
+
+compose-send-plain-option =
+    .label = Only Plain Text
+
+compose-send-plain-description = Some styling will be converted into a plain alternative, while other composition features will be disabled.
+
+autocomplete-description = When addressing messages, look for matching entries in:
+
+ab-label =
+    .label = Local Address Books
+    .accesskey = L
+
+directories-label =
+    .label = Directory Server:
+    .accesskey = D
+
+directories-none-label =
+    .none = None
+
+edit-directories-label =
+    .label = Edit Directories…
+    .accesskey = E
+
+email-picker-label =
+    .label = Automatically add outgoing email addresses to my:
+    .accesskey = A
+
+default-directory-label =
+    .value = Default startup directory in the address book window:
+    .accesskey = S
+
+default-last-label =
+    .none = Last used directory
+
+attachment-label =
+    .label = Check for missing attachments
+    .accesskey = m
+
+attachment-options-label =
+    .label = Keywords…
+    .accesskey = K
+
+enable-cloud-share =
+    .label = Offer to share for files larger than
+cloud-share-size =
+    .value = MB
+
+add-cloud-account =
+    .label = Add…
+    .accesskey = A
+    .defaultlabel = Add…
+
+remove-cloud-account =
+    .label = Remove
+    .accesskey = R
+
+find-cloud-providers =
+    .value = Find more providers…
+
+cloud-account-description = Add a new Filelink storage service
+
+## Privacy Tab
+
+mail-content = Mail Content
+
+remote-content-label =
+    .label = Allow remote content in messages
+    .accesskey = m
+
+exceptions-button =
+    .label = Exceptions…
+    .accesskey = E
+
+remote-content-info =
+    .value = Learn more about the privacy issues of remote content
+
+web-content = Web Content
+
+history-label =
+    .label = Remember websites and links I’ve visited
+    .accesskey = R
+
+cookies-label =
+    .label = Accept cookies from sites
+    .accesskey = A
+
+third-party-label =
+    .value = Accept third-party cookies:
+    .accesskey = c
+
+third-party-always =
+    .label = Always
+third-party-never =
+    .label = Never
+third-party-visited =
+    .label = From visited
+
+cookies-button =
+    .label = Show Cookies…
+    .accesskey = S
+
+do-not-track-label =
+    .label = Send websites a “Do Not Track” signal that you don’t want to be tracked
+    .accesskey = n
+
+dnt-learn-more-button =
+    .value = Learn more
+
+passwords-description = { -brand-short-name } can remember passwords for all of your accounts.
+
+passwords-button =
+    .label = Saved Passwords…
+    .accesskey = S
+
+primary-password-description = A Primary Password protects all your passwords, but you must enter it once per session.
+
+primary-password-label =
+    .label = Use a Primary Password
+    .accesskey = U
+
+primary-password-button =
+    .label = Change Primary Password…
+    .accesskey = C
+
+forms-primary-pw-fips-title = You are currently in FIPS mode. FIPS requires a non-empty Primary Password.
+forms-master-pw-fips-desc = Password Change Failed
+
+
+junk-description = Set your default junk mail settings. Account-specific junk mail settings can be configured in Account Settings.
+
+junk-label =
+    .label = When I mark messages as junk:
+    .accesskey = W
+
+junk-move-label =
+    .label = Move them to the account’s “Junk” folder
+    .accesskey = o
+
+junk-delete-label =
+    .label = Delete them
+    .accesskey = D
+
+junk-read-label =
+    .label = Mark messages determined to be Junk as read
+    .accesskey = M
+
+junk-log-label =
+    .label = Enable adaptive junk filter logging
+    .accesskey = E
+
+junk-log-button =
+    .label = Show log
+    .accesskey = S
+
+reset-junk-button =
+    .label = Reset Training Data
+    .accesskey = R
+
+phishing-description = { -brand-short-name } can analyze messages for suspected email scams by looking for common techniques used to deceive you.
+
+phishing-label =
+    .label = Tell me if the message I’m reading is a suspected email scam
+    .accesskey = T
+
+antivirus-description = { -brand-short-name } can make it easy for antivirus software to analyze incoming mail messages for viruses before they are stored locally.
+
+antivirus-label =
+    .label = Allow antivirus clients to quarantine individual incoming messages
+    .accesskey = A
+
+certificate-description = When a server requests my personal certificate:
+
+certificate-auto =
+    .label = Select one automatically
+    .accesskey = S
+
+certificate-ask =
+    .label = Ask me every time
+    .accesskey = A
+
+ocsp-label =
+    .label = Query OCSP responder servers to confirm the current validity of certificates
+    .accesskey = Q
+
+certificate-button =
+    .label = Manage Certificates…
+    .accesskey = M
+
+security-devices-button =
+    .label = Security Devices…
+    .accesskey = D
+
+email-e2ee-header = Email End-To-End Encryption
+
+account-settings = Account Settings
+
+email-e2ee-enable-info =
+    Set up email accounts and identities for End-To-End Encryption in Account Settings.
+
+email-e2ee-automatism = Automatic Use of Encryption
+email-e2ee-automatism-pre =
+    { -brand-short-name } can assist by automatically enabling or disabling encryption while composing an email.
+    Auto enabling/disabling is based on the availability of valid and accepted correspondents’ keys or certificates.
+email-e2ee-auto-on =
+    .label = Automatically enable encryption when possible
+email-e2ee-auto-off =
+    .label = Automatically disable encryption when recipients change and encryption is no longer possible
+email-e2ee-auto-off-notify =
+    .label = Show a notification whenever encryption is disabled automatically
+email-e2ee-automatism-post =
+    Automatic decisions may be overridden by manually enabling or disabling encryption when composing a message.
+    Note: encryption is always automatically enabled when replying to an encrypted message.
+
+## Chat Tab
+
+startup-label =
+    .value = When { -brand-short-name } starts:
+    .accesskey = s
+
+offline-label =
+    .label = Keep my Chat Accounts offline
+
+auto-connect-label =
+    .label = Connect my chat accounts automatically
+
+## Note: idle-label is displayed first, then there's a field where the user
+## can enter a number, and itemTime is displayed at the end of the line.
+## The translations of the idle-label and idle-time-label parts don't have
+## to mean the exact same thing as in English; please try instead to
+## translate the whole sentence.
+
+idle-label =
+    .label = Let my contacts know that I am Idle after
+    .accesskey = I
+
+idle-time-label = minutes of inactivity
+
+##
+
+away-message-label =
+    .label = and set my status to Away with this status message:
+    .accesskey = A
+
+send-typing-label =
+    .label = Send typing notifications in conversations
+    .accesskey = t
+
+notification-label = When messages directed at you arrive:
+
+show-notification-label =
+    .label = Show a notification:
+    .accesskey = c
+
+notification-all =
+    .label = with sender’s name and message preview
+notification-name =
+    .label = with sender’s name only
+notification-empty =
+    .label = without any info
+
+notification-type-label =
+    .label = { PLATFORM() ->
+        [macos] Animate dock icon
+        *[other] Flash the taskbar item
+    }
+    .accesskey = { PLATFORM() ->
+        [macos] o
+        *[other] F
+    }
+
+chat-play-sound-label =
+    .label = Play a sound
+    .accesskey = d
+
+chat-play-button =
+    .label = Play
+    .accesskey = P
+
+chat-system-sound-label =
+    .label = Default system sound for new mail
+    .accesskey = D
+
+chat-custom-sound-label =
+    .label = Use the following sound file
+    .accesskey = U
+
+chat-browse-sound-button =
+    .label = Browse…
+    .accesskey = B
+
+theme-label =
+    .value = Theme:
+    .accesskey = T
+
+style-mail =
+    .label = { -brand-short-name }
+style-bubbles =
+    .label = Bubbles
+style-dark =
+    .label = Dark
+style-paper =
+    .label = Paper Sheets
+style-simple =
+    .label = Simple
+
+preview-label = Preview:
+no-preview-label = No preview available
+no-preview-description = This theme is not valid or is currently unavailable (disabled addon, safe-mode, …).
+
+chat-variant-label =
+    .value = Variant:
+    .accesskey = V
+
+# This is used to determine the width of the search field in about:preferences,
+# in order to make the entire placeholder string visible
+#
+# Please keep the placeholder string short to avoid truncation.
+#
+# Notice: The value of the `.style` attribute is a CSS string, and the `width`
+# is the name of the CSS property. It is intended only to adjust the element's width.
+# Do not translate.
+search-preferences-input2 =
+    .style = width: 15.4em
+    .placeholder = Find in Settings
+
+## Settings UI Search Results
+
+search-results-header = Search Results
+
+# `<span data-l10n-name="query"></span>` will be replaced by the search term.
+search-results-empty-message2 = { PLATFORM() ->
+    [windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
+    *[other] Sorry! There are no results in Settings for “<span data-l10n-name="query"></span>”.
+}
+
+search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-short-name } Support</a>
+
+## Sync Tab
+
+sync-signedout-caption = Take Your Web With You
+
+sync-signedout-description = Synchronize your accounts, address books, calendars, add-ons, and settings across all your devices.
+
+# Note: "Sync" represents the Firefox Sync product so it shouldn't be translated.
+sync-signedout-account-signin-btn = Sign in to Sync…
+
+sync-pane-header = Sync
+
+# Variables:
+# $userEmail (String) - The email logged into Sync.
+sync-pane-email-not-verified = “{ $userEmail }” is not verified.
+
+# Variables:
+# $userEmail (String) - The email logged into Sync.
+sync-signedin-login-failure = Please sign in to reconnect “{ $userEmail }”
+
+sync-pane-resend-verification = Resend verification
+
+sync-pane-sign-in = Sign in
+
+sync-pane-remove-account = Remove account
+
+sync-pane-edit-photo =
+  .title = Change profile picture
+
+sync-pane-manage-account = Manage account
+
+sync-pane-sign-out = Sign out…
+
+sync-pane-device-name-title = Device Name
+
+sync-pane-change-device-name = Change device name
+
+sync-pane-cancel = Cancel
+
+sync-pane-save = Save
+
+sync-pane-show-synced-header-on = Syncing ON
+
+sync-pane-show-synced-header-off = Syncing OFF
+
+sync-pane-sync-now = Sync Now
+
+sync-panel-sync-now-syncing = Syncing…
+
+show-synced-list-heading = You are currently syncing these items:
+
+show-synced-learn-more = Learn more…
+
+show-synced-item-account = Email Accounts
+
+show-synced-item-address = Address Books
+
+show-synced-item-calendar = Calendars
+
+show-synced-item-identity = Identities
+
+show-synced-item-passwords = Passwords
+
+show-synced-change = Change…
+
+synced-acount-item-server-config = Server configuration
+
+synced-acount-item-filters = Filters
+
+synced-acount-item-keys = OpenPGP - S/MIME
+
+sync-disconnected-text = Synchronize your email accounts, address books, calendars, and identities across all your devices.
+
+sync-disconnected-turn-on-sync = Turn on Syncing…
diff --git a/comm/mail/locales/en-US/messenger/preferences/receipts.ftl b/comm/mail/locales/en-US/messenger/preferences/receipts.ftl
new file mode 100644
index 0000000000..7d65333000
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/receipts.ftl
@@ -0,0 +1,51 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+receipts-dialog-window =
+    .title = Return Receipts
+
+return-receipt-checkbox-control =
+    .label = When sending messages, always request a return receipt
+    .accesskey = W
+
+receipt-arrive-label = When a receipt arrives:
+
+receipt-leave-radio-control =
+    .label = Leave it in my Inbox
+    .accesskey = i
+
+receipt-move-radio-control =
+    .label = Move it to my “Sent” folder
+    .accesskey = m
+
+receipt-request-label = When I receive a request for a return receipt:
+
+receipt-return-never-radio-control =
+    .label = Never send a return receipt
+    .accesskey = n
+
+receipt-return-some-radio-control =
+    .label = Allow return receipts for some messages
+    .accesskey = r
+
+receipt-not-to-cc-label =
+    .value = If I’m not in the To or Cc of the message:
+    .accesskey = f
+
+receipt-send-never-label =
+    .label = Never send
+
+receipt-send-always-label =
+    .label = Always send
+
+receipt-send-ask-label =
+    .label = Ask me
+
+sender-outside-domain-label =
+    .value = If the sender is outside my domain:
+    .accesskey = t
+
+other-cases-text-label =
+    .value = In all other cases:
+    .accesskey = a
diff --git a/comm/mail/locales/en-US/messenger/preferences/sync-dialog.ftl b/comm/mail/locales/en-US/messenger/preferences/sync-dialog.ftl
new file mode 100644
index 0000000000..da03ca42bd
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/sync-dialog.ftl
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+config-sync-dailog-title =
+    .title = Choose what to sync
+
+sync-dialog =
+    .buttonlabelaccept = Save Changes
+    .buttonaccesskeyaccept = S
+    .buttonlabelextra2 = Disconnect…
+    .buttonaccesskeyextra2 = D
diff --git a/comm/mail/locales/en-US/messenger/preferences/system-integration.ftl b/comm/mail/locales/en-US/messenger/preferences/system-integration.ftl
new file mode 100644
index 0000000000..f9723bf8de
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/preferences/system-integration.ftl
@@ -0,0 +1,44 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+system-integration-title =
+    .title = System Integration
+
+system-integration-dialog =
+    .buttonlabelaccept = Set as Default
+    .buttonlabelcancel = Skip Integration
+    .buttonlabelcancel2 = Cancel
+
+default-client-intro = Use { -brand-short-name } as the default client for:
+
+unset-default-tooltip = It is not possible to unset { -brand-short-name } as the default client within { -brand-short-name }. To make another application the default you must use its “Set as default” dialog.
+
+checkbox-email-label =
+    .label = Email
+    .tooltiptext = { unset-default-tooltip }
+checkbox-newsgroups-label =
+    .label = Newsgroups
+    .tooltiptext = { unset-default-tooltip }
+checkbox-feeds-label =
+    .label = Feeds
+    .tooltiptext = { unset-default-tooltip }
+checkbox-calendar-label =
+    .label = Calendar
+    .tooltiptext = { unset-default-tooltip }
+
+# Note: This is the search engine name for all the different platforms.
+# Platforms that don't support it should be left blank.
+system-search-engine-name = { PLATFORM() ->
+    [macos] Spotlight
+    [windows] Windows Search
+    *[other] { "" }
+}
+
+system-search-integration-label =
+    .label = Allow { system-search-engine-name } to search messages
+    .accesskey = S
+
+check-on-startup-label =
+    .label = Always perform this check when starting { -brand-short-name }
+    .accesskey = A
diff --git a/comm/mail/locales/en-US/messenger/shortcuts.ftl b/comm/mail/locales/en-US/messenger/shortcuts.ftl
new file mode 100644
index 0000000000..89c76072b1
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/shortcuts.ftl
@@ -0,0 +1,114 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Shortcuts
+## Variables:
+##  $key (String) - The shortcut key.
+
+shortcut-key = { $key }
+
+meta-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌘ { $key }
+   *[other] Meta+{ $key }
+}
+
+ctrl-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ { $key }
+   *[other] Ctrl+{ $key }
+}
+
+shift-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⇧ { $key }
+   *[other] Shift+{ $key }
+}
+
+alt-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌥ { $key }
+   *[other] Alt+{ $key }
+}
+
+meta-ctrl-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ ⌘ { $key }
+   *[other] Meta+Ctrl+{ $key }
+}
+
+meta-alt-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌥ ⌘ { $key }
+   *[other] Meta+Alt+{ $key }
+}
+
+ctrl-alt-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ ⌥ { $key }
+   *[other] Ctrl+Alt+{ $key }
+}
+
+meta-ctrl-alt-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ ⌥ ⌘ { $key }
+   *[other] Meta+Ctrl+Alt+{ $key }
+}
+
+meta-shift-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⇧ ⌘ { $key }
+   *[other] Meta+Shift+{ $key }
+}
+
+ctrl-shift-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ ⇧ { $key }
+   *[other] Ctrl+Shift+{ $key }
+}
+
+meta-ctrl-shift-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌃ ⇧ ⌘ { $key }
+   *[other] Meta+Ctrl+Shift+{ $key }
+}
+
+alt-shift-shortcut-key = {
+  PLATFORM() ->
+    [macos] ⌥ ⇧ { $key }
+   *[other] Alt+Shift+{ $key }
+}
+
+meta-shift-alt-shortcut-key2 = {
+  PLATFORM() ->
+    [macos] ⌥ ⇧ ⌘ { $key }
+   *[other] Meta+Alt+Shift+{ $key }
+}
+
+ctrl-shift-alt-shortcut-key2 = {
+  PLATFORM() ->
+    [macos] ⌃ ⌥ ⇧ { $key }
+   *[other] Ctrl+Alt+Shift+{ $key }
+}
+
+meta-ctrl-shift-alt-shortcut-key2 = {
+  PLATFORM() ->
+    [macos] ⌃ ⌥ ⇧ ⌘ { $key }
+   *[other] Meta+Ctrl+Alt+Shift+{ $key }
+}
+
+## Shortcut and label combined strings
+
+# Variables:
+#  $title (String): The title coming from the original element.
+#  $shortcut (String): The shortcut generated from the keystroke combination.
+button-shortcut-string =
+    .title = { $title } ({ $shortcut })
+
+# Variables:
+#  $label (String): The text label coming from the original element.
+#  $shortcut (String): The shortcut generated from the keystroke combination.
+menuitem-shortcut-string =
+    .label = { $label }
+    .acceltext = { $shortcut }
diff --git a/comm/mail/locales/en-US/messenger/treeView.ftl b/comm/mail/locales/en-US/messenger/treeView.ftl
new file mode 100644
index 0000000000..d984a36bf1
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/treeView.ftl
@@ -0,0 +1,71 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Table
+
+tree-list-view-row-select =
+  .alt = Checkbox to toggle select the current row
+  .title = Select the current row
+
+tree-list-view-row-deselect =
+  .alt = Checkbox to toggle select the current row
+  .title = Deselect the current row
+
+tree-list-view-row-delete =
+  .title = Delete the current row
+
+tree-list-view-row-restore =
+  .title = Restore the current row
+
+tree-list-view-column-picker =
+  .title = Select columns to display
+
+tree-list-view-column-picker-restore =
+  .label = Restore column order
+
+tree-list-view-row-thread-button =
+  .title = This is a threaded message
+
+tree-list-view-row-ignored-thread = Thread ignored
+
+tree-list-view-row-ignored-thread-button =
+  .title = This threaded message is ignored
+
+tree-list-view-row-ignored-subthread = Subthread ignored
+
+tree-list-view-row-ignored-subthread-button =
+  .title = This subthread is ignored
+
+tree-list-view-row-watched-thread = Thread watched
+
+tree-list-view-row-watched-thread-button =
+  .title = This threaded message is watched
+
+tree-list-view-row-flagged =
+  .alt = Starred message indicator
+  .title = Message starred
+
+tree-list-view-row-flag =
+  .alt = Starred message indicator
+  .title = Message not starred
+
+tree-list-view-row-attach =
+  .alt = Attachment indicator
+  .title = Message contains attachments
+
+tree-list-view-row-spam =
+  .alt = Spam status indicator
+  .title = Message marked as spam
+
+tree-list-view-row-not-spam =
+  .alt = Spam status indicator
+  .title = Message not marked as spam
+
+tree-list-view-row-read =
+  .alt = Read status indicator
+  .title = Message read status
+
+tree-list-view-row-not-read =
+  .alt = Unread status indicator
+  .title = Message unread status
diff --git a/comm/mail/locales/en-US/messenger/troubleshootMode.ftl b/comm/mail/locales/en-US/messenger/troubleshootMode.ftl
new file mode 100644
index 0000000000..69cfa347f9
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/troubleshootMode.ftl
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+troubleshoot-mode-window =
+    .title = { -brand-short-name } Troubleshoot Mode
+    .style = width: 40em;
+
+troubleshoot-mode-description = Use { -brand-short-name } troubleshoot mode to diagnose issues. Your add-ons and customizations will be temporarily disabled.
+
+troubleshoot-mode-description2 = You can make some or all of these changes permanent:
+
+troubleshoot-mode-disable-addons =
+    .label = Disable all add-ons
+    .accesskey = D
+
+troubleshoot-mode-reset-toolbars =
+    .label = Reset toolbars and controls
+    .accesskey = R
+
+troubleshoot-mode-change-and-restart =
+    .label = Make Changes and Restart
+    .accesskey = M
+
+troubleshoot-mode-continue =
+    .label = Continue in Troubleshoot Mode
+    .accesskey = C
+
+troubleshoot-mode-quit =
+    .label =
+        { PLATFORM() ->
+            [windows] Exit
+           *[other] Quit
+        }
+    .accesskey =
+        { PLATFORM() ->
+            [windows] x
+           *[other] Q
+        }
diff --git a/comm/mail/locales/en-US/messenger/unifiedToolbar.ftl b/comm/mail/locales/en-US/messenger/unifiedToolbar.ftl
new file mode 100644
index 0000000000..59df02aee5
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/unifiedToolbar.ftl
@@ -0,0 +1,129 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### Unified Toolbar strings
+
+## Search bar
+
+search-bar-button =
+  .alt = Search
+
+search-bar-item =
+  .label = Search:
+
+search-bar-placeholder = Search…
+
+# Search bar placeholder with formatted key shortcut hint (platform dependent).
+# The key after the control modifier should match the key from quickSearchCmd.key
+# in messenger.dtd.
+search-bar-placeholder-with-key2 = {
+  PLATFORM() ->
+    [macos] {search-bar-placeholder} <kbd>⌘</kbd> <kbd>K</kbd>
+    *[other] {search-bar-placeholder} <kbd>Ctrl</kbd> + <kbd>K</kbd>
+}
+
+## Unified toolbar context menu
+
+customize-menu-customize =
+  .label = Customize…
+
+## Unified Toolbar customization
+
+customize-title = Customize Toolbars
+
+customize-space-tab-mail = Mail
+  .title = Mail
+
+customize-space-tab-addressbook = Address Book
+  .title = Address Book
+
+customize-space-tab-calendar = Calendar
+  .title = Calendar
+
+customize-space-tab-tasks = Tasks
+  .title = Tasks
+
+customize-space-tab-chat = Chat
+  .title = Chat
+
+customize-space-tab-settings = Settings
+  .title = Settings
+
+customize-restore-default = Restore default
+
+customize-change-appearance = Change appearance…
+
+customize-button-style-label = Button style:
+
+customize-button-style-icons-beside-text-option = Icons beside text
+
+customize-button-style-icons-above-text-option = Icons above text
+
+customize-button-style-icons-only-option = Icons only
+
+customize-button-style-text-only-option = Text only
+
+customize-cancel = Cancel
+
+customize-save = Save
+
+customize-unsaved-changes = Unsaved changes in other spaces
+
+customize-search-bar =
+  .label = Search toolbar buttons…
+
+customize-spaces-tabs =
+  .aria-label = Spaces
+
+customize-main-toolbar-target =
+  .aria-label = Main toolbar
+
+customize-palette-generic-title = Available for all Spaces
+
+customize-palette-mail-specific-title = Available for Mail Space only
+
+customize-palette-addressbook-specific-title = Available for Address Book Space only
+
+customize-palette-calendar-specific-title = Available for Calendar Space only
+
+customize-palette-tasks-specific-title = Available for Tasks Space only
+
+customize-palette-chat-specific-title = Available for Chat Space only
+
+customize-palette-settings-specific-title = Available for Settings Space only
+
+customize-palette-extension-specific-title = Available for this Space only
+
+## Unified toolbar customization palette context menu
+
+# Variables:
+# $target (String) - Name of the target the item should be added to.
+customize-palette-add-to =
+  .label = Add to { $target }
+
+customize-palette-add-everywhere =
+  .label = Add to all toolbars
+
+## Unified toolbar customization target context menu
+
+customize-target-forward =
+  .label = Move forward
+
+customize-target-backward =
+  .label = Move backward
+
+customize-target-remove =
+  .label = Remove
+
+customize-target-remove-everywhere =
+  .label = Remove from all toolbars
+
+customize-target-add-everywhere =
+  .label = Add to all toolbars
+
+customize-target-start =
+  .label = Move to the start
+
+customize-target-end =
+  .label = Move to the end
diff --git a/comm/mail/locales/en-US/messenger/unifiedToolbarItems.ftl b/comm/mail/locales/en-US/messenger/unifiedToolbarItems.ftl
new file mode 100644
index 0000000000..fa96706834
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/unifiedToolbarItems.ftl
@@ -0,0 +1,234 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### Unified Toolbar Item Label strings
+
+spacer-label = Flexible Space
+
+search-bar-label = Search
+
+toolbar-write-message-label = Write
+
+toolbar-write-message =
+    .title = Create a new message
+
+toolbar-move-to-label = Move to
+
+toolbar-move-to =
+    .title = Move selected message
+
+toolbar-unifinder-label = Find Events
+
+toolbar-unifinder =
+    .title = Toggle the find events pane
+
+toolbar-folder-location-label = Folder Location
+
+toolbar-folder-location =
+    .title = Switch to folder
+
+toolbar-edit-event-label = Edit
+
+toolbar-edit-event =
+    .title = Edit selected event or task
+
+toolbar-get-messages-label = Get Messages
+
+toolbar-get-messages =
+    .title = Fetch new messages for all accounts
+
+toolbar-reply-label = Reply
+
+toolbar-reply =
+    .title = Reply to the message
+
+toolbar-reply-all-label = Reply All
+
+toolbar-reply-all =
+    .title = Reply to sender and all recipients
+
+toolbar-reply-to-list-label = Reply to List
+
+toolbar-reply-to-list =
+    .title = Reply to mailing list
+
+toolbar-redirect-label = Redirect
+
+toolbar-redirect =
+    .title = Redirect selected message
+
+toolbar-archive-label = Archive
+
+toolbar-archive =
+    .title = Archive selected messages
+
+toolbar-conversation-label = Conversation
+
+toolbar-conversation =
+    .title = Show conversation of selected message
+
+toolbar-previous-unread-label = Previous Unread
+
+toolbar-previous-unread =
+    .title = Move to the previous unread message
+
+toolbar-previous-label = Previous
+
+toolbar-previous =
+    .title = Move to the previous message
+
+toolbar-next-unread-label = Next Unread
+
+toolbar-next-unread =
+    .title = Move to the next unread message
+
+toolbar-next-label = Next
+
+toolbar-next =
+    .title = Move to the next message
+
+toolbar-junk-label = Junk
+
+toolbar-junk =
+    .title = Mark the selected messages as junk
+
+toolbar-delete-label = Delete
+
+toolbar-delete-title =
+    .title = Delete the selected messages
+
+toolbar-undelete-label = Undelete
+
+toolbar-undelete =
+    .title = Undelete the selected messages
+
+toolbar-compact-label = Compact
+
+toolbar-compact =
+    .title = Remove deleted messages from selected folder
+
+toolbar-add-as-event-label = Add as Event
+
+toolbar-add-as-event =
+    .title = Extract calendaring information from the message and add it to your calendar as an event
+
+toolbar-add-as-task-label = Add as Task
+
+toolbar-add-as-task =
+    .title = Extract calendaring information from the message and add it to your calendar as a task
+
+toolbar-tag-message-label = Tag
+
+toolbar-tag-message =
+    .title = Tag messages
+
+toolbar-forward-inline-label = Forward
+
+toolbar-forward-inline =
+    .title = Forward selected message as inline text
+
+toolbar-forward-attachment-label = Forward as Attachment
+
+toolbar-forward-attachment =
+    .title = Forward selected message as an attachment
+
+toolbar-mark-as-label = Mark
+
+toolbar-mark-as =
+    .title = Mark messages
+
+toolbar-view-picker-label = View
+
+toolbar-view-picker =
+    .title = Customize view of current folder
+
+toolbar-address-book-label = Address Book
+
+toolbar-address-book =
+    .title = Go to the address book
+
+toolbar-chat-label = Chat
+
+toolbar-chat =
+    .title = Show the Chat tab
+
+toolbar-add-ons-and-themes-label = Add-ons and Themes
+
+toolbar-add-ons-and-themes =
+    .title = Manage your add-ons
+
+toolbar-calendar-label = Calendar
+
+toolbar-calendar =
+    .title = Switch to the calendar tab
+
+toolbar-tasks-label = Tasks
+
+toolbar-tasks =
+    .title = Switch to the tasks tab
+
+toolbar-mail-label = Mail
+
+toolbar-mail =
+    .title = Switch to the mail tab
+
+toolbar-print-label = Print
+
+toolbar-print =
+    .title = Print this message
+
+toolbar-quick-filter-bar-label = Quick Filter
+
+toolbar-quick-filter-bar =
+    .title = Filter messages
+
+toolbar-synchronize-label = Synchronize
+
+toolbar-synchronize =
+    .title = Reload calendars and synchronize changes
+
+toolbar-delete-event-label = Delete
+
+toolbar-delete-event =
+    .title = Delete selected events or tasks
+
+toolbar-go-to-today-label = Go to Today
+
+toolbar-go-to-today =
+    .title = Go to Today
+
+toolbar-print-event-label = Print
+
+toolbar-print-event =
+    .title = Print events or tasks
+
+toolbar-new-event-label = Event
+
+toolbar-new-event =
+    .title = Create a new event
+
+toolbar-new-task-label = Task
+
+toolbar-new-task =
+    .title = Create a new task
+
+toolbar-go-back-label = Back
+
+toolbar-go-back =
+    .title = Go back one message
+
+toolbar-go-forward-label = Forward
+
+toolbar-go-forward =
+    .title = Go forward one message
+
+toolbar-stop-label = Stop
+
+toolbar-stop =
+    .title = Stop the current transfer
+
+toolbar-throbber-label = Activity Indicator
+
+toolbar-throbber =
+    .title = Activity Indicator
diff --git a/comm/mail/locales/en-US/messenger/viewSource.ftl b/comm/mail/locales/en-US/messenger/viewSource.ftl
new file mode 100644
index 0000000000..51e110d48c
--- /dev/null
+++ b/comm/mail/locales/en-US/messenger/viewSource.ftl
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+context-text-action-find =
+    .label = Find
+    .accesskey = F
+
+context-text-action-find-again =
+    .label = Find Again
+    .accesskey = g
+
+text-action-find =
+    .label = Find
+    .accesskey = F
+
+text-action-find-again =
+    .label = Find Again
+    .accesskey = g