
# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1492041239 -3600
# Node ID 8a9d9539cad1946eec9c445ee1418d4676e74a30
# Parent  ba68757d8ca6217d06ceb320629caa2b6827ae97
Bug 1343053 - Update en-GB for Gecko 52 - SeaMonkey part r=me

diff --git a/suite/chrome/common/help/cert_dialog_help.xhtml b/suite/chrome/common/help/cert_dialog_help.xhtml
--- a/suite/chrome/common/help/cert_dialog_help.xhtml
+++ b/suite/chrome/common/help/cert_dialog_help.xhtml
@@ -356,21 +356,21 @@
       Valid</a></li>
     <li><a href="#domain_name_mismatch">Domain Name Mismatch</a></li>
   </ul>
 </div>
 
 <h3 id="secure_connection_failed_page">Secure Connection Failed Page</h3>
 
 <p>In the case where you have disabled the SSL protocol (e.g. through
-  <a href="ssl_help.xhtml#ssl_settings">SSL Settings</a>) or the web site that
-  you are accessing is using an older, insecure version of the SSL protocol then
-  you will be presented with a page titled &quot;Secure Connection Failed&quot;.
-  That page contains some basic background information (including the
-  <strong>Error code</strong> that uniquely identifies the type of problem
+  <a href="ssl_help.xhtml#ssltls_settings">SSL/TLS Settings</a>) or the web site
+  that you are accessing is using an older, insecure version of the SSL protocol
+  then you will be presented with a page titled &quot;Secure Connection
+  Failed&quot;. That page contains some basic background information (including
+  the <strong>Error code</strong> that uniquely identifies the type of problem
   &brandShortName; detected with the web site) and a <strong>Try Again</strong>
   button that triggers a page reload.</p>
 
 <h3 id="untrusted_connection_page">Untrusted Connection Page</h3>
 
 <p>If SSL itself is enabled then the error page that you will be presented with
   will be titled &quot;This Connection is Untrusted&quot;. There are many
   different reasons why a connection can appear untrusted. Here are some of the
