[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [translation/https_everywhere] Partial fix for #9144

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/https_everywhere] Partial fix for #9144
From: translation@xxxxxxxxxxxxxx
Date: Mon, 10 Mar 2014 21:19:25 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 10 Mar 2014 17:19:59 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 3879f2b2bfbf58e2da01c920d152003a723bcab7
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Mar 10 21:19:12 2014 +0000

    Partial fix for #9144
---
 ak/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 am/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 arn/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 ast/ssl-observatory.dtd      |   71 ++++++++++++++++++++++-----------------
 az/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 be/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 bn/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 bo/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 br/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 csb/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 cy/ssl-observatory.dtd       |   69 +++++++++++++++++++++-----------------
 dz/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 eo/ssl-observatory.dtd       |   73 ++++++++++++++++++++++------------------
 es_AR/ssl-observatory.dtd    |   73 ++++++++++++++++++++++------------------
 es_CO/ssl-observatory.dtd    |   75 +++++++++++++++++++++++-------------------
 fo/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 fur/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 fy/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ga/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 gl/ssl-observatory.dtd       |   69 +++++++++++++++++++++-----------------
 gu_IN/ssl-observatory.dtd    |   75 +++++++++++++++++++++++-------------------
 gun/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 ha/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ht/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 hy/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ia/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 is/ssl-observatory.dtd       |   73 ++++++++++++++++++++++------------------
 jv/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ka/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 kn/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 ko_KR/ssl-observatory.dtd    |   73 ++++++++++++++++++++++------------------
 ku/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 kw/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 lb/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 lg/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ln/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 lo/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 mg/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 mi/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ml/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 mn/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 mt/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 my/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 nah/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 nap/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 nn/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 nso/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 oc/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 or/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 pap/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 pms/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 ps/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 si/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 sk_SK/ssl-observatory.dtd    |   69 +++++++++++++++++++++-----------------
 so/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 son/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 sq/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 sr@latin/ssl-observatory.dtd |   71 ++++++++++++++++++++++-----------------
 st/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 su/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 szl/ssl-observatory.dtd      |   75 +++++++++++++++++++++++-------------------
 te/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 te_IN/ssl-observatory.dtd    |   75 +++++++++++++++++++++++-------------------
 tg/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ti/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 tk/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ur/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 ur_PK/ssl-observatory.dtd    |   71 ++++++++++++++++++++++-----------------
 uz/ssl-observatory.dtd       |   71 ++++++++++++++++++++++-----------------
 ve/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 wa/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 wo/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 zu/ssl-observatory.dtd       |   75 +++++++++++++++++++++++-------------------
 73 files changed, 3035 insertions(+), 2378 deletions(-)

diff --git a/ak/ssl-observatory.dtd b/ak/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ak/ssl-observatory.dtd
+++ b/ak/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/am/ssl-observatory.dtd b/am/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/am/ssl-observatory.dtd
+++ b/am/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/arn/ssl-observatory.dtd b/arn/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/arn/ssl-observatory.dtd
+++ b/arn/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ast/ssl-observatory.dtd b/ast/ssl-observatory.dtd
index c0560ce..5219d16 100644
--- a/ast/ssl-observatory.dtd
+++ b/ast/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Non">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Si">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/az/ssl-observatory.dtd b/az/ssl-observatory.dtd
index eb4b433..50dae88 100644
--- a/az/ssl-observatory.dtd
+++ b/az/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Xeyr">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "BÉ?li">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/be/ssl-observatory.dtd b/be/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/be/ssl-observatory.dtd
+++ b/be/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/bn/ssl-observatory.dtd b/bn/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/bn/ssl-observatory.dtd
+++ b/bn/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/bo/ssl-observatory.dtd b/bo/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/bo/ssl-observatory.dtd
+++ b/bo/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/br/ssl-observatory.dtd b/br/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/br/ssl-observatory.dtd
+++ b/br/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/csb/ssl-observatory.dtd b/csb/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/csb/ssl-observatory.dtd
+++ b/csb/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/cy/ssl-observatory.dtd b/cy/ssl-observatory.dtd
index bc88e19..9300118 100644
--- a/cy/ssl-observatory.dtd
+++ b/cy/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Na">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Ia">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
 <!ENTITY ssl-observatory.prefs.done "Wedi gorffen">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/dz/ssl-observatory.dtd b/dz/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/dz/ssl-observatory.dtd
