diff --git a/_data/comm-beta.json b/_data/comm-beta.json
index 5930bba6..e75fab7d 100644
--- a/_data/comm-beta.json
+++ b/_data/comm-beta.json
@@ -206,7 +206,44 @@
     "calendar-invitations-decline.label"
   ],
   "calendar/calendar/calendar-item-summary.ftl": [
-    "header-comment.value"
+    "calendar-item-summary-general.value",
+    "calendar-item-summary-attendees.value",
+    "calendar-item-summary-description.value",
+    "calendar-item-summary-link.value",
+    "header-comment.value",
+    "calendar-item-summary-title",
+    "calendar-item-summary-calendar",
+    "calendar-item-summary-task-start",
+    "calendar-item-summary-event-start",
+    "calendar-item-summary-task-due",
+    "calendar-item-summary-event-end",
+    "calendar-item-summary-repeat",
+    "calendar-item-summary-location",
+    "calendar-item-summary-category",
+    "calendar-item-summary-organizer",
+    "calendar-item-summary-status",
+    "calendar-item-summary-reminder",
+    "calendar-item-summary-attachments",
+    "calendar-item-summary-status-tentative",
+    "calendar-item-summary-status-confirmed",
+    "calendar-item-summary-event-status-cancelled",
+    "calendar-item-summary-todo-status-cancelled",
+    "calendar-item-summary-status-needs-action",
+    "calendar-item-summary-status-in-process",
+    "calendar-item-summary-status-completed",
+    "calendar-item-summary-reminder-none.label",
+    "calendar-item-summary-reminder-0-minutes-before.label",
+    "calendar-item-summary-reminder-5-minutes-before.label",
+    "calendar-item-summary-reminder-15-minutes-before.label",
+    "calendar-item-summary-reminder-30-minutes-before.label",
+    "calendar-item-summary-reminder-1-hour-before.label",
+    "calendar-item-summary-reminder-2-hours-before.label",
+    "calendar-item-summary-reminder-12-hours-before.label",
+    "calendar-item-summary-reminder-1-day-before.label",
+    "calendar-item-summary-reminder-2-days-before.label",
+    "calendar-item-summary-reminder-1-week-before.label",
+    "calendar-item-summary-reminder-custom.label",
+    "calendar-item-summary-reminder-multiple.value"
   ],
   "calendar/calendar/calendar-itip-identity-dialog.ftl": [
     "calendar-itip-identity-dialog-box-title",
@@ -291,7 +328,19 @@
     "edit-button-context-menu-this-occurrence.accesskey",
     "edit-button-context-menu-all-occurrences.label",
     "edit-button-context-menu-all-occurrences.accesskey",
-    "description-context-menu-copy-link-text.label"
+    "description-context-menu-copy-link-text.label",
+    "event-accepted",
+    "event-tentative",
+    "event-declined",
+    "event-delegated",
+    "event-needs-action",
+    "task-accepted",
+    "task-tentative",
+    "task-declined",
+    "task-delegated",
+    "task-needs-action",
+    "task-in-progress",
+    "task-completed"
   ],
   "calendar/calendar/calendar-today-pane.ftl": [
     "calendar-today-pane-show-events-and-tasks.tooltiptext",
@@ -813,9 +862,9 @@
     "calendar-todaypane-button.label",
     "calendar-todaypane-button.tooltiptext",
     "calendar-search-options-searchfor.value",
-    "calendar-server-dialog-title-edit.title",
+    "calendar-properties-dialog-title",
     "calendar-server-dialog-name-label.value",
-    "calendar-publish-dialog-title.title",
+    "calendar-publish-dialog-window-title",
     "calendar-publish-url-label",
     "calendar-publish-publish-dialog-button.buttonlabelaccept",
     "calendar-publish-close-button",
@@ -823,11 +872,37 @@
     "calendar-error-detail.label",
     "calendar-error-code.value",
     "calendar-error-description.value",
-    "calendar-error-title.title",
+    "calendar-error-prompt-title",
     "calendar-extract-event-button.label",
     "calendar-extract-event-button.tooltiptext",
     "calendar-extract-task-button.label",
-    "calendar-extract-task-button.tooltiptext"
+    "calendar-extract-task-button.tooltiptext",
+    "new-event-input.placeholder",
+    "new-task-input.placeholder",
+    "item-menu-label-event.label",
+    "item-menu-label-event.accesskey",
+    "item-menu-label-task.label",
+    "item-menu-label-task.accesskey",
+    "specify-link-location",
+    "enter-link-location",
+    "attach-via-filelink",
+    "select-a-file",
+    "counter-accepted",
+    "counter-tentative",
+    "counter-declined",
+    "counter-delegated",
+    "counter-needs-action",
+    "counter-on-previous-version-notification",
+    "counter-on-counter-disallowed-notification",
+    "sendandclose-button.label",
+    "sendandclose-button.tooltiptext",
+    "saveandsend-button.label",
+    "saveandsend-button.tooltiptext",
+    "saveandsend-menu.label",
+    "sendandclose-menu.label",
+    "event-recurrence-forever.label",
+    "attendees-tab-label",
+    "attachments-tab-label"
   ],
   "calendar/calendar/categories.ftl": [
     "categories2"
@@ -1258,22 +1333,7 @@
     "event.attendee.usertype.unknown",
     "timezone.title.label",
     "event.timezone.custom.label",
-    "read.only.general.label",
-    "read.only.title.label",
-    "read.only.calendar.label",
-    "read.only.event.start.label",
-    "read.only.task.start.label",
-    "read.only.event.end.label",
-    "read.only.task.due.label",
-    "read.only.repeat.label",
-    "read.only.location.label",
-    "read.only.category.label",
     "read.only.organizer.label",
-    "read.only.reminder.label",
-    "read.only.attachments.label",
-    "read.only.attendees.label",
-    "read.only.description.label",
-    "read.only.link.label",
     "summary.dialog.saveclose.label",
     "summary.dialog.saveclose.tooltiptext",
     "summary.dialog.accept.label",
@@ -1287,47 +1347,6 @@
     "summary.dialog.send.label",
     "summary.dialog.send.tooltiptext"
   ],
-  "calendar/chrome/calendar/calendar-event-dialog.properties": [
-    "newEvent",
-    "newTask",
-    "itemMenuLabelEvent",
-    "itemMenuAccesskeyEvent2",
-    "itemMenuLabelTask",
-    "itemMenuAccesskeyTask2",
-    "specifyLinkLocation",
-    "enterLinkLocation",
-    "summaryDueTaskLabel",
-    "attachViaFilelink",
-    "selectAFile",
-    "eventRecurrenceForeverLabel",
-    "counterSummaryAccepted",
-    "counterSummaryDeclined",
-    "counterSummaryDelegated",
-    "counterSummaryNeedsAction",
-    "counterSummaryTentative",
-    "counterOnPreviousVersionNotification",
-    "counterOnCounterDisallowedNotification",
-    "eventAccepted",
-    "eventTentative",
-    "eventDeclined",
-    "eventDelegated",
-    "eventNeedsAction",
-    "taskAccepted",
-    "taskTentative",
-    "taskDeclined",
-    "taskDelegated",
-    "taskNeedsAction",
-    "taskInProgress",
-    "taskCompleted",
-    "sendandcloseButtonLabel",
-    "sendandcloseButtonTooltip",
-    "saveandsendButtonLabel",
-    "saveandsendButtonTooltip",
-    "saveandsendMenuLabel",
-    "sendandcloseMenuLabel",
-    "attendeesTabLabel",
-    "attachmentsTabLabel"
-  ],
   "calendar/chrome/calendar/calendar-extract.properties": [
     "start.prefix",
     "start.suffix",
@@ -3726,75 +3745,6 @@
     "productHelpMac.commandkey",
     "productHelpMac.modifiers"
   ],
-  "mail/chrome/messenger/charsetTitles.properties": [
-    "iso-8859-1.title",
-    "iso-8859-2.title",
-    "iso-8859-3.title",
-    "iso-8859-4.title",
-    "iso-8859-10.title",
-    "iso-8859-13.title",
-    "iso-8859-14.title",
-    "iso-8859-15.title",
-    "iso-8859-16.title",
-    "windows-1250.title",
-    "windows-1252.title",
-    "windows-1254.title",
-    "windows-1257.title",
-    "macintosh.title",
-    "x-mac-ce.title",
-    "x-mac-turkish.title",
-    "x-mac-croatian.title",
-    "x-mac-romanian.title",
-    "x-mac-icelandic.title",
-    "iso-2022-jp.title",
-    "shift_jis.title",
-    "euc-jp.title",
-    "big5.title",
-    "big5-hkscs.title",
-    "gb2312.title",
-    "gbk.title",
-    "euc-kr.title",
-    "utf-7.title",
-    "utf-8.title",
-    "utf-16.title",
-    "utf-16le.title",
-    "utf-16be.title",
-    "iso-8859-5.title",
-    "windows-1251.title",
-    "x-mac-cyrillic.title",
-    "x-mac-ukrainian.title",
-    "koi8-r.title",
-    "koi8-u.title",
-    "iso-8859-7.title",
-    "windows-1253.title",
-    "x-mac-greek.title",
-    "windows-1258.title",
-    "windows-874.title",
-    "iso-8859-6.title",
-    "iso-8859-8.title",
-    "iso-8859-8-i.title",
-    "windows-1255.title",
-    "windows-1256.title",
-    "x-user-defined.title",
-    "ibm866.title",
-    "gb18030.title",
-    "x-mac-arabic.title",
-    "x-mac-farsi.title",
-    "x-mac-hebrew.title",
-    "x-mac-devanagari.title",
-    "x-mac-gujarati.title",
-    "x-mac-gurmukhi.title",
-    "chardet.off.title",
-    "chardet.universal_charset_detector.title",
-    "chardet.ja_parallel_state_machine.title",
-    "chardet.ko_parallel_state_machine.title",
-    "chardet.zhtw_parallel_state_machine.title",
-    "chardet.zhcn_parallel_state_machine.title",
-    "chardet.zh_parallel_state_machine.title",
-    "chardet.cjk_parallel_state_machine.title",
-    "chardet.ruprob.title",
-    "chardet.ukprob.title"
-  ],
   "mail/chrome/messenger/chat.dtd": [
     "onlineContactsHeader.label",
     "offlineContactsHeader.label",
@@ -3945,47 +3895,6 @@
     "deleteContactTitle",
     "deleteContactMessage"
   ],