diff --git a/suite/chrome/common/help/certs_help.xhtml b/suite/chrome/common/help/certs_help.xhtml
--- a/suite/chrome/common/help/certs_help.xhtml
+++ b/suite/chrome/common/help/certs_help.xhtml
@@ -156,20 +156,16 @@
   an organisation&apos;s name, double-click the name to expand it.</p>
 
 <p>Use the following buttons to view and manage your certificates (most actions
   require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
-  <li><strong>Edit</strong>: View or change the trust settings that Certificate
-    Manager associates with the selected certificates. You can use these
-    settings to designate an email certificate as one that you trust or
-    don&apos;t trust for identification purposes.</li>
   <li><strong>Import</strong>: Import a file containing one or more
     certificates. When you click Import, Certificate Manager first asks you
     to locate the file that contains the certificate(s).</li>
   <li><strong>Export</strong>: Export the selected certificates. You can
     choose among various formats.</li>
   <li><strong>Delete</strong>: Delete the selected certificates.</li>
 </ul>
 
@@ -190,73 +186,24 @@
   an organisation&apos;s name, double-click the name to expand it.</p>
 
 <p>Use the following buttons to view and manage your certificates (most actions
   require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
-  <li><strong>Edit</strong>: View or change the trust settings that Certificate
-    Manager associates with the selected certificates. You can use these
-    settings to designate a web site certificate as one that you trust or
-    don&apos;t trust for identification purposes.</li>
-  <li><strong>Import</strong>: Import a file containing one or more
-    certificates. When you click Import, Certificate Manager first asks you
-    to locate the file that contains the certificate(s).</li>
   <li><strong>Export</strong>: Export the selected certificates. You can
     choose among various formats.</li>
   <li><strong>Delete</strong>: Delete the selected certificates.</li>
   <li><strong>Add Exception</strong>: Add a security exception for a server
     (web site, mail server) that identifies itself with invalid information.
     This is an advanced feature, act with caution.</li>
 </ul>
 
-<h3 id="edit_website_certificate_trust_settings">Edit Web Site Certificate
-  Trust Settings</h3>
-
-<p>When you select a web site certificate from the
-  <a href="#servers">Servers</a> tab in the Certificate Manager and click Edit,
-  you see a window entitled <q>Edit web site certificate trust settings</q>.
-  Here you specify whether you want to trust the selected certificate for
-  identifying the web site and setting up an encrypted connection.</p>
-
-<p>The dialogue box contains these elements:</p>
-
-<ul>
-  <li><strong>The certificate <q><em>name of certificate</em></q> was
-    issued by</strong>: Provides information about the
-    <a href="glossary.xhtml#certificate_authority">certificate authority</a>
-    that issued this certificate.</li>
-  <li><strong>Edit certificate trust settings</strong>:
-    <ul>
-      <li><strong>Trust the authenticity of this certificate</strong>: If you
-        select this option, Certificate Manager will henceforth trust this
-        certificate for the purposes of identifying this web site or setting up
-        an encrypted connection. If you select this option and then attempt to
-        visit the web site, your browser will access the site with few, if any,
-        warnings.</li>
-      <li><strong>Do not trust the authenticity of this certificate</strong>:
-        If you select this option, Certificate Manager will no longer trust
-        this certificate for the purposes of identifying this web site or
-        setting up an encrypted connection. If you select this option and
-        then attempt to visit the web site, you will see one or more warning
-        messages before you can access the site.</li>
-    </ul>
-  </li>
-  <li><strong>Edit CA Trust</strong>: Click this button to specify trust
-    settings for the certificate authority (CA) that issued the web site
-    certificate. These settings allow you to trust or not to trust different
-    kinds of certificates issued by that certificate authority. For example,
-    you can choose to trust all web site certificates issued by the
-    authority.</li>
-</ul>
-
-<p>Click OK to confirm your choice.</p>
-
 <h3 id="delete_website_certificates">Delete Web Site Certificates</h3>
 
 <p>Before deleting a server certificate from the
   <a href="#servers">Servers</a> tab in the Certificate Manager, make sure that
   you won&apos;t need it again for the purposes of identifying a web site or
   mail server and setting up an encrypted connection.</p>
 
 <h2 id="authorities">Authorities</h2>
@@ -271,26 +218,26 @@
   name, double-click the name to expand it.</p>
 
 <p>Use the following buttons to view and manage your certificates (most actions
   require one or more certificates to be selected):</p>
 
 <ul>
   <li><strong>View</strong>: Display detailed information about the selected
     certificates.</li>
-  <li><strong>Edit</strong>: View or change the settings that Certificate
+  <li><strong>Edit Trust</strong>: View or change the settings that Certificate
     Manager associates with the selected certificates. You can use these
     settings to designate what kinds of certificates, if any, you trust that
     are issued by the corresponding CAs.</li>
   <li><strong>Import</strong>: Import a file containing one or more
     certificates. When you click Import, Certificate Manager first asks you
     to locate the file that contains the certificate(s).</li>
   <li><strong>Export</strong>: Export the selected certificates. You can
     choose among various formats.</li>
-  <li><strong>Delete</strong>: Delete the selected certificates.</li>
+  <li><strong>Delete or Distrust</strong>: Delete the selected certificates.</li>
 </ul>
 
 <p>To ensure that an entire
   <a href="glossary.xhtml#certificate_chain">certificate chain</a> of CAs are
   all trusted, you need to edit the root CA certifiate only.</p>
 
 <p>To import the chain, you click a link on a web page provided by the CA. You
   can then use the authorities tab to locate the root certificate and edit its
diff --git a/suite/chrome/common/help/mailnews_preferences.xhtml b/suite/chrome/common/help/mailnews_preferences.xhtml
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -283,17 +283,17 @@
     </ul>
     <ul class="unix">
       <li><strong>Use the operating system&apos;s desktop
         notifications</strong>: Select this to use the operating system&apos;s
         notification system (e.g., libnotify), if available. Note that some
         configuration options for the alert message may not be supported.</li>
       <li><strong>Use &brandShortName;&apos;s own notification
         windows</strong>: Select this to use the built-in
-        <a href="glossary.xhtml#XUL">XUL</a>-based notification system for
+        <a href="glossary.xhtml#xul">XUL</a>-based notification system for
         new-mail alerts. All configuration options are supported.</li>
     </ul>
     <p>When the alert appears, clicking an entry for a message will take you
       to the respective folder and opens that message. You can close the alert
       using the <strong>x</strong> button.
     </p>
 
     <p>The new message alert will continue to work even after you close the
diff --git a/suite/chrome/common/passwordManager.dtd b/suite/chrome/common/passwordManager.dtd
deleted file mode 100644
--- a/suite/chrome/common/passwordManager.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY      windowtitle.label               "Password Manager">
-<!ENTITY      tab.signonsstored.label         "Passwords Saved">
-<!ENTITY      tab.signonsnotstored.label      "Passwords Never Saved">
-<!ENTITY      search.placeholder              "Search">
diff --git a/suite/chrome/mailnews/addressbook/addressBook.properties b/suite/chrome/mailnews/addressbook/addressBook.properties
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -1,15 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the Mailing list dialog
 #
+
+## LOCALIZATION NOTE (mailingListTitleEdit): %S will be replaced by the Mailing List's display name
+mailingListTitleEdit=Edit %S
 emptyListName=You must enter a list name.
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S  
 
 newContactTitle=New Contact
 # %S will be the card's display name
 newContactTitleWithDisplayName=New Contact for %S
 editContactTitle=Edit Contact
@@ -94,20 +97,22 @@ ldap_2.servers.history.description=Colle
 ldap_2.servers.oe.description=OE Contacts
 ## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
 ldap_2.servers.osx.description=Mac OS X Address Book
 
 # status bar stuff
 ## LOCALIZATION NOTE (totalContactStatus): 
 ## %1$S is address book name, %2$S is card count
 totalContactStatus=Total contacts in %1$S: %2$S
-## LOCALIZATION NOTE (matchesFound):  do not localize %S
 noMatchFound=No matches found
-matchFound=1 match found
-matchesFound=%S matches found
+## LOCALIZATION NOTE (matchesFound1):
+## Semicolon-separated list of singular and plural forms.
+## See: https://developer.mozilla.org/docs/Mozilla/Localization/Localization_and_Plurals
+## #1 is the number of matching contacts found
+matchesFound1=#1 match found;#1 matches found
 
 ## LOCALIZATION NOTE (contactsCopied): Semi-colon list of plural forms
 ## %1$S is the number of contacts that were copied. This should be used multiple
 ## times wherever you need it. Do not replace by %S.
 contactsCopied=%1$S contact copied;%1$S contacts copied
 
 ## LOCALIZATION NOTE (contactsMoved): Semi-colon list of plural forms
 ## %1$S is the number of contacts that were moved. This should be used multiple
@@ -149,18 +154,19 @@ joinMeInThisChat=Join+me+in+this+Chat.
 headingHome=Home
 headingWork=Work
 headingOther=Other
 headingPhone=Phone
 headingDescription=Description
 headingAddresses=Addresses
 
 # For address books
-newAddressBookTitle=New Address Book
-renameAddressBookTitle=Address Book Properties
+addressBookTitleNew=New Address Book
+## LOCALIZATION NOTE (addressBookTitleEdit): %S will be replaced by the the Address Book's name
+addressBookTitleEdit=%S Properties
 
 # For corrupt .mab files
 corruptMabFileTitle=Corrupt Address Book File
 corruptMabFileAlert=One of your address book files (%1$S file) could not be read. A new %2$S file will be created and a backup of the old file, called %3$S, will be created in the same directory.
 
 # For locked .mab files
 lockedMabFileTitle=Unable to Load Address Book File
 lockedMabFileAlert=Unable to load address book file %S. It may be read-only, or locked by another application. Please try again later.
diff --git a/suite/chrome/mailnews/messenger.properties b/suite/chrome/mailnews/messenger.properties
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -244,17 +244,17 @@ junkScoreOriginImapFlag=IMAP Flag
 
 # for the has attachment picker in search and mail views
 hasAttachments=Has Attachments
 
 # for the Tag picker in search and mail views.
 tag=Tag
 
 # mailnews.js
-mailnews.send_default_charset=ISO-8859-1
+mailnews.send_default_charset=UTF-8
 mailnews.view_default_charset=ISO-8859-1
 
 # whether to generate display names in last first order
 # LOCALIZATION NOTE(mail.addr_book.displayName.lastnamefirst):
 # the only valid values are: true OR false (choose from the untranslated English words)
 mail.addr_book.displayName.lastnamefirst=false
 
 # whether to also show phonetic fields in the addressbook
diff --git a/suite/chrome/mailnews/newsblog/newsblog.properties b/suite/chrome/mailnews/newsblog/newsblog.properties
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -8,17 +8,19 @@ subscribe-cancelSubscriptionTitle=Subscribing to a Feed…
 subscribe-feedAlreadySubscribed=You already have a subscription for this feed.
 subscribe-errorOpeningFile=Could not open the file.
 subscribe-feedAdded=Feed added.
 subscribe-feedUpdated=Feed updated.
 subscribe-feedMoved=Feed subscription moved.
 subscribe-feedCopied=Feed subscription copied.
 subscribe-feedRemoved=Feed unsubscribed.
 subscribe-feedNotValid=The Feed URL is not a valid feed.
+subscribe-feedVerified=The Feed URL has been verified.
 subscribe-networkError=The Feed URL could not be found. Please check the name and try again.
+subscribe-noAuthError=The Feed URL is not authorised.
 subscribe-loading=Loading, please wait…
 
 subscribe-OPMLImportTitle=Select OPML file to import
 ## LOCALIZATION NOTE(subscribe-OPMLExportTitleList):
 ## %S is the name of the feed account folder name.
 subscribe-OPMLExportTitleList=Export %S as an OPML file - Feeds list
 ## LOCALIZATION NOTE(subscribe-OPMLExportTitleStruct):
 ## %S is the name of the feed account folder name.
@@ -61,16 +63,20 @@ subscribe-confirmFeedDeletion=Are you su
 ##  - The second %S is the total number of items
 subscribe-gettingFeedItems=Downloading feed articles (%S of %S)…
 
 newsblog-noNewArticlesForFeed=There are no new articles for this feed.
 ## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=%S could not be found. Please check the name and try again.
 ## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
 newsblog-feedNotValid=%S is not a valid feed.
+## LOCALIZATION NOTE(newsblog-badCertError): %S is the feed URL host
+newsblog-badCertError=%S uses an invalid security certificate.
+## LOCALIZATION NOTE(newsblog-noAuthError): %S is the feed URL
+newsblog-noAuthError=%S is not authorised.
 newsblog-getNewMsgsCheck=Checking feeds for new items…
 
 ## LOCALIZATION NOTE(feeds-accountname): This string should be the same as feeds.accountName in am-newsblog.dtd
 feeds-accountname=Blogs & News Feeds
 
 ## LOCALIZATION NOTE(externalAttachmentMsg): Content in the MIME part for external link attachments.
 externalAttachmentMsg=This MIME attachment is stored separately from the message.
 
diff --git a/suite/chrome/mailnews/pref/am-identity-edit.dtd b/suite/chrome/mailnews/pref/am-identity-edit.dtd
--- a/suite/chrome/mailnews/pref/am-identity-edit.dtd
+++ b/suite/chrome/mailnews/pref/am-identity-edit.dtd
@@ -1,14 +1,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE (identityDialog.style): This value should be roughly
      equal to the value of accountManager.size entity minus the value
      of accountTree.width entity. -->
 <!ENTITY identityDialog.style "min-width: 75ch;">
-<!ENTITY identityTitle.label "Identity Settings">
 <!ENTITY identityListDesc.label "Configure the settings for this identity:">
 
 <!ENTITY settingsTab.label       "Settings">
 <!ENTITY copiesFoldersTab.label "Copies &amp; Folders">
 <!ENTITY addressingTab.label    "Composition &amp; Addressing">
+
+<!ENTITY publicData.label        "Public Data">
+<!ENTITY privateData.label       "Private Data">
+<!ENTITY identityAlias.label     "Identity Label:">
+<!ENTITY identityAlias.accesskey "b">
diff --git a/suite/chrome/mailnews/pref/pref-directory-add.dtd b/suite/chrome/mailnews/pref/pref-directory-add.dtd
--- a/suite/chrome/mailnews/pref/pref-directory-add.dtd
+++ b/suite/chrome/mailnews/pref/pref-directory-add.dtd
@@ -1,13 +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/. -->
 
-<!ENTITY newDirectoryTitle.label           "Directory Server Properties">
 <!ENTITY directoryName.label               "Name: ">
 <!ENTITY directoryName.accesskey           "n">
 <!ENTITY directoryHostname.label           "Hostname: ">
 <!ENTITY directoryHostname.accesskey       "o">
 <!ENTITY directoryBaseDN.label             "Base DN: ">
 <!ENTITY directoryBaseDN.accesskey         "b">
 <!ENTITY findButton.label                  "Find">
 <!ENTITY findButton.accesskey              "f">
diff --git a/suite/chrome/mailnews/pref/prefs.properties b/suite/chrome/mailnews/pref/prefs.properties
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -26,19 +26,16 @@ localDirectoryNotAllowed=The Local Direc
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
 enterValidServerName=Please enter a valid server name.
 failedRemoveAccount=Failed to remove this account.
-#LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
-confirmRemoveAccount=Are you sure you want to remove the account "%S"?
-confirmRemoveAccountTitle=Remove Account
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 # LOCALIZATION NOTE: confirmDeferAccountWarning: do not localize "\n\n", it means a new empty line in the string.
 confirmDeferAccountWarning=If you store this account's new mail in a different account's Inbox, you will no longer be able to access already downloaded e-mail for this account. If you have mail in this account, please copy it to another account first.\n\nIf you have filters that filter mail into this account, you should disable them or change the destination folder. If any accounts have special folders in this account (Sent, Drafts, Templates, Archives, Junk), you should change them to be in another account.\n\nDo you still want to store this account's e-mail in a different account?
 confirmDeferAccountTitle=Defer Account?
 
 directoryAlreadyUsedByOtherAccount=The directory specified in the Local Directory setting is already used by the "%S" account. Please pick a different directory.
@@ -62,16 +59,20 @@ prefPanel-addressing=Composition & Addre
 prefPanel-junk=Junk Settings
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Outgoing Server (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
 identity-list-title=Identities for %1$S
 
+identityDialogTitleAdd=New Identity
+## LOCALIZATION NOTE (identityDialogTitleEdit): %S is the identity name
+identityDialogTitleEdit=Edit %S
+
 identity-edit-req=You must specify a valid email address for this identity.
 identity-edit-req-title=Error Creating Identity
 
 ## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
 # and should be put on a new line. The new line is produced with the "\n" string.
 identity-delete-confirm=Are you sure you want to delete the identity\n%S?
 ## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
 identity-delete-confirm-title=Deleting identity for %S
diff --git a/suite/chrome/mailnews/pref/removeAccount.dtd b/suite/chrome/mailnews/pref/removeAccount.dtd
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/pref/removeAccount.dtd
@@ -0,0 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY dialogTitle                  "Remove Account and Data">
+<!ENTITY removeButton.label           "Remove">
+<!ENTITY removeButton.accesskey       "R">
+<!ENTITY removeAccount.label          "Remove account information">
+<!ENTITY removeAccount.accesskey      "a">
+<!ENTITY removeAccount.desc           "Removes only &brandShortName;'s knowledge of this account. Does not affect the account itself on the server.">
+<!ENTITY removeData.label             "Remove message data">
+<!ENTITY removeData.accesskey         "d">
+<!ENTITY removeDataLocalAccount.desc  "Removes all messages, folders and filters associated with this account from your local disc. This does not affect some messages which may still be kept on the server. Do not choose this if you plan to archive the local data or re-use it in &brandShortName; later.">
+<!ENTITY removeDataServerAccount.desc "Removes all messages, folders and filters associated with this account from your local disc. Your messages and folders are still kept on the server.">
+<!ENTITY showData.label               "Show data location">
+<!ENTITY showData.accesskey           "S">
+<!ENTITY progressPending              "Removing selected data…">
+<!ENTITY progressSuccess              "Removal succeeded.">
+<!ENTITY progressFailure              "Removal failed.">
diff --git a/suite/chrome/mailnews/pref/removeAccount.properties b/suite/chrome/mailnews/pref/removeAccount.properties
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/pref/removeAccount.properties
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+removeQuestion=Are you sure you want to remove the account "%S"?
diff --git a/suite/chrome/mailnews/pref/replicationProgress.properties b/suite/chrome/mailnews/pref/replicationProgress.properties
--- a/suite/chrome/mailnews/pref/replicationProgress.properties
+++ b/suite/chrome/mailnews/pref/replicationProgress.properties
@@ -9,8 +9,12 @@ replicationCancelled=Replication cancell
 # LOCALIZATION NOTE
 # do not localize %S.  %S is the current entry number (an integer)
 currentCount=Replicating directory entry: %S
 
 downloadButton=Download Now
 downloadButton.accesskey=D
 cancelDownloadButton=Cancel Download
 cancelDownloadButton.accesskey=C
+
+directoryTitleNew=New LDAP Directory
+## LOCALIZATION NOTE (directoryTitleEdit): %S will be replaced by the LDAP directory's display name
+directoryTitleEdit=%S Properties
diff --git a/suite/chrome/mailnews/smime/am-smime.dtd b/suite/chrome/mailnews/smime/am-smime.dtd
--- a/suite/chrome/mailnews/smime/am-smime.dtd
+++ b/suite/chrome/mailnews/smime/am-smime.dtd
@@ -25,8 +25,13 @@
 <!ENTITY signMessage.accesskey "D">
 <!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
 
 <!ENTITY certificates.label "Certificates">
 <!ENTITY manageCerts2.label "Manage Certificates…">
 <!ENTITY manageCerts2.accesskey "M">
 <!ENTITY manageDevices.label "Manage Security Devices…">
 <!ENTITY manageDevices.accesskey "g">
+
+<!-- Strings for the cert picker dialog -->
+<!ENTITY certPicker.title "Select Certificate">
+<!ENTITY certPicker.info  "Certificate:">
+<!ENTITY certPicker.detailsLabel "Details of selected certificate:">
diff --git a/suite/chrome/mailnews/smime/am-smime.properties b/suite/chrome/mailnews/smime/am-smime.properties
--- a/suite/chrome/mailnews/smime/am-smime.properties
+++ b/suite/chrome/mailnews/smime/am-smime.properties
@@ -22,8 +22,20 @@ encryption_wantSame=Do you want to use t
 encryption_needCertWantToSelect=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to configure an encryption certificate now?
 signing_needCertWantSame=You should also specify a certificate to use for digitally signing your messages. Do you want to use the same certificate to digitally sign your messages?
 signing_wantSame=Do you want to use the same certificate to digitally sign your messages?
 signing_needCertWantToSelect=You should also specify a certificate to use for digitally signing your messages. Do you want to configure a certificate for digitally signing messages now?
 
 ## Strings used by nsMsgComposeSecure
 mime_smimeEncryptedContentDesc=S/MIME Encrypted Message
 mime_smimeSignatureContentDesc=S/MIME Cryptographic Signature
+
+## Strings used by the cert picker.
+CertInfoIssuedFor=Issued to:
+CertInfoIssuedBy=Issued by:
+CertInfoValid=Valid
+CertInfoFrom=from
+CertInfoTo=to
+CertInfoPurposes=Purposes
+CertInfoEmail=Email
+CertInfoStoredIn=Stored in:
+NicknameExpired=(expired)
+NicknameNotYetValid=(not yet valid)
diff --git a/suite/chrome/mailnews/start.dtd b/suite/chrome/mailnews/start.dtd
--- a/suite/chrome/mailnews/start.dtd
+++ b/suite/chrome/mailnews/start.dtd
@@ -17,18 +17,18 @@ client, supporting advanced junk mail de
 <!ENTITY feat_htmlmsg.label "HTML message support">
 <!ENTITY feat_abook.label "Address Book">
 <!ENTITY feat_tags.label "Customisable Tags and Mail Views">
 <!ENTITY feat_integration.label
 "Tight integration with the &brandShortName; application suite">
 <!ENTITY dict.title "Dictionaries">
 <!ENTITY dict_intro.label "Dictionaries are used to check the spelling of your messages.">
 <!--# LOCALIZATION NOTE (dict_info.label): the URL for <a id="dictURL"> is fetched from brand.properties -->
-<!ENTITY dict_info.label
+<!ENTITY dict_info.label2
 'Many additional languages can be installed from the
 <a id="dictURL" href="">dictionaries</a> section on
-<a href="https://addons.mozilla.org/seamonkey/">Mozilla Add-ons</a>.'>
+<a href="https://addons.thunderbird.net/seamonkey/">SeaMonkey and Thunderbird Add-ons</a>.'>
 <!ENTITY info.title "More Information">
 <!--# LOCALIZATION NOTE (info_bugs.label): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
 <!ENTITY info_bugs.label
 '<a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature
 requests, but please read the <a id="releaseNotesURL" href="">release notes</a> and query
 <a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
diff --git a/suite/installer/windows/custom.properties b/suite/installer/windows/custom.properties
--- a/suite/installer/windows/custom.properties
+++ b/suite/installer/windows/custom.properties
@@ -41,25 +41,27 @@ SHORTCUTS_PAGE_SUBTITLE=Create Program I
 SUMMARY_PAGE_TITLE=Summary
 SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName
 SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location:
 SUMMARY_CLICK=Click Install to continue.
 SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
 SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
 SURVEY_TEXT=&Tell us what you thought of $BrandShortName
 LAUNCH_TEXT=&Launch $BrandFullNameDA now
-WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
-WARN_UNSUPPORTED_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
 CREATE_ICONS_DESC=Create icons for $BrandShortName:
 ICONS_DESKTOP=On my &Desktop
 ICONS_STARTMENU=In my &Start Menu Programs folder
 ICONS_QUICKLAUNCH=In my &Quick Launch bar
 WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
 WARN_DISK_SPACE=You don't have sufficient disc space to install to this location.\n\nClick OK to select a different location.
+WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
+WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.
+WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
+WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
 WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of $BrandShortName. Do you want to reboot now?
 WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
 ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
 ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
 
 UN_CONFIRM_CLICK=Click Uninstall to continue.
 UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