+++ b/dz/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd
index 6c5a79f..95f571f 100644
--- a/eo/ssl-observatory.dtd
+++ b/eo/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
 <!ENTITY ssl-observatory.prefs.title "Preferumoj pri &quot;SSL Observatory&quot;">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/es_AR/ssl-observatory.dtd b/es_AR/ssl-observatory.dtd
index 1c431b7..8663d1c 100644
--- a/es_AR/ssl-observatory.dtd
+++ b/es_AR/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
 <!ENTITY ssl-observatory.prefs.done "Hecho">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/es_CO/ssl-observatory.dtd b/es_CO/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/es_CO/ssl-observatory.dtd
+++ b/es_CO/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/fo/ssl-observatory.dtd b/fo/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/fo/ssl-observatory.dtd
+++ b/fo/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/fur/ssl-observatory.dtd b/fur/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/fur/ssl-observatory.dtd
+++ b/fur/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/fy/ssl-observatory.dtd b/fy/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/fy/ssl-observatory.dtd
+++ b/fy/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ga/ssl-observatory.dtd b/ga/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ga/ssl-observatory.dtd
+++ b/ga/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/gl/ssl-observatory.dtd b/gl/ssl-observatory.dtd
index 50056ea..a5a1f9a 100644
--- a/gl/ssl-observatory.dtd
+++ b/gl/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Non">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Si">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
 <!ENTITY ssl-observatory.prefs.done "Feito">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/gu_IN/ssl-observatory.dtd b/gu_IN/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/gu_IN/ssl-observatory.dtd
+++ b/gu_IN/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/gun/ssl-observatory.dtd b/gun/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/gun/ssl-observatory.dtd
+++ b/gun/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ha/ssl-observatory.dtd b/ha/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ha/ssl-observatory.dtd
+++ b/ha/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ht/ssl-observatory.dtd b/ht/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ht/ssl-observatory.dtd
+++ b/ht/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/hy/ssl-observatory.dtd b/hy/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/hy/ssl-observatory.dtd
+++ b/hy/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ia/ssl-observatory.dtd b/ia/ssl-observatory.dtd
index a576822..5dc6242 100644
--- a/ia/ssl-observatory.dtd
+++ b/ia/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Si">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/is/ssl-observatory.dtd b/is/ssl-observatory.dtd
index 3bf3033..26cf2f0 100644
--- a/is/ssl-observatory.dtd
+++ b/is/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
 <!ENTITY ssl-observatory.prefs.title "SSL Observatory ValmÃ¶guleikar">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/jv/ssl-observatory.dtd b/jv/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/jv/ssl-observatory.dtd