-  "mail/chrome/messenger/folderProps.dtd": [
-    "folderProps.windowtitle.label",
-    "generalInfo.label",
-    "folderRebuildSummaryFileTip2.label",
-    "folderRebuildSummaryFile2.label",
-    "folderRebuildSummaryFile2.accesskey",
-    "folderRebuildSummaryFile.explanation",
-    "folderIncludeInGlobalSearch.label",
-    "folderIncludeInGlobalSearch.accesskey",
-    "folderSynchronizationTab.label",
-    "folderCheckForNewMessages2.label",
-    "folderCheckForNewMessages2.accesskey",
-    "offlineFolder.check.label",
-    "offlineFolder.check.accesskey",
-    "offlineFolder.button.label",
-    "offlineFolder.button.accesskey",
-    "selectofflineNewsgroup.check.label",
-    "selectofflineNewsgroup.check.accesskey",
-    "offlineNewsgroup.button.label",
-    "offlineNewsgroup.button.accesskey",
-    "folderProps.name.label",
-    "folderProps.name.accesskey",
-    "folderProps.color.label",
-    "folderProps.color.accesskey",
-    "folderProps.reset.tooltip",
-    "folderProps.location.label",
-    "folderProps.location.accesskey",
-    "folderSharingTab.label",
-    "privileges.button.label",
-    "privileges.button.accesskey",
-    "permissionsDesc.label",
-    "folderOtherUsers.label",
-    "folderType.label",
-    "folderQuotaTab.label",
-    "folderQuotaUsage.label",
-    "folderQuotaStatus.label",
-    "numberOfMessages.label",
-    "numberUnknown.label",
-    "sizeOnDisk.label",
-    "sizeUnknown.label"
-  ],
   "mail/chrome/messenger/folderpane.dtd": [
     "nameColumn.label",
     "unreadColumn.label",
@@ -4202,7 +4111,6 @@
     "imapServerDoesntSupportAcl",
     "imapAclExpungeRight",
     "imapServerDisconnected",
-    "imapSubscribePrompt",
     "imapServerDroppedConnection2",
     "imapQuotaStatusFolderNotOpen",
     "imapQuotaStatusNotSupported",
@@ -5231,8 +5139,6 @@
     "confirmSavedSearchDeleteMessage",
     "passwordPrompt",
     "passwordTitle",
-    "editVirtualFolderPropertiesTitle",
-    "alertNoSearchFoldersSelected",
     "byteAbbreviation2",
     "kiloByteAbbreviation2",
     "megaByteAbbreviation2",
@@ -6824,19 +6730,6 @@
     "MdnDeniedReceipt",
     "MdnFailedReceipt"
   ],
-  "mail/chrome/messenger/newFolderDialog.dtd": [
-    "newFolderDialog.title",
-    "name.label",
-    "name.accesskey",
-    "description.label",
-    "description.accesskey",
-    "folderRestriction1.label",
-    "folderRestriction2.label",
-    "foldersOnly.label",
-    "messagesOnly.label",
-    "accept.label",
-    "accept.accesskey"
-  ],
   "mail/chrome/messenger/offline.properties": [
     "downloadMessagesWindowTitle1",
     "downloadMessagesLabel1",
@@ -7070,31 +6963,6 @@
     "authMethod.label",
     "authMethod.accesskey"
   ],
-  "mail/chrome/messenger/subscribe.dtd": [
-    "subscribeDialog.title",
-    "newGroupsTab.label",
-    "newGroupsTab.accesskey",
-    "refreshButton.label",
-    "refreshButton.accesskey",
-    "stopButton.label",
-    "stopButton.accesskey",
-    "server.label",
-    "server.accesskey",
-    "subscribedHeader.label",
-    "namefield.label",
-    "namefield.accesskey"
-  ],
-  "mail/chrome/messenger/subscribe.properties": [
-    "subscribeLabel-nntp",
-    "subscribeLabel-imap",
-    "currentListTab-nntp.label",
-    "currentListTab-nntp.accesskey",
-    "currentListTab-imap.label",
-    "currentListTab-imap.accesskey",
-    "pleaseWaitString",
-    "offlineState",
-    "errorPopulating"
-  ],
   "mail/chrome/messenger/tabmail.dtd": [
     "closeTab.label",
     "listAllTabs.label",
@@ -7236,27 +7104,6 @@
     "fullZoom.label",
     "fullZoom.accesskey"
   ],
