--- a/mail/chrome/messenger/addons.properties
+++ b/mail/chrome/messenger/addons.properties
@@ -29,17 +29,16 @@ xpinstallDisabledButton=Enable
 xpinstallDisabledButton.accesskey=n
 
 # LOCALIZATION NOTE (addonInstallBlockedByPolicy)
 # This message is shown when the installation of an add-on is blocked by
 # enterprise policy. %1$S is replaced by the name of the add-on.
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # the administration can add to the message.
 addonInstallBlockedByPolicy=%1$S (%2$S) is blocked by your system administrator.%3$S
-
 # LOCALIZATION NOTE (addonDomainBlockedByPolicy)
 # This message is shown when the installation of add-ons from a domain
 # is blocked by enterprise policy.
 addonDomainBlockedByPolicy=Your system administrator prevented this site from asking you to install software on your computer.
 
 # LOCALIZATION NOTE (addonPostInstall.message2)
 # %S is replaced with the localized named of the extension that was
 # just installed.
@@ -170,16 +169,17 @@ webextPerms.description.accountsRead2=Se
 webextPerms.description.addressBooks=Read and modify your address books and contacts
 webextPerms.description.bookmarks=Read and modify bookmarks
 webextPerms.description.browserSettings=Read and modify browser settings
 webextPerms.description.browsingData=Clear recent browsing history, cookies, and related data
 webextPerms.description.clipboardRead=Get data from the clipboard
 webextPerms.description.clipboardWrite=Input data to the clipboard
 webextPerms.description.compose=Read and modify your email messages as you compose and send them
 webextPerms.description.compose.send=Send composed email messages on your behalf
+webextPerms.description.compose.save=Save composed email messages as drafts or templates
 webextPerms.description.devtools=Extend developer tools to access your data in open tabs
 webextPerms.description.dns=Access IP address and hostname information
 webextPerms.description.downloads=Download files and read and modify the browser’s download history
 webextPerms.description.downloads.open=Open files downloaded to your computer
 # LOCALIZATION NOTE (webextPerms.description.experiment)
 # %S will be replaced with the name of the application
 webextPerms.description.experiment=Have full, unrestricted access to %S, and your computer
 webextPerms.description.find=Read the text of all open tabs

--- a/mail/messenger/aboutImport.ftl
+++ b/mail/messenger/aboutImport.ftl
@@ -6,49 +6,37 @@ 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-from-app-desc = Choose to import Accounts, Address Books, Calendars, and other data from:
-import-address-book = Import Address Book File
-import-calendar = Import Calendar File
 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-cancel = Cancel
 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
-# Variables:
-#   $app (String) - The name of the app to import from
-profiles-pane-title = Import from { $app }
-profiles-pane-desc = Choose the location from which to import
-profile-file-picker-dir = Select a profile folder
-profile-file-picker-zip = Select a zip file (smaller than 2GB)
-items-pane-title = Select what to import
-items-pane-source = Source location:
 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 }.
@@ -91,77 +79,64 @@ 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-desc = Select the file type you would like to import:
 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. Untick fields you do not want to import.
-addr-book-directories-pane-title = Select the directory you would like to import into:
 addr-book-directories-title = Select where to import the chosen data
 addr-book-directories-pane-source = Source file:
-addr-book-import-into-new-directory = Create a new directory
-
-## Import from address book file steps
-
 # $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-import-into-new-calendar = Create a new calendar
 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
 
-progress-pane-importing = Importing
-progress-pane-exporting = Exporting
-progress-pane-finished-desc = Finished.
-progress-pane-restart-desc = Restart to finish importing.
 # $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-big = The selected zip file is larger than 2GB. Please extract it first, then import from the extracted folder instead.
-error-message-extract-zip-file-failed = Failed to extract the zip file. Please extract it manually, then import from the extracted folder instead.
 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
@@ -169,30 +144,36 @@ error-message-no-profile = No profile fo
 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-desc = Export mail accounts, mail messages, address books, and settings to a zip file. When needed, you can import the zip file to restore your profile.
-export-profile-desc2 = If your current profile is larger than 2GB, we suggest you back it up by yourself.
 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-picker = Export to a zip file
 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 }

--- a/mail/messenger/addressbook/aboutAddressBook.ftl
+++ b/mail/messenger/addressbook/aboutAddressBook.ftl
@@ -21,16 +21,18 @@ about-addressbook-toolbar-import =
 
 ## Books
 
 all-address-books = All Address Books
 about-addressbook-books-context-properties =
     .label = Properties
 about-addressbook-books-context-synchronize =
     .label = Synchronise
+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
@@ -48,18 +50,18 @@ about-addressbook-confirm-remove-remote-
 ## 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-button =
-    .title = Change the list order
+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)
@@ -149,43 +151,44 @@ about-addressbook-confirm-delete-contact
 # $count (Number) - The number of contacts to be deleted.
 # $name (String) - The name of the contact to be deleted, if $count is 1.
 about-addressbook-confirm-delete-contacts =
     { $count ->
         [one] Are you sure you want to delete the contact { $name }?
        *[other] Are you sure you want to delete these { $count } contacts?
     }
 
+## Card list placeholder
+## Shown when there are no cards in the list
+
+
 ## Details
 
 about-addressbook-write-action-button = Write
 about-addressbook-event-action-button = Event
 about-addressbook-search-action-button = Search
 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-home-address-header = Home Address
-about-addressbook-details-work-address-header = Work Address
 about-addressbook-details-addresses-header = Addresses
 about-addressbook-details-notes-header = Notes
 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
 about-addressbook-entry-type-cell = Mobile
 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-department = Department
 about-addressbook-entry-name-organization = Organisation
 about-addressbook-entry-name-website = Web site
 about-addressbook-entry-name-time-zone = Time Zone
 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