+++ b/jv/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ka/ssl-observatory.dtd
+++ b/ka/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/kn/ssl-observatory.dtd b/kn/ssl-observatory.dtd
index 79bd909..dee081f 100644
--- a/kn/ssl-observatory.dtd
+++ b/kn/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "à²?à²²à³?à²²à²ªà³?à²ª">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "à²?à²?à³?">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ko_KR/ssl-observatory.dtd b/ko_KR/ssl-observatory.dtd
index aaa583b..28c7e4f 100644
--- a/ko_KR/ssl-observatory.dtd
+++ b/ko_KR/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "ë?¤">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ku/ssl-observatory.dtd b/ku/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ku/ssl-observatory.dtd
+++ b/ku/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/kw/ssl-observatory.dtd b/kw/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/kw/ssl-observatory.dtd
+++ b/kw/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/lb/ssl-observatory.dtd b/lb/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/lb/ssl-observatory.dtd
+++ b/lb/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/lg/ssl-observatory.dtd b/lg/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/lg/ssl-observatory.dtd
+++ b/lg/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ln/ssl-observatory.dtd b/ln/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ln/ssl-observatory.dtd
+++ b/ln/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/lo/ssl-observatory.dtd b/lo/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/lo/ssl-observatory.dtd
+++ b/lo/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/mg/ssl-observatory.dtd b/mg/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/mg/ssl-observatory.dtd
+++ b/mg/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/mi/ssl-observatory.dtd b/mi/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/mi/ssl-observatory.dtd
+++ b/mi/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ml/ssl-observatory.dtd b/ml/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ml/ssl-observatory.dtd
+++ b/ml/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/mn/ssl-observatory.dtd b/mn/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/mn/ssl-observatory.dtd
+++ b/mn/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/mt/ssl-observatory.dtd b/mt/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/mt/ssl-observatory.dtd
+++ b/mt/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/my/ssl-observatory.dtd b/my/ssl-observatory.dtd
index 32c9139..5530a79 100644
--- a/my/ssl-observatory.dtd
+++ b/my/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "á??á??á?ºá??á??á?¶á?·á?«">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "á??á?¯á??á?ºá??á?²á?·">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/nah/ssl-observatory.dtd b/nah/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/nah/ssl-observatory.dtd
+++ b/nah/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/nap/ssl-observatory.dtd b/nap/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/nap/ssl-observatory.dtd
+++ b/nap/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/nn/ssl-observatory.dtd b/nn/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/nn/ssl-observatory.dtd
+++ b/nn/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/nso/ssl-observatory.dtd b/nso/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/nso/ssl-observatory.dtd
+++ b/nso/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/oc/ssl-observatory.dtd b/oc/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/oc/ssl-observatory.dtd
+++ b/oc/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/or/ssl-observatory.dtd b/or/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/or/ssl-observatory.dtd
+++ b/or/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/pap/ssl-observatory.dtd b/pap/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/pap/ssl-observatory.dtd
+++ b/pap/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/pms/ssl-observatory.dtd b/pms/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/pms/ssl-observatory.dtd
+++ b/pms/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ps/ssl-observatory.dtd b/ps/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ps/ssl-observatory.dtd
+++ b/ps/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/si/ssl-observatory.dtd b/si/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/si/ssl-observatory.dtd
+++ b/si/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/sk_SK/ssl-observatory.dtd b/sk_SK/ssl-observatory.dtd
index 911e583..e6597bb 100644
--- a/sk_SK/ssl-observatory.dtd
+++ b/sk_SK/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Nie">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Ã?no">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
 <!ENTITY ssl-observatory.prefs.done "Hotovo">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/so/ssl-observatory.dtd b/so/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/so/ssl-observatory.dtd