-  "mail/chrome/messenger/virtualFolderListDialog.dtd": [
-    "virtualFolderListTitle.title",
-    "virtualFolderDesc.label"
-  ],
-  "mail/chrome/messenger/virtualFolderProperties.dtd": [
-    "virtualFolderProperties.title",
-    "name.label",
-    "name.accesskey",
-    "description.label",
-    "description.accesskey",
-    "searchTermCaption.label",
-    "folderSelectionCaption.label",
-    "chooseFoldersButton.label",
-    "chooseFoldersButton.accesskey",
-    "searchOnline.label",
-    "searchOnline.accesskey",
-    "newFolderButton.label",
-    "newFolderButton.accesskey",
-    "editFolderButton.label",
-    "editFolderButton.accesskey"
-  ],
   "mail/chrome/mozldap/ldap.properties": [
     "authPromptTitle",
     "authPromptText",
@@ -8160,7 +8007,9 @@
     "account-hub-email-finish-button",
     "account-hub-email-manually-configure-button",
     "account-hub-email-continue-button",
+    "account-hub-email-set-up-account-button",
     "account-hub-email-confirm-button",
+    "account-hub-email-find-settings-button",
     "account-hub-result-incoming-legend",
     "account-hub-result-outgoing-legend",
     "account-hub-all-servers-legend",
@@ -8173,20 +8022,20 @@
     "account-hub-result-port-label",
     "account-hub-result-security-label",
     "account-hub-result-authentication-type-label",
-    "account-hub-result-auth-none",
-    "account-hub-result-auth-none.title",
-    "account-hub-result-auth-password",
-    "account-hub-result-auth-password.title",
-    "account-hub-result-auth-encrypted-password",
-    "account-hub-result-auth-encrypted-password.title",
-    "account-hub-result-auth-gssapi",
-    "account-hub-result-auth-gssapi.title",
-    "account-hub-result-auth-ntlm",
-    "account-hub-result-auth-ntlm.title",
-    "account-hub-result-auth-external",
-    "account-hub-result-auth-external.title",
-    "account-hub-result-auth-oauth2",
-    "account-hub-result-auth-oauth2.title",
+    "account-hub-result-authentication-none",
+    "account-hub-result-authentication-none.title",
+    "account-hub-result-authentication-password",
+    "account-hub-result-authentication-password.title",
+    "account-hub-result-authentication-encrypted-password",
+    "account-hub-result-authentication-encrypted-password.title",
+    "account-hub-result-authentication-gssapi",
+    "account-hub-result-authentication-gssapi.title",
+    "account-hub-result-authentication-ntlm",
+    "account-hub-result-authentication-ntlm.title",
+    "account-hub-result-authentication-external",
+    "account-hub-result-authentication-external.title",
+    "account-hub-result-authentication-oauth2",
+    "account-hub-result-authentication-oauth2.title",
     "account-hub-on-port-label",
     "account-hub-auto-description",
     "account-hub-ssl-label",
@@ -8196,6 +8045,21 @@
     "account-hub-ssl-noencryption-option.label",
     "account-hub-auth-no-authentication-option.label",
     "account-hub-auth-label",
+    "account-hub-exchange-type-title",
+    "account-hub-exchange-type-account-type",
+    "account-hub-card-graph-title",
+    "account-hub-card-graph-description",
+    "account-hub-card-ews-title",
+    "account-hub-card-ews-tag",
+    "account-hub-card-ews-description",
+    "account-hub-card-recommended-description",
+    "account-hub-exchange-type-username",
+    "account-hub-exchange-type-username-hint",
+    "account-hub-exchange-type-authentication",
+    "account-hub-exchange-type-default-oauth",
+    "account-hub-exchange-type-oauth-tenant",
+    "account-hub-exchange-type-oauth-app",
+    "account-hub-exchange-type-advanced-config",
     "account-hub-result-username-label",
     "account-hub-result-username-label.title",
     "account-hub-name-label",
@@ -8211,7 +8075,10 @@
     "account-hub-email-setup-header",
     "account-hub-email-setup-incoming",
     "account-hub-email-setup-outgoing",
+    "account-hub-email-exchange-settings",
     "account-hub-email-connect-settings",
+    "account-hub-email-protocol-select-header",
+    "account-hub-email-protocol-select-notification",
     "account-hub-email-enter-password",
     "account-hub-email-sync-accounts",
     "account-hub-test-configuration",
@@ -8220,8 +8087,8 @@
     "account-hub-result-pop-description",
     "account-hub-result-ews-shortname",
     "account-hub-result-ews-description",
-    "account-hub-result-graph-shortname",
-    "account-hub-result-graph-description",
+    "account-hub-result-graph-api-shortname",
+    "account-hub-result-graph-api-description",
     "account-hub-result-exchange-description",
     "account-hub-result-ews-text",
     "account-hub-result-ews-expanded-text",
@@ -8258,6 +8125,7 @@
     "account-hub-port-error-text.title",
     "account-hub-username-error-text",
     "account-hub-username-error-text.title",
+    "account-hub-manual-config-error-summary",
     "account-hub-oauth-pending",
     "account-hub-addon-install-button",
     "account-hub-addon-error",
@@ -8266,14 +8134,14 @@
     "account-hub-add-address-book",
     "address-book-sync-existing-icon.alt",
     "address-book-sync-existing",
-    "address-book-add-remote-icon.alt",
+    "address-book-add-remote-icon2.alt",
     "address-book-add-remote",
-    "address-book-add-remote-description",
+    "address-book-add-remote-carddav-description",
     "address-book-add-local-icon.alt",
     "address-book-add-local",
     "address-book-add-local-description",
-    "address-book-add-ldap-icon.alt",
-    "address-book-add-ldap",
+    "address-book-add-ldap-icon2.alt",
+    "address-book-add-ldap-button",
     "address-book-add-ldap-description",
     "account-hub-address-book-sync-books-data",
     "address-book-sync-existing-description",
@@ -8316,6 +8184,7 @@
     "address-book-ldap-creation-error",
     "account-hub-email-setup-ews",
     "account-hub-result-exchange-url-label",
+    "account-hub-exchange-service-url-label",
     "account-hub-email-credentials-confirmation",
     "account-hub-result-unknown-hostname",
     "account-hub-result-unknown-cert",
@@ -8346,12 +8215,12 @@
     "account-hub-installing-addon",
     "account-hub-success-addon",
     "account-hub-success-half-manual",
-    "account-hub-result-no-encryption",
-    "account-hub-result-no-encryption.title",
-    "account-hub-result-ssl",
-    "account-hub-result-ssl.title",
-    "account-hub-result-starttls",
-    "account-hub-result-starttls.title",
+    "account-hub-result-security-no-encryption",
+    "account-hub-result-security-no-encryption.title",
+    "account-hub-result-security-ssl",
+    "account-hub-result-security-ssl.title",
+    "account-hub-result-security-starttls",
+    "account-hub-result-security-starttls.title",
     "account-hub-credentials-wrong",
     "account-hub-find-settings-failed",
     "account-hub-exchange-config-unverifiable",
@@ -8368,8 +8237,17 @@
     "account-hub-calendars-button",
     "account-hub-thundermail-button",
     "account-hub-thundermail-divider-text",
+    "account-hub-manual-config-imap-title",
+    "account-hub-manual-config-pop3-title",
+    "account-hub-manual-config-review-settings-title",
     "account-hub-manual-config-incoming-legend",
-    "account-hub-manual-config-outgoing-legend"
+    "account-hub-manual-config-outgoing-legend",
+    "account-hub-same-username-checkbox",
+    "account-hub-protocol-imap",
+    "account-hub-protocol-microsoft",
+    "account-hub-protocol-pop3",
+    "account-hub-oauth-unsupported-title",
+    "account-hub-oauth-unsupported-description"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -9319,6 +9197,43 @@
     "folder-widgets-no-folders"
   ],
   "mail/messenger/folderprops.ftl": [
+    "folder-props-window-title",
+    "folder-props-general-tab.label",
+    "folder-props-name.value",
+    "folder-props-name.accesskey",
+    "folder-props-color.value",
+    "folder-props-color.accesskey",
+    "folder-props-reset-color.tooltiptext",
+    "folder-props-location.value",
+    "folder-props-location.accesskey",
+    "folder-props-number-of-messages.value",
+    "folder-props-number-unknown.value",
+    "folder-props-size-on-disk.value",
+    "folder-props-size-unknown.value",
+    "folder-props-rebuild-summary.label",
+    "folder-props-rebuild-summary.accesskey",
+    "folder-props-rebuild-summary.tooltiptext",
+    "folder-props-include-in-global-search.label",
+    "folder-props-include-in-global-search.accesskey",
+    "folder-props-check-for-new-messages.label",
+    "folder-props-check-for-new-messages.accesskey",
+    "folder-props-rebuild-summary-explanation",
+    "folder-props-synchronization-tab.label",
+    "folder-props-select-for-offline.label",
+    "folder-props-select-for-offline.accesskey",
+    "folder-props-download-now.label",
+    "folder-props-download-now.accesskey",
+    "folder-props-select-newsgroup-for-offline.label",
+    "folder-props-select-newsgroup-for-offline.accesskey",
+    "folder-props-download-newsgroup-now.label",
+    "folder-props-download-newsgroup-now.accesskey",
+    "folder-props-sharing-tab.label",
+    "folder-props-privileges.label",
+    "folder-props-privileges.accesskey",
+    "folder-props-permissions.value",
+    "folder-props-other-users.value",
+    "folder-props-type.value",
+    "folder-props-quota-tab.label",
     "quota-percent-used"
   ],
   "mail/messenger/glodaFacetView.ftl": [
@@ -9395,7 +9310,7 @@
     "menu-quit.label",
     "menu-quit.accesskey",
     "menu-quit-mac.label",
-    "system-tray-menu-quit.label",
+    "system-tray-menuitem-quit",
     "quit-app-shortcut.key",
     "toolbar-spam-button.label",
     "toolbar-spam-button.tooltiptext",
@@ -9442,6 +9357,25 @@
     "file-new-ldap-addressbook.label",
     "file-new-ldap-addressbook.accesskey"
   ],
+  "mail/messenger/menulist-charsetpicker.ftl": [
+    "charset-utf-8",
+    "charset-big5",
+    "charset-euc-kr",
+    "charset-gbk",
+    "charset-koi8-r",
+    "charset-iso-2022-jp",
+    "charset-iso-8859-1",
+    "charset-iso-8859-2",
+    "charset-iso-8859-7",
+    "charset-windows-874",
+    "charset-windows-1250",
+    "charset-windows-1251",
+    "charset-windows-1252",
+    "charset-windows-1255",
+    "charset-windows-1256",
+    "charset-windows-1257",
+    "charset-windows-1258"
+  ],
   "mail/messenger/messageheader/headerFields.ftl": [
     "message-header-to-list-name",
     "message-header-from-list-name",
@@ -10028,6 +9962,19 @@
     "max-count-exceeded",
     "max-thread-count-exceeded"
   ],
+  "mail/messenger/new-folder-dialog.ftl": [
+    "new-folder-dialog-title",
+    "new-folder-dialog-accept-button.buttonlabelaccept",
+    "new-folder-dialog-accept-button.buttonaccesskeyaccept",
+    "new-folder-name-label",
+    "new-folder-name-label.accesskey",
+    "new-folder-description-label",
+    "new-folder-description-label.accesskey",
+    "new-folder-restriction-1",
+    "new-folder-restriction-2",
+    "new-folder-folders-only.label",
+    "new-folder-messages-only.label"
+  ],
   "mail/messenger/newmailalert.ftl": [
     "new-mail-alert-message"
   ],
@@ -11427,8 +11374,10 @@
     "add-opensearch-provider-text",
     "adding-opensearch-provider-failed-title",
     "adding-opensearch-provider-failed-text",
-    "minimize-to-tray-label.label",
-    "minimize-to-tray-label.accesskey",
+    "close-to-tray-label.label",
+    "close-to-tray-label.accesskey",
+    "start-in-tray-label.label",
+    "start-in-tray-label.accesskey",
     "new-message-arrival",
     "mail-play-sound-label.label",
     "mail-play-sound-label.accesskey",
@@ -11453,6 +11402,8 @@
     "mail-browse-sound-button.accesskey",
     "enable-gloda-search-label.label",
     "enable-gloda-search-label.accesskey",
+    "gloda-show-results-as-list-label.label",
+    "gloda-show-results-as-list-label.accesskey",
     "datetime-formatting-legend",
     "language-selector-legend",
     "allow-hw-accel.label",
@@ -12259,6 +12210,28 @@
     "configured-cert-failure-use-anyway-detail-v2",
     "configured-cert-failure-use-anyway-v2"
   ],
