Merge pull request #100 from thunderbird/update

Update messages

Author: coreycb

_data/comm-beta.json

@@ -36,7 +36,7 @@
   "calendar/calendar/calendar-creation.ftl": [
     "select-all-calendars",
     "select-none-calendars",
-    "calendar-creation-wizard-title",
+    "calendar-creation-dialog-title",
     "calendar-creation-initial-description",
     "calendar-creation-initial-computer.label",
     "calendar-creation-initial-network.label",
@@ -311,8 +311,8 @@
     "calendar-no-reminders-tooltip.title",
     "calendar-enable-button",
     "calendar-list-item-context-button.title",
-    "calendar-import-new-calendar",
-    "calendar-import-new-calendar.title",
+    "calendar-add-calendar",
+    "calendar-add-calendar.title",
     "calendar-refresh-calendars.title",
     "calendar-new-event-primary-button",
     "calendar-new-task-primary-button",
@@ -637,8 +637,8 @@
     "calendar-taskview-delete.tooltiptext",
     "calendar-context-attendance-menu.label",
     "calendar-context-attendance-menu.accesskey",
-    "calendar-context-attendance-occurrence.label",
-    "calendar-context-attendance-all-series.label",
+    "calendar-context-attendance-occurrence-label.value",
+    "calendar-context-attendance-all-series-label.value",
     "calendar-context-attendance-send.label",
     "calendar-context-attendance-send.accesskey",
     "calendar-context-attendance-dontsend.label",
@@ -2144,15 +2144,15 @@
     "password-prompt-save-checkbox"
   ],
   "chat/accounts.ftl": [
-    "new-account-label",
+    "add-account-label",
     "accounts-window-title",
-    "account-manager-new-account.label",
-    "account-manager-new-account.accesskey",
+    "account-manager-add-account.label",
+    "account-manager-add-account.accesskey",
     "account-manager-close.label",
     "account-manager-close.accesskey",
     "account-manager-close-command.key",
     "account-manager-no-account-title",
-    "account-manager-no-account-description",
+    "account-manager-no-accounts-description",
     "account-auto-sign-on.label",
     "account-auto-sign-on.accesskey",
     "account-connect.label",
@@ -3497,22 +3497,10 @@
     "autosyncNotDownload.accesskey",
     "kb.label",
     "daysOld.label",
-    "message.label",
     "nntpNotDownloadRead.label",
     "nntpNotDownloadRead.accesskey",
     "nntpDownloadMsg.label",
     "nntpDownloadMsg.accesskey",
-    "retentionCleanup.label",
-    "retentionCleanupImap.label",
-    "retentionCleanupPop.label",
-    "retentionKeepMsg.label",
-    "retentionKeepMsg.accesskey",
-    "retentionKeepAll.label",
-    "retentionKeepAll.accesskey",
-    "retentionKeepRecent.label",
-    "retentionKeepRecent.accesskey",
-    "retentionApplyToFlagged.label",
-    "retentionApplyToFlagged.accesskey",
     "offlineSelectNntp.label",
     "offlineSelectNntp.accesskey",
     "offlineImapAdvancedOffline.label",
@@ -3963,22 +3951,6 @@
     "folderRebuildSummaryFile.explanation",
     "folderIncludeInGlobalSearch.label",
     "folderIncludeInGlobalSearch.accesskey",
-    "retention.label",
-    "retentionUseAccount.label",
-    "retentionUseAccount.accesskey",
-    "daysOld.label",
-    "message.label",
-    "retentionCleanup.label",
-    "retentionCleanupImap.label",
-    "retentionCleanupPop.label",
-    "retentionDeleteMsg.label",
-    "retentionDeleteMsg.accesskey",
-    "retentionKeepAll.label",
-    "retentionKeepAll.accesskey",
-    "retentionKeepRecent.label",
-    "retentionKeepRecent.accesskey",
-    "retentionApplyToFlagged.label",
-    "retentionApplyToFlagged.accesskey",
     "folderSynchronizationTab.label",
     "folderCheckForNewMessages2.label",
     "folderCheckForNewMessages2.accesskey",
@@ -7035,8 +7007,6 @@
     "identity-delete-confirm-button",
     "choosefile",
     "forAccount",
-    "removeFromServerTitle",
-    "removeFromServer",
     "confirmSyncChangesTitle",
     "confirmSyncChanges",
     "confirmSyncChangesDiscard"
@@ -7830,9 +7800,11 @@
   "mail/messenger/aboutAddonsExtra.ftl": [
     "add-on-options-button.title",
     "add-on-search-alternative-button-label",
+    "add-on-learn-more-and-search-alternative-button-label",
     "atn-addons-heading-search-input.placeholder",
     "atn-addons-heading-search-button.title",
-    "atn-addons-heading-search-button.aria-label"
+    "atn-addons-heading-search-button.aria-label",
+    "details-notification-suppressed-esr.message"
   ],
   "mail/messenger/aboutDialog.ftl": [
     "about-update-whats-new",
@@ -7990,34 +7962,6 @@
   "mail/messenger/aboutProfilesExtra.ftl": [
     "profiles-launch-profile-plain"
   ],
-  "mail/messenger/aboutRights.ftl": [
-    "rights-title",
-    "rights-intro",
-    "rights-intro-point-1",
-    "rights-intro-point-2",
-    "rights-intro-point-3",
-    "rights-intro-point-4",
-    "rights-intro-point-4-unbranded",
-    "rights-intro-point-5",
-    "rights-intro-point-5-unbranded",
-    "rights-intro-point-6",
-    "rights-webservices-header",
-    "rights-webservices2",
-    "rights-locationawarebrowsing",
-    "rights-locationawarebrowsing-term-1",
-    "rights-locationawarebrowsing-term-2",
-    "rights-locationawarebrowsing-term-3",
-    "rights-locationawarebrowsing-term-4",
-    "rights-webservices-unbranded",
-    "rights-webservices-term-unbranded",
-    "rights-webservices-term-1",
-    "rights-webservices-term-2",
-    "rights-webservices-term-3",
-    "rights-webservices-term-4",
-    "rights-webservices-term-5",
-    "rights-webservices-term-6",
-    "rights-webservices-term-7"
-  ],
   "mail/messenger/aboutSupportCalendar.ftl": [
     "calendars-title",
     "calendars-table-heading-property",
@@ -8107,8 +8051,8 @@
     "filelink-label",
     "filelink-label.aria-label",
     "filelink-description",
-    "addressbook-label",
-    "addressbook-label.aria-label",
+    "address-book-add-label",
+    "address-book-add-label.aria-label",
     "addressbook-description",
     "feeds-label",
     "feeds-label.aria-label",
@@ -8136,7 +8080,7 @@
   "mail/messenger/accountManager.ftl": [
     "open-preferences-sidebar-button2",
     "open-addons-sidebar-button",
-    "account-tree-create-account-button",
+    "account-tree-add-account-button",
     "account-tree-add-mail-account.label",
     "account-tree-add-mail-account.accesskey",
     "account-tree-add-chat-account.label",
@@ -8699,7 +8643,7 @@
     "about-addressbook-toolbar-add-ldap-address-book.label",
     "books-pane-create-contact-button",
     "books-pane-create-contact-button.title",
-    "books-pane-create-book-button.title",
+    "books-pane-add-book-button.title",
     "books-pane-create-list-button.title",
     "books-pane-import-button",
     "books-pane-import-button.title",
@@ -8963,9 +8907,9 @@
     "appmenu-sync-settings.accesskey",
     "appmenu-sync-sign-out.label",
     "appmenu-sync-sign-out.accesskey",
-    "appmenu-new-account-panel-title.title",
-    "appmenu-new-account-panel.label",
-    "appmenu-new-account-panel.accesskey",
+    "appmenu-add-account-panel-title.title",
+    "appmenu-add-account-panel.label",
+    "appmenu-add-account-panel.accesskey",
     "appmenu-new-email-account.label",
     "appmenu-new-email-account.accesskey",
     "appmenu-new-calendar.label",
@@ -8976,9 +8920,9 @@
     "appmenu-new-feed.accesskey",
     "appmenu-new-newsgroup.label",
     "appmenu-new-newsgroup.accesskey",
-    "appmenu-newab-panel-title.title",
-    "appmenu-newab-panel.label",
-    "appmenu-newab-panel.accesskey",
+    "appmenu-add-address-book-panel-title.title",
+    "appmenu-add-address-book.label",
+    "appmenu-add-address-book.accesskey",
     "appmenu-new-addressbook.label",
     "appmenu-new-addressbook.accesskey",
     "appmenu-new-carddav.label",
@@ -9225,6 +9169,8 @@
   "mail/messenger/extensionsUI.ftl": [
     "webext-experiment-warning",
     "webext-perms-learn-more",
+    "webext-install-suppressed-message",
+    "webext-install-suppressed-details",
     "addon-post-install-message"
   ],
   "mail/messenger/feeds.ftl": [
@@ -9362,7 +9308,7 @@
     "quota-percent-used"
   ],
   "mail/messenger/glodaFacetView.ftl": [
-    "items-m-of-n",
+    "item-count-m-of-n",
     "facets-mode-to-list-all-label",
     "facet-view-and-others"
   ],
@@ -9842,9 +9788,7 @@
     "ignored-subtheads-feedback",
     "attachment-view-attachment-count",
     "allow-remote-content-resource.label",
-    "remote-content-option-allow-all.label",
-    "oauth2-loopback-success",
-    "oauth2-loopback-failure"
+    "remote-content-option-allow-all.label"
   ],
   "mail/messenger/messengercompose/messengercompose.ftl": [
     "compose-send-format-menu.label",
@@ -10089,6 +10033,16 @@
     "try-searching-prefix",
     "remove-expired-articles-label"
   ],
+  "mail/messenger/oauthResultPage.ftl": [
+    "oauth-result-wordmark-alt",
+    "oauth-result-footer-text",
+    "oauth-success-title",
+    "oauth-success-subtitle",
+    "oauth-success-body",
+    "oauth-error-title",
+    "oauth-error-subtitle",
+    "oauth-error-body"
+  ],
   "mail/messenger/openpgp/backupKeyPassword.ftl": [
     "set-password-window-title",
     "set-password-legend",
@@ -10966,7 +10920,7 @@
     "policy-SanitizeOnShutdown2",
     "policy-SearchEngines",
     "policy-SearchSuggestEnabled",
-    "policy-SecurityDevices",
+    "policy-SecurityDevices2",
     "policy-SSLVersionMax",
     "policy-SSLVersionMin",
     "policy-SupportMenu",
@@ -12062,12 +12016,35 @@
     "checkbox-feeds-label.tooltiptext",
     "checkbox-calendar-label.label",
     "checkbox-calendar-label.tooltiptext",
+    "checkbox-net-thunderbird-url-label.label",
+    "checkbox-net-thunderbird-url-label.tooltiptext",
     "system-search-engine-name",
     "system-search-integration-label.label",
     "system-search-integration-label.accesskey",
     "check-on-startup-label.label",
     "check-on-startup-label.accesskey"
   ],
+  "mail/messenger/retention.ftl": [
+    "retention-tab.label",
+    "retention-use-default.label",
+    "retention-use-default.accesskey",
+    "retention-button.label",
+    "retention-dialog-title",
+    "retention-description",
+    "retention-description-imap",
+    "retention-description-pop",
+    "retention-retain-all.label",
+    "retention-retain-all.accesskey",
+    "retention-retain-by-num-headers.label",
+    "retention-retain-by-num-headers.accesskey",
+    "retention-messages",
+    "retention-retain-by-age.label",
+    "retention-retain-by-age.accesskey",
+    "retention-days-old",
+    "retention-always-keep-starred.label",
+    "retention-always-keep-starred.accesskey",
+    "retention-removal-warning"
+  ],
   "mail/messenger/searchDialog.ftl": [
     "search-button.label",
     "search-button.accesskey",
@@ -12454,8 +12431,8 @@
     "toolbar-throbber.title",
     "toolbar-create-contact-label",
     "toolbar-create-contact.title",
-    "toolbar-create-address-book-label",
-    "toolbar-create-address-book.title",
+    "toolbar-add-address-book-label",
+    "toolbar-add-address-book.title",
     "toolbar-create-list-label",
     "toolbar-create-list.title",
     "toolbar-import-contacts-label",