+++ b/so/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/son/ssl-observatory.dtd b/son/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/son/ssl-observatory.dtd
+++ b/son/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/sq/ssl-observatory.dtd b/sq/ssl-observatory.dtd
index becbb3c..f32505a 100644
--- a/sq/ssl-observatory.dtd
+++ b/sq/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Jo">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Po">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/sr@latin/ssl-observatory.dtd b/sr@latin/ssl-observatory.dtd
index 543bd33..84738a8 100644
--- a/sr@latin/ssl-observatory.dtd
+++ b/sr@latin/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Ne">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Da">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/st/ssl-observatory.dtd b/st/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/st/ssl-observatory.dtd
+++ b/st/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/su/ssl-observatory.dtd b/su/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/su/ssl-observatory.dtd
+++ b/su/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/szl/ssl-observatory.dtd b/szl/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/szl/ssl-observatory.dtd
+++ b/szl/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/te/ssl-observatory.dtd b/te/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/te/ssl-observatory.dtd
+++ b/te/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/te_IN/ssl-observatory.dtd b/te_IN/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/te_IN/ssl-observatory.dtd
+++ b/te_IN/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/tg/ssl-observatory.dtd b/tg/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/tg/ssl-observatory.dtd
+++ b/tg/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ti/ssl-observatory.dtd b/ti/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ti/ssl-observatory.dtd
+++ b/ti/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/tk/ssl-observatory.dtd b/tk/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/tk/ssl-observatory.dtd
+++ b/tk/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ur/ssl-observatory.dtd b/ur/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ur/ssl-observatory.dtd
+++ b/ur/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ur_PK/ssl-observatory.dtd b/ur_PK/ssl-observatory.dtd
index a47660b..8d71018 100644
--- a/ur_PK/ssl-observatory.dtd
+++ b/ur_PK/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Ù?Û?Û?Úº">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Û?Ø§Úº">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/uz/ssl-observatory.dtd b/uz/ssl-observatory.dtd
index 9bce1b7..bfd0206 100644
--- a/uz/ssl-observatory.dtd
+++ b/uz/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "Yo'q">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Ha">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/ve/ssl-observatory.dtd b/ve/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/ve/ssl-observatory.dtd
+++ b/ve/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/wa/ssl-observatory.dtd b/wa/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/wa/ssl-observatory.dtd
+++ b/wa/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/wo/ssl-observatory.dtd b/wo/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/wo/ssl-observatory.dtd
+++ b/wo/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
diff --git a/zu/ssl-observatory.dtd b/zu/ssl-observatory.dtd
index d832b69..9457a96 100644
--- a/zu/ssl-observatory.dtd
+++ b/zu/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "">
-<!ENTITY ssl-observatory.popup.later "">
-<!ENTITY ssl-observatory.popup.no "">
+<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"">
+"Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "">
+<!ENTITY ssl-observatory.popup.yes "Yes">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"">
+"It is safe to enable this, unless you use a very
+intrusive corporate network:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"">
+"Safe, unless you use a corporate network with secret intranet server names:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"">
+"Submit and check certificates signed by non-standard root CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"">
+"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority.  If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce.  So we leave it off by default.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "">
+<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"">
+"Check certificates using Tor for anonymity (requires Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"">
+"This option requires Tor to be installed and running">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"">
+"When you see a new certificate, tell the Observatory which ISP you are connected to">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"">
+"This will fetch and send the &quot;Autonomous System number&quot; of your network.  This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.">
 
-<!ENTITY ssl-observatory.prefs.done "">
+<!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"">
+"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"">
+"For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:">
 
-<!ENTITY ssl-observatory.prefs.hide "">
+<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"">
+"Check certificates even if Tor is not available">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"">
+"We will still try to keep the data anonymous, but this option is less secure">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"">
+"Submit and check certificates for non-public DNS names">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"">
+"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">
 
-<!ENTITY ssl-observatory.prefs.show "">
+<!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
 
-<!ENTITY ssl-observatory.prefs.use "">
-<!ENTITY ssl-observatory.warning.title "">
-<!ENTITY ssl-observatory.warning.showcert "">
-<!ENTITY ssl-observatory.warning.okay "">
-<!ENTITY ssl-observatory.warning.text "">
-<!ENTITY ssl-observatory.warning.defense "">
+<!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
+<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
+<!ENTITY ssl-observatory.warning.okay "I understand">
+<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
+<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"">
+"Submit and check self-signed certificates">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"">
+"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
Next by Author: [tor-commits] [translation/torbutton-branddtd] Partial fix for #9144
Previous by thread: [tor-commits] [translation/abouttor-homepage] Partial fix for #9144
Next by thread: [tor-commits] [translation/torbutton-branddtd] Partial fix for #9144
Index(es):
- Author
- Thread