+  "mail/messenger/subscribe.ftl": [
+    "subscribe-window-title",
+    "subscribe-server",
+    "subscribe-server.accesskey",
+    "subscribe-namefield",
+    "subscribe-namefield.accesskey",
+    "subscribe-new-groups-tab.label",
+    "subscribe-new-groups-tab.accesskey",
+    "subscribe-refresh-button.label",
+    "subscribe-refresh-button.accesskey",
+    "subscribe-stop-button.label",
+    "subscribe-stop-button.accesskey",
+    "subscribe-label-nntp",
+    "subscribe-label-imap",
+    "subscribe-current-list-tab-nntp.label",
+    "subscribe-current-list-tab-nntp.accesskey",
+    "subscribe-current-list-tab-imap.label",
+    "subscribe-current-list-tab-imap.accesskey",
+    "subscribe-please-wait",
+    "subscribe-offline",
+    "subscribe-error-populating"
+  ],
   "mail/messenger/syncAccounts.ftl": [
     "sync-verification-sent-title",
     "sync-verification-sent-body",
@@ -12488,7 +12461,26 @@
     "text-action-find-again.accesskey"
   ],
   "mail/messenger/virtualFolderProperties.ftl": [
-    "virtual-folder-sources-chosen"
+    "virtual-folder-sources-chosen",
+    "virtual-folder-no-search-folders-selected",
+    "virtual-folder-properties-title",
+    "virtual-folder-properties-edit-title",
+    "virtual-folder-name",
+    "virtual-folder-name.accesskey",
+    "virtual-folder-description",
+    "virtual-folder-description.accesskey",
+    "virtual-folder-folder-selection-caption",
+    "virtual-folder-choose-folders-button.label",
+    "virtual-folder-choose-folders-button.accesskey",
+    "virtual-folder-search-online.label",
+    "virtual-folder-search-online.accesskey",
+    "virtual-folder-search-term-caption",
+    "virtual-folder-accept-button-create.label",
+    "virtual-folder-accept-button-create.accesskey",
+    "virtual-folder-accept-button-update.label",
+    "virtual-folder-accept-button-update.accesskey",
+    "virtual-folder-list-title",
+    "virtual-folder-list-desc"
   ],
   "mail/updater/updater.ini": [
     "Strings.TitleText",
diff --git a/_data/comm-release.json b/_data/comm-release.json
index 64420531..5930bba6 100644
--- a/_data/comm-release.json
+++ b/_data/comm-release.json
@@ -205,6 +205,9 @@
     "calendar-invitations-accept.label",
     "calendar-invitations-decline.label"
   ],
