b=129100 Finalize S/Mime UI implementation

r=ducarroz/javi
sr=mscott
a=asa

suite/locales/en-US/chrome/mailnews/smime/am-smime.dtd

@@ -1,13 +1,12 @@
 <!ENTITY securityTitle.label "Security">
 <!ENTITY encryptionGroupTitle.label "Encryption">
-<!ENTITY encryptionChoiceLabel.label "Use encryption when sending messages:">
-<!ENTITY neverEncrypt.label "Never">
-<!ENTITY ifPossibleEncryptMessage.label "If possible (messages are sent without encryption if not all recipients have a certificate)">
-<!ENTITY alwaysEncryptMessage.label "Always (disable send unless all recipients have a certificate)">
+<!ENTITY encryptionChoiceLabel.label "Default encryption setting when sending messages:">
+<!ENTITY neverEncrypt.label "Never (do not use encryption)">
+<!ENTITY alwaysEncryptMessage.label "Required (can't send message unless all recipients have certificates)">
 <!ENTITY encryptionCert.message "Use the following personal certificate:">
 <!ENTITY encryptionCert.notselected "No certificate set">
 <!ENTITY certificate.button "Select...">
 <!ENTITY signingGroupTitle.label "Digital Signing">
-<!ENTITY signMessage.label "Digitally sign messages">
+<!ENTITY signMessage.label "Digitally sign messages (by default)">
 <!ENTITY signingCert.message "Use the following personal certificate:">
 <!ENTITY signingCert.notselected "No certificate set">

suite/locales/en-US/chrome/mailnews/smime/am-smime.properties

@@ -6,4 +6,3 @@ SignNoSenderEncryptionCert=You requested to sign this message, but the applicati
 
 ## Strings used for in the prefs.
 prefPanel-smime=Security
-smimeCertPrompt=Select the certificate that you want to use:

suite/locales/en-US/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd

@@ -6,8 +6,8 @@
 <!ENTITY menu_securityEncryptIfPossible.label "Encrypt if Possible">
 <!ENTITY menu_securityEncryptIfPossible.accesskey "E">
 
-<!ENTITY menu_securityEncryptAlways.label "Always Encrypt">
-<!ENTITY menu_securityEncryptAlways.accesskey "A">
+<!ENTITY menu_securityEncryptRequire.label "Require Encryption">
+<!ENTITY menu_securityEncryptRequire.accesskey "R">
 
 <!ENTITY menu_securityNoEncryption.label "No Encryption">
 <!ENTITY menu_securityNoEncryption.accesskey "N">
@@ -17,3 +17,8 @@
 
 <!ENTITY menu_securityStatus.label "Message Security">
 <!ENTITY menu_securityStatus.accesskey "M">
+
+<!ENTITY securityButton.label "Security">
+
+<!ENTITY menu_viewSecurityStatus.label "Message Security Info">
+<!ENTITY menu_viewSecurityStatus.accesskey "I">

suite/locales/en-US/chrome/mailnews/smime/msgCompSMIMEOverlay.properties

@@ -0,0 +1,2 @@
+## S/MIME mail compose window error strings.
+NeedSetup=You need to set up one or more personal certificates before you can use this security feature. Would you like to learn how to do this now?

suite/locales/en-US/chrome/mailnews/smime/msgCompSecurityInfo.dtd

@@ -0,0 +1,13 @@
+<!--LOCALIZATION NOTE msgCompSecurityInfo.dtd UI for viewing security status when composing a message -->
+
+<!ENTITY title.label "Message Security">
+<!ENTITY subject.plaintextWarning "Please note: Subject lines of email messages are never encrypted.">
+<!ENTITY status.heading "The contents of your message will be sent as follows:">
+<!ENTITY status.signed "Digitally signed:">
+<!ENTITY status.encrypted "Encrypted:">
+<!ENTITY status.certificates "Certificates:">
+<!ENTITY view.label "View">
+<!ENTITY tree.recipient "Recipient:">
+<!ENTITY tree.status "Status:">
+<!ENTITY tree.issuedDate "Issued:">
+<!ENTITY tree.expiresDate "Expires:">

suite/locales/en-US/chrome/mailnews/smime/msgCompSecurityInfo.properties

@@ -0,0 +1,9 @@
+StatusNotFound=Not Found
+StatusValid=Valid
+StatusExpired=Expired
+StatusUntrusted=Not Trusted
+StatusRevoked=Revoked
+StatusInvalid=Invalid
+StatusYes=Yes
+StatusNo=No
+StatusNotPossible=Not possible