+  "calendar/calendar/calendar-item-summary.ftl": [
+    "header-comment.value"
+  ],
   "calendar/calendar/calendar-itip-identity-dialog.ftl": [
     "calendar-itip-identity-dialog-box-title",
     "calendar-itip-identity-warning-body",
@@ -2597,7 +2600,7 @@
     "gtalk-protocol-name",
     "odnoklassniki-protocol-name",
     "gtalk-disabled",
-    "odnoklassniki-username-hint",
+    "odnoklassniki-disabled",
     "command-join3",
     "command-part2",
     "command-topic",
@@ -3657,8 +3660,8 @@
     "openpgpKey.accesskey"
   ],
   "mail/chrome/messenger/am-smime.properties": [
-    "NoSenderSigningCert",
-    "NoSenderEncryptionCert",
+    "SenderSigningCertInvalid",
+    "SenderEncryptionCertInvalid",
     "MissingRecipientEncryptionCert",
     "ErrorEncryptMail",
     "ErrorCanNotSignMail",
@@ -4694,16 +4697,6 @@
     "watchThreadMenu.key",
     "tagMenu.label",
     "tagMenu.accesskey",
-    "tagCmd0.key",
-    "tagCmd1.key",
-    "tagCmd2.key",
-    "tagCmd3.key",
-    "tagCmd4.key",
-    "tagCmd5.key",
-    "tagCmd6.key",
-    "tagCmd7.key",
-    "tagCmd8.key",
-    "tagCmd9.key",
     "markMenu.label",
     "markMenu.accesskey",
     "toggleReadCmd.key",
@@ -4864,10 +4857,6 @@
     "appmenuNewMsgCmd.label",
     "appmenuNewContactCmd.label",
     "appmenuToolbarLayout.label",
-    "addNewTag.label",
-    "addNewTag.accesskey",
-    "manageTags.label",
-    "manageTags.accesskey",
     "folderNameColumn.label",
     "folderUnreadColumn.label",
     "folderTotalColumn.label",
@@ -5083,7 +5072,6 @@
     "markFolderRead",
     "markNewsgroupRead",
     "folderProperties",
-    "newTag",
     "advanceNextPrompt",
     "titleNewsPreHost",
     "replyToSender",
@@ -5172,13 +5160,6 @@
     "templatesFolderName",
     "outboxFolderName",
     "archivesFolderName",
-    "mailnews.tags.remove",
-    "mailnews.labels.description.1",
-    "mailnews.labels.description.2",
-    "mailnews.labels.description.3",
-    "mailnews.labels.description.4",
-    "mailnews.labels.description.5",
-    "mailnews.tags.format",
     "mailnews.search_date_format",
     "mailnews.search_date_separator",
     "mailnews.search_date_leading_zeros",
@@ -5250,8 +5231,6 @@
     "confirmSavedSearchDeleteMessage",
     "passwordPrompt",
     "passwordTitle",
-    "tagExists",
-    "editTagTitle",
     "editVirtualFolderPropertiesTitle",
     "alertNoSearchFoldersSelected",
     "byteAbbreviation2",
@@ -7804,12 +7783,14 @@
     "atn-addons-heading-search-input.placeholder",
     "atn-addons-heading-search-button.title",
     "atn-addons-heading-search-button.aria-label",
-    "details-notification-suppressed-esr.message"
+    "details-notification-suppressed-esr-2.message"
   ],
   "mail/messenger/aboutDialog.ftl": [
     "about-update-whats-new",
     "about-dialog-title",
     "release-notes-link",
+    "about-dialog-meadow-logo.alt",
+    "about-dialog-meadow-logo.title",
     "update-internal-error",
     "update-check-for-updates-button",
     "update-check-for-updates-button.accesskey",
@@ -8180,14 +8161,32 @@
     "account-hub-email-manually-configure-button",
     "account-hub-email-continue-button",
     "account-hub-email-confirm-button",
-    "account-hub-result-incoming-server-legend",
-    "account-hub-result-incoming-server-legend.title",
-    "account-hub-result-outgoing-server-legend",
-    "account-hub-result-outgoing-server-legend.title",
+    "account-hub-result-incoming-legend",
+    "account-hub-result-outgoing-legend",
+    "account-hub-all-servers-legend",
     "account-hub-protocol-label",
     "account-hub-result-hostname-label",
     "account-hub-result-hostname-label.title",
     "account-hub-result-socket-type-label",
+    "account-hub-servers-username-label",
+    "account-hub-result-server-label",
+    "account-hub-result-port-label",
+    "account-hub-result-security-label",
+    "account-hub-result-authentication-type-label",
+    "account-hub-result-auth-none",
+    "account-hub-result-auth-none.title",
+    "account-hub-result-auth-password",
+    "account-hub-result-auth-password.title",
+    "account-hub-result-auth-encrypted-password",
+    "account-hub-result-auth-encrypted-password.title",
+    "account-hub-result-auth-gssapi",
+    "account-hub-result-auth-gssapi.title",
+    "account-hub-result-auth-ntlm",
+    "account-hub-result-auth-ntlm.title",
+    "account-hub-result-auth-external",
+    "account-hub-result-auth-external.title",
+    "account-hub-result-auth-oauth2",
+    "account-hub-result-auth-oauth2.title",
     "account-hub-on-port-label",
     "account-hub-auto-description",
     "account-hub-ssl-label",
@@ -8212,7 +8211,7 @@
     "account-hub-email-setup-header",
     "account-hub-email-setup-incoming",
     "account-hub-email-setup-outgoing",
-    "account-hub-email-config-found",
+    "account-hub-email-connect-settings",
     "account-hub-email-enter-password",
     "account-hub-email-sync-accounts",
     "account-hub-test-configuration",
@@ -8225,15 +8224,18 @@
     "account-hub-result-graph-description",
     "account-hub-result-exchange-description",
     "account-hub-result-ews-text",
+    "account-hub-result-ews-expanded-text",
+    "account-hub-result-graph-expanded-text",
     "account-hub-result-recommended-label",
     "account-hub-result-addon-label",
     "account-hub-edit-configuration",
-    "account-hub-config-success",
-    "account-hub-config-success-exchange",
-    "account-hub-config-success-guess",
-    "account-hub-config-success-disk",
-    "account-hub-config-success-isp",
-    "account-hub-config-success-unknown",
+    "account-hub-config-success-title",
+    "account-hub-config-success-description-db",
+    "account-hub-config-success-description-exchange",
+    "account-hub-config-success-description-guess",
+    "account-hub-config-success-description-disk",
+    "account-hub-config-success-description-isp",
+    "account-hub-config-success-description-read-more",
     "account-hub-password-info",
     "account-hub-creating-account",
     "account-hub-sync-accounts-found",
@@ -8345,8 +8347,11 @@
     "account-hub-success-addon",
     "account-hub-success-half-manual",
     "account-hub-result-no-encryption",
+    "account-hub-result-no-encryption.title",
     "account-hub-result-ssl",
+    "account-hub-result-ssl.title",
     "account-hub-result-starttls",
+    "account-hub-result-starttls.title",
     "account-hub-credentials-wrong",
     "account-hub-find-settings-failed",
     "account-hub-exchange-config-unverifiable",
@@ -8362,7 +8367,9 @@
     "account-hub-address-books-button",
     "account-hub-calendars-button",
     "account-hub-thundermail-button",
-    "account-hub-thundermail-divider-text"
+    "account-hub-thundermail-divider-text",
+    "account-hub-manual-config-incoming-legend",
+    "account-hub-manual-config-outgoing-legend"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -8551,7 +8558,11 @@
     "gloda-indexing-status-exact",
     "gloda-indexing-folder-status-exact",
     "gloda-indexed-folder",
-    "gloda-indexed-folder-status"
+    "gloda-indexed-folder-status",
+    "extension-send-activity-live",
+    "extension-send-activity-progress",
+    "extension-send-activity-event",
+    "extension-send-activity-event-status"
   ],
   "mail/messenger/activityFeedback.ftl": [
     "looking-for-messages-account",
@@ -9061,17 +9072,18 @@
     "cert-error-expired",
     "cert-error-not-yet-valid",
     "cert-error-untrusted-default",
+    "cert-error-ssl-connection-error",
     "cert-error-inline-domain-mismatch.title",
     "cert-error-inline-expired.title",
     "cert-error-inline-not-yet-valid.title",
     "cert-error-inline-untrusted-default.title",
+    "cert-error-inline-ssl-connection-error.title",
     "certificate-check-test-button",
     "certificate-check-view-button",
     "certificate-check-add-exception-button",
     "certificate-check-remove-exception-button",
     "certificate-checking",
     "certificate-test-success",
-    "certificate-test-failure",
     "certificate-check-exception-added",
     "certificate-check-exception-removed",
     "certificate-check-exception-exists"
@@ -9156,6 +9168,8 @@
     "webext-perms-description-messagesDelete",
     "webext-perms-description-messagesRead2",
     "webext-perms-description-messagesUpdate",
+    "webext-perms-description-messages-send",
+    "webext-perms-description-messages-save",
     "webext-perms-description-messagesTags",
     "webext-perms-description-messagesTagsList",
     "webext-perms-description-sensitiveDataUpload",
@@ -9169,8 +9183,8 @@
   "mail/messenger/extensionsUI.ftl": [
     "webext-experiment-warning",
     "webext-perms-learn-more",
-    "webext-install-suppressed-message",
-    "webext-install-suppressed-details",
+    "webext-install-suppressed-message-2",
+    "webext-install-suppressed-details-2",
     "addon-post-install-message"
   ],
   "mail/messenger/feeds.ftl": [
@@ -9788,7 +9802,21 @@
     "ignored-subtheads-feedback",
     "attachment-view-attachment-count",
     "allow-remote-content-resource.label",
-    "remote-content-option-allow-all.label"
+    "remote-content-option-allow-all.label",
+    "tags-label-1",
+    "tags-label-2",
+    "tags-label-3",
+    "tags-label-4",
+    "tags-label-5",
+    "tags-add-new.label",
+    "tags-add-new.accesskey",
+    "tags-manage.label",
+    "tags-manage.accesskey",
+    "tags-remove-all.label",
+    "tags-remove-all.accesskey",
+    "tags-format-with-accesskey.label",
+    "tags-format-with-accesskey.accesskey",
+    "tags-format-without-accesskey.label"
   ],
   "mail/messenger/messengercompose/messengercompose.ftl": [
     "compose-send-format-menu.label",
@@ -10033,6 +10061,10 @@
     "try-searching-prefix",
     "remove-expired-articles-label"
   ],
+  "mail/messenger/oauth.ftl": [
+    "oauth-reauthorize-title",
+    "oauth-reauthorize-description"
+  ],
   "mail/messenger/oauthResultPage.ftl": [
     "oauth-result-wordmark-alt",
     "oauth-result-footer-text",
@@ -11182,10 +11214,12 @@
   ],
   "mail/messenger/preferences/new-tag.ftl": [
     "tag-dialog-title",
+    "tag-edit-dialog-title",
     "tag-name-label.value",
     "tag-name-label.accesskey",
     "tag-color-label.value",
-    "tag-color-label.accesskey"
+    "tag-color-label.accesskey",
+    "tag-already-exists"
   ],
   "mail/messenger/preferences/notifications.ftl": [
     "notifications-dialog-title",
@@ -12221,7 +12255,9 @@
     "configured-cert-ok-enc",
     "configured-cert-ok-sig",
     "configured-cert-failure-detail",
-    "configured-cert-failure"
+    "configured-cert-failure",
+    "configured-cert-failure-use-anyway-detail-v2",
+    "configured-cert-failure-use-anyway-v2"
   ],
   "mail/messenger/syncAccounts.ftl": [
     "sync-verification-sent-title",
diff --git a/_data/comm.json b/_data/comm.json
index d6dba6a9..1b0da8c5 100644
--- a/_data/comm.json
+++ b/_data/comm.json
@@ -67,7 +67,8 @@
     "calendar-creation-network-authfail",
     "calendar-creation-network-certerror",
     "calendar-creation-network-subscribe-single",
-    "calendar-creation-network-subscribe-multiple"
+    "calendar-creation-network-subscribe-multiple",
+    "calendar-creation-mapi-login-text"
   ],
   "calendar/calendar/calendar-delete-prompt.ftl": [
     "calendar-delete-event-prompt-title",
@@ -251,6 +252,88 @@
     "calendar-itip-identity-label",
     "calendar-itip-identity-label-none"
   ],
+  "calendar/calendar/calendar-itip.ftl": [
+    "calendar-tab-title-calendar",
+    "calendar-tab-title-tasks",
+    "imip-html-header",
+    "imip-html-summary",
+    "imip-html-location",
+    "imip-html-when",
+    "imip-html-organizer",
+    "imip-html-description",
+    "imip-html-attachments",
+    "imip-html-comment",
+    "imip-html-attendees",
+    "imip-html-url",
+    "imip-html-canceled-occurrences",
+    "imip-html-modified-occurrences",
+    "imip-html-new-location",
+    "imip-html-attendee-delegated-from",
+    "imip-html-attendee-combined",
+    "imip-html-attendee-role-chair",
+    "imip-html-attendee-role-non-participant",
+    "imip-html-attendee-role-opt-participant",
+    "imip-html-attendee-role-req-participant",
+    "imip-html-attendee-part-stat-accepted",
+    "imip-html-attendee-part-stat-declined",
+    "imip-html-attendee-part-stat-delegated",
+    "imip-html-attendee-part-stat-needs-action",
+    "imip-html-attendee-part-stat-tentative",
+    "imip-html-attendee-user-type-individual",
+    "imip-html-attendee-user-type-group",
+    "imip-html-attendee-user-type-resource",
+    "imip-html-attendee-user-type-room",
+    "imip-html-attendee-user-type-unknown",
+    "imip-added-item-to-cal",
+    "imip-canceled-item",
+    "imip-updated-item",
+    "imip-bar-cancel-text",
+    "imip-bar-counter-error-text",
+    "imip-bar-counter-previous-version-text",
+    "imip-bar-counter-text",
+    "imip-bar-disallowed-counter-text",
+    "imip-bar-decline-counter-text",
+    "imip-bar-refresh-text",
+    "imip-bar-publish-text",
+    "imip-bar-request-text",
+    "imip-bar-sent-text",
+    "imip-bar-sent-but-removed-text",
+    "imip-bar-update-text",
+    "imip-bar-update-multiple-text",
+    "imip-bar-update-series-text",
+    "imip-bar-already-processed-text",
+    "imip-bar-processed-needs-action",
+    "imip-bar-processed-multiple-needs-action",
+    "imip-bar-processed-series-needs-action",
+    "imip-bar-reply-text",
+    "imip-bar-reply-to-not-existing-item",
+    "imip-bar-reply-to-recently-removed-item",
+    "imip-bar-processing-failed",
+    "imip-bar-calendar-deactivated",
+    "imip-bar-not-writable",
+    "imip-no-calendar-available",
+    "imip-send-mail-title",
+    "imip-send-mail-text",
+    "imip-no-identity",
+    "no-identity-selected-notification",
+    "invitations-link-label",
+    "confirm-process-invitation",
+    "confirm-process-invitation-title",
+    "itip-request-subject",
+    "itip-request-updated-subject",
+    "itip-request-body",
+    "itip-cancel-subject",
+    "itip-cancel-body",
+    "itip-counter-body",
+    "itip-decline-counter-body",
+    "itip-decline-counter-subject",
+    "itip-reply-subject",
+    "itip-reply-subject-accept",
+    "itip-reply-subject-decline",
+    "itip-reply-subject-tentative",
+    "itip-reply-body-accept",
+    "itip-reply-body-decline"
+  ],
   "calendar/calendar/calendar-occurrence-prompt.ftl": [
     "header-isrepeating-event.label",
     "header-isrepeating-task.label",
@@ -489,7 +572,8 @@
     "week-title",
     "week-title-label.aria-label",
     "calendar-none.label",
-    "too-new-schema-error-text",
+    "too-new-dbschema-error-text",
+    "imip-bar-unsupported-text",
     "event-untitled",
     "tooltip-title",
     "tooltip-location",
@@ -862,9 +946,9 @@
     "calendar-todaypane-button.label",
     "calendar-todaypane-button.tooltiptext",
     "calendar-search-options-searchfor.value",
-    "calendar-server-dialog-title-edit.title",
+    "calendar-properties-dialog-title",
     "calendar-server-dialog-name-label.value",
-    "calendar-publish-dialog-title.title",
+    "calendar-publish-dialog-window-title",
     "calendar-publish-url-label",
     "calendar-publish-publish-dialog-button.buttonlabelaccept",
     "calendar-publish-close-button",
@@ -872,7 +956,7 @@
     "calendar-error-detail.label",
     "calendar-error-code.value",
     "calendar-error-description.value",
-    "calendar-error-title.title",
+    "calendar-error-prompt-title",
     "calendar-extract-event-button.label",
     "calendar-extract-event-button.tooltiptext",
     "calendar-extract-task-button.label",
@@ -902,7 +986,11 @@
     "sendandclose-menu.label",
     "event-recurrence-forever.label",
     "attendees-tab-label",
-    "attachments-tab-label"
+    "attachments-tab-label",
+    "calendar-window-title",
+    "calendar-window-title-base",
+    "calendar-auth-enter-password-for",
+    "calendar-auth-enter-user-password-for"
   ],
   "calendar/calendar/categories.ftl": [
     "categories2"
@@ -2075,91 +2163,6 @@
     "todaypane.showTodayPane.label",
     "todaypane.showTodayPane.accesskey"
   ],
-  "calendar/chrome/lightning/lightning.properties": [
-    "taskModeApplicationTitle",
-    "tabTitleCalendar",
-    "tabTitleTasks",
-    "imipHtml.header",
-    "imipHtml.summary",
-    "imipHtml.location",
-    "imipHtml.when",
-    "imipHtml.organizer",
-    "imipHtml.description",
-    "imipHtml.attachments",
-    "imipHtml.comment",
-    "imipHtml.attendees",
-    "imipHtml.url",
-    "imipHtml.canceledOccurrences",
-    "imipHtml.modifiedOccurrences",
-    "imipHtml.newLocation",
-    "imipHtml.attendeeDelegatedFrom",
-    "imipHtml.attendeeDelegatedTo",
-    "imipHtml.attendee.combined",
-    "imipHtml.attendeeRole2.CHAIR",
-    "imipHtml.attendeeRole2.NON-PARTICIPANT",
-    "imipHtml.attendeeRole2.OPT-PARTICIPANT",
-    "imipHtml.attendeeRole2.REQ-PARTICIPANT",
-    "imipHtml.attendeePartStat2.ACCEPTED",
-    "imipHtml.attendeePartStat2.DECLINED",
-    "imipHtml.attendeePartStat2.DELEGATED",
-    "imipHtml.attendeePartStat2.NEEDS-ACTION",
-    "imipHtml.attendeePartStat2.TENTATIVE",
-    "imipHtml.attendeeUserType2.INDIVIDUAL",
-    "imipHtml.attendeeUserType2.GROUP",
-    "imipHtml.attendeeUserType2.RESOURCE",
-    "imipHtml.attendeeUserType2.ROOM",
-    "imipHtml.attendeeUserType2.UNKNOWN",
-    "imipAddedItemToCal2",
-    "imipCanceledItem2",
-    "imipUpdatedItem2",
-    "imipBarCancelText",
-    "imipBarCounterErrorText",
-    "imipBarCounterPreviousVersionText",
-    "imipBarCounterText",
-    "imipBarDisallowedCounterText",
-    "imipBarDeclineCounterText",
-    "imipBarRefreshText",
-    "imipBarPublishText",
-    "imipBarRequestText",
-    "imipBarSentText",
-    "imipBarSentButRemovedText",
-    "imipBarUpdateText",
-    "imipBarUpdateMultipleText",
-    "imipBarUpdateSeriesText",
-    "imipBarAlreadyProcessedText",
-    "imipBarProcessedNeedsAction",
-    "imipBarProcessedMultipleNeedsAction",
-    "imipBarProcessedSeriesNeedsAction",
-    "imipBarReplyText",
-    "imipBarReplyToNotExistingItem",
-    "imipBarReplyToRecentlyRemovedItem",
-    "imipBarUnsupportedText2",
-    "imipBarProcessingFailed",
-    "imipBarCalendarDeactivated",
-    "imipBarNotWritable",
-    "imipSendMail.title",
-    "imipSendMail.text",
-    "imipNoIdentity",
-    "imipNoCalendarAvailable",
-    "itipReplySubject2",
-    "itipReplyBodyAccept",
-    "itipReplyBodyDecline",
-    "itipReplySubjectAccept2",
-    "itipReplySubjectDecline2",
-    "itipReplySubjectTentative2",
-    "itipRequestSubject2",
-    "itipRequestUpdatedSubject2",
-    "itipRequestBody",
-    "itipCancelSubject2",
-    "itipCancelBody",
-    "itipCounterBody",
-    "itipDeclineCounterBody",
-    "itipDeclineCounterSubject",
-    "confirmProcessInvitation",
-    "confirmProcessInvitationTitle",
-    "invitationsLink.label",
-    "noIdentitySelectedNotification"
-  ],
   "chat/accounts-properties.ftl": [
     "password-prompt-title",
     "password-prompt-text",
@@ -8125,6 +8128,7 @@
     "account-hub-port-error-text.title",
     "account-hub-username-error-text",
     "account-hub-username-error-text.title",
+    "account-hub-manual-config-error-summary",
     "account-hub-oauth-pending",
     "account-hub-addon-install-button",
     "account-hub-addon-error",
@@ -8238,12 +8242,15 @@
     "account-hub-thundermail-divider-text",
     "account-hub-manual-config-imap-title",
     "account-hub-manual-config-pop3-title",
+    "account-hub-manual-config-review-settings-title",
     "account-hub-manual-config-incoming-legend",
     "account-hub-manual-config-outgoing-legend",
     "account-hub-same-username-checkbox",
     "account-hub-protocol-imap",
     "account-hub-protocol-microsoft",
-    "account-hub-protocol-pop3"
+    "account-hub-protocol-pop3",
+    "account-hub-oauth-unsupported-title",
+    "account-hub-oauth-unsupported-description"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -9946,6 +9953,8 @@
     "multi-message-delete-button.tooltiptext",
     "multi-message-undelete-button.label",
     "multi-message-undelete-button.tooltiptext",
+    "multi-message-flagged-button.title",
+    "multi-message-flagged-button.aria-label",
     "num-conversations",
     "at-least-num-conversations",
     "num-messages",
@@ -10097,6 +10106,15 @@
     "openpgp-key-assistant-confirm-button",
     "openpgp-key-assistant-key-created"
   ],
+  "mail/messenger/openpgp/keyImportInfo.ftl": [
+    "key-import-info-close.label",
+    "key-import-info-close.accesskey",
+    "import-info-dialog-title",
+    "import-info-created",
+    "import-info-fpr",
+    "import-info-details",
+    "import-info-no-keys"
+  ],
   "mail/messenger/openpgp/keyWizard.ftl": [
     "key-wizard-dialog-window.title",
     "key-wizard-dialog.buttonlabelaccept",
@@ -10529,12 +10547,6 @@
     "filter-decrypt-move-label",
     "filter-decrypt-copy-label",
     "filter-encrypt-label",
-    "import-info-dialog-title",
-    "import-info-bits",
-    "import-info-created",
-    "import-info-fpr",
-    "import-info-details",
-    "import-info-no-keys",
     "import-from-clip",
     "import-from-url",
     "copy-to-clipbrd-failed",
@@ -10857,6 +10869,7 @@
     "policy-DisableMasterPasswordCreation",
     "policy-DisablePasswordReveal",
     "policy-DisableProfileImport",
+    "policy-DisableQRExport",
     "policy-DisableSafeMode",
     "policy-DisableSecurityBypass",
     "policy-DisableSystemAddonUpdate",
@@ -11628,6 +11641,10 @@
     "edit-directories-label.accesskey",
     "email-picker-label.label",
     "email-picker-label.accesskey",
+    "email-picker-description",
+    "default-add-address-book-label.value",
+    "default-add-address-book-label.accesskey",
+    "default-add-address-book-description",
     "default-directory-label.value",
     "default-directory-label.accesskey",
     "default-last-label.none",
@@ -12203,6 +12220,12 @@
     "configured-cert-ok-sig",
     "configured-cert-failure-detail",
     "configured-cert-failure",
+    "smime-crypto-signature-algorithm",
+    "smime-crypto-digest-algorithm",
+    "smime-crypto-cipher",
+    "smime-crypto-key-encryption",
+    "smime-crypto-cipher-with-key-size",
+    "smime-crypto-details-summary",
     "configured-cert-failure-use-anyway-detail-v2",
     "configured-cert-failure-use-anyway-v2"
   ],
diff --git a/calendar/calendar/calendar-creation.ftl b/calendar/calendar/calendar-creation.ftl
index 18836a08..e8987db2 100644
--- a/calendar/calendar/calendar-creation.ftl
+++ b/calendar/calendar/calendar-creation.ftl
@@ -47,3 +47,6 @@ calendar-creation-network-authfail = The credentials you have entered were not a
 calendar-creation-network-certerror = Could not find calendars at this location because of a certificate problem.
 calendar-creation-network-subscribe-single = Please select the calendars you would like to subscribe to.
 calendar-creation-network-subscribe-multiple = Multiple calendar types are available for this location. Please select the calendar type, then mark the calendars you would like to subscribe to.
+# Variables:
+# $location (String) - The calendar server location.
+calendar-creation-mapi-login-text = Please enter your password for { $location }:
diff --git a/calendar/calendar/calendar-itip.ftl b/calendar/calendar/calendar-itip.ftl
new file mode 100644
index 00000000..5a0117e0
--- /dev/null
+++ b/calendar/calendar/calendar-itip.ftl
@@ -0,0 +1,190 @@
+# 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/.
+
+# Tab titles
+calendar-tab-title-calendar = Calendar
+calendar-tab-title-tasks = Tasks
+
+## Email invitation preview (HTML rendering of an iTIP invitation)
+
+imip-html-header = Event Invitation
+# Field labels of the invitation preview table.
+imip-html-summary = Title:
+imip-html-location = Location:
+imip-html-when = When:
+imip-html-organizer = Organizer:
+imip-html-description = Description:
+imip-html-attachments = Attachments:
+imip-html-comment = Comment:
+imip-html-attendees = Attendees:
+imip-html-url = Related Link:
+imip-html-canceled-occurrences = Canceled Occurrences:
+imip-html-modified-occurrences = Modified Occurrences:
+# Variables:
+#   $location (String) - The new location of a modified occurrence.
+imip-html-new-location = New Location: { $location }
+# Appended behind an attendee name in the email invitation preview.
+# Variables:
+#   $delegators (String) - A single delegator or a comma separated list of delegators.
+imip-html-attendee-delegated-from = (delegated from { $delegators })
+# Tooltip for the attendee icon, composed from the role and the participation
+# status sentences.
+# Variables:
+#   $role (String) - One of the imip-html-attendee-role-* strings.
+#   $partStat (String) - One of the imip-html-attendee-part-stat-* strings.
+imip-html-attendee-combined = { $role } { $partStat }
+# Attendee roles. Composed into imip-html-attendee-combined.
+# Variables:
+#   $userType (String) - One of the imip-html-attendee-user-type-* strings.
+imip-html-attendee-role-chair = { $userType } chairs the event.
+# Variables:
+#   $userType (String) - One of the imip-html-attendee-user-type-* strings.
+imip-html-attendee-role-non-participant = { $userType } is a non-participant.
+# Variables:
+#   $userType (String) - One of the imip-html-attendee-user-type-* strings.
+imip-html-attendee-role-opt-participant = { $userType } is an optional participant.
+# Variables:
+#   $userType (String) - One of the imip-html-attendee-user-type-* strings.
+imip-html-attendee-role-req-participant = { $userType } is a required participant.
+# Attendee participation statuses. Composed into imip-html-attendee-combined.
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-part-stat-accepted = { $attendee } has confirmed attendance.
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-part-stat-declined = { $attendee } has declined attendance.
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+#   $delegatees (String) - A single delegatee or a comma separated list of delegatees.
+imip-html-attendee-part-stat-delegated = { $attendee } has delegated attendance to { $delegatees }.
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-part-stat-needs-action = { $attendee } still needs to reply.
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-part-stat-tentative = { $attendee } has confirmed attendance tentatively.
+# Attendee user types. Composed into imip-html-attendee-role-*.
+# Variables:
+#   $attendee (String) - Email address or common name <email address> of the attendee.
+imip-html-attendee-user-type-individual = { $attendee }
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-user-type-group = { $attendee } (group)
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-user-type-resource = { $attendee } (resource)
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-user-type-room = { $attendee } (room)
+# Variables:
+#   $attendee (String) - Common name or email address of the attendee.
+imip-html-attendee-user-type-unknown = { $attendee }
+
+## iTIP processing result text
+
+imip-added-item-to-cal = The event has been added to your calendar.
+imip-canceled-item = The event has been deleted from your calendar.
+imip-updated-item = The event has been updated.
+
+## iTIP bar labels
+
+imip-bar-cancel-text = This message contains an event cancellation.
+imip-bar-counter-error-text = This message contains a counterproposal to an invitation that cannot be processed.
+imip-bar-counter-previous-version-text = This message contains a counterproposal to a previous version of an invitation.
+imip-bar-counter-text = This message contains a counterproposal to an invitation.
+imip-bar-disallowed-counter-text = This message contains a counterproposal although you disallowed countering for this event.
+imip-bar-decline-counter-text = This message contains a reply to your counterproposal.
+imip-bar-refresh-text = This message asks for an event update.
+imip-bar-publish-text = This message contains an event.
+imip-bar-request-text = This message contains an invitation to an event.
+imip-bar-sent-text = This message contains a sent event.
+imip-bar-sent-but-removed-text = This message contains a sent out event that is not in your calendar anymore.
+imip-bar-update-text = This message contains an update to an existing event.
+imip-bar-update-multiple-text = This message contains updates to multiple existing events.
+imip-bar-update-series-text = This message contains an update to an existing series of events.
+imip-bar-already-processed-text = This message contains an event that has already been processed.
+imip-bar-processed-needs-action = This message contains an event that you have not yet responded to.
+imip-bar-processed-multiple-needs-action = This message contains multiple events that you have not yet responded to.
+imip-bar-processed-series-needs-action = This message contains an event series that you have not yet responded to.
+imip-bar-reply-text = This message contains a reply to an invitation.
+imip-bar-reply-to-not-existing-item = This message contains a reply referring to an event that is not in your calendar.
+# Variables:
+#   $deletionTime (String) - The formatted time the event was removed from the calendar.
+imip-bar-reply-to-recently-removed-item = This message contains a reply referring to an event that was removed from your calendar at { $deletionTime }.
+# Variables:
+#   $status (String) - The hexadecimal status code of the failed processing.
+imip-bar-processing-failed = Processing message failed. Status: { $status }.
+imip-bar-calendar-deactivated = This message contains event information. Enable a calendar to handle it.
+imip-bar-not-writable = No writable calendars are configured for invitations, please check the calendar properties.
+imip-no-calendar-available = There are no writable calendars available.
+
+## Sending invitation emails
+
+imip-send-mail-title = Email Notification
+imip-send-mail-text = Would you like to send out notification Email now?
+
+## Calendar email identity
+
+imip-no-identity = None
+no-identity-selected-notification = If you want to use this calendar to store invitations to or from other people you should assign an email identity below.
+
+## Invitations panel
+
+# Variables:
+#   $count (Number) - The number of pending invitations.
+invitations-link-label = Invitations: { $count }
+
+## Process invitation confirmation prompt
+
+confirm-process-invitation = You have recently deleted this item, are you sure you want to process this invitation?
+confirm-process-invitation-title = Process Invitation?
+
+## iTIP email subjects and bodies
+
+# Variables:
+#   $summary (String) - The event title.
+itip-request-subject = Invitation: { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-request-updated-subject = Updated: { $summary }
+# Variables:
+#   $organizer (String) - The event organizer.
+#   $summary (String) - The event title.
+itip-request-body = { $organizer } has invited you to { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-cancel-subject = Canceled: { $summary }
+# Variables:
+#   $organizer (String) - The event organizer.
+#   $summary (String) - The event title.
+itip-cancel-body = { $organizer } has canceled this event: { $summary }
+# Variables:
+#   $attendee (String) - The attendee who made the counterproposal.
+#   $summary (String) - The event title.
+itip-counter-body = { $attendee } has made a counterproposal for "{ $summary }":
+# Variables:
+#   $organizer (String) - The event organizer.
+#   $summary (String) - The event title.
+itip-decline-counter-body = { $organizer } has declined your counterproposal for "{ $summary }".
+# Variables:
+#   $summary (String) - The event title.
+itip-decline-counter-subject = Counterproposal Declined: { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-reply-subject = Invitation Reply: { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-reply-subject-accept = Accepted: { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-reply-subject-decline = Invitation Declined: { $summary }
+# Variables:
+#   $summary (String) - The event title.
+itip-reply-subject-tentative = Tentative: { $summary }
+# Variables:
+#   $attendee (String) - The attendee who replied.
+itip-reply-body-accept = { $attendee } has accepted your event invitation.
+# Variables:
+#   $attendee (String) - The attendee who replied.
+itip-reply-body-decline = { $attendee } has declined your event invitation.
diff --git a/calendar/calendar/calendar.ftl b/calendar/calendar/calendar.ftl
index c7412486..59c56a27 100644
--- a/calendar/calendar/calendar.ftl
+++ b/calendar/calendar/calendar.ftl
@@ -158,6 +158,10 @@ week-title-label =
     .aria-label = Week { $title }
 calendar-none =
     .label = None
+# Variables:
+#   $fileName (String) - The backup file name, e.g. 'local-2020-05-11T21-30-17.sqlite'.
+too-new-dbschema-error-text = Your calendar data is not compatible with this version of { -brand-short-name }. The calendar data in your profile was updated by a newer version of { -brand-short-name }. A backup of the data file has been created, named “{ $fileName }”. Continuing with a newly created data file.
+imip-bar-unsupported-text = This message contains an event that this version of { -brand-short-name } cannot process.
 # Error strings
 # @name UID_NOT_FOUND
 # @loc none
@@ -1041,10 +1045,12 @@ calendar-todaypane-button =
     .tooltiptext = Show Today Pane
 calendar-search-options-searchfor =
     .value = contain
+calendar-properties-dialog-title = Edit Calendar
 calendar-server-dialog-title-edit =
     .title = Edit Calendar
 calendar-server-dialog-name-label =
     .value = Calendar Name:
+calendar-publish-dialog-window-title = Publish Calendar
 calendar-publish-dialog-title =
     .title = Publish Calendar
 calendar-publish-url-label = Publishing URL
@@ -1058,6 +1064,7 @@ calendar-error-code =
     .value = Error code:
 calendar-error-description =
     .value = Description:
+calendar-error-prompt-title = An error has occurred
 calendar-error-title =
     .title = An error has occurred
 calendar-extract-event-button =
@@ -1116,3 +1123,14 @@ event-recurrence-forever =
 attendees-tab-label = Attendees ({ $count }):
 # $count - the number of attachments
 attachments-tab-label = Attachments ({ $count }):
+# Variables:
+#   $docTitle (String) - The date or view label for the current calendar view.
+calendar-window-title = { $docTitle } - { -brand-full-name }
+calendar-window-title-base = { -brand-full-name }
+# Variables:
+#   $username (String) - The account username.
+#   $location (String) - The calendar server location.
+calendar-auth-enter-password-for = Enter password for { $username } on { $location }
+# Variables:
+#   $location (String) - The calendar server location.
+calendar-auth-enter-user-password-for = { $location } is requesting your username and password.
diff --git a/mail/messenger/aboutAddonsExtra.ftl b/mail/messenger/aboutAddonsExtra.ftl
index 7a7958db..8df634d6 100644
--- a/mail/messenger/aboutAddonsExtra.ftl
+++ b/mail/messenger/aboutAddonsExtra.ftl
@@ -13,5 +13,3 @@ atn-addons-heading-search-button =
     .aria-label = Search addons.thunderbird.net
 details-notification-suppressed-esr-2 =
     .message = The add-on was disabled because it uses legacy APIs. Add-ons with legacy APIs can modify every part of { -brand-product-name } and need to be updated, reviewed and approved whenever { -brand-product-name } itself changes. Such add-ons are therefore not supported by this version of { -brand-product-name }, but only by { -brand-product-name } ESR, which receives fewer code changes and stays stable throughout the 1-year ESR cycle.
-details-notification-suppressed-esr =
-    .message = The add-on was disabled because it uses Experiment APIs. These APIs are limited to { -brand-product-name } ESR and are not supported in this version of { -brand-product-name }.
diff --git a/mail/messenger/accountcreation/accountHub.ftl b/mail/messenger/accountcreation/accountHub.ftl
index a1d2494b..c65cbd68 100644
--- a/mail/messenger/accountcreation/accountHub.ftl
+++ b/mail/messenger/accountcreation/accountHub.ftl
@@ -240,6 +240,7 @@ account-hub-thundermail-button = Sign in with Thundermail
 account-hub-thundermail-divider-text = or
 account-hub-manual-config-imap-title = IMAP Settings
 account-hub-manual-config-pop3-title = POP3 Settings
+account-hub-manual-config-review-settings-title = Review updated settings
 account-hub-manual-config-incoming-legend = Incoming server
 account-hub-manual-config-outgoing-legend = Outgoing server
 # Label for checkbox that will hide an outgoing username input if it's the same is the incoming
@@ -247,6 +248,10 @@ account-hub-same-username-checkbox = Same username as incoming server
 account-hub-protocol-imap = Sync across devices
 account-hub-protocol-microsoft = Exchange or Microsoft 365
 account-hub-protocol-pop3 = Download to device
+account-hub-oauth-unsupported-title = Additional configuration is required
+# Note: 'Advanced Configuration' is the text of the link/button at the bottom of the form (e.g., account-hub-exchange-type-advanced-config)
+# 'Account Settings' is the text of the menu option/tab name accessible outside Account Hub
+account-hub-oauth-unsupported-description = { -brand-short-name } can’t automatically configure OAuth2 for this hostname. Select Advanced Configuration to create the account, then complete setup from Account Settings. <a data-l10n-name="oauth-support-link">Get help with OAuth2 setup.</a>
 account-hub-notification-show-more = Show more
 account-hub-notification-show-less = Show less
 account-hub-email-setup-header = Add your email address
@@ -284,18 +289,13 @@ account-hub-config-success-description-disk = Configuration found in { -brand-sh
 account-hub-config-success-description-isp = Configuration found at email provider.
 account-hub-config-success-description-read-more = You can <a data-l10n-name="automated-setup-link">read about how automated email setup works.</a>
 account-hub-config-success = Configuration found in Mozilla ISPDB
-account-hub-config-success-exchange = Configuration found for a Microsoft Exchange server
-account-hub-config-success-guess = Configuration found by trying common server names
-account-hub-config-success-disk = Configuration found in { -brand-short-name } installation
-account-hub-config-success-isp = Configuration found at email provider
-account-hub-config-success-unknown = Configuration found
 account-hub-password-info = Your credentials will only be stored locally on your computer
 account-hub-creating-account = Creating account…
 account-hub-sync-accounts-found = { -brand-short-name } found some connected services
 account-hub-sync-accounts-not-found = { -brand-short-name } was unable to find connected services
 account-hub-sync-accounts-failure = { -brand-short-name } was unable to connect the selected services
 account-hub-email-added-success = Email account connected successfully
-account-hub-config-test-success = Configuration settings valid
+account-hub-config-test-success = { -brand-short-name } found the correct settings and updated them.
 account-hub-select-all = Select all
 account-hub-deselect-all = Deselect all
 # $count (Number) - The number of sync accounts selected.
@@ -316,6 +316,7 @@ account-hub-port-error-text = Port must be between 1 and 65535
     .title = Port must be between 1 and 65535
 account-hub-username-error-text = Username is required
     .title = Username is required
+account-hub-manual-config-error-summary = Please resolve the following errors:
 account-hub-oauth-pending = Waiting for authorization in login popup…
 account-hub-addon-install-button = Install
 account-hub-addon-install-needed = { -brand-short-name } doesn’t natively support this server. To access Exchange email, <a data-l10n-name="addon-install"> install a third-party add-on like Owl (paid).</a>
diff --git a/mail/messenger/certError.ftl b/mail/messenger/certError.ftl
index 887cfbdc..2be95c1e 100644
--- a/mail/messenger/certError.ftl
+++ b/mail/messenger/certError.ftl
@@ -51,9 +51,6 @@ certificate-checking = Testing connection to server { $hostname }…
 # Variables:
 #   $hostname (string) - Hostname (and possibly port) of a server.
 certificate-test-success = Successfully established a secure connection to { $hostname }.
-# Variables:
-#   $hostname (string) - Hostname (and possibly port) of a server.
-certificate-test-failure = Connection to server { $hostname } failed.
 certificate-check-exception-added = Certificate exception added.
 certificate-check-exception-removed = Certificate exception removed.
 # Variables:
diff --git a/mail/messenger/extensionsUI.ftl b/mail/messenger/extensionsUI.ftl
index f22e2f59..5b75732a 100644
--- a/mail/messenger/extensionsUI.ftl
+++ b/mail/messenger/extensionsUI.ftl
@@ -8,8 +8,6 @@ webext-perms-learn-more = Learn more
 # not yet been updated to use fluent placeholders.
 webext-install-suppressed-message-2 = The <> add-on could not be installed because it uses legacy APIs, which are not supported by this version of { -brand-product-name }.
 webext-install-suppressed-details-2 = Add-ons with legacy APIs can modify every part of { -brand-product-name } and need to be updated, reviewed and approved whenever { -brand-product-name } itself changes. These legacy APIs are therefore only supported by { -brand-product-name } ESR, which receives fewer code changes and stays stable throughout the 1-year ESR cycle.
-webext-install-suppressed-message = The <> add-on could not be installed because it uses Experiment APIs, which are not supported by this version of Thunderbird.
-webext-install-suppressed-details = Add-ons with Experiment APIs are only supported on { -brand-product-name } ESR.
 # Variables:
 #   $addonName (String): localized name of the extension that was just installed.
 addon-post-install-message = { $addonName } was added.
diff --git a/mail/messenger/multimessageview.ftl b/mail/messenger/multimessageview.ftl
index ec08e6ea..d271c5c6 100644
--- a/mail/messenger/multimessageview.ftl
+++ b/mail/messenger/multimessageview.ftl
@@ -13,6 +13,9 @@ multi-message-delete-button =
 multi-message-undelete-button =
     .label = Undelete
     .tooltiptext = Undelete
+multi-message-flagged-button =
+    .title = Starred
+    .aria-label = Starred
 # Variables:
 #   $count - total number of conversations (threads or solitary messages) selected
 num-conversations =
diff --git a/mail/messenger/openpgp/keyImportInfo.ftl b/mail/messenger/openpgp/keyImportInfo.ftl
new file mode 100644
index 00000000..1dbd05f6
--- /dev/null
+++ b/mail/messenger/openpgp/keyImportInfo.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/.
+
+key-import-info-close =
+    .label = Close
+    .accesskey = C
+import-info-dialog-title = Success! Keys imported
+import-info-created = Created
+import-info-fpr = Fingerprint
+import-info-details = View Details and manage key acceptance
+import-info-no-keys = No keys imported.
diff --git a/mail/messenger/policies/policies-descriptions.ftl b/mail/messenger/policies/policies-descriptions.ftl
index a8a1154d..75080652 100644
--- a/mail/messenger/policies/policies-descriptions.ftl
+++ b/mail/messenger/policies/policies-descriptions.ftl
@@ -35,6 +35,7 @@ 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-DisableQRExport = Disable the generation of the QR code to export account settings and credentials.
 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.
diff --git a/mail/messenger/preferences/preferences.ftl b/mail/messenger/preferences/preferences.ftl
index 05e408d0..02c1ec5a 100644
--- a/mail/messenger/preferences/preferences.ftl
+++ b/mail/messenger/preferences/preferences.ftl
@@ -567,6 +567,11 @@ edit-directories-label =
 email-picker-label =
     .label = Automatically add outgoing email addresses to my:
     .accesskey = A
+email-picker-description = The location of new contacts saved from sent messages.
+default-add-address-book-label =
+    .value = Default address book for manually added contacts:
+    .accesskey = D
+default-add-address-book-description = The location of new contacts saved from received messages.
 default-directory-label =
     .value = Default startup directory in the address book window:
     .accesskey = S
diff --git a/mail/messenger/smime/smime.ftl b/mail/messenger/smime/smime.ftl
index 70b9a0eb..3ec7214b 100644
--- a/mail/messenger/smime/smime.ftl
+++ b/mail/messenger/smime/smime.ftl
@@ -12,6 +12,15 @@ configured-cert-ok-sig = The certificate passed the test and can be used for ema
 configured-cert-failure-detail = The certificate verification failed with the following error: { $errorMsg } (Error Code: { $errorCodeStr })
 # $errorCode A numeric error code
 configured-cert-failure = The certificate verification failed with error code { $errorCode }
+# Cryptographic details displayed in the message security popup
+smime-crypto-signature-algorithm = Signature algorithm:
+smime-crypto-digest-algorithm = Signature Digest algorithm:
+smime-crypto-cipher = Encryption algorithm:
+smime-crypto-key-encryption = Key Encryption algorithm:
+# $algorithm - The encryption algorithm name (e.g. "AES-GCM")
+# $keySize - The key size in bits (e.g. "256")
+smime-crypto-cipher-with-key-size = { $algorithm } ({ $keySize }-bit)
+smime-crypto-details-summary = Algorithms
 # $errorMsg A sentence that explains the error.
 # $errorCodeStr A human readable error code, e.g. SEC_ERROR_UNKNOWN_ISSUER
 # Note the initial empty line is necessary to preserve the line breaks.