From 789ffd1155c1cc9f4fa7f719346d68cfabada800 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Tue, 10 May 2016 19:16:58 -0400
Subject: HTTPS-Everywhere updated to 5.1.6

---
 .../chrome/locale/ach/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ady/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/af/https-everywhere.dtd          |  58 ++++++------
 .../chrome/locale/ak/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/am/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/am_ET/https-everywhere.dtd       |  10 +-
 .../chrome/locale/am_ET/ssl-observatory.dtd        |  10 +-
 .../chrome/locale/ar/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/ar/ssl-observatory.dtd           |   7 +-
 .../chrome/locale/ar_AA/https-everywhere.dtd       |  53 +++++++++++
 .../locale/ar_AA/https-everywhere.properties       |   8 ++
 .../chrome/locale/ar_AA/ssl-observatory.dtd        | 101 +++++++++++++++++++++
 .../chrome/locale/arn/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ast/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/az/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/ba/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/bal/https-everywhere.dtd         |  56 ++++++++++++
 .../chrome/locale/bal/https-everywhere.properties  |   8 ++
 .../chrome/locale/bal/ssl-observatory.dtd          | 101 +++++++++++++++++++++
 .../chrome/locale/be/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/bg/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/bn/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/bn_BD/https-everywhere.dtd       |  33 ++++---
 .../chrome/locale/bn_BD/ssl-observatory.dtd        |   8 +-
 .../chrome/locale/bn_IN/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/bo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/br/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/brx/https-everywhere.dtd         |  56 ++++++++++++
 .../chrome/locale/brx/https-everywhere.properties  |   8 ++
 .../chrome/locale/brx/ssl-observatory.dtd          | 101 +++++++++++++++++++++
 .../chrome/locale/bs/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ca/https-everywhere.dtd          |  68 +++++++-------
 .../chrome/locale/ca/https-everywhere.properties   |  16 ++--
 .../chrome/locale/ca/ssl-observatory.dtd           |  14 +--
 .../chrome/locale/ceb/https-everywhere.dtd         |  56 ++++++++++++
 .../chrome/locale/ceb/https-everywhere.properties  |   8 ++
 .../chrome/locale/ceb/ssl-observatory.dtd          | 101 +++++++++++++++++++++
 .../chrome/locale/co/https-everywhere.dtd          |  56 ++++++++++++
 .../chrome/locale/co/https-everywhere.properties   |   8 ++
 .../chrome/locale/co/ssl-observatory.dtd           | 101 +++++++++++++++++++++
 .../chrome/locale/cs/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/cs_CZ/https-everywhere.dtd       |   6 ++
 .../chrome/locale/cs_CZ/ssl-observatory.dtd        |   8 +-
 .../chrome/locale/csb/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/cv/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/cy/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/cy/ssl-observatory.dtd           |   8 +-
 .../chrome/locale/cy_GB/https-everywhere.dtd       |   3 +
 .../chrome/locale/da/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/da_DK/https-everywhere.dtd       |  53 +++++++++++
 .../locale/da_DK/https-everywhere.properties       |   8 ++
 .../chrome/locale/da_DK/ssl-observatory.dtd        | 101 +++++++++++++++++++++
 .../chrome/locale/de/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/de/ssl-observatory.dtd           |   4 +-
 .../chrome/locale/dz/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/el/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/en/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/en_GB/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/eo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/eo/https-everywhere.properties   |   8 +-
 .../chrome/locale/es/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/es_AR/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/es_AR/ssl-observatory.dtd        |   4 +-
 .../chrome/locale/es_CL/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/es_CO/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/es_MX/https-everywhere.dtd       |  38 ++++----
 .../locale/es_MX/https-everywhere.properties       |  16 ++--
 .../chrome/locale/es_MX/ssl-observatory.dtd        |   2 +-
 .../chrome/locale/et/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/et/ssl-observatory.dtd           |  16 ++--
 .../chrome/locale/eu/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/fa/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/fi/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/fil/https-everywhere.dtd         |  66 ++++++++------
 .../chrome/locale/fil/https-everywhere.properties  |   8 +-
 .../chrome/locale/fil/ssl-observatory.dtd          |   2 +-
 .../chrome/locale/fo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/fr/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/fr/ssl-observatory.dtd           |  36 +++-----
 .../chrome/locale/fr_CA/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/fur/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/fy/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ga/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/gd/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/gl/https-everywhere.dtd          |  64 +++++++------
 .../chrome/locale/gl/https-everywhere.properties   |   4 +-
 .../chrome/locale/gl/ssl-observatory.dtd           |  82 ++++++++---------
 .../chrome/locale/gu/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/gu_IN/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/gun/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ha/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/he/https-everywhere.dtd          |  56 +++++++-----
 .../chrome/locale/he/https-everywhere.properties   |   8 +-
 .../chrome/locale/he/ssl-observatory.dtd           |  64 ++++++-------
 .../chrome/locale/hi/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/hr/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/hr_HR/https-everywhere.dtd       |  36 ++++----
 .../chrome/locale/ht/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/hu/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/hy/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/hy_AM/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/ia/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/id/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/id/ssl-observatory.dtd           |   4 +-
 .../chrome/locale/is/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/it/https-everywhere.dtd          |  33 ++++---
 .../chrome/locale/ja/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/ja/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/jbo/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/jv/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ka/https-everywhere.dtd          |  52 ++++++-----
 .../chrome/locale/ka/ssl-observatory.dtd           |   8 +-
 .../chrome/locale/kk/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/km/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/kn/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ko/https-everywhere.dtd          |  34 ++++---
 .../chrome/locale/ko_KR/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/ku/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ku_IQ/https-everywhere.dtd       |  34 ++++---
 .../locale/ku_IQ/https-everywhere.properties       |  16 ++--
 .../chrome/locale/ku_IQ/ssl-observatory.dtd        |   2 +-
 .../chrome/locale/kw/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ky/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/la/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/la/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/lb/https-everywhere.dtd          |  94 ++++++++++---------
 .../chrome/locale/lb/https-everywhere.properties   |  16 ++--
 .../chrome/locale/lb/ssl-observatory.dtd           |  85 +++++++++--------
 .../chrome/locale/lg/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ln/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/lo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/lt/https-everywhere.dtd          |  34 ++++---
 .../chrome/locale/lt/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/lv/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/mg/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/mi/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/mk/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ml/https-everywhere.dtd          |  64 +++++++------
 .../chrome/locale/mn/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/mr/https-everywhere.dtd          |  72 ++++++++-------
 .../chrome/locale/mr/https-everywhere.properties   |   4 +-
 .../chrome/locale/mr/ssl-observatory.dtd           |   6 +-
 .../chrome/locale/ms_MY/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/mt/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/my/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/nah/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/nap/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/nb/https-everywhere.dtd          |  68 +++++++-------
 .../chrome/locale/nb/https-everywhere.properties   |  10 +-
 .../chrome/locale/nb/ssl-observatory.dtd           |  44 ++++-----
 .../chrome/locale/nds/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ne/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/nl/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/nl_BE/https-everywhere.dtd       |  32 ++++---
 .../locale/nl_BE/https-everywhere.properties       |   6 +-
 .../chrome/locale/nn/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/nso/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/oc/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/or/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/pa/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/pap/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/pl/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/pms/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ps/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/pt/https-everywhere.dtd          |  60 ++++++------
 .../chrome/locale/pt/https-everywhere.properties   |   2 +-
 .../chrome/locale/pt/ssl-observatory.dtd           |  20 ++--
 .../chrome/locale/pt_BR/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/ro/https-everywhere.dtd          |  33 ++++---
 .../chrome/locale/ru/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/ru/https-everywhere.properties   |   4 +-
 .../chrome/locale/ru@petr1708/https-everywhere.dtd |  30 +++---
 .../chrome/locale/sa/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/scn/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/sco/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/si/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/si_LK/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/sk/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/sk_SK/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/sl/https-everywhere.dtd          |  36 +++++---
 .../chrome/locale/sl/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/sl_SI/https-everywhere.dtd       |  38 ++++----
 .../locale/sl_SI/https-everywhere.properties       |  14 +--
 .../chrome/locale/sl_SI/ssl-observatory.dtd        |  15 ++-
 .../chrome/locale/sn/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/so/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/son/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/sq/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/sq_AL/https-everywhere.dtd       |   6 ++
 .../chrome/locale/sq_AL/ssl-observatory.dtd        |   8 +-
 .../chrome/locale/sr/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/sr@latin/https-everywhere.dtd    |  30 +++---
 .../chrome/locale/st/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/su/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/sv/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/sw/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/szl/https-everywhere.dtd         |  30 +++---
 .../chrome/locale/ta/https-everywhere.dtd          |  32 ++++---
 .../chrome/locale/te/https-everywhere.dtd          |  34 ++++---
 .../chrome/locale/te/https-everywhere.properties   |  10 +-
 .../chrome/locale/te_IN/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/te_IN/ssl-observatory.dtd        |   2 +-
 .../chrome/locale/templates/https-everywhere.dtd   |  30 +++---
 .../chrome/locale/tg/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/th/https-everywhere.dtd          |  40 ++++----
 .../chrome/locale/th/https-everywhere.properties   |   2 +-
 .../chrome/locale/ti/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/tk/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/tl_PH/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/tr/https-everywhere.dtd          |  50 +++++-----
 .../chrome/locale/tr/https-everywhere.properties   |  12 +--
 .../chrome/locale/tr/ssl-observatory.dtd           |  28 +++---
 .../chrome/locale/tzm/https-everywhere.dtd         |  56 ++++++++++++
 .../chrome/locale/tzm/https-everywhere.properties  |   8 ++
 .../chrome/locale/tzm/ssl-observatory.dtd          | 101 +++++++++++++++++++++
 .../chrome/locale/ug@Arab/https-everywhere.dtd     |  30 +++---
 .../chrome/locale/uk/https-everywhere.dtd          |  48 +++++-----
 .../chrome/locale/uk/ssl-observatory.dtd           |   8 +-
 .../chrome/locale/ur/https-everywhere.dtd          |  74 ++++++++-------
 .../chrome/locale/ur/https-everywhere.properties   |  16 ++--
 .../chrome/locale/ur/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/ur_PK/https-everywhere.dtd       |  70 +++++++-------
 .../locale/ur_PK/https-everywhere.properties       |  16 ++--
 .../chrome/locale/uz/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/uz/ssl-observatory.dtd           |   2 +-
 .../chrome/locale/ve/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/vi/https-everywhere.dtd          |  68 +++++++-------
 .../chrome/locale/vi/https-everywhere.properties   |  16 ++--
 .../chrome/locale/vi/ssl-observatory.dtd           |  36 ++++----
 .../chrome/locale/wa/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/wo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/yo/https-everywhere.dtd          |  30 +++---
 .../chrome/locale/zh-CN/https-everywhere.dtd       |  30 +++---
 .../chrome/locale/zh_HK/https-everywhere.dtd       |  74 ++++++++-------
 .../locale/zh_HK/https-everywhere.properties       |   8 +-
 .../chrome/locale/zh_HK/ssl-observatory.dtd        |   2 +-
 .../chrome/locale/zh_TW/https-everywhere.dtd       |  44 +++++----
 .../locale/zh_TW/https-everywhere.properties       |   2 +-
 .../chrome/locale/zu/https-everywhere.dtd          |  30 +++---
 239 files changed, 4774 insertions(+), 2646 deletions(-)
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/ssl-observatory.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.dtd
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.properties
 create mode 100644 data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/ssl-observatory.dtd

(limited to 'data/extensions/https-everywhere-eff@eff.org/chrome/locale')

diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ach/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ach/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ach/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ach/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ady/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ady/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ady/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ady/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/af/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/af/https-everywhere.dtd
index a032c02..bb29be6 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/af/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/af/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "Oor HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.ext_description "Enkripteer die Web! Gebruik HTTPS sekuriteit automaties op baie plekke.">
+<!ENTITY https-everywhere.about.version "Weergawe">
+<!ENTITY https-everywhere.about.created_by "Geskep deur">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.thanks "Te danke aan">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "Indien jy van HTTPS Everywhere hou, mag jy die volgende oorweeg">
+<!ENTITY https-everywhere.about.donate_tor "Ondersteun Tor met 'n donasie">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.or "of">
+<!ENTITY https-everywhere.about.donate_eff "Gee 'n donasie aan EFF">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "Oor HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Blok alle HTTPS Everywhere versoeke">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Besigtig Alle Reëls">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
 <!ENTITY https-everywhere.prefs.disable_all "Disable All">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.search "Soek">
 <!ENTITY https-everywhere.prefs.site "Site">
 <!ENTITY https-everywhere.prefs.notes "Notes">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
 <!ENTITY https-everywhere.prefs.enabled "Enabled">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.here_link "hier">
 <!ENTITY https-everywhere.prefs.toggle "Toggle">
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Kanselleer">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Kanselleer">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ak/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ak/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ak/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ak/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am/https-everywhere.dtd
index 81070f5..0239f1b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "ድሩን ያመስጥሩ! በብዙ ጣቢያዎች ላይ HTTPSን በራስ-ሰር ይጠቀሙ።">
 <!ENTITY https-everywhere.about.version "ስሪት">
 <!ENTITY https-everywhere.about.created_by "የተፈጠረው በ">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "የደንብ ስብስብ  ቤተ-መዝጋቢዎች">
 <!ENTITY https-everywhere.about.thanks "ምስጋና ይድረስ ለ">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "HTTPS Everywhereን ከወደዱት ይህን ማድረግ ከግምት ውስጥ ማስገባት ሊፈልጉ ይችላሉ">
 <!ENTITY https-everywhere.about.donate_tor "ለTor መለገስ">
 <!ENTITY https-everywhere.about.tor_lang_code "am">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "ለEFF መለገስ">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "ስለHTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "የSSL መታዘቢያ ምርጫዎች">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhereን አንቃ">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "ወደ ነባሪ ዳግም አስጀምር">
 <!ENTITY https-everywhere.prefs.view_xml_source "የXML ምንጩን ይመልከቱ">
 
-<!ENTITY https-everywhere.source.downloading "በማውረድ ላይ">
-<!ENTITY https-everywhere.source.filename "የፋይል ስም">
-<!ENTITY https-everywhere.source.unable_to_download "ምንጩን ማውረድ አልተቻለም።">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ይቅር">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0ግንባታ.11 ማሳወቂያ">
-<!ENTITY https-everywhere.popup.paragraph1 "ውይ። የረጋው HTTPS Everywhere ስሪቱን ነው ሲጠቀሙት የነበረው፣ ነገር ግን በቅርብ ጊዜው ልቀታችን ውስጥ ወዳለው የግንባታ ስሪት በስህተት አሳድገነዎት ሊሆን ይችላል።">
-<!ENTITY https-everywhere.popup.paragraph2 "ወደ የረጋው መመለስ ይፈልጋሉ?">
-<!ENTITY https-everywhere.popup.paragraph3 "የግንባታ ልቀታችንን መጠቀሙን ቢቀጥሉና HTTPS Everywhere የተሻለ እንድናደርገው ቢያግዙን በጣም ደስ ይለናል። እዚህና እዚያ ጥቂት ሳንካዎች ሊያገኙ ይችላሉ፣ እነዚህንም ለhttps-everywhere@eff.org ሪፖርት ማድረግ ይችላሉ። ለተፈጠረው ችግር ይቅርታ እንጠይቃለን፣ እና HTTPS Everywhereን ስለተጠቀሙ እናመሰግናለን።">
-<!ENTITY https-everywhere.popup.keep "በግንባታ ስሪቱ ላይ አቆየኝ">
-<!ENTITY https-everywhere.popup.revert "የቅርብ ጊዜውን የረጋው ስሪት አውርድ">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "የHTTPS Everywhere ደንብ ስብስብ ሙከራዎች">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ይቅር">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "ጀምር">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/https-everywhere.dtd
index 9a63c45..5012fd0 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/https-everywhere.dtd
@@ -1,20 +1,26 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "ስለ ኤችቲቲፒኤስ የትኛውም ቦታ">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.about "ስለ ኤችቲቲፒኤስ የትኛውም ቦታ">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/ssl-observatory.dtd
index 9457a96..8e6591d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/am_ET/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.details "ዝርዝር የግላዊ መግለጫ">
 <!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "No">
 
@@ -44,6 +44,12 @@ intrusive corporate network:">
 <!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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
 <!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
@@ -87,7 +93,7 @@ looked at.  Mouseover the options for further details:">
 <!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.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Submit and check self-signed certificates">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/https-everywhere.dtd
index 88c9113..117a727 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "شفر شبكة الإنترنت! استخدم تلقائيا تقنية HTTPS للأمان مع الكثير من المواقع.">
 <!ENTITY https-everywhere.about.version "النسخة">
 <!ENTITY https-everywhere.about.created_by "أنشأه">
+<!ENTITY https-everywhere.about.and "، ايضاً">
 <!ENTITY https-everywhere.about.librarians "جامعيْ القواعد">
 <!ENTITY https-everywhere.about.thanks "شكراً لكل من">
+<!ENTITY https-everywhere.about.many_contributors "والعديد العديد من المساهمين، شاملا">
+<!ENTITY https-everywhere.about.noscript "وايضا، جزئ من HTTPS Everywhere متمركزه على شفره NoScript ، من صنع Giorgio Maone وآخرين. نشكرهم على عملهم المتقن.">
 <!ENTITY https-everywhere.about.contribute  "إن أعجبتك إضافة HTTPS Everywhere، فكر بـ">
 <!ENTITY https-everywhere.about.donate_tor "التبرع لتور">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "أو">
 <!ENTITY https-everywhere.about.donate_eff "التبرع للـ EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "عن  HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "خيارات مرصد SSL">
 <!ENTITY https-everywhere.menu.globalEnable "فعّل HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "عطّل  HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "منع جميع طلبات HTTP">
 <!ENTITY https-everywhere.menu.showCounter "أظهر العداد">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "عرض جميع القواعد">
 
 <!ENTITY https-everywhere.prefs.title "خيارات  HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "فعّل الكل">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "استعادة الإعداد الافتراضي">
 <!ENTITY https-everywhere.prefs.view_xml_source "افحص مصدر XML">
 
-<!ENTITY https-everywhere.source.downloading "جاري التحميل">
-<!ENTITY https-everywhere.source.filename "اسم الملف">
-<!ENTITY https-everywhere.source.unable_to_download "تعذّر تنزيل المصدر.">
+<!ENTITY https-everywhere.chrome.stable_rules "قوانين متوازنة.">
+<!ENTITY https-everywhere.chrome.stable_rules_description "روابط مشفره اجبارياً الى هذه المواقع">
+<!ENTITY https-everywhere.chrome.experimental_rules "قوانين تجريبية">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "قد يفعل تحذير عند العطل. موقف عن العمل افتراضيا.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "إلغاء">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "عذراً. انت كنت تستخدم اصدار مستقر من HTTPS Everywhere، ولكن تم تحديث اصدارك إلي الاصدار التجريبي عن طريق الخطء.">
-<!ENTITY https-everywhere.popup.paragraph2 "هل ترغب في العودة  للاصدار المستقر؟">
-<!ENTITY https-everywhere.popup.paragraph3 "كنا نحب لو واصلت استخدام الاصدار التجريبي من HTTPS Everywhere لان ذلك يساعدنا علي جعل البرنامج أفضل! قد تجد في الاصدار التجريبي بعض الأخطاء التي يمكنك ان تبلغ عنها بمراسلة https-everywhere@eff.org. نآسف على الإزعاج و شكراً لأستخدامك HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "ابقني علي الاصدار التجريبي">
-<!ENTITY https-everywhere.popup.revert "حمل الاصدار المستقر الاخير">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "اختبارات مجموعة أوامر HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "إلغاء">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "ابدأ">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/ssl-observatory.dtd
index 49389d7..d7bb55a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar/ssl-observatory.dtd
@@ -44,10 +44,10 @@ to turn it on?">-->
 "هذا سيجلب و يرسل &quot;رقم النظام المستقل&quot; الخاص بشبكتك. هذا سيساعدنا على تحديد موقع الهجمات ضد HTTPS، وتحديد ما إذا كان لدينا ملاحظات من شبكات في أماكن مثل سوريا وإيران حيث هذه الهجمات شائعة نسبياً.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"أظهر تحذيرا إذا كشف المرقاب عن وجود شهادة مسحوبة لم يكتشفها المتصفح">
+"أظهر تحذيرا إذا كشف المرصد عن وجود شهادة لم يكتشفها المتصفح">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"سيتم مقارنة الشهادات المرسلة بقائمة الشهادات المسحوبة. للأسف لا يمكن أن نضمن اكتشاف كل الشهادات المسحوبة في كل مرة، لكن إذا رأيت تحذيرا فاعلم أن هناك خطبا ما.">
+"سيتم مقارنة الشهادات المرسلة بقائمة الشهادات الملغاة. للأسف لا يمكن أن نضمن اكتشاف كل الشهادات الملغاة في كل مرة، لكن إذا رأيت تحذيرا فاعلم أن هناك خطبا ما.">
 
 <!ENTITY ssl-observatory.prefs.done "انتهى">
 
@@ -90,7 +90,8 @@ Mouseover the options for further details:">-->
 <!ENTITY ssl-observatory.warning.showcert "أظهر سلسة الشهادة">
 <!ENTITY ssl-observatory.warning.okay "أنا أفهم">
 <!ENTITY ssl-observatory.warning.text "أصدر مرصد SSL من الـEFF تحذيراً حول شهادة ( أو شهادات) HTTPS لهذا الموقع:">
-<!ENTITY ssl-observatory.warning.defense "إذا كان حسابك مفتوحا على هذا الموقع فيستحسن تغيير كلمة المرور مباشرة بعد حصول اتصال آمن. (يمكن تعطيل هذه التحذيرات في باب &quot;مرقاب SSL&quot; في إعدادات HTTPS في كل مكان)">
+<!ENTITY ssl-observatory.warning.defense "إذا كان حسابك مفتوحا على هذا الموقع فيستحسن تغيير كلمة المرور مباشرة بعد تفعيل إتصال آمن..
+ (يمكن تعطيل هذه التحذيرات في باب &quot;مرصد SSL&quot; في إعدادات HTTPS Everywhere)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "اعرض و تحقق من الشهادات الموقعة ذاتياً">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.dtd
new file mode 100644
index 0000000..0bbb1fe
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.dtd
@@ -0,0 +1,53 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.source.downloading "Downloading">
+<!ENTITY https-everywhere.source.filename "Filename">
+<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+
+<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
+<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
+<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
+<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
+<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
+<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
+
+<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
+<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
+<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ar_AA/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/arn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/arn/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/arn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/arn/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ast/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ast/https-everywhere.dtd
index f3b22bf..317c1f6 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ast/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ast/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encripta la Web! Usar seguridá HTTPS automáticamente en munchos sitios">
 <!ENTITY https-everywhere.about.version "Versión">
 <!ENTITY https-everywhere.about.created_by "Creáu por">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Gracies a">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Si te presta HTTPS Everywhere, tendríes de considerar">
 <!ENTITY https-everywhere.about.donate_tor "Donar a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donar a EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Tocante a HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/az/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/az/https-everywhere.dtd
index 07e8d45..5a3138e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/az/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/az/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Veb-i şifrələ! Bir çox saytlarda HTTPS-i avtomatik istifadə et.">
 <!ENTITY https-everywhere.about.version "Versiya">
 <!ENTITY https-everywhere.about.created_by "Yaradan şəxs">
+<!ENTITY https-everywhere.about.and ", və">
 <!ENTITY https-everywhere.about.librarians "Kitabxanaçıların Qayda Toplusu">
-<!ENTITY https-everywhere.about.thanks "Təşəkkürlər">
+<!ENTITY https-everywhere.about.thanks "Təşəkkürlər:">
+<!ENTITY https-everywhere.about.many_contributors "Dəstək olan hər kəsə, həmçinin">
+<!ENTITY https-everywhere.about.noscript "Həmçinin HTTPS Everywhere kodunun bir hissəsi Giorgio Maone və digərləri tərəfindən olan NoScript əsasındadır. Onların böyük əməkləri üçün minnətdarıq!">
 <!ENTITY https-everywhere.about.contribute  "Hamı üçün HTTPS-i xoşlayırsansa, sən buna üstünlük verməlisən">
 <!ENTITY https-everywhere.about.donate_tor "Tor-a donorluq">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "və ya">
 <!ENTITY https-everywhere.about.donate_eff "EFF-ə donorluq">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Hər yerdə HTTPS haqqında">
 <!ENTITY https-everywhere.menu.observatory "SSL İzləyici Xüsusiyyətləti">
 <!ENTITY https-everywhere.menu.globalEnable " HTTPS -ni hər yerdə aktivləşdir">
 <!ENTITY https-everywhere.menu.globalDisable "HTTPS -ni həryerdə söndür">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Bütün HTTP sorğuları blokla">
 <!ENTITY https-everywhere.menu.showCounter "Hesablayıcını Göstər">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Bütün Qaydaları Gör">
 
 <!ENTITY https-everywhere.prefs.title "Hər yerdə HTTPS Xüsusiyyətləri">
 <!ENTITY https-everywhere.prefs.enable_all "Hamısını Aktivləşdir">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "İlkin hala sıfırla">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML Mənbəyə Bax">
 
-<!ENTITY https-everywhere.source.downloading "Yüklənir">
-<!ENTITY https-everywhere.source.filename "Fayl adı">
-<!ENTITY https-everywhere.source.unable_to_download "Mənbənin yüklənməsi alınmadı.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Ləğv et">
 
-<!ENTITY https-everywhere.popup.title "Hər yerdə HTTPS 4.0development.11 xəbərdarlığı">
-<!ENTITY https-everywhere.popup.paragraph1 "Vayy.Sən Hər yerdə HTTPS-in stabil versiyasını istifadə edirdin, amma ola bilsin ki biz təsadüfən səni ən son buraxılışımızda inkişaf versiyasına təkmilləşdirmişik.">
-<!ENTITY https-everywhere.popup.paragraph2 "Stabil vəziyyətə qayıtmaq istəyirsən?">
-<!ENTITY https-everywhere.popup.paragraph3 "Sən bizim inkişaf buraxılışımızı istifadə etmək və Hər yerdə HTTPS versiyamızı yaxşılaşdırmaq istəsəydin biz bunu etmək arzusunda olardıq. Orada və burada https-everywhere@eff.org emailimizə xəbər verə biləcəyin problemlərı aşkarlaya bilərsən. Narahatlıq üçün üzr istəyirik. Hər yerdə HTTPS istifadə etdiyin üçün minnətdarıq.">
-<!ENTITY https-everywhere.popup.keep "Məni inkişaf versiyasında saxla">
-<!ENTITY https-everywhere.popup.revert "Ən son stabil versiyanı yüklə">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Hər yerdə HTTPS qayda dəsti Testi">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Ləğv et">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Başla">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ba/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ba/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ba/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ba/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.dtd
new file mode 100644
index 0000000..2ac51cd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.dtd
@@ -0,0 +1,56 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
+
+
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bal/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/be/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/be/https-everywhere.dtd
index 438ba91..11dfbbc 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/be/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/be/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Шыфраванне Сеціва! Аўтаматычнае выкарыстанне бяспекі HTTPS на розных сайтах">
 <!ENTITY https-everywhere.about.version "Версія">
 <!ENTITY https-everywhere.about.created_by "Стваральнікі">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Бібліятэкары збораў правілаў">
 <!ENTITY https-everywhere.about.thanks "Падзякі">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Калі вам да спадобы HTTPS Everywhere, мабыць вам будзе цікава">
 <!ENTITY https-everywhere.about.donate_tor "ахвяраваць сродкі Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "be">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "ахвяраваць сродкі EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Пра HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Настáўленні SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Уключыць HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Скінуць да стандартнага">
 <!ENTITY https-everywhere.prefs.view_xml_source "Прагляд крынічнага XML-коду">
 
-<!ENTITY https-everywhere.source.downloading "Сцягванне">
-<!ENTITY https-everywhere.source.filename "Назва файла">
-<!ENTITY https-everywhere.source.unable_to_download "Не выйшла сцягнуць зыходнік">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Скасаваць">
 
-<!ENTITY https-everywhere.popup.title "Абвяшчэнне HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Ой. Вы выкарыстоўвалі стабільную версію HTTPS Everywhere, але мы, мусіць, выпадкова абнавілі вас да версіі ў распрацоўцы з нашага апошняга выпуску.">
-<!ENTITY https-everywhere.popup.paragraph2 "Жадаеце вярнуцца назад на стабільную версію?">
-<!ENTITY https-everywhere.popup.paragraph3 "Вы б зрабілі нам ласку, калі працягнулі карыстацца версіяй у распрацоўцы і дапамаглі палепшыць HTTPS Everywhere! Калі адшукаеце некалькі хібаў тут і там, паведаміце пра іх на https-everywhere@eff.org. Даруйце за нязручнасць; дзякуем за выкарыстанне HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Пакінуць версію ў распрацоўцы">
-<!ENTITY https-everywhere.popup.revert "Сцягнуць апошнюю стабільную версію">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Тэсты для збораў правілаў HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Скасаваць">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Старт">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bg/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bg/https-everywhere.dtd
index b9a6e24..a695ee4 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bg/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bg/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Шифрирайте мрежата! Използвайте автоматична HTTPS защита на много страници.">
 <!ENTITY https-everywhere.about.version "Версия">
 <!ENTITY https-everywhere.about.created_by "Създадено от">
+<!ENTITY https-everywhere.about.and "и">
 <!ENTITY https-everywhere.about.librarians "Библиотеки с правила">
 <!ENTITY https-everywhere.about.thanks "Благодарности на">
+<!ENTITY https-everywhere.about.many_contributors "Много сътрудници, включително">
+<!ENTITY https-everywhere.about.noscript "Също така, части от HTTPS Everywhere са базирани върху NoScript код, писан от Джорджо Маоне и други. Благодарни сме за отличната им работа!">
 <!ENTITY https-everywhere.about.contribute  "Ако харесвате HTTPS Everywhere можете да направите">
 <!ENTITY https-everywhere.about.donate_tor "дарение за Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "bg">
 <!ENTITY https-everywhere.about.or "или">
 <!ENTITY https-everywhere.about.donate_eff "дарение за EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Дари за EFF">
 <!ENTITY https-everywhere.menu.about "За HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Настройки на SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Включи HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Възстановяване">
 <!ENTITY https-everywhere.prefs.view_xml_source "Преглед на XML кода">
 
-<!ENTITY https-everywhere.source.downloading "Изтегляне">
-<!ENTITY https-everywhere.source.filename "Име на файл">
-<!ENTITY https-everywhere.source.unable_to_download "Не може да свали кода.">
+<!ENTITY https-everywhere.chrome.stable_rules "Устойчиви правила">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Принудително криптиране при свързването към тези сайтове:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Експериментални правила">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Може да предизвика предупреждения или прекъсване. Изключено по подразбиране.">
+<!ENTITY https-everywhere.chrome.add_rule "Добави правило за този сайт">
+<!ENTITY https-everywhere.chrome.add_new_rule "Добави ново правило за този сайт">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Отказ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 известие">
-<!ENTITY https-everywhere.popup.paragraph1 "Опс. Използвали сте стабилната версия на HTTPS Everywhere, но е възможно случайно да сме Ви надградили с разработваща се версия.">
-<!ENTITY https-everywhere.popup.paragraph2 "Искате ли да се върнете към стабилната версия?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ще се радваме, ако продължите да използвате нашата разработваща се версия и ни помогнете да направим HTTPS Everywhere по-добра! Може да откриете няколко грешки тук-там, които да докладвате на https-everywhere@eff.org. Извинете за неудобството и Ви благодарим, че използвате HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Задържане на разработващата версия">
-<!ENTITY https-everywhere.popup.revert "Изтегли най-актуалната стабилна версия">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Тестване правилата на HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Отказ">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Старт">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn/https-everywhere.dtd
index c4a4c03..f8f7be8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere সক্রিয় করুন">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/https-everywhere.dtd
index 9a63c45..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/https-everywhere.dtd
@@ -3,18 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
@@ -31,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/ssl-observatory.dtd
index 9457a96..69f1cfd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_BD/ssl-observatory.dtd
@@ -44,6 +44,12 @@ intrusive corporate network:">
 <!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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
 <!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
@@ -87,7 +93,7 @@ looked at.  Mouseover the options for further details:">
 <!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.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Submit and check self-signed certificates">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_IN/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_IN/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_IN/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bn_IN/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bo/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/br/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/br/https-everywhere.dtd
index eac7ddf..7eaae35 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/br/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/br/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Nullañ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.dtd
new file mode 100644
index 0000000..2ac51cd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.dtd
@@ -0,0 +1,56 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
+
+
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/brx/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bs/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bs/https-everywhere.dtd
index 3ecba3c..8e8c5d4 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bs/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/bs/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Otkaži">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Otkaži">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.dtd
index 0aa0252..bc91115 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.dtd
@@ -1,50 +1,56 @@
 <!ENTITY https-everywhere.about.title "Sobre HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Xifrar la Web! Fes servir la seguretat HTTPS a molts llocs.">
+<!ENTITY https-everywhere.about.ext_description "Xifra la Web! Fes servir automàticament la seguretat HTTPS a molts llocs.">
 <!ENTITY https-everywhere.about.version "Versió">
 <!ENTITY https-everywhere.about.created_by "Creat per">
-<!ENTITY https-everywhere.about.librarians "C">
+<!ENTITY https-everywhere.about.and ", i">
+<!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes">
 <!ENTITY https-everywhere.about.thanks "Gràcies a">
-<!ENTITY https-everywhere.about.contribute  "Si t'agrada HTTPS Everywhere, podries considerar">
-<!ENTITY https-everywhere.about.donate_tor "Donar a Tor">
+<!ENTITY https-everywhere.about.many_contributors "Molts, molts contribuïdors, inclosos: ">
+<!ENTITY https-everywhere.about.noscript "A més, parts de HTTPS Everywhere estan basades en codi de NoScript, per Giorgio Maone i altres. Agraïm la seva excel·lent feina!">
+<!ENTITY https-everywhere.about.contribute  "Si us agrada HTTPS Everywhere, podríeu considerar">
+<!ENTITY https-everywhere.about.donate_tor "Fer una donació a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "o">
-<!ENTITY https-everywhere.about.donate_eff "Donar a EFF">
+<!ENTITY https-everywhere.about.donate_eff "Fer una donació a EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EEF">
 <!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Preferències de SSL Observatory">
-<!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Bloqueja totes les peticiones HTTP">
-<!ENTITY https-everywhere.menu.showCounter "Mostra el contador">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.globalEnable "Activa HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Desactiva HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Bloqueja totes les peticions HTTP">
+<!ENTITY https-everywhere.menu.showCounter "Mostra el comptador">
+<!ENTITY https-everywhere.menu.viewAllRules "Ensenya totes les regles">
 
-<!ENTITY https-everywhere.prefs.title "Preferències de HTTPS Everywhere">
-<!ENTITY https-everywhere.prefs.enable_all "Activar-ho tot">
-<!ENTITY https-everywhere.prefs.disable_all "Desactivar-ho tot">
-<!ENTITY https-everywhere.prefs.reset_defaults "Tornar a opcions per defecte">
-<!ENTITY https-everywhere.prefs.search "Cercar">
+<!ENTITY https-everywhere.prefs.title "Preferències d'HTTPS Everywhere">
+<!ENTITY https-everywhere.prefs.enable_all "Activa-ho tot">
+<!ENTITY https-everywhere.prefs.disable_all "Desactiva-ho tot">
+<!ENTITY https-everywhere.prefs.reset_defaults "Torna a les opcions per defecte">
+<!ENTITY https-everywhere.prefs.search "Cerca">
 <!ENTITY https-everywhere.prefs.site "Lloc">
 <!ENTITY https-everywhere.prefs.notes "Notes">
-<!ENTITY https-everywhere.prefs.list_caption "Quines regles de redirecció HTTPS vols aplicar?">
-<!ENTITY https-everywhere.prefs.enabled "Habilitat">
-<!ENTITY https-everywhere.prefs.ruleset_howto "Pots aprendre com escriure les teves pròpies regles (per afegir suport a altres webs)">
+<!ENTITY https-everywhere.prefs.list_caption "Quines regles de redirecció HTTPS voleu aplicar?">
+<!ENTITY https-everywhere.prefs.enabled "Activat">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Podeu aprendre com escriure les vostres pròpies normes (per afegir suport a altres webs)">
 <!ENTITY https-everywhere.prefs.here_link "aquí">
-<!ENTITY https-everywhere.prefs.toggle "Canviar">
+<!ENTITY https-everywhere.prefs.toggle "Canvia">
 <!ENTITY https-everywhere.prefs.reset_default "Tornar a la opció per defecte">
 <!ENTITY https-everywhere.prefs.view_xml_source "Veure el codi XML">
 
-<!ENTITY https-everywhere.source.downloading "Descarregant">
-<!ENTITY https-everywhere.source.filename "Nom d'arxiu">
-<!ENTITY https-everywhere.source.unable_to_download "Incapaç de descarregar la font.">
+<!ENTITY https-everywhere.chrome.stable_rules "Normes estables.">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Força connexions encriptades a les següents pàgines web:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Normes experimentals">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Pot causar avisos i problemes. Desactivat per defecte.">
+<!ENTITY https-everywhere.chrome.add_rule "Afegir una norma per a aquest lloc">
+<!ENTITY https-everywhere.chrome.add_new_rule "Afegir una nova norma per a aquest lloc">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Utilitza sempre https per a aquest host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avançat">
+<!ENTITY https-everywhere.chrome.hide_advanced "Amagar avançat">
+<!ENTITY https-everywhere.chrome.rule_name "Nom de la norma">
+<!ENTITY https-everywhere.chrome.regex "Trobant regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Re-direccionar a">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel·lar ">
 
-<!ENTITY https-everywhere.popup.title "Notificació HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups, Estaveu usant una versió estable de HTTPS Everywhere, però possiblement us hem actualitzat a la versió de desenvolupadors.">
-<!ENTITY https-everywhere.popup.paragraph2 "Voleu tornar a la versió estable?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ens agradaria que continuéssiu usant la versió de desenvolupador per a ajudar-nos a millorar. Potser hi trobeu alguns errors, que ens podeu indicar a  https-everywhere@eff.org. Disculpeu les molèsties, i gràcies per usar HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Vull continuar amb la versió de desenvolupador.">
-<!ENTITY https-everywhere.popup.revert "Descarrega l'última versió estable.">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere test de funcionament">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel·la">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Inici">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.properties
index 934d665..a73faf3 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Activar HTTPS Everywhere
-https-everywhere.menu.globalDisable = Desactivar HTTPS Everywhere
-https-everywhere.menu.enableDisable = Activar/Desactivar Normes
-https-everywhere.menu.noRules = (Sense Normes per Aquesta Pàgina)
-https-everywhere.menu.unknownRules = (Normes per Aquesta Pàgina Desconegudes)
-https-everywhere.toolbar.hint = HTTPS Everywhere està actiu. Pots modificar-ho en l'icona de la barra d'eines.
-https-everywhere.migration.notification0 = En ordre per implementar una reparació crucial, aquesta actualització reinicia les normes del teu HTTPS Everywhere al seu valor orginial.
-https-everywhere.menu.ruleset-tests = Iniciar Testsos de Normes
+https-everywhere.menu.globalEnable = Activa HTTPS Everywhere
+https-everywhere.menu.globalDisable = Desactiva HTTPS Everywhere
+https-everywhere.menu.enableDisable = Activa/Desactiva Normes
+https-everywhere.menu.noRules = (Sense normes per aquesta pàgina)
+https-everywhere.menu.unknownRules = (Normes desconegudes per aquesta pàgina)
+https-everywhere.toolbar.hint = HTTPS Everywhere està actiu. Podeu modificar-ho en la icona de la barra d'eines.
+https-everywhere.migration.notification0 = Per tal d'implementar una reparació crucial, aquesta actualització reinicia les normes de l'HTTPS Everywhere al seu valor original.
+https-everywhere.menu.ruleset-tests = Inicia el test de les normes de l'HTTPS Everywhere
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/ssl-observatory.dtd
index 1d22c96..d4eb580 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ca/ssl-observatory.dtd
@@ -1,11 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Detalls i privacitat de la Informació">
+<!ENTITY ssl-observatory.popup.details "Detalls i informació de Privadesa">
 <!ENTITY ssl-observatory.popup.later "Pregunta-ho més endavant">
 <!ENTITY ssl-observatory.popup.no "No">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS a tot arreu pot detectar atacs 
-contra el seu navegador mitjançant l'enviament dels certificats que hagin estat
-atorgats a l'Observatori. Activar aquest paràmetre?">
+<!ENTITY ssl-observatory.popup.text "L'HTTPS Everywhere pot detectar atacs 
+contra el navegador enviant a l'Observatori els certificats que heu rebut.
+Voleu activar aquest paràmetre?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,18 +13,18 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"Hauria HTTPS utilitzar a tot arreu el SSL Observatory?">
+"L'HTTPS Everywhere pot usar l'Observatori SSL?">
 
 <!ENTITY ssl-observatory.popup.yes "Sí">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"Es segur permetre això, excepte si utilitza una
+"És segur activar-ho, excepte si utilitzeu una
 xarxa corporativa molt intrusiva.">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Segur, excepte si utilitza una xarxa corporativa amb noms secrets d'intranet.">
+"És segur, excepte si utilitzeu una xarxa corporativa amb noms secrets d'intranet.">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
 "Submet i comprova els certificats firmats per arrels no estàndards CAs">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.dtd
new file mode 100644
index 0000000..2ac51cd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.dtd
@@ -0,0 +1,56 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
+
+
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ceb/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.dtd
new file mode 100644
index 0000000..2ac51cd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.dtd
@@ -0,0 +1,56 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
+
+
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/co/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs/https-everywhere.dtd
index c7e8684..4218078 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Zašifrujte Web! Automaticky používejte HTTPS zabezpečení na mnoha stránkách.">
 <!ENTITY https-everywhere.about.version "Verze">
 <!ENTITY https-everywhere.about.created_by "Vytvořil">
+<!ENTITY https-everywhere.about.and ", a">
 <!ENTITY https-everywhere.about.librarians "Knihovníci Pravidel">
 <!ENTITY https-everywhere.about.thanks "Poděkování">
+<!ENTITY https-everywhere.about.many_contributors "Spousty přispěvatelů, včetně">
+<!ENTITY https-everywhere.about.noscript "Části HTTPS Everywhere jsou založený na kódu z NoScript od Giorgio Maone a ostatních. Jsme vděčni za jejich výbornou práci.">
 <!ENTITY https-everywhere.about.contribute  "Pokud se vám líbí HTTPS Everywhere, můžete">
 <!ENTITY https-everywhere.about.donate_tor "Přispět na Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "nebo">
 <!ENTITY https-everywhere.about.donate_eff "Přispět na EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Přispět na EFF">
 <!ENTITY https-everywhere.menu.about "O aplikaci HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Nastavení SSL Observatoře">
 <!ENTITY https-everywhere.menu.globalEnable "Zapnout HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Vypnout HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokovat všechny HTTP požadavky">
 <!ENTITY https-everywhere.menu.showCounter "Zobrazit počítadlo">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Zobrazit všechna pravidla">
 
 <!ENTITY https-everywhere.prefs.title "Nastavení HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Zapnout vše">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Vrátit výchozí nastavení">
 <!ENTITY https-everywhere.prefs.view_xml_source "Zobrazit Zdroj v XML">
 
-<!ENTITY https-everywhere.source.downloading "Stahování">
-<!ENTITY https-everywhere.source.filename "Název souboru">
-<!ENTITY https-everywhere.source.unable_to_download "Zdroj nelze stáhnout.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabilní pravidla">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Vynutit šifrovaná spojení pro tyto stránky:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimentální pravidla">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Může způsobit upozornění nebo chyby. Zakázáno ve výchozím nastavení.">
+<!ENTITY https-everywhere.chrome.add_rule "Přidat pravidlo pro tuto stránku">
+<!ENTITY https-everywhere.chrome.add_new_rule "Přidat nové pravidlo pro tuto stránku">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Vždy používat https pro tohoto hostitele">
+<!ENTITY https-everywhere.chrome.host "Hostitel:">
+<!ENTITY https-everywhere.chrome.show_advanced "Zobrazit pokročilé">
+<!ENTITY https-everywhere.chrome.hide_advanced "Skrýt pokročilé">
+<!ENTITY https-everywhere.chrome.rule_name "Jméno pravidla">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Přesměrovat na">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Zrušit">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 oznámení">
-<!ENTITY https-everywhere.popup.paragraph1 "Chybička se vloudila. Používali jste stabilní verzi HTTPS Everywhere, ale my jsme možná nechtíc aktualizovali vaši verzi na poslední vývojovou verzi.">
-<!ENTITY https-everywhere.popup.paragraph2 "Přejete si přejít zpět na stabilní verzi?">
-<!ENTITY https-everywhere.popup.paragraph3 "Budeme rádi jestliže budete pokračovat v používání námi vyvinuté verze a pomůžete nám HTTPS Everywhere vylepšit. Možná najdete sem tam chybu, kterou můžete ohlásit na https-everywhere@eff.org. Omlouváme se za obtěžování a děkujeme za používání HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Chci používat vývojovou verzi.">
-<!ENTITY https-everywhere.popup.revert "Stáhnout poslední stabilní verzi.">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Test pravidel HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Zrušit">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Zapnout">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/https-everywhere.dtd
index 9a63c45..0bbb1fe 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/https-everywhere.dtd
@@ -3,18 +3,24 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/ssl-observatory.dtd
index 9457a96..69f1cfd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cs_CZ/ssl-observatory.dtd
@@ -44,6 +44,12 @@ intrusive corporate network:">
 <!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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
 <!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
@@ -87,7 +93,7 @@ looked at.  Mouseover the options for further details:">
 <!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.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Submit and check self-signed certificates">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/csb/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/csb/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/csb/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/csb/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cv/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cv/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cv/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cv/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/https-everywhere.dtd
index c4a583c..37b0bf1 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Amgriptiwch yr We! Defnyddiwch diogelwch HTTPS yn awtomatig ar nifer o wefanau.">
 <!ENTITY https-everywhere.about.version "Fersiwn">
 <!ENTITY https-everywhere.about.created_by "Creuwyd gan">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Llyfrgellwyr Set Rheol ">
 <!ENTITY https-everywhere.about.thanks "Diolch i">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Os rydych yn hoffi HTTPS Everywhere, efallai byddech yn ystyrio">
 <!ENTITY https-everywhere.about.donate_tor "Gyfrannu i Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Gyfrannu i EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Ynghylch HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Dewisiadau SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Galluogi HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Ailosod i ddiofyn">
 <!ENTITY https-everywhere.prefs.view_xml_source "Gwelwch ffynhonnell XML">
 
-<!ENTITY https-everywhere.source.downloading "Yn lawrlwytho">
-<!ENTITY https-everywhere.source.filename "Enw ffeil">
-<!ENTITY https-everywhere.source.unable_to_download "Methu lawrlwytho'r ffynhonnell.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Diddymu">
 
-<!ENTITY https-everywhere.popup.title "Hysbysiad HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Wps! Oeddech yn defnyddio'r fersiwn sefydloh o HTTPS Everywhere, ond efallai wnaethon ni uwchraddio chithau i'r fersiwn datblygiad yn y datganiad diwethaf.">
-<!ENTITY https-everywhere.popup.paragraph2 "Ydych chi eisiau fynd yn ôl i sefydlog?">
-<!ENTITY https-everywhere.popup.paragraph3 "Bydden ni'n hoffi iddich chi parhau defnyddio ein datganiad datblygiad, ac helpu ni gwneud HTTPS Everywhere yn gwell! Efallai byddech chi'n canfod cwpl o bygiau - gallwch adrodd y broblem gan e-bostio https-everywhere@eff.org. Mae'n ddrwg gennym ni am yr anghyfleustr, ac diolch am defnyddio HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Cadw finnau ar y fersiwn datblydiedig">
-<!ENTITY https-everywhere.popup.revert "Lawrlwythwch y fersiwn sefydlog diwethaf">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Profion setiau rheol HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Canslo">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Dechrau">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/ssl-observatory.dtd
index 2877137..952172d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy/ssl-observatory.dtd
@@ -1,11 +1,11 @@
 <!-- Observatory popup window -->
 <!ENTITY ssl-observatory.popup.details "Manylion a Gwybodaeth Preifatrwydd">
-<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.later "Gofyn Wrthyf Nes Ymlaen">
 <!ENTITY ssl-observatory.popup.no "Na">
 
-<!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 "Gall HTTPS Everywhere rwystro ymosodiadau
+en erbyn eich porwr wrth anfon y tystysgrifau a dderbynwch i'r
+Observatory. Galluogi hyn?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy_GB/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy_GB/https-everywhere.dtd
index eac7ddf..0bbb1fe 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy_GB/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/cy_GB/https-everywhere.dtd
@@ -3,8 +3,11 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da/https-everywhere.dtd
index 36abab4..1a3f8f3 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Kryptér nettet! Brug HTTPS-sikkerhed automatisk på mange netsteder.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Oprettet af">
+<!ENTITY https-everywhere.about.and " og">
 <!ENTITY https-everywhere.about.librarians "Regelsæt-bibliotekarer">
 <!ENTITY https-everywhere.about.thanks "Tak til">
+<!ENTITY https-everywhere.about.many_contributors "Mange, mange bidragsydere, herunder">
+<!ENTITY https-everywhere.about.noscript "Derudover er dele af HTTPS Overalt baseret på kode fra NoScript af Giorgio Maone og andre. Vi er taknemmelige for deres fremragende arbejde!">
 <!ENTITY https-everywhere.about.contribute  "Hvis du kan lide HTTPS Overalt, så vil du måske overveje at">
-<!ENTITY https-everywhere.about.donate_tor "give bidrag til Tor">
+<!ENTITY https-everywhere.about.donate_tor "give et bidrag til Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "da">
-<!ENTITY https-everywhere.about.or "eller">
-<!ENTITY https-everywhere.about.donate_eff "give bidrag til EFF">
+<!ENTITY https-everywhere.about.or "eller at">
+<!ENTITY https-everywhere.about.donate_eff "give et bidrag til EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Doner til EFF">
 <!ENTITY https-everywhere.menu.about "Om HTTPS Overalt">
 <!ENTITY https-everywhere.menu.observatory "Indstillinger for SSL-observatoriet">
 <!ENTITY https-everywhere.menu.globalEnable "Aktivér HTTPS Overalt">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Nulstil til standardindstilling">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vis XML-kilde">
 
-<!ENTITY https-everywhere.source.downloading "Henter">
-<!ENTITY https-everywhere.source.filename "Filnavn">
-<!ENTITY https-everywhere.source.unable_to_download "Kan ikke hente kilde">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabile regler">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Sørg for at forbindelserne krypteres til følgende websteder:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentelle regler">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan give anledning til advarsler og fejl. Deaktiveret som standardindstilling.">
+<!ENTITY https-everywhere.chrome.add_rule "Tilføj en regel for dette websted">
+<!ENTITY https-everywhere.chrome.add_new_rule "Tilføj en ny regel for dette websted">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Brug altid HTTPS for dette værtsnavn">
+<!ENTITY https-everywhere.chrome.host "Værtsnavn:">
+<!ENTITY https-everywhere.chrome.show_advanced "Vis avancerede indstillinger">
+<!ENTITY https-everywhere.chrome.hide_advanced "Skjul avancerede indstillinger">
+<!ENTITY https-everywhere.chrome.rule_name "Regelnavn">
+<!ENTITY https-everywhere.chrome.regex "Alt der matcher det regulære udtryk ...">
+<!ENTITY https-everywhere.chrome.redirect_to "... skal viderestilles til ...">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annuller">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 meddelelse">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups. Du anvendte den stabile version af HTTPS Overalt, men måske har vi ved et uheld opdateret til udvikler-versionen ved den sidste opdatering.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vil du skifte tilbage til den stabile version?">
-<!ENTITY https-everywhere.popup.paragraph3 "Vi ville sætte pris på, at du fortsatte med at anvende vores udvikler-version, og derved hjalp os med at gøre HTTPS Overalt bedre! Der optræder måske fejl her og der, som du kan rapportere på https-everywhere@eff.org, på engelsk. Vi beklager besværet. Tak for at du anvender HTTPS Oversalt.">
-<!ENTITY https-everywhere.popup.keep "Behold udvikler-versionen">
-<!ENTITY https-everywhere.popup.revert "Hent den seneste stabile version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Afprøvninger af HTTPS Overalt-regelsæt">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annullér">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.dtd
new file mode 100644
index 0000000..0bbb1fe
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.dtd
@@ -0,0 +1,53 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.source.downloading "Downloading">
+<!ENTITY https-everywhere.source.filename "Filename">
+<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+
+<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
+<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
+<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
+<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
+<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
+<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
+
+<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
+<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
+<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/da_DK/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/https-everywhere.dtd
index ec23a93..e26f98d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Verschlüsselt das Internet! Nutzen Sie HTTPS-Sicherheit automatisch auf vielen Webseiten.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Entwickelt von">
+<!ENTITY https-everywhere.about.and ", und">
 <!ENTITY https-everywhere.about.librarians "Regelsatz-Bibliothekare">
 <!ENTITY https-everywhere.about.thanks "Dank an">
+<!ENTITY https-everywhere.about.many_contributors "Viele, viele Mitwirkende, darunter">
+<!ENTITY https-everywhere.about.noscript "Teile von HTTPS Everywhere basieren auf dem Code von NoScript von Giorgio Maone und anderen. Wir sind dankbar für ihre exzellente Arbeit!">
 <!ENTITY https-everywhere.about.contribute  "Wenn Sie HTTPS Everywhere mögen, sollten Sie sich dieses ansehen">
 <!ENTITY https-everywhere.about.donate_tor "An Tor spenden">
 <!ENTITY https-everywhere.about.tor_lang_code "de">
 <!ENTITY https-everywhere.about.or "oder">
 <!ENTITY https-everywhere.about.donate_eff "An EFF spenden">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Spende an EFF">
 <!ENTITY https-everywhere.menu.about "Über HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL-Observatory-Einstellungen">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere aktivieren">
@@ -27,24 +31,26 @@
 <!ENTITY https-everywhere.prefs.site "Webseite">
 <!ENTITY https-everywhere.prefs.notes "Notizen">
 <!ENTITY https-everywhere.prefs.list_caption "Welche HTTPS-Weiterleitungsregeln sollen gelten?">
-<!ENTITY https-everywhere.prefs.enabled "Gestartet">
+<!ENTITY https-everywhere.prefs.enabled "Aktiviert">
 <!ENTITY https-everywhere.prefs.ruleset_howto "Sie können lernen, wie Sie Ihren eigenen Regelsatz schreiben (Regeln für andere Webseiten hinzufügen)">
 <!ENTITY https-everywhere.prefs.here_link "hier">
 <!ENTITY https-everywhere.prefs.toggle "Umschalten">
 <!ENTITY https-everywhere.prefs.reset_default "Auf Standardeinstellung zurücksetzen">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML-Quelltext ansehen">
 
-<!ENTITY https-everywhere.source.downloading "Herunterladevorgang">
-<!ENTITY https-everywhere.source.filename "Dateiname">
-<!ENTITY https-everywhere.source.unable_to_download "Quelle konnte nicht heruntergeladen werden.">
+<!ENTITY https-everywhere.chrome.stable_rules "Funktionierende Regeln">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Erzwingen Sie eine verschlüsselte Verbindung zu diesen Webseiten:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimentelle Regeln">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Kann Warnungen oder Abstürze verursachen. Standardmäßig deaktiviert.">
+<!ENTITY https-everywhere.chrome.add_rule "Erstelle eine Regel für diese Seite">
+<!ENTITY https-everywhere.chrome.add_new_rule "Erstelle eine neue Regel für diese Seite">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Benutze immer https für diesen host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Erweiterte Optionen anzeigen">
+<!ENTITY https-everywhere.chrome.hide_advanced "Erweiterte Optionen ausblenden">
+<!ENTITY https-everywhere.chrome.rule_name "Regelname">
+<!ENTITY https-everywhere.chrome.regex "Übereinstimmende regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Weiterleiten nach">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Abbrechen">
 
-<!ENTITY https-everywhere.popup.title "Nachricht von HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Huch. Sie haben die stabile Version von HTTPS Everywhere benutzt, aber wir haben Sie möglicherweise in unserer letzten Aktualisierung auf eine Entwicklerversion aktualisiert.">
-<!ENTITY https-everywhere.popup.paragraph2 "Möchten Sie zurück zur stabilen Version?">
-<!ENTITY https-everywhere.popup.paragraph3 "Wir würden uns freuen, wenn Sie weiterhin die Entwicklerversion benutzen würden, um uns zu helfen, HTTPS Everywhere zu verbessern! Es könnte sein, dass Sie hier und da einige Fehler finden, welche Sie an https-everywhere@eff.org melden können. Entschuldigen Sie die Unannehmlichkeit und danke, dass Sie HTTPS Everywhere benutzen.">
-<!ENTITY https-everywhere.popup.keep "Entwicklerversion beibehalten">
-<!ENTITY https-everywhere.popup.revert "Die letzte stabile Version herunterladen">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS-Everywhere-Regelsatztests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Abbrechen">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/ssl-observatory.dtd
index 8888bb0..697a8c1 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/de/ssl-observatory.dtd
@@ -20,8 +20,8 @@ to turn it on?">-->
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"Es ist sicher, diese Option zu aktivieren, es sei denn, 
-Sie benutzen ein sehr aufdringliches Firmennetzwerk:">
+"Es ist kein Problem, diese Option zu aktivieren, es sei denn, 
+Sie befinden sich in einem sehr aufdringlichen Firmennetzwerk:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
 "Sicher, es sei denn, Sie benutzen ein Firmennetzwerk mit geheimen Intranet-Servernamen:">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/dz/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/dz/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/dz/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/dz/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/el/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/el/https-everywhere.dtd
index 26e2f9a..55218f5 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/el/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/el/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Κρυπτογραφήστε τον Παγκόσμιο Ιστό! Χρησιμοποιήστε ασφάλεια HTTPS σε πολλούς δικτυακούς τόπους.">
 <!ENTITY https-everywhere.about.version "Έκδοση">
 <!ENTITY https-everywhere.about.created_by "Δημιουργήθηκε από">
+<!ENTITY https-everywhere.about.and ", και">
 <!ENTITY https-everywhere.about.librarians "Βιβλιοθήκες για κανόνες">
 <!ENTITY https-everywhere.about.thanks "Ευχαριστούμε τους">
+<!ENTITY https-everywhere.about.many_contributors "Πολύ συνεργάτες,  συμπεριλαμβανομένου">
+<!ENTITY https-everywhere.about.noscript "Επίσης, κομμάτια του HTTPS Everywhere είναι βασισμένα στον κώδικα NoScript, από τον Giorgio Maone και άλλους. Τους ευχαριστούμε για την καταπληκτική δουλειά τους!">
 <!ENTITY https-everywhere.about.contribute  "Αν σας αρέσει το HTTPS Everywhere, δοκιμάστε">
 <!ENTITY https-everywhere.about.donate_tor "Δωρίστε στο Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ή">
 <!ENTITY https-everywhere.about.donate_eff "Δωρίστε στο EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Δωρεά στο EFF">
 <!ENTITY https-everywhere.menu.about "Σχετικά με το HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Προτιμήσεις για το Παρατηρητήριο SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Ενεργοποίηση του HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Απενεργοποίηση του HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Μπλοκάρισμα όλων των αιτημάτων HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Εμφάνιση Μετρητή">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Προβολή όλων των Κανόνων">
 
 <!ENTITY https-everywhere.prefs.title "Προτιμήσεις του HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Ενεργοποίηση όλων">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Επαναφορά προεπιλογών">
 <!ENTITY https-everywhere.prefs.view_xml_source "Προβολή του Πηγαίου Κώδικα XML">
 
-<!ENTITY https-everywhere.source.downloading "Γίνεται λήψη">
-<!ENTITY https-everywhere.source.filename "Όνομα αρχείου">
-<!ENTITY https-everywhere.source.unable_to_download "Αδυναμία λήψης πηγαίου κώδικα.">
+<!ENTITY https-everywhere.chrome.stable_rules "Σταθεροί κανόνες ">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Εξαναγκασμένη κρυπτογραφημένη σύνδεση με αυτές τις σελίδες:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Πειραματικοί κανόνες ">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Μπορεί να προκαλέσει προειδοποιήσεις ή  κατάρευση. Απενεργοποιημένο από προεπιλογή.">
+<!ENTITY https-everywhere.chrome.add_rule "Προσθήκη κανόνα για αυτήν την σελίδα ">
+<!ENTITY https-everywhere.chrome.add_new_rule "Προσθήκη νέου κανόνα για αυτήν την σελίδα ">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Πάντα https για αυτόν τον host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Εμφάνιση προχωρημένων ">
+<!ENTITY https-everywhere.chrome.hide_advanced "Απόκρυψη προχωρημένων ">
+<!ENTITY https-everywhere.chrome.rule_name "Όνομα Κανόνα">
+<!ENTITY https-everywhere.chrome.regex "Ταιριαστές εκφράσεις ">
+<!ENTITY https-everywhere.chrome.redirect_to "Ανακατεύθυνση στο ">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Ακύρωση ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 ειδοποίηση">
-<!ENTITY https-everywhere.popup.paragraph1 "Ωχ. Χρησιμοποιούσατε τη σταθερή έκδοση του HTTPS Everywhere, αλλά μπορεί κατά λάθος να σας αναβαθμίσαμε στην δοκιμαστική έκδοση κατά τη τελευταία ενημέρωση.">
-<!ENTITY https-everywhere.popup.paragraph2 "Θα θέλατε να πάτε πίσω στη σταθερή έκδοση;">
-<!ENTITY https-everywhere.popup.paragraph3 "Θα μας άρεσε πραγματικά αν συνεχίζατε να χρησιμοποιείτε την έκδοση ανάπτυξης βοηθώντας μας να κάνουμε το HTTPS Everywhere καλύτερο! Ίσως βρείτε μερικά σφάλματα εδώ και εκεί, τα οποία μπορείτε να αναφέρετε στο https-everywhere@eff.org. Συγγνώμη για την τυχόν ταλαιπωρία, και ευχαριστούμε που χρησιμοποιείτε το HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Αφήστε με, με τη δοκιμαστική έκδοση">
-<!ENTITY https-everywhere.popup.revert "Μεταφόρτωση της τελευταίας σταθερής έκδοσης">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Δοκιμές Κανόνων">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Ακύρωση">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Εκκίνηση">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en_GB/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en_GB/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en_GB/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/en_GB/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.dtd
index b604a45..399dc11 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Ĉifrigu la reton! Aŭtomate uzu HTTPS‐sekurecon ĉe multaj retejoj.">
 <!ENTITY https-everywhere.about.version "Versio">
 <!ENTITY https-everywhere.about.created_by "Kreita de">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Libraristoj pri regularo">
 <!ENTITY https-everywhere.about.thanks "Dankoj al">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Se vi ŝatas HTTPS-Ĉie, vi devus konsideri">
 <!ENTITY https-everywhere.about.donate_tor "Donaci al Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "eo">
 <!ENTITY https-everywhere.about.or "aŭ">
 <!ENTITY https-everywhere.about.donate_eff "Donaci al EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Pri HTTPS-Ĉie">
 <!ENTITY https-everywhere.menu.observatory "Agordoj de SSL-Observatorio">
 <!ENTITY https-everywhere.menu.globalEnable "Enŝalti HTTPS-Ĉie">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reŝargi al aprioroj">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vidi XML-fonton">
 
-<!ENTITY https-everywhere.source.downloading "Elŝutante">
-<!ENTITY https-everywhere.source.filename "Dosiernomo">
-<!ENTITY https-everywhere.source.unable_to_download "Fonto ne elŝuteblas.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Rezigni">
 
-<!ENTITY https-everywhere.popup.title "Atentigo pri HTTPS-Ĉie 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. Vi estas uzanta la stabilan version de HTTPS-Ĉie sed ni eble erare ĝisdatigis vin al evoluigan version dum nia lasta eldono.">
-<!ENTITY https-everywhere.popup.paragraph2 "Ĉu vi volas reiri al stabila versio?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ni deziras, ke vi uzas nian evoluigan version por helpi nin plibonigi HTTPS-Ĉie! Vi eble trovas kelkajn cimojn, kiujn vi povas raporti per https-everywhere@eff.org. Ni pardonpetas por la malagrablo kaj dankas vin por uzi HTTPS-Ĉie.">
-<!ENTITY https-everywhere.popup.keep "Teni min al evoluiga versio">
-<!ENTITY https-everywhere.popup.revert "Elŝutu la lastan stabilan version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Provoj de HTTPS-Ĉie Regularoj">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Rezigni">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Ek">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.properties
index 9d8d8bf..8eaf3f8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eo/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enŝalti HTTPS-Ĉie
+https-everywhere.menu.globalEnable = Ŝalti HTTPS-Ĉie
 https-everywhere.menu.globalDisable = Malŝalti HTTPS-Ĉie
-https-everywhere.menu.enableDisable = Ŝalti regulojn
+https-everywhere.menu.enableDisable = Ŝalti/malŝalti regulojn
 https-everywhere.menu.noRules = (neniu regulo por ĉi tiu paĝo)
-https-everywhere.menu.unknownRules = (nekonataj reguloj por ĉi tiu paĝo)
-https-everywhere.toolbar.hint = HTTPS-Ĉie estas nun aktiva. Vi enŝaltas ĝin laŭ retejo alklakante la piktogramon en la adresbreto.
+https-everywhere.menu.unknownRules = (reguloj por ĉi tiu paĝo estas nekonataj)
+https-everywhere.toolbar.hint = HTTPS-Ĉie estas nun aktiva. Vi povas baskuligi ĝin laŭ retejo alklakante la piktogramon en la adresbreto.
 https-everywhere.migration.notification0 = Por funkciigi gravan flikaĵon, ĉi tiu ĝisdatigo reŝargas la preferojn de viaj reguloj por HTTPS-Ĉie al la aprioraj valoroj.
 https-everywhere.menu.ruleset-tests = Faru la provojn de la HTTPS-Ĉie Regularo
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es/https-everywhere.dtd
index 429d482..c2b20cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "¡Cifre la Web! Utilice automáticamente la seguridad HTTPS en muchos sitios.">
 <!ENTITY https-everywhere.about.version "Versión">
 <!ENTITY https-everywhere.about.created_by "Creado por">
+<!ENTITY https-everywhere.about.and ", y">
 <!ENTITY https-everywhere.about.librarians "Bibliotecarios de reglas">
 <!ENTITY https-everywhere.about.thanks "Agradecimientos para">
+<!ENTITY https-everywhere.about.many_contributors "Muchos muchos colaboradores, incluyendo">
+<!ENTITY https-everywhere.about.noscript "Además, partes de HTTPS Everywhere están basadas en código de NoScript, de Giorgio Maone y otros. ¡Estamos agradecidos por su excelente trabajo!">
 <!ENTITY https-everywhere.about.contribute  "Si le agrada HTTPS Everywhere (HTTPS en cualquier sitio), podría considerar">
 <!ENTITY https-everywhere.about.donate_tor "Donar a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "es">
 <!ENTITY https-everywhere.about.or "o">
 <!ENTITY https-everywhere.about.donate_eff "Donar a EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EFF">
 <!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere (HTTPS en cualquier sitio)">
 <!ENTITY https-everywhere.menu.observatory "Opciones del Observatorio SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Restablecer configuración predeterminada">
 <!ENTITY https-everywhere.prefs.view_xml_source "Ver código XML">
 
-<!ENTITY https-everywhere.source.downloading "Descargando">
-<!ENTITY https-everywhere.source.filename "Nombre de fichero">
-<!ENTITY https-everywhere.source.unable_to_download "No fue posible descargar la fuente.">
+<!ENTITY https-everywhere.chrome.stable_rules "Reglas estables">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Fuerzan conexiones cifradas a estos sitios web:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Reglas estables">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Pueden causar advertencias u obstaculizaciones. Deshabilitado por defecto.">
+<!ENTITY https-everywhere.chrome.add_rule "Añadir una regla para este sitio">
+<!ENTITY https-everywhere.chrome.add_new_rule "Añadir una nueva regla para este sitio">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Usar siempre https para este servidor">
+<!ENTITY https-everywhere.chrome.host "Servidor:">
+<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avanzadas">
+<!ENTITY https-everywhere.chrome.hide_advanced "Ocultar avanzadas">
+<!ENTITY https-everywhere.chrome.rule_name "Nombre de la regla">
+<!ENTITY https-everywhere.chrome.regex "Expresión regular (regex) coincidente">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirigir a">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "Notificación de HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Uups. Está usted usando la versión estable de HTTPS Everywhere, pero podríamos haberle elevado accidentalmente a la versión de desarrollo.">
-<!ENTITY https-everywhere.popup.paragraph2 "¿Le gustaría volver a la versión estable?">
-<!ENTITY https-everywhere.popup.paragraph3 "¡Nos encantaría que continuase usando nuestra versión de desarrollo y nos ayudara a hacer HTTPS Everywhere mejor! Podría encontrar algunos fallos más, de los que puede informar a 'https-everywhere@eff.org'. Disculpe la inconveniencia, y gracias por usar HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Manténganme en la versión de desarrollo.">
-<!ENTITY https-everywhere.popup.revert "Descargar la última versión estable.">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Pruebas del Conjunto de Reglas de HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Iniciar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/https-everywhere.dtd
index e601747..77b4347 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encriptar la Web! Usar seguridad HTTPS automáticamente en la mayoría de los sitios.">
 <!ENTITY https-everywhere.about.version "Versión">
 <!ENTITY https-everywhere.about.created_by "Creado por">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Librería de conjunto de reglas">
 <!ENTITY https-everywhere.about.thanks "Gracias a">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Si te gusta HTTPS Everywhere, puedes considerar">
 <!ENTITY https-everywhere.about.donate_tor "Donar a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "o">
 <!ENTITY https-everywhere.about.donate_eff "Donar a EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Acerca de HTTPS en todos lados">
 <!ENTITY https-everywhere.menu.observatory "Preferencias del Observatorio SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Habilitar HTTPS En todos lados">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Restablecer valores predeterminados">
 <!ENTITY https-everywhere.prefs.view_xml_source "Ver código XML">
 
-<!ENTITY https-everywhere.source.downloading "Descargando">
-<!ENTITY https-everywhere.source.filename "Nombre del archivo">
-<!ENTITY https-everywhere.source.unable_to_download "No se puede descargar la fuente.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "Notificación HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. Parece que estás usando la versión estable de HTTPS Everywhere, pero te hemos actualizado accidentalmente a una versión de desarrollo en nuestro último lanzamiento.">
-<!ENTITY https-everywhere.popup.paragraph2 "Quieres volver a estable?">
-<!ENTITY https-everywhere.popup.paragraph3 "Estaríamos encantados si continúas usando nuestra versión de desarrollo y nos ayudas a mejorar HTTPS Everywhere! Encontrarás que hay algunos bugs aquí y allá, los cuales puedes reportar a https-everywhere@eff.org. Perdón por el inconveniente, y gracias por utilizar HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Guárdame en la versión de desarrollo">
-<!ENTITY https-everywhere.popup.revert "Descarga la última versión estable">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Probar los juegos de reglas de HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Iniciar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/ssl-observatory.dtd
index 0e94730..46b004b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_AR/ssl-observatory.dtd
@@ -20,8 +20,8 @@ to turn it on?">-->
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"It is safe to enable this, unless you use a very
-intrusive corporate network:">
+"Es seguro habilitar esta opción, a menos que
+se encuentre en una red corporativa muy invasiva:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
 "Seguro, a menos que utilice una red corporativa con nombres secretos de servidor de intranet:">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CL/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CL/https-everywhere.dtd
index 7a611be..116321a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CL/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CL/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Versión">
 <!ENTITY https-everywhere.about.created_by "Creado por">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Agradecimientos a">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Acerca De HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Preferencias del Observatorio SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Habilitar HTTPS en todas partes">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Mantenerme en la versión de desarrollo">
-<!ENTITY https-everywhere.popup.revert "Descargar la última versión estable">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Iniciar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CO/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CO/https-everywhere.dtd
index 409d35a..a0198ca 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CO/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_CO/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Habilitar HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.dtd
index cd3154a..a177622 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.dtd
@@ -1,20 +1,24 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "Sobre HTTPS en todas partes">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "Sobre HTTPS en todas partes">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
 <!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.properties
index be83831..d01e6cb 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = Activar HTTPS Everywhere
+https-everywhere.menu.globalDisable = Desactivar HTTPS Everywhere
+https-everywhere.menu.enableDisable = Activar / Desactivar Reglas
+https-everywhere.menu.noRules = (No hay reglas para de esta página)
+https-everywhere.menu.unknownRules = (Reglas de esta página Desconocido)
+https-everywhere.toolbar.hint = HTTPS Everywhere es ahora activo. Puede alternar en un sitio por sitio haciendo clic en el icono en la barra de direcciones.
+https-everywhere.migration.notification0 = Con el fin de poner en práctica una solución fundamental, esta actualización restablece su HTTPS Everywhere descarta preferencias a sus valores predeterminados.
+https-everywhere.menu.ruleset-tests = Ejecute HTTPS Everywhere pruebas de conjuntos de reglas
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/ssl-observatory.dtd
index d557f93..a5db5b5 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/es_MX/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.details "Detalles e información de privacidad">
 <!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "No">
 
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/https-everywhere.dtd
index c1f568f..8c43b2a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Krüpteeri veeb! Kasuta HTTPS turvalaiendust automaatselt paljudel lehtedel.">
 <!ENTITY https-everywhere.about.version "Versioon">
 <!ENTITY https-everywhere.about.created_by "Loodud">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Reeglistiku haldajad">
 <!ENTITY https-everywhere.about.thanks "Tänud">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Kui sulle meeldib HTTPS Everywhere, võiksid kaaluda">
 <!ENTITY https-everywhere.about.donate_tor "Annetust Tor-ile">
 <!ENTITY https-everywhere.about.tor_lang_code "et">
 <!ENTITY https-everywhere.about.or "või">
 <!ENTITY https-everywhere.about.donate_eff "Annetust EFF-ile">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere-ist">
 <!ENTITY https-everywhere.menu.observatory "SSL Jälgija Eelistused">
 <!ENTITY https-everywhere.menu.globalEnable "Luba HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Keela HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokeeri kõik HTTP päringud">
 <!ENTITY https-everywhere.menu.showCounter "Näita loendurit">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Vaata kõiki reegleid">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Eelistused">
 <!ENTITY https-everywhere.prefs.enable_all "Luba kõik">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Taasta vaikeväärtused">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vaata XML lähtekoodi">
 
-<!ENTITY https-everywhere.source.downloading "Allalaadimine">
-<!ENTITY https-everywhere.source.filename "Failinimi">
-<!ENTITY https-everywhere.source.unable_to_download "Lähtekoodi allalaadimine ebaõnnestus">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Katkesta">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 teavitus">
-<!ENTITY https-everywhere.popup.paragraph1 "Oih. Sa kasutasid HTTPS Everwhere stabiilset versiooni aga oleme ekslikult uuendanud sind arendus versioonile.">
-<!ENTITY https-everywhere.popup.paragraph2 "Kas sa soovid minna tagasi stabiilsele versioonile?">
-<!ENTITY https-everywhere.popup.paragraph3 "Meile meeldiks kui sa jätkaksid arendus verisooni kasutamist ja aitaks meil HTTPS Everywherei parendada. Sa võid leida mõne väikse vea siin või seal, sellisel juhul palun raporteeri need https-everywhere@eff.org. Vabandame ebamugavuste pärast ja täname et kasutate HTTPS Everywhere-i.">
-<!ENTITY https-everywhere.popup.keep "Hoia mind arendus verisoonil">
-<!ENTITY https-everywhere.popup.revert "Lae alla viimane stabiilne versioon">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere reeglistikku test">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Katkesta">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Käivita">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/ssl-observatory.dtd
index 0bd9eca..adec4dd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/et/ssl-observatory.dtd
@@ -39,13 +39,13 @@ kui kasutad sissetungivat korporatiivvõrku:">
 "See säte nõuab, et Tor on paigaldatud ja töötab">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"When you see a new certificate, tell the Observatory which ISP you are connected to">
+"Kui te näete uut sertifikaati, öelge observatooriumile mis ISPsse te olete ühendatud">
 
 <!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.show_cert_warning
-"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+"Näita hoiatust kui observatoorium leiab tühistatud sertifikaadi, mida teie brauser ei märganud">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
@@ -73,16 +73,16 @@ looked at.  Mouseover the options for further details:">
 <!ENTITY ssl-observatory.prefs.hide "Peida täiendavad sätted">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"Check certificates even if Tor is not available">
+"Kontrolli sertifikaate kui Tor ei ole saadaval">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"We will still try to keep the data anonymous, but this option is less secure">
+"Me üritame hoida andmeid anonnüümsena, aga see seade on vähem turvaline">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"Submit and check certificates for non-public DNS names">
+"Saada ja kontrolli sertifikaate mitte-publik DNS nimedele">
 
 <!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.">
+"Väljaarvatud kui see seade on sees, observatoorium ei talleta sertifikaate nimedele, mida see ei suuda lahendada läbi DNS süsteemi.">
 
 <!ENTITY ssl-observatory.prefs.show "Kuva täiendavad sätted">
 
@@ -92,8 +92,8 @@ looked at.  Mouseover the options for further details:">
 <!ENTITY ssl-observatory.warning.title "HOIATUS EFF'i SSL Observatory'st">
 <!ENTITY ssl-observatory.warning.showcert "Kuva sertifikaatide ahel">
 <!ENTITY ssl-observatory.warning.okay "Sain aru">
-<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+<!ENTITY ssl-observatory.warning.text "EFFi SSL Observatoorium on välja andnud hoiatuse selle veebilehekülje HTTPS sertifikaatide kohta: ">
+<!ENTITY ssl-observatory.warning.defense "Kui sa oled sisse logitud sellesse veebilehekülge, on soovitav vahetada salasõna, siis kui olete saavutanud turvalise ühenduse. (Need hoiatused on võimalik keelata &quot;SSL observatoorium&quot; vahelehel HTTPS Igalpool eelistuste dialoogis.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Saada ja kontrolli enda allkirjastatud sertifikaate">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eu/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eu/https-everywhere.dtd
index 8b03071..ece34fd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eu/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/eu/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Weba enkriptatu! Automatikoki erabili HTTPS segurtasuna leku askotan.">
 <!ENTITY https-everywhere.about.version "Bertsioa">
 <!ENTITY https-everywhere.about.created_by "Sortzaileak">
+<!ENTITY https-everywhere.about.and ", eta">
 <!ENTITY https-everywhere.about.librarians "Arau-sorta Liburuzainak">
 <!ENTITY https-everywhere.about.thanks "Eskerrak">
+<!ENTITY https-everywhere.about.many_contributors "Kolaboratzaile pila, barnean">
+<!ENTITY https-everywhere.about.noscript "Gainera, HTTPS Everywhere-en zenbait zati Giorgio Maone eta beste batzuen  NoScript kodean oinarritzen dira. Eskerrak eman nahi dizkiegu beraien lan bikainagatik.">
 <!ENTITY https-everywhere.about.contribute  "HTTPS Everywhere gustoko baduzu, kontutan har zenezake">
 <!ENTITY https-everywhere.about.donate_tor "Torera dohaintza eman">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "edo">
 <!ENTITY https-everywhere.about.donate_eff "EFFra dohaintza eman">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere buruz">
 <!ENTITY https-everywhere.menu.observatory "SSL Behatokiaren Hobespenak">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere gaitu">
 <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere ezgaitu">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokeatu HTTP eskaera guztiak">
 <!ENTITY https-everywhere.menu.showCounter "Kopurua erakutsi">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Ikusi arau guztiak">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Hobespenak">
 <!ENTITY https-everywhere.prefs.enable_all "Gaitu dena">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Lehenetsia berrezarri">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML Iturria ikusi">
 
-<!ENTITY https-everywhere.source.downloading "Deskargatzen">
-<!ENTITY https-everywhere.source.filename "Fitxategi izena">
-<!ENTITY https-everywhere.source.unable_to_download "Ezin izan da iturria deskargatu">
+<!ENTITY https-everywhere.chrome.stable_rules "Arau egonkorrak">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Behartu konexio enkriptatuak webgune hauetan:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Arau esperimentalak">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Alarmak edo kalteak eragin dezake. Ezgaitua lehenetsia.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Utzi">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 jakinarazpena">
-<!ENTITY https-everywhere.popup.paragraph1 "Hara! HTTPS Everywhereren bertsio egonkorra erabiltzen ari zinen, baina baliteke nahigabe garapen bertsiora eguneratu izana gure azken argitalpenean.">
-<!ENTITY https-everywhere.popup.paragraph2 "Egonkorrera bueltatu nahiko al zenuke?">
-<!ENTITY https-everywhere.popup.paragraph3 "Gustatuko litzaiguke garapen argitalpena erabiltzen jarraitu eta HTTPS Everywhere hobeagoa egiten lagunduko bagintuzu! Han hemen akats gutxi batzuk daudela ikus dezakezu, hauen berri https-everywhere@eff.org helbidean eman dezakezu. Barkatu eragozpenak, eta eskerri asko HTTPS Everywhere erabiltzeagatik.">
-<!ENTITY https-everywhere.popup.keep "Mantendu nazazu garapen bertsioan">
-<!ENTITY https-everywhere.popup.revert "Deskargatu azken bertsio egonkorra">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere arau-sorta froga">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Utzi">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Abiarazi">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fa/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fa/https-everywhere.dtd
index 81643f0..5a3ee14 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fa/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fa/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "وب را رمزگذاری کنید! از امنیت HTTPS بصورت خودکار برای بسیاری از وب‌سایت‌ها استفاده کنید.">
 <!ENTITY https-everywhere.about.version "نسخه">
 <!ENTITY https-everywhere.about.created_by "نوشته‌شده توسط">
+<!ENTITY https-everywhere.about.and "، و">
 <!ENTITY https-everywhere.about.librarians "کتابداران قوانین">
 <!ENTITY https-everywhere.about.thanks "با تشکر از">
+<!ENTITY https-everywhere.about.many_contributors "بسیار زیادی همکار، از جمله">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "اگر شما از HTTPS همه‌جا راضی هستید، پیشنهاد می‌کنیم">
 <!ENTITY https-everywhere.about.donate_tor "به Tor کمک مالی کنید.">
 <!ENTITY https-everywhere.about.tor_lang_code "fa">
 <!ENTITY https-everywhere.about.or "یا">
 <!ENTITY https-everywhere.about.donate_eff "به EFF کمک مالی کنید.">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "به EFF کمک مالی کنید.">
 <!ENTITY https-everywhere.menu.about "درباره‌ی HTTPS همه‌جا">
 <!ENTITY https-everywhere.menu.observatory "تنظیم‌های رصدخانه‌ی SSL">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS همه‌جا را فعال کنید">
 <!ENTITY https-everywhere.menu.globalDisable "HTTPS همه‌جا را غیرفعال کنید">
 <!ENTITY https-everywhere.menu.blockHttpRequests "مسدود کردن تمام درخواست های HTTP">
 <!ENTITY https-everywhere.menu.showCounter "نمایش شمارنده">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "نمایش همه قوانین ">
 
 <!ENTITY https-everywhere.prefs.title "تنظیم‌های HTTPS همه‌جا">
 <!ENTITY https-everywhere.prefs.enable_all "همه‌ی موارد را فعال کنید">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "بازگشت به تنظیم‌های اولیه">
 <!ENTITY https-everywhere.prefs.view_xml_source "مشاهده منبع XML">
 
-<!ENTITY https-everywhere.source.downloading "در حال دانلود">
-<!ENTITY https-everywhere.source.filename "نام فایل">
-<!ENTITY https-everywhere.source.unable_to_download "امکان دانلود منبع وجود ندارد.">
+<!ENTITY https-everywhere.chrome.stable_rules "قوانین پایدار">
+<!ENTITY https-everywhere.chrome.stable_rules_description "اجبار اتصال رمزگذاری شده به این وب سایت:">
+<!ENTITY https-everywhere.chrome.experimental_rules "قوانین تجربی">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "ممکن است علت، هشدار و یا شکستگی باشد. غیر فعال به طور پیش فرض.">
+<!ENTITY https-everywhere.chrome.add_rule "اضافه کردن یک قانون برای این سایت">
+<!ENTITY https-everywhere.chrome.add_new_rule "اضافه کردن یک قانون جدید برای این سایت">
+<!ENTITY https-everywhere.chrome.always_https_for_host "همیشه از https برای این میزبان استفاده شود">
+<!ENTITY https-everywhere.chrome.host "ميزبان:">
+<!ENTITY https-everywhere.chrome.show_advanced "نمایش پیشرفته">
+<!ENTITY https-everywhere.chrome.hide_advanced "مخفی‌کردن پیشرفته">
+<!ENTITY https-everywhere.chrome.rule_name "نام قانون">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "تغییر مسیر به">
+<!ENTITY https-everywhere.chrome.status_cancel_button "لغو">
 
-<!ENTITY https-everywhere.popup.title "آگهی از همه جا HTTPS نسخه 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "اوه! شما از نسخه پایدار «همه جا HTTPS» استفاده می کردید، اما احتمالا ما به طور تصادفی در حین آخرین انتشار، شما را به نسخه در حال توسعه ارتقا دادیم. ">
-<!ENTITY https-everywhere.popup.paragraph2 "آیا مایلید به نسخه‌ی پایدار بازگردید؟">
-<!ENTITY https-everywhere.popup.paragraph3 "ما خوشحال می شویم اگر شما همچنان از آخرین نسخه‌ی در حال توسعه منتشر شده ما استفاده کنید! شاید اینجا و آنجا به یکی دو مشکل برخورد کنید که می توانید آنها را به آدرس https-everywhere@eff.org اطلاع دهید. با عرض پوزش به خاطر مشکلات احتمالی و با تشکر به خاطر استفاده از «همه جا HTTPS».">
-<!ENTITY https-everywhere.popup.keep "آخرین نسخه پایدار را داونلود کن">
-<!ENTITY https-everywhere.popup.revert "آخرین نسخه پایدار را داونلود کن">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "تست قوانین HTTPS همه جا">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "لغو">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "آغاز">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fi/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fi/https-everywhere.dtd
index abb4aa3..d810c86 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fi/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fi/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Salaa verkko automaattisesti käyttäen HTTPS-suojausta monilla sivuilla!">
 <!ENTITY https-everywhere.about.version "Versio">
 <!ENTITY https-everywhere.about.created_by "Tekijät:">
+<!ENTITY https-everywhere.about.and ", ja">
 <!ENTITY https-everywhere.about.librarians "Sääntöjen hallinnoijat">
 <!ENTITY https-everywhere.about.thanks "Kiitokset">
+<!ENTITY https-everywhere.about.many_contributors "Monia myötävaikuttajia, mukaanlukien">
+<!ENTITY https-everywhere.about.noscript "Lisäksi, osia HTTPS Everywhere:stä perustuu Giorgio Maonen ja muiden koodiin NoScriptistä. Olemme kiitollisia heidän mahtavasta työstään!">
 <!ENTITY https-everywhere.about.contribute  "Jos pidät HTTPS Everywheresta, voit harkita">
 <!ENTITY https-everywhere.about.donate_tor "Lahjoita Tor-sovellukselle.">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "tai">
 <!ENTITY https-everywhere.about.donate_eff "Lahjoita EFFille">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Lahjoita EFF:lle">
 <!ENTITY https-everywhere.menu.about "Tietoja HTTPS Everywheresta">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatoryn asetukset">
 <!ENTITY https-everywhere.menu.globalEnable "Ota HTTPS Everywhere käyttöön">
 <!ENTITY https-everywhere.menu.globalDisable "Poista HTTPS Everywhere käytöstä">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Estä kaikki HTTP-pyynnöt">
 <!ENTITY https-everywhere.menu.showCounter "Näytä laskuri">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Näytä kaikki säännöt">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywheren asetukset">
 <!ENTITY https-everywhere.prefs.enable_all "Ota kaikki käyttöön">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Palauta oletusasetus">
 <!ENTITY https-everywhere.prefs.view_xml_source "Katso XML-lähde">
 
-<!ENTITY https-everywhere.source.downloading "Ladataan">
-<!ENTITY https-everywhere.source.filename "Tiedostonimi">
-<!ENTITY https-everywhere.source.unable_to_download "Lähteen lataaminen epäonnistui.">
+<!ENTITY https-everywhere.chrome.stable_rules "Vakaat käytännöt">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Pakota salatut yhteydet näihin nettisivustoihin:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Kokeelliset käytännöt">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Voi aiheuttaa varoituksia tai hajoamisen. Pois käytöstä oletuksena.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Käytä aina https tälle isännälle">
+<!ENTITY https-everywhere.chrome.host "Isäntä:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Uudelleenohjaa kohteeseen">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Peruuta">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0kehitys.11 ilmoitus">
-<!ENTITY https-everywhere.popup.paragraph1 "Hups. Käytit HTTPS Everywheren vakaata versiota, mutta olemme ehkä vahingossa päivittäneet sen kehitysversioon uusimmassa julkaisussamme.">
-<!ENTITY https-everywhere.popup.paragraph2 "Tahtoisitko palata vakaaseen versioon?">
-<!ENTITY https-everywhere.popup.paragraph3 "Toivomme, että jatkat kehitysversion käyttöä ja autat meitä tekemään HTTPS Everywerestä entistä paremman! Saatat löytää bugeja, jotka voit raportoida https-everywhere@eff.org osoitteeseen. Pahoittelumme vaivasta, ja kiitos, että käytät HTTPS Everywhereä.">
-<!ENTITY https-everywhere.popup.keep "Jatka kehitysversion käyttöä">
-<!ENTITY https-everywhere.popup.revert "Lataa viimeisin vakaa versio">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere -sääntötestit">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Peruuta">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Käynnistä">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.dtd
index 68fe6b5..28571f6 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.dtd
@@ -2,49 +2,55 @@
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "I-encrypt ang Web! Awtomatikong gamitin ang HTTPS security sa maraming sites.">
 <!ENTITY https-everywhere.about.version "Bersyon">
-<!ENTITY https-everywhere.about.created_by "Ginawa ni/ng">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Salamat kay/sa">
-<!ENTITY https-everywhere.about.contribute  "Kung nagustuhan mo ang HTTPS Everywhere, baka magustuhan mo rin ang">
-<!ENTITY https-everywhere.about.donate_tor "Paano mag-donate sa Tor">
+<!ENTITY https-everywhere.about.created_by "Ginawa nina">
+<!ENTITY https-everywhere.about.and "at">
+<!ENTITY https-everywhere.about.librarians "Mga Ruleset Librarian">
+<!ENTITY https-everywhere.about.thanks "Salamat sa">
+<!ENTITY https-everywhere.about.many_contributors "Maraming maraming contributor, kasama sina">
+<!ENTITY https-everywhere.about.noscript "Gayundin, ang ilang bahagi ng HTTPS Everywhere ay batay sa code mula sa NoScript nina Giorgio Maone at marami pang iba.  Lubos kaming nagpapasalamat sa kanilang mahusay na trabaho!">
+<!ENTITY https-everywhere.about.contribute  "Kung nagustuhan mo ang HTTPS Everywhere, baka magustuhan mo ring">
+<!ENTITY https-everywhere.about.donate_tor "Mag-donate sa Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "fil">
 <!ENTITY https-everywhere.about.or "o">
-<!ENTITY https-everywhere.about.donate_eff "Paano mag-donate sa EFF">
+<!ENTITY https-everywhere.about.donate_eff "Mag-donate sa EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Tungkol sa HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.observatory "Mga Preference sa SSL Observatory">
+<!ENTITY https-everywhere.menu.globalEnable "I-enable ang HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "I-disable ang HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "I-block ang lahat ng HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Ipakita ang Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "Tingnan ang Lahat ng Rules">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
-<!ENTITY https-everywhere.prefs.enable_all "Enable All">
-<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.title "Mga Preference sa HTTPS Everywhere">
+<!ENTITY https-everywhere.prefs.enable_all "I-enable Lahat">
+<!ENTITY https-everywhere.prefs.disable_all "I-disable Lahat">
 <!ENTITY https-everywhere.prefs.reset_defaults "Ibalik sa Defaults">
 <!ENTITY https-everywhere.prefs.search "Maghanap">
 <!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.notes "Mga Paunawa">
 <!ENTITY https-everywhere.prefs.list_caption "Aling HTTPS redirection rules ang dapat gamitin?">
-<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.enabled "Naka-enable">
 <!ENTITY https-everywhere.prefs.ruleset_howto "Puwede kang matuto kung paano magsulat ng sarili mong rulesets (para magdagdag ng support para sa iba pang web sites)">
 <!ENTITY https-everywhere.prefs.here_link "dito">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.toggle "I-toggle">
 <!ENTITY https-everywhere.prefs.reset_default "Ibalik sa Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "Tingnan ang XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Hindi ma-download ang source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Mga stable na rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Puwersahin ang mga naka-encrypt na koneksyon sa mga website na ito:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Mga experimental na rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Maaaring hindi gumana o magkaroon ng mga babala. Default na naka-disable.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "I-kansela">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Hala. Ginagamit mo dati ang stable version ng HTTPS Everywhere, pero maaaring hindi namin sinasadyang naibigay sa iyo ang development version noong huli naming release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Gusto mo bang bumalik sa stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ikalulugod namin kung itutuloy mo ang paggamit sa aming development release at kung tutulungan mo kaming pagandahin ang HTTPS Everywhere! Maaari kang makakita ng ilan pang bugs dito na maaari mong iulat sa https-everywhere@eff.org. Humihingi kami ng paumanhin sa abala at nagpapasalamat kami sa iyong paggamit ng HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Sige, gusto ko sa development version">
-<!ENTITY https-everywhere.popup.revert "I-download ang pinakabagong stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Simulan">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.properties
index fe2ef52..ea0041b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.globalEnable = I-enable ang HTTPS Everywhere
+https-everywhere.menu.globalDisable = I-disable ang HTTPS Everywhere
+https-everywhere.menu.enableDisable = I-enable / I-disable ang Rules
 https-everywhere.menu.noRules = (Walang Rules para sa Page na Ito)
 https-everywhere.menu.unknownRules = (Hindi Alam ang Rules para sa Page na Ito)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.toolbar.hint = Gumagana na ngayon ang HTTPS Everywhere. Puwede mo itong i-toggle para sa bawat site sa pamamamagitan ng pag-click sa icon sa address bar.
 https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
 https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/ssl-observatory.dtd
index 78781b2..294766e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fil/ssl-observatory.dtd
@@ -86,7 +86,7 @@ looked at.  Mouseover the options for further details:">
 
 <!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "Mga Preference sa SSL Observatory">
 
 <!ENTITY ssl-observatory.prefs.use "Gamitin ang Observatory?">
 <!ENTITY ssl-observatory.warning.title "BABALA mula sa SSL Observatory ng EFF">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fo/https-everywhere.dtd
index b0a916c..128076e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Brongla alnetið! Brúka HTTPS-trygd sjávvirkandi á fleiri síðum.">
 <!ENTITY https-everywhere.about.version "Útgáva">
 <!ENTITY https-everywhere.about.created_by "Stovna hevur">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Tøkk til">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Dámar tær HTTPS Allastaðni, átti tú at">
 <!ENTITY https-everywhere.about.donate_tor "latið Tor eitt oyra">
 <!ENTITY https-everywhere.about.tor_lang_code "fo">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Letur EFF eitt oyra">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Um HTTPS Allastaðni">
 <!ENTITY https-everywhere.menu.observatory "Stillingar fyri SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Gilda HTTPS Allastaðni">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Nullstilla">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vís XML-keldu">
 
-<!ENTITY https-everywhere.source.downloading "Tekur niður">
-<!ENTITY https-everywhere.source.filename "Fílunavn">
-<!ENTITY https-everywhere.source.unable_to_download "Fær ikki tikið kelduna niður.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Angra">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Allastaðni 4,0framleiðsu.11 fráboðan">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups. Tú brúkaði støðugu útgávuna av HTTPS Allastaðni, men vit hava við óvart dagført teg at brúka nýggjastu framleiðaraútgávu.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vilt tú fara aftur til støðugu útgávuna?">
-<!ENTITY https-everywhere.popup.paragraph3 "Okkum hevði dámt, um tú helt fram at brúka framleiðaraútgávuna og hjálpti okkum at betra um HTTPS Allastaðni. Tú finnur sikkur villur og lýti, men tað er til at melda tílíkt til https-everywhere@eff.org. Haldið okkum til góðum, og takk fyri, at tú brúka HTTPS Allastaðni.">
-<!ENTITY https-everywhere.popup.keep "Hald fram við framleiðaraútgávuni">
-<!ENTITY https-everywhere.popup.revert "Tak nýggjastu støðugu útgávu niður">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Reglusett-roynd fyri HTTPS Allastaðni">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Angra">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Starta">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/https-everywhere.dtd
index 53650f4..3763672 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Chiffrez le Web ! Utilisez automatiquement HTTPS avec de nombreux sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Créé par">
+<!ENTITY https-everywhere.about.and ", et">
 <!ENTITY https-everywhere.about.librarians "Bibliothécaires de règles">
 <!ENTITY https-everywhere.about.thanks "Merci à">
+<!ENTITY https-everywhere.about.many_contributors "De nombreux, nombreux contributeurs y compris">
+<!ENTITY https-everywhere.about.noscript "Aussi les portions de HTTPS Everywhere sont basés sur le code de NoScript par Giorgio Maone et autres. Nous sommes reconnaissants pour leur excellent travail ! ">
 <!ENTITY https-everywhere.about.contribute  "Si vous aimez HTTPS Everywhere, vous devriez considérer">
 <!ENTITY https-everywhere.about.donate_tor "Faire un Don à Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ou">
 <!ENTITY https-everywhere.about.donate_eff "Faire un Don à EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Faites un don à EFF">
 <!ENTITY https-everywhere.menu.about "À propos de HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Préférences de l'Observatoire SSL ">
 <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Désactiver HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Bloquer toutes les requêtes HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur">
-<!ENTITY https-everywhere.menu.viewAllRules "Voir Toutes Les Règles">
+<!ENTITY https-everywhere.menu.viewAllRules "Voir toutes les règles">
 
 <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Tout activer">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Revenir aux paramètres par défaut">
 <!ENTITY https-everywhere.prefs.view_xml_source "Voir le code source XML">
 
-<!ENTITY https-everywhere.source.downloading "Téléchargement">
-<!ENTITY https-everywhere.source.filename "Nom du fichier">
-<!ENTITY https-everywhere.source.unable_to_download "Impossible de télécharger le code source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Règles permanentes">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Peut causer des alertes ou des ruptures. Désactivé par défaut.">
+<!ENTITY https-everywhere.chrome.add_rule "Ajouter une règle pour ce site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Ajouter une nouvelle règle pour ce site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Toujours utiliser https pour ce serveur">
+<!ENTITY https-everywhere.chrome.host "Serveur :">
+<!ENTITY https-everywhere.chrome.show_advanced "Montrer l'onglet avancé">
+<!ENTITY https-everywhere.chrome.hide_advanced "Cacher l'onglet avancé">
+<!ENTITY https-everywhere.chrome.rule_name "Nom de la règle">
+<!ENTITY https-everywhere.chrome.regex "Expression régulière concordante">
+<!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annuler">
 
-<!ENTITY https-everywhere.popup.title "Notification de HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oups. Vous utilisiez la version stable de HTTPS Everywhere, mais notre dernière version a accidentellement pu effectuer la mise à jour vers la version de développement.">
-<!ENTITY https-everywhere.popup.paragraph2 "Est-ce que vous souhaitez revenir vers la version stable ?">
-<!ENTITY https-everywhere.popup.paragraph3 "Nous aimerions vous voir continuer à utiliser notre version de développement et à nous aider à améliorer HTTPS Everywhere ! Vous allez peut-être trouver quelques bogues ici et là, que vous pouvez rapporter (en anglais) en écrivant à https-everywhere@eff.org. Désolé pour le dérangement, et merci d'utiliser HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Rester sur la version de développement">
-<!ENTITY https-everywhere.popup.revert "Télécharger la dernière version stable">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Tests de règles pour HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annuler">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Démarrer">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/ssl-observatory.dtd
index 122b340..ac45da5 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr/ssl-observatory.dtd
@@ -3,9 +3,7 @@
 <!ENTITY ssl-observatory.popup.later "Plus tard">
 <!ENTITY ssl-observatory.popup.no "Non">
 
-<!ENTITY ssl-observatory.popup.text " HTTPS Everywhere peut détecter les attaques
-contre votre navigateur en envoyant les certificats reçus
-à l'Observatoire. Souhaitez-vous activer cette fonctionnalité ?">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere peut détecter les attaques contre votre navigateur en envoyant les certificats reçus à l'Observatoire. Souhaitez-vous activer cette fonctionnalité ?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,15 +11,14 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"Activer l'usage de l'Observatoire SSL par HTTPS Everywhere ?">
+"Activer l'usage de l'observatoire SSL par HTTPS Everywhere ?">
 
 <!ENTITY ssl-observatory.popup.yes "Oui">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"Cette option est sécurisée, sauf si vous 
-vous connectez via un réseau d'entreprise très intrusif:">
+"Cette option est sécurisée, sauf si vous vous connectez via un réseau d'entreprise très intrusif:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
 "Cette option est sécurisée, sauf si vous passez par un réseau d'entreprise utilisant des serveurs Intranet masqués:">
@@ -30,16 +27,16 @@ vous connectez via un réseau d'entreprise très intrusif:">
 "Envoyer et vérifier les certificats signés par des autorités inhabituelles">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-" Il est sûr d'activer cette option (et c'est une bonne idée), sauf si vous utilisez un réseau d'entreprise intrusif ou le logiciel antivirus Kaspersky qui surveille votre navigation avec un proxy TLS et une autorité racine privée du certificat. Si elle est activée sur un tel réseau, cette option pourrait publier des preuves que tel ou tel domaine a été visité en https:// à travers ce proxy, à cause des certificats uniques qu'elle produirait. C'est pourquoi nous la désactivons par défaut.">
+" Il est plus sûr d'activer cette option (et c'est une bonne idée), sauf si vous utilisez un réseau d'entreprise intrusif ou le logiciel antivirus Kaspersky qui surveille votre navigation avec un proxy TLS et une autorité racine privée du certificat. Si elle est activée sur un tel réseau, cette option pourrait publier des preuves que tel ou tel domaine a été visité en https:// à travers ce proxy, à cause des certificats uniques qu'elle produirait. C'est pourquoi nous la désactivons par défaut.">
 
 <!ENTITY ssl-observatory.prefs.anonymous "Vérifier les certificats en utilisant TOR pour votre anonymat">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Vérifier les certificats en utilisant TOR pour votre anonymat (installation du TORbutton indispensable)">
+"Vérifier les certificats en utilisant TOR pour votre anonymat (installation du Torbutton indispensable)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
 "Cette option nécessite l'installation de TOR et du Torbutton">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"Quand vous voyez un nouveau certificat, indiquez à l'Observatoire le FAI auquel vous êtes connecté.">
+"Quand vous voyez un nouveau certificat, indiquez à l'observatoire le FAI auquel vous êtes connecté.">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
 "Cette option récupérera et enverra le «numéro Autonomous System» de votre réseau.  Cela nous aide à localiser les attaques contre HTTPS, et permet de savoir si nous avons des observations à partir de réseaux dans des pays comme l'Iran et la Syrie où ces attaques sont relativement fréquentes.">
@@ -54,9 +51,7 @@ vous connectez via un réseau d'entreprise très intrusif:">
 
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Everywhere peut également faire appel à l'Observatoire SSL de l'EFF.  Cela permet deux choses: (1)
-l'envoi de copies des certificats HTTPS à l'Observatoire, ce qui nous permet
-de détecter les attaques de type 'homme du milieu' et d'améliorer la sécurité globale de l'Internet ; et (2)
-cela nous permet de mieux vous informer quant aux connexions non sécurisées et aux attaques contre votre navigateur.">
+l'envoi de copies des certificats HTTPS à l'Observatoire, ce qui nous permet de détecter les attaques de type 'homme du milieu' et d'améliorer la sécurité globale du Web ; et (2) cela nous permet de mieux vous informer quant aux connexions non sécurisées et aux attaques contre votre navigateur.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -65,10 +60,7 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"Par exemple, si vous visitez https://www.something.com, le certificat
-reçu par l'Observatoire indiquera que quelqu'un a visité 
-www.something.com, mais pas qui a visité le site, ou quelle page spécifique
-a été consultée. Passez votre souris sur les options pour plus d'informations:">
+"Par exemple, si vous visitez https://www.something.com, le certificat reçu par l'observatoire indiquera que quelqu'un a visité www.something.com, mais pas qui a visité le site, ou quelle page spécifique a été consultée. Passez votre souris sur les options pour plus d'informations:">
 
 <!ENTITY ssl-observatory.prefs.hide "Cacher les options avancées">
 
@@ -79,20 +71,20 @@ a été consultée. Passez votre souris sur les options pour plus d'informations
 "Nous essaierons tout de même de faire en sorte que les données restent anonymes, mais cette option est moins sécurisée">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"Envoyer et vérifier les certificats des noms DNS non publiques">
+"Envoyer et vérifier les certificats des noms DNS non publics">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"Quand cette option est activée, l'Observatoire conserve les certificats des domaines qui ne peuvent être résolus par le système DNS public.">
+"Quand cette option est activée, l'observatoire conserve les certificats des domaines qui ne peuvent être résolus par le système DNS public.">
 
 <!ENTITY ssl-observatory.prefs.show "Voir les options avancées">
 
-<!ENTITY ssl-observatory.prefs.title "Préférences de l'Observatoire SSL">
+<!ENTITY ssl-observatory.prefs.title "Préférences de l'observatoire SSL">
 
-<!ENTITY ssl-observatory.prefs.use "Utiliser l'Observatoire?">
-<!ENTITY ssl-observatory.warning.title "Avertissement de l'Observatoire SSL de l'EFF">
+<!ENTITY ssl-observatory.prefs.use "Utiliser l'observatoire?">
+<!ENTITY ssl-observatory.warning.title "Avertissement de l'observatoire SSL de l'EFF">
 <!ENTITY ssl-observatory.warning.showcert "Montrer l'empreinte du certificat">
 <!ENTITY ssl-observatory.warning.okay "Je comprends">
-<!ENTITY ssl-observatory.warning.text "L'Observatoire SSL de l'EFF a publié un avertissement sur les certificats SSL émis par ce site:">
+<!ENTITY ssl-observatory.warning.text "L'observatoire SSL de l'EFF a publié un avertissement sur les certificats SSL émis par ce site:">
 <!ENTITY ssl-observatory.warning.defense "Si vous êtes authentifié sur ce site, il peut être préférable de changer votre mot de passe une fois que vous aurez une connexion sûre. (Ces alertes peuvent être désactivées dans l'onglet &quot;Observatoire SSL&quot; de la fenêtre des préférences de HTTPS Everywhere).">
 
 <!ENTITY ssl-observatory.prefs.self_signed
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr_CA/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr_CA/https-everywhere.dtd
index 434c230..174d534 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr_CA/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fr_CA/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Chiffrer le Web! Utiliser automatiquement la sécurité HTTPS avec de nombreux sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Créé par">
+<!ENTITY https-everywhere.about.and ", et">
 <!ENTITY https-everywhere.about.librarians "Bibliothécaires des ensembles de règles">
 <!ENTITY https-everywhere.about.thanks "Merci à">
+<!ENTITY https-everywhere.about.many_contributors "De très nombreux collaborateurs, incluant">
+<!ENTITY https-everywhere.about.noscript "Aussi, des parties de HTTPS partout reposent sur du code de NoScript par Giorgio Maone et al. Nous les remercions pour leur excellent travail !">
 <!ENTITY https-everywhere.about.contribute  "Si vous aimez HTTPS partout, vous devriez considérer">
 <!ENTITY https-everywhere.about.donate_tor "Faire un don à Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ou">
 <!ENTITY https-everywhere.about.donate_eff "Faire un don à EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à l'EFF">
 <!ENTITY https-everywhere.menu.about "À propos de HTTPS partout">
 <!ENTITY https-everywhere.menu.observatory "Préférences de l'observatoire SSL ">
 <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS partout">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Revenir aux paramètres par défaut">
 <!ENTITY https-everywhere.prefs.view_xml_source "Voir la source XML">
 
-<!ENTITY https-everywhere.source.downloading "Téléchargement">
-<!ENTITY https-everywhere.source.filename "Nom du fichier">
-<!ENTITY https-everywhere.source.unable_to_download "Impossible de télécharger la source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Règles stables">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :">
+<!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales :">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Pourrait causer des avertissements ou des défaillances. Désactivé par défaut.">
+<!ENTITY https-everywhere.chrome.add_rule "Ajouter une règle pour ce site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Ajouter une nouvelle règle pour ce site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Toujours utiliser HTTPS pour cet hôte">
+<!ENTITY https-everywhere.chrome.host "Hôte :">
+<!ENTITY https-everywhere.chrome.show_advanced "Afficher les options avancées">
+<!ENTITY https-everywhere.chrome.hide_advanced "Cacher les options avancées">
+<!ENTITY https-everywhere.chrome.rule_name "Nom de la règle">
+<!ENTITY https-everywhere.chrome.regex "Regex correspondant">
+<!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annuler">
 
-<!ENTITY https-everywhere.popup.title "Notification de HTTPS partout 4.0développement.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oups. Vous utilisiez la version stable de HTTPS partout, mais nous vous avons peut-être mis à niveau vers la version de développement dans notre dernière version.">
-<!ENTITY https-everywhere.popup.paragraph2 "Est-ce que vous souhaitez revenir vers la version stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "Nous aimerions vous voir continuer à utiliser notre version de développement et nous aider à améliorer HTTPS partout! Vous allez peut-être trouver quelques bogues de plus ici et là, que vous pouvez rapporter à https-everywhere@eff.org. Désolé pour l'inconvénient et merci d'utiliser HTTPS partout.">
-<!ENTITY https-everywhere.popup.keep "Rester sur la version de développement">
-<!ENTITY https-everywhere.popup.revert "Télécharger la dernière version stable">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Tests d'ensemble de règles de HTTPS partout">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annuler">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Démarrer">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fur/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fur/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fur/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fur/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fy/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fy/https-everywhere.dtd
index c67433d..c1c0989 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fy/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/fy/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Ferzje">
 <!ENTITY https-everywhere.about.created_by "Makke troch">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "fy">
 <!ENTITY https-everywhere.about.or "of">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Oer HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumfoarkarren">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ynskeakelje">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Standertwearde ferfarskje">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML-boarnekoade besjen">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Triemnamme">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annulearje">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annulearje">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ga/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ga/https-everywhere.dtd
index c7cde87..c7c567f 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ga/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ga/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "leagan">
 <!ENTITY https-everywhere.about.created_by "Cruthaithe ag">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Buíochas le">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Faoi HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Íoslódáil">
-<!ENTITY https-everywhere.source.filename "Ainm Chomhaid">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cur ar Ceal">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cur ar Ceal">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Tosaigh">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gd/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gd/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gd/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gd/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.dtd
index 9b9c06b..f922754 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.dtd
@@ -1,50 +1,56 @@
 <!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.ext_description "Cifrar a Web! Usar automáticamente seguridade HTTPS en moitos sitios.">
 <!ENTITY https-everywhere.about.version "Versión">
 <!ENTITY https-everywhere.about.created_by "Creado por">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.and ", e">
+<!ENTITY https-everywhere.about.librarians "Bibliotecarios do Conxunto de Regras">
 <!ENTITY https-everywhere.about.thanks "Grazas a">
+<!ENTITY https-everywhere.about.many_contributors "Moitos, moitos contribuíntes, incluíndo">
+<!ENTITY https-everywhere.about.noscript "Asimesmo, partes de HTTPS Everywhere están baseadas no código de NoScript, de Giorgio Maone e outros. Estamos agradecidos polo seu excelente traballo!">
 <!ENTITY https-everywhere.about.contribute  "Se ques usar HTTPS Everywhere, deberías ter en conta">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.donate_tor "Donando a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "gl">
 <!ENTITY https-everywhere.about.or "ou">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.donate_eff "Donando á EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.observatory "Preferencias do Observatorio SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS para todo">
 <!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS para todo">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Bloquear tódalas peticións HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Amosar Contador">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Ver Tódalas Regras">
 
 <!ENTITY https-everywhere.prefs.title "Preferencias do HTTPS Everywhere">
-<!ENTITY https-everywhere.prefs.enable_all "Enable All">
-<!ENTITY https-everywhere.prefs.disable_all "Disable All">
-<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.enable_all "Habilitar Todo">
+<!ENTITY https-everywhere.prefs.disable_all "Deshabilitar Todo">
+<!ENTITY https-everywhere.prefs.reset_defaults "Restablecer a Valores por Defecto">
 <!ENTITY https-everywhere.prefs.search "Buscar">
-<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.site "SItio">
 <!ENTITY https-everywhere.prefs.notes "Notas">
-<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.list_caption "Que regras de redirección HTTPS debería aplicar?">
 <!ENTITY https-everywhere.prefs.enabled "Activado">
-<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "here">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
-<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a cómo escribir o seu propio conxunto de reglas (para engadir soporte para outros sitios web)">
+<!ENTITY https-everywhere.prefs.here_link "eiquí">
+<!ENTITY https-everywhere.prefs.toggle "Conmutar">
+<!ENTITY https-everywhere.prefs.reset_default "Restablecer a Valor por Defecto">
+<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Nome do ficheiro">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.properties
index f004c41..3794fd1 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/https-everywhere.properties
@@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Activar / Desactivar as regras
 https-everywhere.menu.noRules = (Sen regras para esta páxina)
 https-everywhere.menu.unknownRules = (As regras para esta páxina son descoñecidas)
 https-everywhere.toolbar.hint = HTTPS para todo está activado. Pode alternar a activación sitio por sitio premendo na icona da barra de enderezos.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.migration.notification0 = Para implementar unha solución crucial, esta actualización restablece as súas preferencias de regra HTTPS Everywhere aos seus valores por defecto.
+https-everywhere.menu.ruleset-tests = Executar Probas do Conxunto de Regras HTTPS Everywhere
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/ssl-observatory.dtd
index e0d7d9a..8314546 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gl/ssl-observatory.dtd
@@ -1,11 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
-<!ENTITY ssl-observatory.popup.later "Ask Me Later">
+<!ENTITY ssl-observatory.popup.details "Detalles e Información de Privacidade">
+<!ENTITY ssl-observatory.popup.later "Pregúnteme despois">
 <!ENTITY ssl-observatory.popup.no "Non">
 
-<!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 "HTTPS Everywhere pode detectar ataques
+contra o seu navegador enviando os certificados que reciba ao
+Observatorio. Activar isto?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,50 +13,50 @@ 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?">
+"Debería HTTPS Everywhere usar o Observatorio SSL?">
 
 <!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:">
+"É seguro habilitar isto, a menos que use unha
+rede corporativa moi intrusiva:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Safe, unless you use a corporate network with secret intranet server names:">
+"Seguro, a menos que use unha rede corporativa con nomes secretos para os servidores da intranet:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"Submit and check certificates signed by non-standard root CAs">
+"Enviar e comprobar certificados asinados por CAs raíz non estándar">
 
 <!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.">
+"É seguro (e unha boa idea) habilitar esta opción, a menos que use unha rede corporativa intrusiva ou software antivirus de Karspersky que monitoriza a súa navegación cun proxy e unha Autoridade Certificadora raíz privada. Se se habilita en tal rede, esta opción podería publicar proba de cáles dominios https:// están sendo visitados a través dese proxy, debido aos certificados únicos que produciría. Así que déixeo apagado por defecto.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
+<!ENTITY ssl-observatory.prefs.anonymous "Comprobar certificados usando Tor para anonimidade">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Check certificates using Tor for anonymity (requires Tor)">
+"Comprobar certificados usando Tor para anonimidade (require Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"This option requires Tor to be installed and running">
+"Esta opción require que Tor estea instalado i executándose">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"When you see a new certificate, tell the Observatory which ISP you are connected to">
+"Cando vexa un novo certificado, dígalle ao Observatorio a qué ISP está conectado vostede">
 
 <!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.">
+"Isto obterá i enviará o &quot;número de Sistema Autónomo&quot; da sua rede. Isto axudaranos a localizar ataques contra HTTPS, e determinar se temos vixiancia dende redes en lugares como Irán e Siria onde os ataques son comunes comparativamente.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+"Amosar unha advertencia cando o Observatorio detecta un certificado revocado non pillado polo seu navegador">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+"Isto comprobará os certificados enviado contra Listas de Revocación de Certificados coñecidas. Desgraciadamente non podemos garantir que marcaremos cada certificado revocado, pero se ve unha advertencia hai unha boa probabilidade de que algo vai mal.">
 
 <!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.">
+"HTTPS Everywhere pode usar o Observatorio SSL da EFF. Isto fai dúas cousas: (1)
+envía copias dos certificados HTTPS ao Observatorio, para axudarnos a
+detectar ataques 'man in the midlle' e millorar a seguridade da Web; e (2)
+nos permite advertirlle de conexións inseguras ou ataques no seu navegador.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -65,37 +65,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:">
+"Por exemplo, cando visita https://www.algunhacousa.com, o certificado
+recibido polo Observatorio indicará que alguén visitou
+www.algunhacousa.com, pero non quen visitou o sitio, ou que páxina en concreto
+estiveron mirando. Mova o ratón por riba das opcións para detalles adicionais:">
 
-<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
+<!ENTITY ssl-observatory.prefs.hide "Ocultar opcións avanzadas">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"Check certificates even if Tor is not available">
+"Comprobar certificados incluso se Tor non está dispoñible">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"We will still try to keep the data anonymous, but this option is less secure">
+"Sempre tentaremos manter os datos anónimos, pero esta opción é menos segura">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"Submit and check certificates for non-public DNS names">
+"Enviar e comprobar certificados para nomes DNS non públicos">
 
 <!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.">
+"A menos que esta opción esté marcada, o Observatorio non rexistrará certificados para nomes que non poida resolver a través do sistema DNS.">
 
-<!ENTITY ssl-observatory.prefs.show "Show advanced options">
+<!ENTITY ssl-observatory.prefs.show "Amosar opcións avanzadas">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "Preferencias do Observatorio SSL">
 
-<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+<!ENTITY ssl-observatory.prefs.use "Usar o Observatorio?">
+<!ENTITY ssl-observatory.warning.title "ADVERTENCIA dende o Observatorio SSL da EFF">
+<!ENTITY ssl-observatory.warning.showcert "Amosar a cadena do certificado">
+<!ENTITY ssl-observatory.warning.okay "Comprendo">
+<!ENTITY ssl-observatory.warning.text "O Observatorio SSL da EFF emitíu unha advertencia acerca do(s) certificado(s) HTTPS para este sitio:">
+<!ENTITY ssl-observatory.warning.defense "Se está conectado neste sitio, pode ser recomendable o seu contrasinal unha vez teña unha conexión segura. (Estas advertencias pódense deshabilitar na pestaña &quot;Observatorio SSL&quot; do diálogo de preferencias de HTTPS Everywhere).">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"Submit and check self-signed certificates">
+"Enviar e comprobar certificados auto asinados">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
+"Isto é o recomendado; os problemas criptográficos son especialmente comúns en dispositivos embebidos auto asinados">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu/https-everywhere.dtd
index 9a51ece..ae725fa 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "રદ્ કરો">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "રદ્ કરો">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu_IN/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu_IN/https-everywhere.dtd
index f20e1cd..a39e802 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu_IN/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gu_IN/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "રદ કરો">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "રદ કરો">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gun/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gun/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gun/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/gun/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ha/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ha/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ha/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ha/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.dtd
index cec9014..4d4401c 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "אודות HTTPS בכל מקום">
-<!ENTITY https-everywhere.about.ext_name "HTTPS בכל מקום">
-<!ENTITY https-everywhere.about.ext_description "הצפן את הרשת! השתמש ב-HTTPS אוטומטית">
+<!ENTITY https-everywhere.about.title "אודות &quot;HTTPS בכל מקום&quot;">
+<!ENTITY https-everywhere.about.ext_name "&quot;HTTPS בכל מקום&quot;">
+<!ENTITY https-everywhere.about.ext_description "הצפן את הרשת! השתמש ב-HTTPS אוטומטית באתרים רבים.">
 <!ENTITY https-everywhere.about.version "גרסה">
 <!ENTITY https-everywhere.about.created_by "נבנה על ידי">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "ספרני Ruleset">
 <!ENTITY https-everywhere.about.thanks "תודות ל">
-<!ENTITY https-everywhere.about.contribute  "אם אהבת את HTTPS בכל מקום, אולי תרצה">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "אם הינך שבע רצון מ- &quot;HTTPS בכל מקום&quot;, אולי תרצה לשקול">
 <!ENTITY https-everywhere.about.donate_tor "לתרום ל-Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "אנגלית">
 <!ENTITY https-everywhere.about.or "או">
 <!ENTITY https-everywhere.about.donate_eff "תרומה לEFF">
 
-<!ENTITY https-everywhere.menu.about "אודות HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "אודות &quot;HTTPS בכל מקום&quot;">
 <!ENTITY https-everywhere.menu.observatory "העדפות SSL Observatory">
-<!ENTITY https-everywhere.menu.globalEnable "הפעל את HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "השבת את HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "הצג מדד">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.globalEnable "הפעל את &quot;HTTPS בכל מקום&quot;">
+<!ENTITY https-everywhere.menu.globalDisable "השבת את &quot;HTTPS בכל מקום&quot;">
+<!ENTITY https-everywhere.menu.blockHttpRequests "חסום את כל בקשות ה-HTTP">
+<!ENTITY https-everywhere.menu.showCounter "הצג מונה">
+<!ENTITY https-everywhere.menu.viewAllRules "צפה בכל הכללים">
 
-<!ENTITY https-everywhere.prefs.title "הגדרות HTTPS Everywhere">
+<!ENTITY https-everywhere.prefs.title "הגדרות &quot;HTTPS בכל מקום&quot;">
 <!ENTITY https-everywhere.prefs.enable_all "הפעל הכל">
 <!ENTITY https-everywhere.prefs.disable_all "השבת הכל">
 <!ENTITY https-everywhere.prefs.reset_defaults "איפוס לברירת מחדל">
 <!ENTITY https-everywhere.prefs.search "חפש">
 <!ENTITY https-everywhere.prefs.site "אתר">
-<!ENTITY https-everywhere.prefs.notes "פתקים">
+<!ENTITY https-everywhere.prefs.notes "הערות">
 <!ENTITY https-everywhere.prefs.list_caption "אילו הגדרות ניתוב HTTPS ליישם?">
 <!ENTITY https-everywhere.prefs.enabled "פועל">
 <!ENTITY https-everywhere.prefs.ruleset_howto "אתה יכול ללמוד איך לכתוב rulesets משלך (להוספת תמיכה באתרי אינטרנט אחרים)">
 <!ENTITY https-everywhere.prefs.here_link "פה">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.toggle "הפעל/השבת">
 <!ENTITY https-everywhere.prefs.reset_default "החזר לברירת מחדל">
 <!ENTITY https-everywhere.prefs.view_xml_source "הצג מקור XML">
 
-<!ENTITY https-everywhere.source.downloading "מוריד">
-<!ENTITY https-everywhere.source.filename "שם הקובץ">
-<!ENTITY https-everywhere.source.unable_to_download "הורדת המקור נכשלה">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "בטל">
 
-<!ENTITY https-everywhere.popup.title "HTTPS בכל מקום 4.0פיתוח.11 הודעה ">
-<!ENTITY https-everywhere.popup.paragraph1 "אופס. אתה משתמש בגרסה היציבה של HTTPS בכל מקום, אבל ייתכן שאנחנו שידרגנו אותך בטעות לגרסת הפיתוח במהדורה האחרונה שלנו.">
-<!ENTITY https-everywhere.popup.paragraph2 "האם אתה רוצה לחזור לגרסה היציבה?">
-<!ENTITY https-everywhere.popup.paragraph3 "היינו אוהבים שתמשיך להשתמש בגרסת הפיתוח כדי לעזור לנו לשפר את 'HTTPS בכל מקום'! אתה עלול למצוא שיש עוד כמה באגים פה ושם, שבו אתה יכול לדווח ל- https-everywhere@eff.org . אנו מצטערים על אי הנוחות, ומודים לך על השימוש ב-'HTTPS בכל מקום'.">
-<!ENTITY https-everywhere.popup.keep "תשאיר אותי על גרסת הפיתוח">
-<!ENTITY https-everywhere.popup.revert "הורד את הגירסה היציבה האחרונה">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS בכל מקום בדיקות Ruleset">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ביטול">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "התחל">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.properties
index c1c604f..ff15872 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = להפעיל את HTTPS Everywhere
-https-everywhere.menu.globalDisable = להשבית את HTTPS Everywhere
+https-everywhere.menu.globalDisable = להשבית את "HTTPS בכל מקום"
 https-everywhere.menu.enableDisable = להפעיל/להשבית כללים
 https-everywhere.menu.noRules = (אין כללים עבור דף זה)
 https-everywhere.menu.unknownRules = (כללים לדף זה אינם ידועים)
-https-everywhere.toolbar.hint = ‏HTTPS Everywhere מופעל כעת. באפשרותך להחליף את מצב פעילותו על בסיס של צורה משותפת על ידי הקלקה על הסמל אשר בתוך שורת הכתובת.
-https-everywhere.migration.notification0 = כדי ליישם תיקון חיוני, עדכון זה מאפס את כללי העדפות של HTTPS בכל מקום לערכי ברירת המחדל שלהם.
-https-everywhere.menu.ruleset-tests = הפעל HTTPS בכל מקום בדיקות Ruleset
+https-everywhere.toolbar.hint = ‏"HTTPS בכל מקום" פועל כעת. באפשרותך להתאים את מצב פעילותו לכל אתר בנפרד על ידי לחיצה על הצלמית שבתוך שורת הכתובת.
+https-everywhere.migration.notification0 = כדי לתקן תקלה חמורה, עדכון זה יאפס את כל כללי "HTTPS בכל מקום" לערכי ברירת המחדל שלהם.
+https-everywhere.menu.ruleset-tests = הפעל את בדיקות הכללים של "HTTPS בכל מקום"
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/ssl-observatory.dtd
index 0c73b77..2f6231a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/he/ssl-observatory.dtd
@@ -3,9 +3,9 @@
 <!ENTITY ssl-observatory.popup.later "שאל אותי אחר כך">
 <!ENTITY ssl-observatory.popup.no "לא">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere יכול לאתר התקפות
-נגד הדפדפן שלך ע&quot;י שליחת תעודות ה-SSL שאתה מקבל 
-למצפה. להפעיל?">
+<!ENTITY ssl-observatory.popup.text "&quot;HTTPS בכל מקום&quot; יכול לאתר התקפות
+נגד הדפדפן שלך ע&quot;י חיפוש אישורי אבטחה המתקבלים מאתרים בתוך
+ מאגר האישורים המקוון. להפעיל?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,47 +13,47 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"האם כדאי ש- HTTPS Everywhere ישתמש ב-SSL Observatory?">
+"האם ברצונך ש-&quot;HTTPS בכל מקום&quot; יסתייע במאגר האישורים המקוון?">
 
 <!ENTITY ssl-observatory.popup.yes "כן">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"בטוח לאפשר זאת, אלא אם כן אתה משתמש ברשת תאגידית פולשנית מאוד:">
+"אפשרות זו בטוחה לשימוש, אלא אם כן אתה משתמש ברשת תאגידית פולשנית מאוד:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"בטוח, אלא אם כן אתה משתמש ברשת תאגידית עם שמות שרתים סודיים ברשת זמנית:">
+"אין חשש, אלא אם כן אתה משתמש ברשת תאגידית סגורה ששמות שרתים סודיים:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"שלח ובדוק אישורים החתומים על ידי רשויות האישורים העליונות הלא רגילות">
+"שלח לבדיקה כל אישור שנחתם על ידי רשות אישורים עליונה לא תקנית">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"זה בטוח (ורעיון טוב) לאפשר אפשרות זאת, אלא אם כן אתה משתמש ברשת תאגידית פולשנית או תוכנת אנטיוירוס קספרסקי שמנטרת את הגלישה שלך עם פרוקסי TLS  ורשות אישורים עליונה אישית. אם מאופשרת רשת כזאת, אפשרות זאת יכולה לפרסם עדות של אילו כתובות שמתחילות ב https:// בוקרו דרך הפרוקסי הזה, בשל האישור המיוחד שהוא מייצר.  לכן נשאיר זאת כבוי כברירת מחדל.">
+"בטיחותי (ואף מומלץ) להפעיל תכונה זאת, אלא אם כן אתה גולש דרך רשת תאגידית פולשנית או משתמש בתוכנת אבטחה המנטרת את תעבורת הרשת שלך באמצעות שרת פרוקסי TLS מקומי ורשות אישורים עליונה מקומית. במקרה שכזה, תכונה זאת עלולה להביא לפרסום ראיות המזהות את כתובות ה-https שאליהן גלשת דרך שרת זה, בשל התעודה המיוחדת בה הוא עושה שימוש. לאור זאת, אנו נמנעים מהפעלת תכונה זו כברירת מחדל.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "בדוק אישורים לשימוש  ב TOR באנונימיות">
+<!ENTITY ssl-observatory.prefs.anonymous "בצע את הליך אימות האישורים דרך הרשת של Tor על מנת לשמור על האנונימיות שלך.">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"בדוק אישורים לשימוש ב  Tor באנונימיות (דורש  Tor )">
+"בצע את הליך אימות האישורים דרך הרשת של Tor על מנת לשמור על האנונימיות שלך (מחייב שימוש ב-Tor).">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"אפשרות זאת דורשת ש  Tor יותקן וירוץ ">
+"אפשרות זאת תפעל רק במקרה ש-Tor כבר מותקן ומופעל.">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"כאשר אתה רואה אישור חדש, תגיד למצפה לאיזה ספק אתה מחובר">
+"כשתראה אישור חדש, עדכן את מאגר האישורים המקוון בזהות ספק האינטרנט שלך">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"זה מביא ושולח את &quot;מספר המערכת האנונימי&quot; של הרשת שלך. זה יעזור לנו למקם התקפות נגד HTTPS, ולקבוע האם יש לנו תצפיות מרשתות במקומות כמו איראן וסוריה שבהם התקפות נפוצות באופן השוואתי.">
+"זה יאחזר וישלח את &quot;מספר המערכת האוטונומי&quot; של הרשת שלך. דבר זה יעזור לנו למקם מתקפות על HTTPS ויקבע האם נקבל דיווחים מרשתות במקומות כמו איראן וסוריה שבהם מתקפות שכאלה שכיחות יחסית.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+"הצג התרעה כאשר מאגר האישורים מזהה אישור שאיננו תקף מבלי שהדפדפן גילה זאת.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+"זה יבדוק את האישורים שיישלחו אל מול רשימת האישורים המבוטלים. לצערנו הרב איננו יכולים להתחייב שנאתר כל אישור שתוקפו פג, אך אם בכל זאת תוצג התרעה ישנו סיכוי סביר שמשהו השתבש.">
 
 <!ENTITY ssl-observatory.prefs.done "הושלם">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"HTTPS בכל מקום יכול להשתמש במצפה SSL של EFF. זה מקיים שני דברים: 
-(1) שולח עותקים של אישורי  HTTPS למצפה, כדי לעזור לנו לגלות התקפות 'איש באמצע' ולשפר את אבטחת הרשת;  ו (2) מאפשר  לנו להזהיר אותך מפני חיבורים לא מאובטחים או  התקפות על הדפדפן שלך.">
+"&quot;HTTPS בכל מקום&quot; יכול להשתמש במאגר האישורים המקוון של EFF. אם תפעיל אפשרות זו היא תביא לתוצאות הבאות: 
+(1) יישלחו עותקים מאישורי HTTPS למאגר, כדי לעזור לנו ליירט התקפות &quot;אדם באמצע&quot; ולשפר את אבטחת הרשת;  ו-(2) נוכל להתריע בפניך על חיבורים לא מאובטחים ועל מתקפות על הדפדפן שלך.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -62,34 +62,34 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"לדוגמא, כאשר אתה מבקר ב  https://www.something.com, האישור שהתקבל על ידי המצפה יציין שמישהו ביקר ב www.something.com, אבל לא מי ביקר באתר, או על איזה עמוד ספציפי הם הסתכלו. תעבור עם העכבר על האפשרויות בשביל פרטים נוספים:">
+"לדוגמא, כאשר אתה מבקר ב-  https://www.something.com, האישור שיתקבל אצלנו במאגר יעיד על כך שמישהו ביקר ב- www.something.com, אך ללא פרטים על זהות המבקר או על העמודים הספציפיים אליהם גלש. עבור עם סמן העכבר על האפשרויות לקבלת פרטים נוספים:">
 
 <!ENTITY ssl-observatory.prefs.hide "הסתר אפשרויות מתקדמות">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"בדוק אישורים אפילו אם Tor לא זמין">
+"בדוק אישורים גם כשאינך מחובר לרשת Tor">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"עדיין ננסה לשמור את הנתונים אנונימיים, אבל אפשרות זאת פחות מאובטחת">
+"אמנם נשתדל לשמור על פרטיות הנתונים, אבל אפשרות זאת בטוחה פחות">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"שלח ובדוק אישורים עבור שמות DNS לא ציבוריים">
+"שלח לבדיקה אישורים עבור שמות מתחם שאינם נחלת הכלל">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"אלא אם כן האפשרות הזאת נבדקה, המצפה לא יתעד אישורים עבור שמות שהוא לא יכול לגלות דרך מערכת ה DNS ">
+"אלא אם אפשרות זאת סומנה, המאגר לא ישמור אישורים עבור שמות מתחם שאינם מופיעים במאגרי שמות המתחם הציבוריים">
 
-<!ENTITY ssl-observatory.prefs.show "הראה אפשרויות מתקדמות">
+<!ENTITY ssl-observatory.prefs.show "הצג אפשרויות מתקדמות">
 
-<!ENTITY ssl-observatory.prefs.title "עדיפויות מצפה SSL">
+<!ENTITY ssl-observatory.prefs.title "העדפות מאגר האישורים המקוון">
 
-<!ENTITY ssl-observatory.prefs.use "האם להשתמש במצפה?">
-<!ENTITY ssl-observatory.warning.title "אזהרה ממצפה SSL של EFF">
-<!ENTITY ssl-observatory.warning.showcert "הראה את שרשרת האישורים">
-<!ENTITY ssl-observatory.warning.okay "אני מבין">
-<!ENTITY ssl-observatory.warning.text "מצפה SSL של EFF עוסק באזהרה מפני האישור(ים) של HTTPS  עבור האתר הזה:">
-<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+<!ENTITY ssl-observatory.prefs.use "האם להשתמש במאגר?">
+<!ENTITY ssl-observatory.warning.title "אזהרה ממאגר אישורי האבטחה של EFF">
+<!ENTITY ssl-observatory.warning.showcert "הצג את שרשרת האישורים">
+<!ENTITY ssl-observatory.warning.okay "הבנתי">
+<!ENTITY ssl-observatory.warning.text "מאגר אישורי האבטחה של EFF פרסם אזהרה לגבי אישורי האבטחה של אתר זה:">
+<!ENTITY ssl-observatory.warning.defense "אם הינך מחובר לאתר זה, מומלץ שתחליף את סיסמתך מתוך חיבור מאובטח. (ניתן לבטל התרעות אלה בטאב &quot;מאגר האישורים&quot; בחלונית הדו-שיח של &quot;HTTPS בכל מקום&quot;.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"שלח ובדוק את האישורים החתומים על ידך">
+"שלח לבדיקה אישורים חתומים עצמית">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"זה מומלץ;  בעיות הצפנה נפוצות במיוחד בכלים משובצים חתומים עצמית">
+"אפשרות זו מומלצת; בעיות הצפנה נפוצות במיוחד בקרב מערכות משובצות מחשב המשתמשות באישורי אבטחה חתומים עצמית">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hi/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hi/https-everywhere.dtd
index 21a0386..d1bd66b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hi/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hi/https-everywhere.dtd
@@ -1,17 +1,21 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में">
+<!ENTITY https-everywhere.about.ext_name "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE)">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "संस्करण">
 <!ENTITY https-everywhere.about.created_by "के द्वारा बनाई गई">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में">
 <!ENTITY https-everywhere.menu.observatory "एसएसएल वेधशाला प्राथमिकताएं">
 <!ENTITY https-everywhere.menu.globalEnable "हर जगह HTTPS सक्षम">
 <!ENTITY https-everywhere.menu.globalDisable "हर जगह HTTPS अक्षम">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source " एक्सएमएल स्रोत देखें">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename " फाईल का नाम">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "रद्द करें">
 
-<!ENTITY https-everywhere.popup.title "HTTPS हर जगह 4.0 विकास .11 अधिसूचना">
-<!ENTITY https-everywhere.popup.paragraph1 "उफ़. आप हर जगह HTTPS का स्थिर संस्करण का उपयोग कर रहे थे, लेकिन हम गलती से हमारे पिछले रिलीज में विकास संस्करण पर अपग्रेड किया गया हो सकता है.">
-<!ENTITY https-everywhere.popup.paragraph2 "आप वापस स्थिर करने के लिए जाना चाहते हैं?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "विकास संस्करण पर मुझे रखें">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "रद्द करें">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "प्रारंभ">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr/https-everywhere.dtd
index edaf0d9..26d8a81 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Verzija">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Zahvaljujući">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Doniraj za Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS-u Svuda">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Otkazi">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr_HR/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr_HR/https-everywhere.dtd
index b42ef3e..eabd2ac 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr_HR/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hr_HR/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Enkriptirajte web! Automatski koristite HTTPS sigurnost na mnogim stranicama.">
 <!ENTITY https-everywhere.about.version "Inačica">
 <!ENTITY https-everywhere.about.created_by "Autori">
+<!ENTITY https-everywhere.about.and ", i">
 <!ENTITY https-everywhere.about.librarians "Autori biblioteke skupova pravila">
 <!ENTITY https-everywhere.about.thanks "Zahvala">
+<!ENTITY https-everywhere.about.many_contributors "Puno, puno kontributora, uključujući">
+<!ENTITY https-everywhere.about.noscript "Također, dijelovi HTTPS Everywhere su zasnovani na kodu iz NoScript-a, autora Giorgioa Maonea i ostalih. Zahvalni smo im za odličan rad!">
 <!ENTITY https-everywhere.about.contribute  "Ako Vam se sviđa HTTPS Everywhere, mogli biste razmotriti">
 <!ENTITY https-everywhere.about.donate_tor "doniranje Tor-u">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ili">
 <!ENTITY https-everywhere.about.donate_eff "doniranje EFF-u">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donirajte EFF-u">
 <!ENTITY https-everywhere.menu.about "O proširenju HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory " Podešavanje SSL Opservatorija">
+<!ENTITY https-everywhere.menu.observatory "Postavke SSL Opservatorija">
 <!ENTITY https-everywhere.menu.globalEnable "Omogući HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Onemogući HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokiraj sve HTTP zahtjeve">
 <!ENTITY https-everywhere.menu.showCounter "Prikaži brojač">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Pogledaj sva pravila">
 
 <!ENTITY https-everywhere.prefs.title "Podešavanje HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Omogući sve">
@@ -34,19 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Vrati na početno">
 <!ENTITY https-everywhere.prefs.view_xml_source "Prikaži izvorni XML kod">
 
-<!ENTITY https-everywhere.source.downloading "Preuzimanje">
-<!ENTITY https-everywhere.source.filename "Ime datoteke">
-<!ENTITY https-everywhere.source.unable_to_download "Nije moguće preuzeti izvorni kod.">
+<!ENTITY https-everywhere.chrome.stable_rules "Pravila stabilnosti">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Prisili enkriptirane veze s ovim stranicama:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentalna pravila">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Može prouzročiti upozorenja ili kvarove. Onemogućeno pod zadano.">
+<!ENTITY https-everywhere.chrome.add_rule "Dodaj pravilo za ovu stranicu">
+<!ENTITY https-everywhere.chrome.add_new_rule "Dodaj novo pravilo za ovu stranicu">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Uvjek koristi https za ovog domaćina">
+<!ENTITY https-everywhere.chrome.host "Domaćin:">
+<!ENTITY https-everywhere.chrome.show_advanced "Pokaži napredno">
+<!ENTITY https-everywhere.chrome.hide_advanced "Sakrij napredno">
+<!ENTITY https-everywhere.chrome.rule_name "Ime pravila">
+<!ENTITY https-everywhere.chrome.regex "Uspoređujem regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Preumsjeri na">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Otkaži">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 obavijest">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups. Koristili ste stabilnu verziju HTTPS Everywhere, ali smo Vas možda slučajno prebacili na razvojnu verziju u našoj zadnjoj distribuciji.">
-<!ENTITY https-everywhere.popup.paragraph2 "Želite li se vratiti na stabilno?">
-<!ENTITY https-everywhere.popup.paragraph3 "Bilo bi nam drago kad biste nastavili koristiti razvojnu verziju i pomogli učiniti HTTPS Everywhere boljim! Možete
-naići na nekoliko bugova tu i tamo, koje možete prijaviti na https-everywhere@eff.org. Oprostite na
-neugodnosti, i hvala Vam što koristite HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Ostani na razvojnoj verziji">
-<!ENTITY https-everywhere.popup.revert "Preuzmi posljednju stabilnu verziju">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere testovi setova pravila">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Otkaži">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Početak">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ht/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ht/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ht/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ht/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hu/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hu/https-everywhere.dtd
index c792866..a8f0342 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hu/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hu/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Titkosítsa a Web-et! Automatikusan használja a HTTPS titkosítást a legtöbb oldalon.">
 <!ENTITY https-everywhere.about.version "Verzió">
 <!ENTITY https-everywhere.about.created_by "Készítette:">
+<!ENTITY https-everywhere.about.and ", és">
 <!ENTITY https-everywhere.about.librarians "Szabálykészlet könyvtárosok">
 <!ENTITY https-everywhere.about.thanks "Köszönet:">
+<!ENTITY https-everywhere.about.many_contributors "Sok, sok közreműködő, köztük">
+<!ENTITY https-everywhere.about.noscript "A HTTPS Everywhere egyes részei Giorgio Maone és mások által fejlesztett NoScripten alapulnak. Hálásak vagyunk a nagyszerű munkájukért!">
 <!ENTITY https-everywhere.about.contribute  "Ha tetszik a HTTPS Everywhere, talán megfontolja a következőket:">
 <!ENTITY https-everywhere.about.donate_tor "A Tor támogatása">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "vagy">
 <!ENTITY https-everywhere.about.donate_eff "Az EFF támogatása">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Támogatás az EFF-nek">
 <!ENTITY https-everywhere.menu.about "A HTTPS Everywhere névjegye">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferenciák">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere bekapcsolása">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Visszaállítás alaphelyzetre">
 <!ENTITY https-everywhere.prefs.view_xml_source "Az XML forrás megtekintése">
 
-<!ENTITY https-everywhere.source.downloading "Letöltés">
-<!ENTITY https-everywhere.source.filename "Fájlnév">
-<!ENTITY https-everywhere.source.unable_to_download "A forrás letöltése sikertelen.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabil szabályok">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Titkosított kapcsolatok kényszerítése ezekhez a weboldalakhoz:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Kísérleti szabályok">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Figyelmeztetéseket és megszakításokat okozhat. Alapértelmezésben letiltva.">
+<!ENTITY https-everywhere.chrome.add_rule "Szabály felvétel az oldalhoz">
+<!ENTITY https-everywhere.chrome.add_new_rule "Új szabály az oldalhoz">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Mindig https-t használjon ehhez a kiszolgálóhoz">
+<!ENTITY https-everywhere.chrome.host "Kiszolgáló:">
+<!ENTITY https-everywhere.chrome.show_advanced "Speciális beállítások megjelenítése">
+<!ENTITY https-everywhere.chrome.hide_advanced "Speciális beállítások elrejtése">
+<!ENTITY https-everywhere.chrome.rule_name "Szabály neve">
+<!ENTITY https-everywhere.chrome.regex "Illeszkedő regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Átirányítás ide:">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Mégsem">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 figyelmeztetés">
-<!ENTITY https-everywhere.popup.paragraph1 "Hoppá. A HTTPS Everywhere stabil verzióját használja, de véletlenül az utolsó frissítésnél fejlesztői változatra frissítettük véletlenül.">
-<!ENTITY https-everywhere.popup.paragraph2 "Szeretne visszaváltani stabil verzióra?">
-<!ENTITY https-everywhere.popup.paragraph3 "Örülünk, ha a tovább használja a fejlesztői verziót, és így a HTTPS Everywhere-t jobbá tehetjük! Biztosan talál erre vagy arra néhány hibát, amit bejelenthet a https-everywhere@eff.org címre. Elnézést a következetlenségért, és köszönjük hogy a HTTPS Everywhere-t használja.">
-<!ENTITY https-everywhere.popup.keep "Maradok a fejlesztői verziónál">
-<!ENTITY https-everywhere.popup.revert "Letöltöm az utolsó stabil verziót">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere szabálygyűjtemény tesztek">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Mégse">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Indítás">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy_AM/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy_AM/https-everywhere.dtd
index 3db7e65..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy_AM/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/hy_AM/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Ֆայլի անունը">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "եղարկել">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ia/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ia/https-everywhere.dtd
index d288759..9ee28bd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ia/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ia/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancellar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancellar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/https-everywhere.dtd
index 1f2b72e..3668c08 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Enkripsi Web-nya! Secara otomatis menggunakan keamanan HTTPS pada banyak situs.">
 <!ENTITY https-everywhere.about.version "Versi">
 <!ENTITY https-everywhere.about.created_by "Dibuat oleh">
+<!ENTITY https-everywhere.about.and ", dan">
 <!ENTITY https-everywhere.about.librarians "Pustakawan Ruleset">
 <!ENTITY https-everywhere.about.thanks "Terima kasih kepada">
-<!ENTITY https-everywhere.about.contribute  "Jika Anda menyukai HTTPS Everywhere, Anda dapat">
+<!ENTITY https-everywhere.about.many_contributors "Sangat banyak kontributor, termasuk">
+<!ENTITY https-everywhere.about.noscript "Juga, sebagian kode HTTPS Everywhere dikembangkan berdasarkan NoScript, oleh Giorgio Maone dan lainnya. Kami berterima kasih untuk hasil karya mereka yang luar biasa!">
+<!ENTITY https-everywhere.about.contribute  "Jika Anda menyukai HTTPS Everywhere, Anda bisa">
 <!ENTITY https-everywhere.about.donate_tor "Donasi untuk Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "atau">
 <!ENTITY https-everywhere.about.donate_eff "Donasi untuk EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donasi ke EFF">
 <!ENTITY https-everywhere.menu.about "Tentang HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Preferensi SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Fungsikan HTTPS Everywhere">
@@ -27,24 +31,26 @@
 <!ENTITY https-everywhere.prefs.site "Situs">
 <!ENTITY https-everywhere.prefs.notes "Catatan">
 <!ENTITY https-everywhere.prefs.list_caption "Aturan pengalihan HTTPS yang mana yang harus diterapkan?">
-<!ENTITY https-everywhere.prefs.enabled "Fungsikan">
-<!ENTITY https-everywhere.prefs.ruleset_howto "Sekarang Anda bisa belajar bagaimana menulis ruleset Anda sendiri (untuk menambah dukungan untuk situs web lain)">
+<!ENTITY https-everywhere.prefs.enabled "Difungsikan">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Anda bisa belajar bagaimana menulis ruleset Anda sendiri (untuk menambah dukungan situs web yang lain)">
 <!ENTITY https-everywhere.prefs.here_link "di sini">
 <!ENTITY https-everywhere.prefs.toggle "Jungkit">
 <!ENTITY https-everywhere.prefs.reset_default "Kembalikan ke Bawaan">
 <!ENTITY https-everywhere.prefs.view_xml_source "Lihat Sumber XML">
 
-<!ENTITY https-everywhere.source.downloading "Mengunduh">
-<!ENTITY https-everywhere.source.filename "Nama Berkas">
-<!ENTITY https-everywhere.source.unable_to_download "Tidak dapat mengunduh sumber.">
+<!ENTITY https-everywhere.chrome.stable_rules "Aturan stabil">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Paksa koneksi terenkripsi untuk situs ini:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Aturan eksperimental">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Dapat mengakibatkan peringatan atau kerusakan. Dinonfungsikan secara bawaan.">
+<!ENTITY https-everywhere.chrome.add_rule "Tambah aturan untuk situs ini">
+<!ENTITY https-everywhere.chrome.add_new_rule "Tambah aturan baru untuk situs ini">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Selalu gunakan https untuk host ini">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Tampilkan opsi lanjutan">
+<!ENTITY https-everywhere.chrome.hide_advanced "Sembunyikan opsi lanjutan">
+<!ENTITY https-everywhere.chrome.rule_name "Nama aturan">
+<!ENTITY https-everywhere.chrome.regex "Regex kecocokan">
+<!ENTITY https-everywhere.chrome.redirect_to "Alihkan ke">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Batal">
 
-<!ENTITY https-everywhere.popup.title "Notifikasi HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. Anda telah menggunakan HTTPS Everywhere versi stabil, tetapi kami mungkin secara tidak sengaja memutakhirkannya ke versi pengembangan pada rilis terakhir kami.">
-<!ENTITY https-everywhere.popup.paragraph2 "Apakah Anda ingin kembali ke versi stabil?">
-<!ENTITY https-everywhere.popup.paragraph3 "Kami senang jika Anda tetap menggunakan rilis pengembangan kami dan membantu kami membuat HTTPS Everywhere lebih baik! Anda mungkin akan menemukan beberapa kutu di sana-sini, dan kamu dapat melaporkannya ke https-everywhere@eff.org. Maaf atas ketidak-nyamanannya, dan terima kasih telah menggunakan HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Tetap pada versi pengembangan">
-<!ENTITY https-everywhere.popup.revert "Unduh versi stabil terakhir">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Tes Ruleset HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Batal">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Mulai">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/ssl-observatory.dtd
index 9d43cac..fd01758 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/id/ssl-observatory.dtd
@@ -21,10 +21,10 @@ to turn it on?">-->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
 "Aman untuk memfungsikan ini, kecuali Anda menggunakan
-jaringan korporat yang sangat ketat:">
+jaringan perusahaan yang sangat ketat:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Aman, kecuali Anda menggunakan jaringan korporat dengan nama server intranet rahasia:">
+"Aman, kecuali Anda menggunakan jaringan perusahaan dengan nama server intranet rahasia:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
 "Kirim dan periksa sertifikat yang ditanda tangani oleh root CA non-standar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/is/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/is/https-everywhere.dtd
index 57faabc..f3b0230 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/is/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/is/https-everywhere.dtd
@@ -1,23 +1,27 @@
-<!ENTITY https-everywhere.about.title "Um HTTPS Alls staðar">
+<!ENTITY https-everywhere.about.title "Um HTTPS Allsstaðar">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Allsstaðar">
 <!ENTITY https-everywhere.about.ext_description "Dulkóðaðu vefinn! Notaðu sjálfkrafa HTTPS-öryggi á mörgum vefsvæðum.">
 <!ENTITY https-everywhere.about.version "Útgáfa">
 <!ENTITY https-everywhere.about.created_by "Búið til af">
+<!ENTITY https-everywhere.about.and " og">
 <!ENTITY https-everywhere.about.librarians "&quot;Ruleset Librarians&quot;">
 <!ENTITY https-everywhere.about.thanks "Þökk sé">
+<!ENTITY https-everywhere.about.many_contributors "gríðarlega mörgum aðilum, þar á meðal">
+<!ENTITY https-everywhere.about.noscript "Ennfremur má geta bað hlutar HTTPS Everywhere eru byggðir á kóða frá NoScript, eftir Giorgio Maone og fleiri.  Við stöndum í þakkarskuld við þá !">
 <!ENTITY https-everywhere.about.contribute  "Ef þú kannt við HTTPS Allsstaðar ættirðu að íhuga">
-<!ENTITY https-everywhere.about.donate_tor "framlag til Tor">
+<!ENTITY https-everywhere.about.donate_tor "Framlag til Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "is">
 <!ENTITY https-everywhere.about.or "eða">
 <!ENTITY https-everywhere.about.donate_eff "Framlag til EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Um HTTPS Allsstaðar">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory valkostir">
 <!ENTITY https-everywhere.menu.globalEnable "Virkja HTTPS Allsstaðar">
 <!ENTITY https-everywhere.menu.globalDisable "Gera HTTPS Allsstaðar óvirkt">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Hindra allar HTTP beiðnir">
 <!ENTITY https-everywhere.menu.showCounter "Birta teljara">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Skoða allar reglur">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Allsstaðar valkostir">
 <!ENTITY https-everywhere.prefs.enable_all "Virkja allt">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Frumstillaá sjálfgefið">
 <!ENTITY https-everywhere.prefs.view_xml_source "Skoða XML-uppruna">
 
-<!ENTITY https-everywhere.source.downloading "Sæki">
-<!ENTITY https-everywhere.source.filename "Skráarheiti">
-<!ENTITY https-everywhere.source.unable_to_download "Næ ekki að sækja upprunagögn.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Hætta við">
 
-<!ENTITY https-everywhere.popup.title "Tilkynning frá þróunarteymi HTTPS Allsstaðar 4.0">
-<!ENTITY https-everywhere.popup.paragraph1 "Úbbs. Þú varst að nota stöðuga útgáfu af HTTPS Allsstaðar, en við gætum fyrir slysni látið þig uppfæra í þróunarútgáfuna í síðustu uppfærslu.">
-<!ENTITY https-everywhere.popup.paragraph2 "Viltu fara aftur í stöðuga útgáfu?">
-<!ENTITY https-everywhere.popup.paragraph3 "Okkur þætti vænt um ef þú notaðir áfram þróunarútgáfuna og hjálpaðir okkur þannig að gera HTTPS Allsstaðar betri! Þú gætir fundið einhverjar villur á stöku stað, sem þú gætir þá tilkynnt til https-everywhere@eff.org. Við hörmum óþægindin ef einhver eru, og þökkum þér fyrir að nota HTTPS Allstaðar.">
-<!ENTITY https-everywhere.popup.keep "Ég vil halda þróunarútgáfunni">
-<!ENTITY https-everywhere.popup.revert "Ná í nýjustu stöðuga útgáfu">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Prófunarreglur fyrir HTTPS Allsstaðar">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Hætta við">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Byrja">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/it/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/it/https-everywhere.dtd
index e84cbdf..794f2c4 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/it/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/it/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Cripta il Web! Usa HTTPS automaticamente su numerosi siti.">
 <!ENTITY https-everywhere.about.version "Versione">
 <!ENTITY https-everywhere.about.created_by "Creato da">
+<!ENTITY https-everywhere.about.and ", e">
 <!ENTITY https-everywhere.about.librarians "Autori regole">
 <!ENTITY https-everywhere.about.thanks "Grazie a">
+<!ENTITY https-everywhere.about.many_contributors "Tanti e tanti collaboratori, compresi">
+<!ENTITY https-everywhere.about.noscript "Inoltre, porzioni di HTTPS Everywhere sono basate su codice di NoScript, di Giorgio Maone ed altri. Noi siamo grati per il loro eccellente lavoro!">
 <!ENTITY https-everywhere.about.contribute  "Se ti piace HTTPS Everywhere, considera anche">
 <!ENTITY https-everywhere.about.donate_tor "Donazioni a Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "it">
 <!ENTITY https-everywhere.about.or "o">
 <!ENTITY https-everywhere.about.donate_eff "Donazioni a EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Dona alla EFF">
 <!ENTITY https-everywhere.menu.about "Informazioni su HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Preferenze Osservatorio SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Abilita HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disabilita HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blocca tutte le richieste HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Mostra contatore">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Vedi tutte le regole">
 
 <!ENTITY https-everywhere.prefs.title "Preferenze di HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Abilita tutto">
@@ -34,18 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Ripristina configurazione predefinita">
 <!ENTITY https-everywhere.prefs.view_xml_source "Mostra sorgente XML">
 
-<!ENTITY https-everywhere.source.downloading "Scaricamento">
-<!ENTITY https-everywhere.source.filename "Nome file">
-<!ENTITY https-everywhere.source.unable_to_download "Impossibile scaricare il sorgente.">
+<!ENTITY https-everywhere.chrome.stable_rules "Regole stabil">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Forza connessione criptate a questi siti:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Regole sperimentali">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Possono causare avvisi o rotture. Normalmente disabilitato.">
+<!ENTITY https-everywhere.chrome.add_rule "Aggiungi una regola per questo sito">
+<!ENTITY https-everywhere.chrome.add_new_rule "Aggiungi una nuova regola per questo sito">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Usa sempre https per questo host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Mostra avanzate">
+<!ENTITY https-everywhere.chrome.hide_advanced "Nascondi avanzate">
+<!ENTITY https-everywhere.chrome.rule_name "Nome regola">
+<!ENTITY https-everywhere.chrome.regex "Regex equivalente">
+<!ENTITY https-everywhere.chrome.redirect_to "Reindirizza a">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annulla">
 
-<!ENTITY https-everywhere.popup.title "Notifiche di HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Ops! Stavi usando la versione stabile di HTTPS Everywhere ma potremmo aver accidentalmente eseguito un upgrade alla più recente versione di sviluppo!">
-<!ENTITY https-everywhere.popup.paragraph2 "Ritornare alla versione stabile?">
-<!ENTITY https-everywhere.popup.paragraph3 "Continuando con la nostra versione di sviluppo ci aiuterai a migliorare HTTPS Everywhere! 
-In caso di bug, segnalali all'indirizzo https-everywhere@eff.org. Ci scusiamo per eventuali inconvenienti e ti ringraziamo per utilizzare HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Rimani sulla versione di sviluppo">
-<!ENTITY https-everywhere.popup.revert "Scarica l'ultima versione stabile">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Test delle regole di HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annulla">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Avvia">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/https-everywhere.dtd
index 68e2b04..1ddd984 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "ウェブの暗号化！自動的に多くのサイトにHTTPSセキュリティを使用します。">
 <!ENTITY https-everywhere.about.version "バージョン">
 <!ENTITY https-everywhere.about.created_by "作成者:">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "ルール設定ライブラリ">
 <!ENTITY https-everywhere.about.thanks "のおかげで">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "HTTPS Everywhereが好きなら、検討してください">
 <!ENTITY https-everywhere.about.donate_tor "Torに寄付する">
 <!ENTITY https-everywhere.about.tor_lang_code "英語">
 <!ENTITY https-everywhere.about.or "または">
 <!ENTITY https-everywhere.about.donate_eff "EFFに寄付する">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "EFFに寄付する">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhereについて">
 <!ENTITY https-everywhere.menu.observatory "ssl Observatoryの設定">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhereを有効化">
 <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhereを無効化">
 <!ENTITY https-everywhere.menu.blockHttpRequests "すべてのHTTPリクエストのブロック">
 <!ENTITY https-everywhere.menu.showCounter "カウンターを表示">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "すべてのルールを表示">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhereの設定">
 <!ENTITY https-everywhere.prefs.enable_all "全て有効化">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "デフォルトにリセット">
 <!ENTITY https-everywhere.prefs.view_xml_source "XMLソースを表示">
 
-<!ENTITY https-everywhere.source.downloading "ダウンロード中">
-<!ENTITY https-everywhere.source.filename "ファイル名">
-<!ENTITY https-everywhere.source.unable_to_download "ソースをダウンロード出来ません。">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "このホストでは常にhttpsを使用する">
+<!ENTITY https-everywhere.chrome.host "ホスト:">
+<!ENTITY https-everywhere.chrome.show_advanced "高度な設定を表示する">
+<!ENTITY https-everywhere.chrome.hide_advanced "高度な設定を隠す">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "リダイレクト先">
+<!ENTITY https-everywhere.chrome.status_cancel_button "キャンセル">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 開発版.11の通知">
-<!ENTITY https-everywhere.popup.paragraph1 "申し訳ありません。HTTPS Everywhereの安定版を使用していましたが、誤って最新のリリースの開発版にアップグレードしてしまった可能性があります。">
-<!ENTITY https-everywhere.popup.paragraph2 "安定版に戻しますか？">
-<!ENTITY https-everywhere.popup.paragraph3 "開発版を使用し続け、HTTPS Everywhereを改善する手助けをしてくれるなら、ありがたいです！あちこちに数個以上バグがあるのに気付くこともありますが、そうしたらhttps-everywhere@eff.orgまでご報告ください。ご不便をお掛けし申し訳ありません、またHTTPS Everywhereを使用していただきありがとうございます。">
-<!ENTITY https-everywhere.popup.keep "開発用のバージョンを使い続ける">
-<!ENTITY https-everywhere.popup.revert "最新の安定版をダウンロード">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere ルール設定テスト">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "キャンセル">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "スタート">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/ssl-observatory.dtd
index 466c02a..87156a8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ja/ssl-observatory.dtd
@@ -18,7 +18,7 @@ to turn it on?">-->
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"非常に監視が厳しい企業ネットワークを使用する場合は、これを有効にした方が安全です:">
+"非常に監視が厳しい企業ネットワークを使用していなければ、これを有効にした方が安全です:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
 "次の秘密イントラネットのサーバー名で企業ネットワークを使用しなければ、安全です:">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jbo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jbo/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jbo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jbo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jv/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jv/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jv/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/jv/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/https-everywhere.dtd
index 0652964..fd87597 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/https-everywhere.dtd
@@ -1,50 +1,56 @@
 <!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.version "ვერსია">
+<!ENTITY https-everywhere.about.created_by "შექმნილია მიერ">
+<!ENTITY https-everywhere.about.and ", და">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.thanks "მადლობა">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.tor_lang_code "ka">
+<!ENTITY https-everywhere.about.or "ან">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere-ის ჩართვა">
 <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere-ის გათიშვა">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "წესების ნახვა ">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
 <!ENTITY https-everywhere.prefs.disable_all "Disable All">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
-<!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.search "ძებნა">
+<!ENTITY https-everywhere.prefs.site "საიტი">
+<!ENTITY https-everywhere.prefs.notes "შენიშვნები">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
-<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.enabled "ჩართულია">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.here_link "აქ">
 <!ENTITY https-everywhere.prefs.toggle "Toggle">
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "ფაილის სახელი">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "სტაბილური წესები">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "ექსპერიმენტული წესები">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "გაუქმება">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "გაუქმება">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/ssl-observatory.dtd
index 69f1cfd..9ebb0db 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ka/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.details "დეტალები და კონფიდენციალური ინფორმაცია">
 <!ENTITY ssl-observatory.popup.later "Ask Me Later">
-<!ENTITY ssl-observatory.popup.no "No">
+<!ENTITY ssl-observatory.popup.no "არა">
 
 <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
 against your browser by sending the certificates you receive to the
@@ -15,7 +15,7 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.popup.title 
 "Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "Yes">
+<!ENTITY ssl-observatory.popup.yes "დიახ">
 
 <!-- Observatory preferences dialog -->
 
@@ -50,7 +50,7 @@ intrusive corporate network:">
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
 
-<!ENTITY ssl-observatory.prefs.done "Done">
+<!ENTITY ssl-observatory.prefs.done "შესრულებულია">
 
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kk/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kk/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kk/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kk/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/km/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/km/https-everywhere.dtd
index de9ab1a..ee0702e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/km/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/km/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "អ៊ិនគ្រីប​តំបន់​បណ្ដាញ! ប្រើ​សុវត្ថិភាព HTTPS នៅ​លើ​បណ្ដាញ​​ជា​ច្រើន។">
 <!ENTITY https-everywhere.about.version "កំណែ">
 <!ENTITY https-everywhere.about.created_by "បាន​បង្កើត​ដោយ">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "អរគុណ​ចំពោះ">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "ប្រសិនបើ​អ្នក​ចូលចិត្ត HTTPS Everywhere, អ្នក​អាច​ពិចារណា">
 <!ENTITY https-everywhere.about.donate_tor "ឧបត្ថម្ភ​​ដល់ Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ឬ">
 <!ENTITY https-everywhere.about.donate_eff "ឧបត្ថម្ភ​​ដល់  EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "អំពី HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "ចំណូលចិត្ត SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "បើក HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "កំណត់​ឡើង​វិញ​ទៅ​លំនាំដើម">
 <!ENTITY https-everywhere.prefs.view_xml_source "មើល​ប្រភព XML">
 
-<!ENTITY https-everywhere.source.downloading "ទាញ​យក">
-<!ENTITY https-everywhere.source.filename "ឈ្មោះ​ឯកសារ">
-<!ENTITY https-everywhere.source.unable_to_download "មិន​អាច​ទាញ​យក​ប្រភព​បាន​ទេ។">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "បោះបង់">
 
-<!ENTITY https-everywhere.popup.title "ការ​ជួន​ដំណឹង HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "អូ! អ្នក​បាន​កំពុង​ប្រើ​កំណែ HTTPS Everywhere ថេរ​​, ប៉ុន្តែ​យើង​អាច​មាន​បញ្ហា​ចំពោះ​កំណែ​​ការ​អភិវឌ្ឍន​ដែល​បាន​ធ្វើ​ឲ្យ​ទាន់​សម័យ​​នៅ​ក្នុង​ការ​ចេញ​ផ្សាយ​ចុងក្រោយ។">
-<!ENTITY https-everywhere.popup.paragraph2 "តើ​អ្នក​ចង់​ត្រឡប់​ទៅ​ក្រោយ​ដើម្បី​ស្ថេរ​ភាព​ឬ?">
-<!ENTITY https-everywhere.popup.paragraph3 "យើង​ចូលចិត្ត​វា ប្រសិនបើ​អ្នក​បន្ត​ប្រើ​ការ​ចេញ​ផ្សាយ​ការ​អភិវឌ្ឍន​របស់​ពួក​យើង ហើយ​ជួយ​ពួក​យើង​ក្នុង​ការ​ធ្វើ​ឲ្យ HTTPS Everywhere ប្រសើរ​ឡើយ! អ្នក​អាច​ស្វែងរក​កំហុស​មួយ​ចំនួន​នៅ​ទីនេះ, ដែល​អ្នក​អាច​រាយការណ៍​ទៅ https-everywhere@eff.org. សូមទោស​ប្រសិនបើ​មាន​បញ្ហា, ហើយ​អរគុណ​អក្សរ​សម្រាប់​ការ​ប្រើប្រាស់ HTTPS Everywhere ។">
-<!ENTITY https-everywhere.popup.keep "រក្សាទុក​ខ្ញុំ​នៅ​លើ​កំណែ​ការអភិវឌ្ឍន">
-<!ENTITY https-everywhere.popup.revert "ទាញ​យក​កំណែ​ថេរ​ថ្មី​បំផុត">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "ការ​សាកល្បង HTTPS Everywhere Ruleset">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "ចាប់ផ្ដើម">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kn/https-everywhere.dtd
index 56734f7..c7cb846 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kn/https-everywhere.dtd
@@ -3,8 +3,11 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
@@ -12,6 +15,7 @@
 ">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere ಬಗ್ಗೆ">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "ಎಲ್ಲೆಡೆ HTTPS ಸಕ್ರಿಯಗೊಳಿಸಿ">
@@ -35,17 +39,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko/https-everywhere.dtd
index 9ce0338..5dbb6f3 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko/https-everywhere.dtd
@@ -4,21 +4,25 @@
 <!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "작성">
+<!ENTITY https-everywhere.about.and ", ">
 <!ENTITY https-everywhere.about.librarians "규칙설정 라이브러리">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "다음과 같은 많은 참여자들이 있습니다.">
+<!ENTITY https-everywhere.about.noscript "또한, HTTPS Everywhere의 스크립트는 Giorgio Maone등이 제작한 NoScript도 부분적으로 참조했습니다. 제작자분들께 감사드립니다.">
 <!ENTITY https-everywhere.about.contribute  "모든곳에서 HTTPS를 사용하려면, 고려해 보십시오">
 <!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기">
 <!ENTITY https-everywhere.about.tor_lang_code "영어">
 <!ENTITY https-everywhere.about.or "또는">
 <!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "EFF에 기부하기">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여">
 <!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정">
 <!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용">
 <!ENTITY https-everywhere.menu.globalDisable "모든곳에서 HTTPS 사용 안 함">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "모든 HTTP 송수신 차단">
 <!ENTITY https-everywhere.menu.showCounter "카운터 보기">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "모든 규칙 표시">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정">
 <!ENTITY https-everywhere.prefs.enable_all "모두 사용">
@@ -35,17 +39,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "기본값으로 다시 설정">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML 소스 보기">
 
-<!ENTITY https-everywhere.source.downloading "다운로드">
-<!ENTITY https-everywhere.source.filename "파일명">
-<!ENTITY https-everywhere.source.unable_to_download "소스를 다운로드할 수 없습니다.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable, 안정된 규칙">
+<!ENTITY https-everywhere.chrome.stable_rules_description "다음 사이트에 접속시 강제 암호화:">
+<!ENTITY https-everywhere.chrome.experimental_rules "실험용 규칙">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "경고나 오류를 발생시킬 수 있음. 기본설정은 비활성화.">
+<!ENTITY https-everywhere.chrome.add_rule "해당 사이트에 규칙 추가">
+<!ENTITY https-everywhere.chrome.add_new_rule "해당 사이트에 새 규칙 추가">
+<!ENTITY https-everywhere.chrome.always_https_for_host "해당 호스트는 항상 https 사용">
+<!ENTITY https-everywhere.chrome.host "호스트:">
+<!ENTITY https-everywhere.chrome.show_advanced "고급 보이기">
+<!ENTITY https-everywhere.chrome.hide_advanced "고급 숨기기">
+<!ENTITY https-everywhere.chrome.rule_name "규칙명">
+<!ENTITY https-everywhere.chrome.regex "해당하는 regex">
+<!ENTITY https-everywhere.chrome.redirect_to "다음으로 리다이렉트">
+<!ENTITY https-everywhere.chrome.status_cancel_button "취소">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 신제품.11 알립니다.">
-<!ENTITY https-everywhere.popup.paragraph1 "아, 지금까지 HTTPS Everywhere 안정화 버전을 사용하셨죠? 업그레이드 하실 수도 있습니다.">
-<!ENTITY https-everywhere.popup.paragraph2 "안정화를 원하시나요?">
-<!ENTITY https-everywhere.popup.paragraph3 "저희 제품을 이용해 주심에 늘 감사드립니다. 저희는 HTTPS Everywhere를 늘 개선하고 있습니다. 혹시 오류가 여기저기에서 발생한다면 https-everywhere@eff.org에 보고해 주시면 되고 불편을 끼쳐 드려 죄송합니다.">
-<!ENTITY https-everywhere.popup.keep "현재 버전으로 유지">
-<!ENTITY https-everywhere.popup.revert "최신 안정화 버전 다운로드">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere 룰셋 테스트">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "취소">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "시작">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko_KR/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko_KR/https-everywhere.dtd
index ad3e797..be1a432 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko_KR/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ko_KR/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "어디서나 HTTPS 켬">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "취소">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "취소">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.dtd
index 3ce518d..c26dfed 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.dtd
@@ -3,18 +3,22 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalEnable "بەگەڕخستنی ئێچ تی تی پی ئێس لە هەمووشوێنێک">
+<!ENTITY https-everywhere.menu.globalDisable "لەکارخستنی ئێچ تی تی پی ئێس لە هەمووشوێنێک">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
 <!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "پشتگوێخستن">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "پاشگەزبوونەوە">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.properties
index be83831..3f4b2a2 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = بەگەڕخستنی ئێچ تی تی پی ئێس لە هەمووشوێنێک
+https-everywhere.menu.globalDisable = لەکارخستنی ئێچ تی تی پی ئێس لە هەمووشوێنێک
+https-everywhere.menu.enableDisable = بەگەڕخستن/لەکارخستن یاساکان
+https-everywhere.menu.noRules = (هیچ یاسایەک نیە بۆ ئەم پەیجە)
+https-everywhere.menu.unknownRules = (یاساکانی ئەم پەیجە نەزانراون)
+https-everywhere.toolbar.hint = ئێچ تی تی پی ئێس لە هەمووشوێنێک ئێستا لە کاردایە. ئەتوانی بیگۆڕیت لەسەر بنەمای ماڵپەڕ-بە-ماڵپەڕ بە کلیککردن لەسەر ئایکۆنی ڕەفەی ناونیشان
+https-everywhere.migration.notification0 = بۆ ئەوەی چاکردنەوەی گرنگ ئەنجام بدەیت، ئەم تازەکردنەوەیە یاسای ئێچ تی تی پی ئێس لە هەمووشووێنێک ئەگەڕێنێتەوە بۆ نرخە سەرەتایەکان. 
+https-everywhere.menu.ruleset-tests =  یاساکانی ئێچ تی تی پی ئێس لە هەمووشوێنێک تاقیبکەرەوە.
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/ssl-observatory.dtd
index c995605..0bdf17e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ku_IQ/ssl-observatory.dtd
@@ -15,7 +15,7 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.popup.title 
 "Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "Yes">
+<!ENTITY ssl-observatory.popup.yes "بەڵی">
 
 <!-- Observatory preferences dialog -->
 
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kw/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kw/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kw/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/kw/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ky/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ky/https-everywhere.dtd
index f85c267..08066aa 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ky/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ky/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Айнуу">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Айнуу">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/https-everywhere.dtd
index eac7ddf..0e58451 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.or "aut">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/ssl-observatory.dtd
index 69f1cfd..68913d0 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/la/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 <!-- Observatory popup window -->
 <!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.no "Non">
 
 <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
 against your browser by sending the certificates you receive to the
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.dtd
index eac7ddf..ae35050 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "Iwwert HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.ext_description "Verschlësselt den Internet! Benotzt automatesch HTTPS fir eng helle Wull u Websäiten">
+<!ENTITY https-everywhere.about.version "Versioun">
+<!ENTITY https-everywhere.about.created_by "Erstallt vun">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Bibliothekar Regelen">
+<!ENTITY https-everywhere.about.thanks "Merci un">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "Wann dir HTTPS Everywhere gär hutt, dann consideréiert">
+<!ENTITY https-everywhere.about.donate_tor "Een Don fir Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "lb">
+<!ENTITY https-everywhere.about.or "oder">
+<!ENTITY https-everywhere.about.donate_eff "Un d´ EFF spenden">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "Iwwert HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Astellungen">
+<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere aktivéieren">
+<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere desaktivéieren">
+<!ENTITY https-everywhere.menu.blockHttpRequests "All HTTP Ufro blockéieren">
+<!ENTITY https-everywhere.menu.showCounter "Compteur uweisen">
+<!ENTITY https-everywhere.menu.viewAllRules "All d'Regelen gesinn">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
-<!ENTITY https-everywhere.prefs.enable_all "Enable All">
-<!ENTITY https-everywhere.prefs.disable_all "Disable All">
-<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
-<!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
-<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
-<!ENTITY https-everywhere.prefs.enabled "Enabled">
-<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "here">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
-<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Astellungen">
+<!ENTITY https-everywhere.prefs.enable_all "Alles aktivéieren">
+<!ENTITY https-everywhere.prefs.disable_all "Alles desaktivéieren">
+<!ENTITY https-everywhere.prefs.reset_defaults "Op d'Standardastellungen zerécksetzen">
+<!ENTITY https-everywhere.prefs.search "Sichen">
+<!ENTITY https-everywhere.prefs.site "Websäit">
+<!ENTITY https-everywhere.prefs.notes "Noten">
+<!ENTITY https-everywhere.prefs.list_caption "Wei eng HTTPS Weiderleedungsregelen sollen gëllen?">
+<!ENTITY https-everywhere.prefs.enabled "Aktivéiert">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Dir kennt leieren är eegen Regelen ze kreéieren (Regelen fir aner Websäiten bäifügen)">
+<!ENTITY https-everywhere.prefs.here_link "hei">
+<!ENTITY https-everywhere.prefs.toggle "Ëmschalten">
+<!ENTITY https-everywhere.prefs.reset_default "Op d'Standardastellungen zerécksetzen">
+<!ENTITY https-everywhere.prefs.view_xml_source "Den XML Quellcode kucken">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Ofbriechen">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.properties
index be83831..09e0627 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = HTTPS Everywhere aktivéieren
+https-everywhere.menu.globalDisable = HTTPS Everywhere desaktivéieren
+https-everywhere.menu.enableDisable = Regelen aktivéieren / desaktivéieren
+https-everywhere.menu.noRules = (Keng Regelen fir des Websäit)
+https-everywhere.menu.unknownRules = (Regele fir des Websäit sinn onbekannt)
+https-everywhere.toolbar.hint = HTTPS Everywhere ass elo aktiv. Dir kennt et fir bestëmmten Websäiten an- an ausstellen andeems dir d'Ikon an der Adresszeil uklickt.
+https-everywhere.migration.notification0 = Fir een wichtegt Update anzespillen, wärt dëst Update är HTTPS Everywhere Regelen op de Standard zerécksetzen.
+https-everywhere.menu.ruleset-tests = HTTPS Everywhere Regeltest starten
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/ssl-observatory.dtd
index 69f1cfd..fa48274 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lb/ssl-observatory.dtd
@@ -1,11 +1,11 @@
 <!-- Observatory popup window -->
-<!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.details "Detailer an Dateschutzinformatiounen">
+<!ENTITY ssl-observatory.popup.later "Fro mech méi spéit">
+<!ENTITY ssl-observatory.popup.no "Nee">
 
-<!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 "HTTPS Everywhere kann Attacken
+géint äre Browser detektéieren andeems en Zertifikater déi dir kritt
+un EFF SSL-Observatory schéckt. Des Funktioun aktivéieren?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,50 +13,48 @@ 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?">
+"Soll HTTPS Everywhere d'EFF SSL-Observatory benotzen?">
 
-<!ENTITY ssl-observatory.popup.yes "Yes">
+<!ENTITY ssl-observatory.popup.yes "Jo">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"It is safe to enable this, unless you use a very
-intrusive corporate network:">
+"Et ass sécher dat ze aktivéieren, ausser dir sidd an engem
+ganz restriktivem Firmenetzwierk:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Safe, unless you use a corporate network with secret intranet server names:">
+"Sécher, ausser dir benotzt e Firmenetzwierk mat geheimen Intranet Servernimm:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"Submit and check certificates signed by non-standard root CAs">
+"Schéckt an iwwerpréift Zertifikater wei eng vu Net-Standard root CAs kommen">
 
 <!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.">
+"Et ass sécher (an eng gutt Iddi) fir des Optioun ze aktivéieren, ausser dir benotzt een restriktiv Firmenetzwierk oder Kaspersky Antivirus Software wat är Internetaktivitéiten mat engem TLS Proxy beobacht an eng eegen privat root Zertifikat-Autoritéit stellt. Wann des Funktioun an esou engem Netzwierk aktivéiert ass, kann et Spuren hannerloossen wei eng https:// Domains dir besicht hutt. Dowéinst loossen mer déi Funktioun standardméisseg aus.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
+<!ENTITY ssl-observatory.prefs.anonymous "Zertifikater via Tor iwwerpréiwen fir Anonym ze bleiwen">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Check certificates using Tor for anonymity (requires Tor)">
+"Zertifikater via Tor iwwerpréiwen fir Anonym ze bleiwen (Dofir muss Tor installéiert sinn)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"This option requires Tor to be installed and running">
+"Des Optioun verlaangt, datt Tor installéiert ass an och leeft">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"When you see a new certificate, tell the Observatory which ISP you are connected to">
+"Wann dir e neit Zertifikat gesitt, dann sot dem SSL-Observatory wei een ISP dir benotzt">
 
 <!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.">
+"Des Funktioun benotzt är &quot;Autonom Systemzuel&quot; vun ärem Netzwierk. Dëst hëlleft eis Attacke géint HTTPS ze lokaliséieren an erauszefannen op déi Attacken aus Länner wéi dem Iran oder Syrien kommen, wou sou Attacke méi dacks virkommen.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+"Weist eng Warnung un, wann d'SSL-Observatory een revidéiert Zertifikat fënnt wat vun ärem Browser nach net fonnt ginn ass.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+"Des Funktioun wärt Zertifikater bei kënnegen Blacklists iwwerpréiwen. Leider kënne mer net garantéieren, datt mir all revidéiert Zertifikat markéieren kennen mä wann dir eng Warnung gesitt, ass dat een gutt Indiz, datt eppes net stemmt.">
 
-<!ENTITY ssl-observatory.prefs.done "Done">
+<!ENTITY ssl-observatory.prefs.done "Fäerdeg">
 
 <!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.">
+"HTTPS Everywhere kann d'EFF SSL-Observatory benotzen. Dat erméiglecht eis zwou Saachen: (1)
+D'Erkennung vun &quot;Man-in-the-Middle&quot; Attacken an domadder eng verbessert Internetsécherheet, doduerch, datt Kopië vun den HTTPS Zertifikater un d'SSL-Observatory geschéckt ginn; an zweetens (2) kenne mer iech bei onséchere Verbindungen an Attacken op äre Browser warnen.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
@@ -65,37 +63,36 @@ 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:">
+"Beispillsweis, wann dir  https://www.something.com besicht, da wärt dat vum
+SSL-Observatory empfaangent Zertifikat feststellen, datt een www.something.com besicht huet mä net wien oder wei eng genee Säit en gekuckt huet. Fir méi Informatiounen,
+einfach mat der Maus iwwert des Optioun fueren:">
 
-<!ENTITY ssl-observatory.prefs.hide "Hide advanced options">
+<!ENTITY ssl-observatory.prefs.hide "Erweidert Optiounen ausblennen">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"Check certificates even if Tor is not available">
+"Zertifikater iwwerpréiwen och wann Tor net zur Verfügung steet">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"We will still try to keep the data anonymous, but this option is less secure">
+"Mir wäerte probéieren är Daten anonym ze halen, mä des Optioun ass net sou sécher">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"Submit and check certificates for non-public DNS names">
+"Schéckt an iwwerpréift Zertifikater fir net-ëffentlech DNS Nimm">
 
 <!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.">
+"Wann des Optioun net aktivéiert ass, da wäert SSL-Observatory keng Zertifikater fir Domainnimm ophuelen, déi et net iwwert den DNS System kann opléisen.">
 
-<!ENTITY ssl-observatory.prefs.show "Show advanced options">
+<!ENTITY ssl-observatory.prefs.show "Erweidert Optiounen uweisen">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Astellungen">
 
-<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+<!ENTITY ssl-observatory.prefs.use "SSL-Observatory benotzen?">
+<!ENTITY ssl-observatory.warning.title "Eng WARNUNG vum EFF SSL-Observatory">
+<!ENTITY ssl-observatory.warning.showcert "Zertifikatsketten uweisen">
+<!ENTITY ssl-observatory.warning.okay "Ech verstinn">
+<!ENTITY ssl-observatory.warning.text "D'EFF SSL Observatory huet eng Warnung fir dës(t) HTTPS Zertifikat(er) erausginn:">
+<!ENTITY ssl-observatory.warning.defense "Wann dir op dëser Websäit ugemellt sidd, dann ass et net vu Muttwëll wann dir äert Passwuert ännert soubal dir eng sécher Verbindung hutt. (Des Warnung kann am &quot;SSL-Observatory&quot; Reider vun HTTPS Everywhere Astellungen, ausgeschalt ginn.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
-"Submit and check self-signed certificates">
+"Een selwer-signéiert Zertifikat schécken an iwwerpréiwen">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"This is recommended; cryptographic problems are especially common in self-signed embedded devices">
+"Dëst ass recommandéiert. Kryptographesch Problemer si bei selwer-signéiert Zertifikater an integréierte Geräter, heefeg">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lg/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lg/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lg/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lg/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ln/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ln/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ln/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ln/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lo/https-everywhere.dtd
index 4dc3f2e..9a6e43d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "ກ່ຽວກັບ HTTPS ທຸກໆບ່ອນ">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ຍົກເລີກ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/https-everywhere.dtd
index e50f4c2..ef9b858 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Šifruokite žiniatinklį! Automatiškai naudokite HTTPS apsaugą daugelyje svetainių.">
 <!ENTITY https-everywhere.about.version "Versija">
 <!ENTITY https-everywhere.about.created_by "Sukūrė">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Taisyklių bibliotekininkai">
 <!ENTITY https-everywhere.about.thanks "Dėkojame">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Jei Jums patinka HTTPS Everywhere, galbūt norėsite">
 <!ENTITY https-everywhere.about.donate_tor "Paaukoti Tor projektui">
 <!ENTITY https-everywhere.about.tor_lang_code "lt">
 <!ENTITY https-everywhere.about.or "arba">
 <!ENTITY https-everywhere.about.donate_eff "Paaukoti EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Apie HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatorijos nustatymai">
 <!ENTITY https-everywhere.menu.globalEnable "Įgalinti HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Išjungti HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Blokuoti visas HTTP užklausas">
 <!ENTITY https-everywhere.menu.showCounter "Rodyti Skaitiklį">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Žiūrėti visas taisykles">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere nustatymai">
 <!ENTITY https-everywhere.prefs.enable_all "Įgalinti visas">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Atstatyti numatytą">
 <!ENTITY https-everywhere.prefs.view_xml_source "Žiūrėti XML šaltinį">
 
-<!ENTITY https-everywhere.source.downloading "Atsisiunčiama">
-<!ENTITY https-everywhere.source.filename "Failo pavadinimas">
-<!ENTITY https-everywhere.source.unable_to_download "Nepavyko atsisiųsti šaltinio">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Atšaukti">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 plėtra.11 pranešimas">
-<!ENTITY https-everywhere.popup.paragraph1 "Oj. Jus naudojotės stabilia HTTPS Everywhere versija, bet mes galėjome, paskutiniame leidime, atsitiktinai atnaujinti ją į vystomąją versiją .">
-<!ENTITY https-everywhere.popup.paragraph2 "Ar norėtumėte gryžti prie stabilios versijos?">
-<!ENTITY https-everywhere.popup.paragraph3 "Mes džiaugtumės, jei jūs ir toliau naudotumėtės mūsų plėtros leidiniais ir padėtumėt mums pagerinti HTTPS Everywhere. Jūs galite rasti šen bei ten klaidų, apie kurias prašome pranešti adresu https-everywhere@eff.org. Atsiprašome už nepatogumus ir dėkojame, kad naudojatės HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Pasilikti vystomąją versiją">
-<!ENTITY https-everywhere.popup.revert "Parsisiųsti naujaujią stabilią versiją">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Taisyklių rinkinių Testai">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Atšaukti">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Pradėti">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/ssl-observatory.dtd
index 54c83a2..7936a00 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lt/ssl-observatory.dtd
@@ -93,7 +93,7 @@ bet ne tai, kas aplankė svetainę, ar kokį konkrečiai puslapį jie
 <!ENTITY ssl-observatory.warning.showcert "Rodyti sertifikatų grandinę">
 <!ENTITY ssl-observatory.warning.okay "Suprantu">
 <!ENTITY ssl-observatory.warning.text "EFF SSL Observatorija įspėja apie šių svetainių HTTPS sertifikatus:">
-<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+<!ENTITY ssl-observatory.warning.defense "Jeigu esate prisijungę prie šios svetainės, gali būti patariama, kai turėsite saugų ryšį, pasikeisti savo slaptažodį. (Šie įspėjimai gali būti išjungti &quot;SSL Observatorijos&quot; kortelėje, HTTPS Everywhere nuostatų dialoge.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Teikti ir tikrinti savo paties pasirašytus sertifikatus">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lv/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lv/https-everywhere.dtd
index 1a9410b..1d2a34b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lv/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/lv/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Šifrēt tīmekli! Automātiski lietot HTTPS drošību daudzās vietnēs.">
 <!ENTITY https-everywhere.about.version "Versija">
 <!ENTITY https-everywhere.about.created_by "Autori">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Pateicoties">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "ja Jums patīk HTTPS Everywhere, iespējams vēlaties">
 <!ENTITY https-everywhere.about.donate_tor "ziedot Tor'am">
 <!ENTITY https-everywhere.about.tor_lang_code "an">
 <!ENTITY https-everywhere.about.or "vai">
 <!ENTITY https-everywhere.about.donate_eff "ziedot EFF'am">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Par HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Iespējot HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Atspējot HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Bloķēt visus HTTP pieprasījumus">
 <!ENTITY https-everywhere.menu.showCounter "Rādījumu skaitītājs">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Skatīt visas kārtulas">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Iespējot visus">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Atiestatīt uz noklusējuma vērtībām">
 <!ENTITY https-everywhere.prefs.view_xml_source "Skatīt XML avotu">
 
-<!ENTITY https-everywhere.source.downloading "Lejupielādē">
-<!ENTITY https-everywhere.source.filename "Datnes_nosaukums">
-<!ENTITY https-everywhere.source.unable_to_download "Nevar lejupielādēt avotu.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Atcelt">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 paziņojums">
-<!ENTITY https-everywhere.popup.paragraph1 "Opā! Jūs lietojāt stabilu HTTPS Everywhere versiju, bet, iespējams, mūsu jaunākajā laidienā mēs nejauši jauninājām Jūsu līdzšinējo versiju ar izstrādātāju versiju.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vai vēlaties atgriezties pie stabilās versijas?">
-<!ENTITY https-everywhere.popup.paragraph3 "Mēs ļoti priecātos, ja Jūs turpinātu lietot izstrādātāju versiju un palīdzētu padarīt HTTPS Everywhere labāku! Iespējams, ka laiku pa laikam pamanīsit kādas kļūdas, par kurām varat ziņot rakstot angļu valodā https-everywhere@eff.org . Atvainojamies par sagādātajām neērtībām un pateicamies par to, ka lietojat HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Izvēlos strādāt ar izstrādātāja versiju">
-<!ENTITY https-everywhere.popup.revert "Lejuplādēt jaunāko stabilo versiju">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere kārtulu kopas pārbaudes">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Atcelt">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Startēt">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mg/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mg/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mg/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mg/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mi/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mi/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mi/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mi/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mk/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mk/https-everywhere.dtd
index dee8b7f..4bafe53 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mk/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mk/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Откажи">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Откажи се">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Вклучи">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ml/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ml/https-everywhere.dtd
index 9ff2ecb..5f29a26 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ml/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ml/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് കുറിച്ച്">
+<!ENTITY https-everywhere.about.ext_name "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ്">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.version "പതിപ്പ്">
+<!ENTITY https-everywhere.about.created_by "ഉണ്ടാക്കിയത്">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.thanks "നന്ദി">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് കുറിച്ച്">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് പ്രാപ്തമാക്കുക">
 <!ENTITY https-everywhere.menu.globalDisable "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് പ്രവര്‍ത്തന രഹിതമാക്കുക">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "എല്ലാ എച്ച്ടിടിപി  അഭ്യർത്ഥനകൾ തടയുക">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "എല്ലാ നിയമങ്ങളെയും കാണൂ">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
-<!ENTITY https-everywhere.prefs.enable_all "Enable All">
-<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.enable_all "എല്ലാം പ്രാപ്തമാക്കുക">
+<!ENTITY https-everywhere.prefs.disable_all "എല്ലാം അപ്രാപ്തമാക്കുക">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.search "തിരച്ചിൽ">
 <!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.notes "കുറിപ്പുകൾ">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
-<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.enabled "പ്രാപ്തമാക്കി">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "here">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
-<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.here_link "ഇവിടെ">
+<!ENTITY https-everywhere.prefs.toggle "ടോഗിൾ">
+<!ENTITY https-everywhere.prefs.reset_default "സ്വതേ പുനഃസജ്ജമാക്കുക">
+<!ENTITY https-everywhere.prefs.view_xml_source "എക്സ്എംഎൽ സൌരസ് കാണുക">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mn/https-everywhere.dtd
index eac7ddf..40a69b2 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mn/https-everywhere.dtd
@@ -1,16 +1,20 @@
 <!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.version "Хувилбар">
+<!ENTITY https-everywhere.about.created_by "Үүсгэсэн">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -23,7 +27,7 @@
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
 <!ENTITY https-everywhere.prefs.disable_all "Disable All">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.search "Хайлт">
 <!ENTITY https-everywhere.prefs.site "Site">
 <!ENTITY https-everywhere.prefs.notes "Notes">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.dtd
index 9f23253..31e2810 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.dtd
@@ -1,28 +1,32 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.title "HTTPS सर्वत्र बद्दल">
+<!ENTITY https-everywhere.about.ext_name "HTTPS सर्वत्र">
+<!ENTITY https-everywhere.about.ext_description "वेब कूटबद्ध करा ! आपोआप अनेक साइटवर HTTPS सुरक्षा वापरा.">
 <!ENTITY https-everywhere.about.version "आवृत्ती">
-<!ENTITY https-everywhere.about.created_by "Created by">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.created_by "ने निर्मित">
+<!ENTITY https-everywhere.about.and ", आणि">
+<!ENTITY https-everywhere.about.librarians "नियमावली संचय">
 <!ENTITY https-everywhere.about.thanks "धन्यवाद">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.many_contributors "अनेक योगदानकर्ते, यासह">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "आपणास सर्वत्र HTTPS आवडत असेल तर, विचार करा">
+<!ENTITY https-everywhere.about.donate_tor "टोर ला देणगी देण्यासाठी">
+<!ENTITY https-everywhere.about.tor_lang_code "इ एन">
+<!ENTITY https-everywhere.about.or "किंवा">
+<!ENTITY https-everywhere.about.donate_eff "इ एफ एफ ला देणगी देण्यासाठी ">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "सर्वत्र HTTPS बद्दल">
+<!ENTITY https-everywhere.menu.observatory "एसएसएल प्राधान्ये">
+<!ENTITY https-everywhere.menu.globalEnable "सर्वत्र HTTPS सक्षम करा">
+<!ENTITY https-everywhere.menu.globalDisable "सर्वत्र HTTPS अक्षम करा">
+<!ENTITY https-everywhere.menu.blockHttpRequests "सर्व HTTP विनंत्यां बंद करा">
+<!ENTITY https-everywhere.menu.showCounter "काउंटर दाखवा">
+<!ENTITY https-everywhere.menu.viewAllRules "सर्व नियम पहा">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.title "सर्वत्र HTTPS प्राधान्ये">
 <!ENTITY https-everywhere.prefs.enable_all "सर्व सक्रीय करा">
 <!ENTITY https-everywhere.prefs.disable_all "सर्व निष्क्रिय करा">
-<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.reset_defaults "डीफॉल्ट रीसेट करा">
 <!ENTITY https-everywhere.prefs.search "शोध">
 <!ENTITY https-everywhere.prefs.site "साईट">
 <!ENTITY https-everywhere.prefs.notes "टिपा">
@@ -30,21 +34,23 @@
 <!ENTITY https-everywhere.prefs.enabled "सक्रीय">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
 <!ENTITY https-everywhere.prefs.here_link "येथे">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
-<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.toggle "टॉगल करा">
+<!ENTITY https-everywhere.prefs.reset_default "डीफॉल्ट रीसेट करा">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML सोर्स पहा">
 
-<!ENTITY https-everywhere.source.downloading "डाऊनलोड करत आहे">
-<!ENTITY https-everywhere.source.filename "फाईलचे नाव">
-<!ENTITY https-everywhere.source.unable_to_download "सोर्स डाऊनलोड करण्यात असमर्थ.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "रद्द करा">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "नवीनतम स्थिर आवृत्ती डाऊनलोड करा">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "रद्द करा">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "चालू करा">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.properties
index be83831..c12fb3e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/https-everywhere.properties
@@ -1,5 +1,5 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.globalEnable = सर्वत्र HTTPS सक्षम करा
+https-everywhere.menu.globalDisable = सर्वत्र HTTPS अक्षम करा
 https-everywhere.menu.enableDisable = Enable / Disable Rules
 https-everywhere.menu.noRules = (No Rules for This Page)
 https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/ssl-observatory.dtd
index d6bc0f1..e810612 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mr/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 <!-- Observatory popup window -->
 <!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.no "नाही">
 
 <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
 against your browser by sending the certificates you receive to the
@@ -15,7 +15,7 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.popup.title 
 "Should HTTPS Everywhere use the SSL Observatory?">
 
-<!ENTITY ssl-observatory.popup.yes "Yes">
+<!ENTITY ssl-observatory.popup.yes "होय">
 
 <!-- Observatory preferences dialog -->
 
@@ -86,7 +86,7 @@ looked at.  Mouseover the options for further details:">
 
 <!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "एसएसएल प्राधान्ये">
 
 <!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
 <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ms_MY/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ms_MY/https-everywhere.dtd
index a956c0f..a940c0e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ms_MY/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ms_MY/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt laman sesawang! Gunakan HTTPS secara automatik di kebanyakan laman sesawang.">
 <!ENTITY https-everywhere.about.version "Versi">
 <!ENTITY https-everywhere.about.created_by "Dihasilkan oleh">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Pustaka set aturan">
 <!ENTITY https-everywhere.about.thanks "Terima kasih kepada">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Sekiranya anda menyukai HTTPS Everywhere, anda mungkin ingin mempertimbangkan untuk">
 <!ENTITY https-everywhere.about.donate_tor "Menderma kepada Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "ms-MY">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Menderma kepada EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Mengenai HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Tetapan Pemantau SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Pengaktifan HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Tetapan semula kepada asal">
 <!ENTITY https-everywhere.prefs.view_xml_source "Papar Sumber XML">
 
-<!ENTITY https-everywhere.source.downloading "Sedang memuat turun">
-<!ENTITY https-everywhere.source.filename "Nama fail">
-<!ENTITY https-everywhere.source.unable_to_download "Gagal untuk memuat turun sumber.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Batal">
 
-<!ENTITY https-everywhere.popup.title "Pemberitahuan HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. Anda telah menggunakan versi stabil HTTPS Everywhere, tetapi kami mungkin secara tidak sengaja telah menaik taraf anda untuk versi pembangunan dalam siaran pengeluaran terakhir kami.">
-<!ENTITY https-everywhere.popup.paragraph2 "Adakah anda ingin kembali ke versi stabil?">
-<!ENTITY https-everywhere.popup.paragraph3 "Kami akan sentiasa senang jika anda terus menggunakan versi pembangunan kami dan membantu kami membuatkan HTTPS Everywhere menjadi lebih baik! Anda mungkin mendapati terdapat beberapa lagi kelemahan yang terdapat pada versi ini, dan anda boleh melaporkan kelemahan yang anda dapati di https-everywhere@eff.org. Minta maaf atas kesulitan yang anda alami, dan terima kasih kerana menggunakan HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Biarkan saya dalam versi pembangunan">
-<!ENTITY https-everywhere.popup.revert "Muat turun versi stabil terbaru">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Jalankan ujian Set Peraturan HTTPS Dimana Sahaja">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Batal">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Mula">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mt/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mt/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mt/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/mt/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/my/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/my/https-everywhere.dtd
index 93fa59e..2f217ee 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/my/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/my/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "ဗားရှင်း">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "အင်္ဂလိပ်">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ဖျက်သိမ်းရန်">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ဖျက်သိမ်းရန်">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nah/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nah/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nah/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nah/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nap/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nap/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nap/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nap/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.dtd
index c8ff03e..c43825f 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "Om HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Kryptér nettet. Bruk HTTPS-sikkerhet automatisk på mange nettsider.">
+<!ENTITY https-everywhere.about.title "Om HTTPS-everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS-everywhere">
+<!ENTITY https-everywhere.about.ext_description "Krypter nettet. Bruk HTTPS-sikkerhet automatisk på mange nettsider.">
 <!ENTITY https-everywhere.about.version "Versjon">
 <!ENTITY https-everywhere.about.created_by "Lagd av">
+<!ENTITY https-everywhere.about.and ", og">
 <!ENTITY https-everywhere.about.librarians "Regelsettbibliotekarer">
 <!ENTITY https-everywhere.about.thanks "Takk til">
-<!ENTITY https-everywhere.about.contribute  "Hvis du liker HTTPS Everywhere, vurder å">
-<!ENTITY https-everywhere.about.donate_tor "Donére til Tor">
+<!ENTITY https-everywhere.about.many_contributors "En masse bidragsytere, inkludert">
+<!ENTITY https-everywhere.about.noscript "Også deler av HTTPS-everywhere er basert på kode fra NoScript, av Giorgio Maone og andre. Vi er takknemlige for deres utmerkede arbeid!">
+<!ENTITY https-everywhere.about.contribute  "Hvis du liker HTTPS-everywhere, vurder å">
+<!ENTITY https-everywhere.about.donate_tor "Donasjoner til Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "no">
 <!ENTITY https-everywhere.about.or "eller">
-<!ENTITY https-everywhere.about.donate_eff "Donére til EFF">
+<!ENTITY https-everywhere.about.donate_eff "Donasjoner til EFF">
 
-<!ENTITY https-everywhere.menu.about "Om HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Innstillinger">
-<!ENTITY https-everywhere.menu.globalEnable "Aktiver HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Deaktiver HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Sperr alle HTTP forespørsler">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Doner til EFF">
+<!ENTITY https-everywhere.menu.about "Om HTTPS-everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL-observatoriums-innstillinger">
+<!ENTITY https-everywhere.menu.globalEnable "Aktiver HTTPS-everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Skru av HTTPS-everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Sperr alle HTTP-forespørsler">
 <!ENTITY https-everywhere.menu.showCounter "Vis teller">
 <!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillinger">
-<!ENTITY https-everywhere.prefs.enable_all "Aktiver Alle">
-<!ENTITY https-everywhere.prefs.disable_all "Deaktiver Alle">
-<!ENTITY https-everywhere.prefs.reset_defaults "Gjenopprett Standardinnstillinger">
+<!ENTITY https-everywhere.prefs.title "Innstillinger for HTTPS-everywhere">
+<!ENTITY https-everywhere.prefs.enable_all "Aktiver alle">
+<!ENTITY https-everywhere.prefs.disable_all "Skru av alle">
+<!ENTITY https-everywhere.prefs.reset_defaults "Tilbakestill til forvalg">
 <!ENTITY https-everywhere.prefs.search "Søk">
 <!ENTITY https-everywhere.prefs.site "Side">
 <!ENTITY https-everywhere.prefs.notes "Merknader">
-<!ENTITY https-everywhere.prefs.list_caption "Hvilke HTTPS omdirigeringsregler skal gjelde?">
+<!ENTITY https-everywhere.prefs.list_caption "Hvilke HTTPS-omdirigeringsregler skal gjelde?">
 <!ENTITY https-everywhere.prefs.enabled "Aktivert">
-<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lære mer om hvordan du lager dine egne regelsett (for å støtte andre websider)">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lære mer om hvordan du lager dine egne regelsett (for å støtte andre nettsider)">
 <!ENTITY https-everywhere.prefs.here_link "her">
 <!ENTITY https-everywhere.prefs.toggle "Av/På">
-<!ENTITY https-everywhere.prefs.reset_default "Gjenopprett Standardinnstilling">
-<!ENTITY https-everywhere.prefs.view_xml_source "Vis XML Kilde">
+<!ENTITY https-everywhere.prefs.reset_default "Tilbakestill til forvalg">
+<!ENTITY https-everywhere.prefs.view_xml_source "Vis XML-kilde">
 
-<!ENTITY https-everywhere.source.downloading "Laster ned">
-<!ENTITY https-everywhere.source.filename "Filnavn">
-<!ENTITY https-everywhere.source.unable_to_download "Klarte ikke å laste ned kilde.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabile regler">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte forbindelser til disse nettstedene:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentelle regler">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan føre til advarsler eller brekkasje. Avskrudd som forvalg.">
+<!ENTITY https-everywhere.chrome.add_rule "Legg til en regel for dette nettstedet">
+<!ENTITY https-everywhere.chrome.add_new_rule "Legg til en ny regel for dette nettstedet">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Bruk alltid https for denne verten">
+<!ENTITY https-everywhere.chrome.host "Vert:">
+<!ENTITY https-everywhere.chrome.show_advanced "Vis avanserte">
+<!ENTITY https-everywhere.chrome.hide_advanced "Skjul avanserte">
+<!ENTITY https-everywhere.chrome.rule_name "Regelnavn">
+<!ENTITY https-everywhere.chrome.regex "Samsvarende regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Omdiriger til">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0utvikling.11 varsel">
-<!ENTITY https-everywhere.popup.paragraph1 "Oi da. Du brukte den stabile versjonen av HTTPS Everywhere, men vi kan ved et uhell ha oppgradert deg til utviklingsversjonen i vår siste utgivelse.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vil du gå tilbake til den stabile?">
-<!ENTITY https-everywhere.popup.paragraph3 "Vi ville elske det hvis du fortsetter å bruke vår utviklingsutgivelse, og hjalp oss med å gjøre HTTPS Everywhere bedre! Du kan oppleve at det er noen feil her, og der som du kan rapportere til https-everywhere@eff.org. Beklager det inntrufne, og takk for at du bruker HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Hold meg på utvikler versjonen">
-<!ENTITY https-everywhere.popup.revert "Last ned den siste stabile versjonen">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regelsett-tester">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.properties
index 9fab8af..7de4f7d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Aktiver HTTPS Everywhere
-https-everywhere.menu.globalDisable = Deaktiver HTTPS Everywhere
+https-everywhere.menu.globalEnable = Skru på HTTPS-everywhere
+https-everywhere.menu.globalDisable = Skru av HTTPS-everywhere
 https-everywhere.menu.enableDisable = Aktiver / Deaktiver Regler
 https-everywhere.menu.noRules = (Ingen regler for denne siden)
 https-everywhere.menu.unknownRules = (Reglene for denne siden er ukjente)
-https-everywhere.toolbar.hint = HTTPS Everywhere er nå aktiv. Du kan aktivere/deaktivere fra side til side ved å klikke på ikonet i adresselinjen.
-https-everywhere.migration.notification0 = For å implementere en viktig rettelse, tilbakestiller denne oppdateringen din HTTPS Everywhere regelinnstillinger til standardverdiene.
-https-everywhere.menu.ruleset-tests = Kjør HTTPS Everywhere Regelsett Tester
+https-everywhere.toolbar.hint = HTTPS-everywhere er nå påslått. Du kan veksle status sidevis ved å klikke på miniatyrbildet i adresselinjen.
+https-everywhere.migration.notification0 = For å implementere en viktig feilretting, tilbakestiller denne oppdateringen dine HTTPS-everywhere-regelinnstillinger til forvalgte verdier.
+https-everywhere.menu.ruleset-tests = Kjør tester av regelsett for HTTPS-everywhere
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/ssl-observatory.dtd
index 9ace528..96a10df 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nb/ssl-observatory.dtd
@@ -1,11 +1,11 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Detaljer og Personvernsinformasjon">
-<!ENTITY ssl-observatory.popup.later "Spør Meg Senere">
+<!ENTITY ssl-observatory.popup.details "Detaljer og personvernsinformasjon">
+<!ENTITY ssl-observatory.popup.later "Spør meg senere">
 <!ENTITY ssl-observatory.popup.no "Nei">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere kan oppdage angrep
+<!ENTITY ssl-observatory.popup.text "HTTPS-everywhere kan oppdage angrep
 mot nettleseren din ved å sende sertifikatene du mottar til
-Observatory. Aktivere dette?">
+observatoriet. Aktivere dette?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,7 +13,7 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"Skal HTTPS Everywhere bruke SSL Observatory?">
+"Skal HTTPS-everywhere bruke SSL-observatoriet?">
 
 <!ENTITY ssl-observatory.popup.yes "Ja">
 
@@ -24,28 +24,28 @@ to turn it on?">-->
 påtrengende bedriftsnettverk:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Trygt, med mindre du bruker et bedriftsnettverk med hemmelige intranett servernavn.">
+"Trygt, med mindre du bruker et bedriftsnettverk med hemmelige intranett-tjenernavn.">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
 "Send inn og sjekk sertifikater signert av ikke-standardiserte rotsertifiseringsinstanser">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"Det er trygt (og en god idé) å aktivere denne innstillingen, med mindre du bruker et påtrengende bedriftsnettverk eller Kaspersky antivirusprogramvare som overvåker surfingen din med en TLS proxy og en privat rotsertifiseringsinstans. Hvis du aktiverer dette på et slikt nettverk, kan innstillingen publisere bevis på hvilke https://-domener som ble besøk gjennom den proxyen, som følge av de unike sertifkatene den vil lage. Så vi deaktiverer den som standard.">
+"Det er trygt (og en god idé) å aktivere denne innstillingen, med mindre du bruker et  bedriftsnettverk eller Kaspersky antivirusprogramvare som overvåker surfingen din med en TLS-mellomtjener og en privat rotsertifiseringsinstans. Hvis du aktiverer dette på et slikt nettverk, kan innstillingen publisere bevis på hvilke https://-domener som ble besøkt gjennom den mellomtjeneren, som følge av de unike sertifikatene den ville ha lagd. Så vi deaktiverer den som forvalg.">
 
 <!ENTITY ssl-observatory.prefs.anonymous "Sjekk sertifikatene ved å bruke Tor for anonymitet">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Sjekk sertifikater anonymt ved å bruke Tor (Tor kreves)">
+"Sjekk sertifikater anonymt ved bruk av Tor (Tor kreves)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
 "Denne innstillingen krever at Tor installeres og aktiveres">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"Når du ser et nytt sertifikat, fortell Observatory hvilken internettleverandør du er tilkoblet">
+"Når du ser et nytt sertifikat, fortell observatoriet hvilken internettleverandør du er tilkoblet">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
 "Dette vil hente og sende ditt nettverks &quot;autonome systemnummer&quot;.  Dette vil hjelpe oss med å lokalisere angrep mot HTTPS og med å avgjøre om vi har observasjoner fra nettverk i Iran og Syria, hvor angrep er relativt vanlige.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Vis en advarsel når Observatory oppdager et opphevet sertifikat som ikke fanges opp av nettleseren din">
+"Vis en advarsel når observatoriet oppdager et opphevet sertifikat som ikke fanges opp av nettleseren din">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "Dette vil sjekke innsende sertifikater opp mot kjente opphevelseslister.
@@ -54,8 +54,8 @@ Uheldigvis kan vi ikke garantere at vi vil flagge alle sertifikater som er opphe
 <!ENTITY ssl-observatory.prefs.done "Ferdig">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"HTTPS Everywhere kan bruke EFF's SSL Observatory.  Dette gjør to ting: (1)
-sender kopier av HTTPS sertifikater til Observatory, for å hjelpe oss å
+"HTTPS-everywhere kan bruke EFF sitt SSL-observatorium.  Dette gjør to ting: (1)
+sender kopier av HTTPS-sertifikater til observatoriet, for å hjelpe oss å
 avsløre 'mellommann'-angrep og forbedre sikkerheten på nettet; og (2)
 lar oss advare deg mot usikre tilkoblinger og angrep på nettleseren din.">
 
@@ -66,9 +66,9 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"For eksempel, hvis du besøker https://www.something.com, vil sertifikatet
-Observatory mottar indikere at noen besøkte
-www.something.com, men ikke hvem som besøkte siden, eller spesifikt hvilken side
+"Hvis du for eksempel besøker https://www.something.com, vil sertifikatet
+observatoriet mottar indikere at noen besøkte
+www.etellerannet.no, men ikke hvem som besøkte siden, eller spesifikt hvilken side
 de så på. Hold muspekeren over innstillingene for flere detaljer:">
 
 <!ENTITY ssl-observatory.prefs.hide "Skjul avanserte innstillinger">
@@ -83,20 +83,20 @@ de så på. Hold muspekeren over innstillingene for flere detaljer:">
 "Send inn og sjekk sertifikater til DNS-navn som ikke er offentlige">
 
 <!ENTITY ssl-observatory.prefs.priv_dns_tooltip
-"Hvis denne innstillingen ikke er aktivert, vil ikke Observatory registrere sertikatene til navn som ikke kan analyseres gjennom DNS-systemet.">
+"Hvis denne innstillingen ikke er aktivert, vil ikke observatoriet registrere sertikatene tilhørende navn som ikke kan analyseres gjennom DNS-systemet.">
 
 <!ENTITY ssl-observatory.prefs.show "Vis avanserte innstillinger">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Innstillinger">
+<!ENTITY ssl-observatory.prefs.title "Innstillinger for SSL-observatoriet">
 
-<!ENTITY ssl-observatory.prefs.use "Bruke Observatory?">
-<!ENTITY ssl-observatory.warning.title "ADVARSEL fra EFF's SSL Observatory ">
+<!ENTITY ssl-observatory.prefs.use "Bruk observatoriumet?">
+<!ENTITY ssl-observatory.warning.title "ADVARSEL fra EFF sitt SSL-observatorium">
 <!ENTITY ssl-observatory.warning.showcert "Vis sertifikatkjede">
 <!ENTITY ssl-observatory.warning.okay "Jeg forstår">
-<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory har utstedt en advarsel om HTTPS-sertifikatene for dette nettstedet:">
-<!ENTITY ssl-observatory.warning.defense "Hvis du er logget inn på denne siden, så kan det være en god idé å endre passordet ditt så snart du har en sikker tilkobling. (Disse advarslene kan deaktiveres i &quot;SSL Observatory&quot; fanen under instillinger i HTTPS Everywhere).">
+<!ENTITY ssl-observatory.warning.text "EFF sitt SSL-observatorium har utstedt en advarsel om HTTPS-sertifikatene for dette nettstedet:">
+<!ENTITY ssl-observatory.warning.defense "Hvis du er logget inn på denne siden, så kan det være en god idé å endre passordet ditt så snart du har en sikker tilkobling. (Disse advarslene kan deaktiveres i &quot;SSL-observatoriet&quot;-fanen under innstillinger i HTTPS-everywhere).">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Send og sjekk selvsignerte sertifikater">
 <!ENTITY ssl-observatory.prefs.self_signed_tooltip
-"Dette er anbefalt; kryptografiske problemer er spesielt vanlig i selvsignerte enheter">
+"Dette er anbefalt; kryptografiske problemer er spesielt vanlig i selvsignerte innebygde enheter">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nds/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nds/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nds/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nds/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ne/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ne/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ne/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ne/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl/https-everywhere.dtd
index 5ccea04..4f5986b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Versleutel het web! Gebruik HTTPS-beveiliging automatisch op vele sites.">
 <!ENTITY https-everywhere.about.version "Versie">
 <!ENTITY https-everywhere.about.created_by "Gemaakt door">
+<!ENTITY https-everywhere.about.and ", en">
 <!ENTITY https-everywhere.about.librarians "Regelsetbibliothecarissen">
 <!ENTITY https-everywhere.about.thanks "Met dank aan">
+<!ENTITY https-everywhere.about.many_contributors "Vele vrijwilligers, waaronder">
+<!ENTITY https-everywhere.about.noscript "Ook delen van HTTPS Everywhere zijn gebaseerd op code van NoScript, gemaakt door Giorgio Maone en anderen. We zijn dankbaar voor hun fantastisch werk!">
 <!ENTITY https-everywhere.about.contribute  "Als HTTPS Everywhere u bevalt, kunt u overwegen">
 <!ENTITY https-everywhere.about.donate_tor "te doneren aan Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "of">
 <!ENTITY https-everywhere.about.donate_eff "te doneren aan het EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Doneer aan EFF">
 <!ENTITY https-everywhere.menu.about "Over HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumvoorkeuren">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere inschakelen">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Standaardwaarden herstellen">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML-broncode bekijken">
 
-<!ENTITY https-everywhere.source.downloading "Bezig met downloaden">
-<!ENTITY https-everywhere.source.filename "Bestandsnaam">
-<!ENTITY https-everywhere.source.unable_to_download "Kan broncode niet downloaden.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Forceer versleutelde connecties naar deze websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimentele regels">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan schade aanrichten of waarschuwingen tonen. Standaard is deze uitgeschakeld.">
+<!ENTITY https-everywhere.chrome.add_rule "Voeg een regel toe voor deze site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Voeg een nieuwe regel toe voor deze site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Gebruik altijd https voor deze host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Toon geavanceerd">
+<!ENTITY https-everywhere.chrome.hide_advanced "Geavanceerd verbergen">
+<!ENTITY https-everywhere.chrome.rule_name "Regel naam">
+<!ENTITY https-everywhere.chrome.regex "Matchende regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Verwijs naar">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annuleren">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 bericht">
-<!ENTITY https-everywhere.popup.paragraph1 "Oeps! U gebruikte de stabiele versie van HTTPS Everywhere, maar het is mogelijk dat we u tijdens de laatste uitgave per ongeluk naar de ontwikkelversie hebben geupgrade.">
-<!ENTITY https-everywhere.popup.paragraph2 "Wilt u teruggaan naar de stabiele versie?">
-<!ENTITY https-everywhere.popup.paragraph3 "We zouden het op prijs stellen als u doorging met het gebruik van onze ontwikkelaars versie en ons hielp met het verbeteren van HTTPS Everywhere! U zult hier en daar wat bugs tegenkomen, die u kunt melden aan https-everywhere@eff.org. Excuses voor het ongemak, en veel dank voor het gebruik van HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Blijf gebruik maken van de ontwikkelaars versie">
-<!ENTITY https-everywhere.popup.revert "Download de meest recenste stabiele uitgave.">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regels Testen">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annuleren">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.dtd
index 7e83561..25c43be 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Versleutel het Web! Gebruik HTTPS Everywhere automatisch op vele websites.">
 <!ENTITY https-everywhere.about.version "Versie">
 <!ENTITY https-everywhere.about.created_by "Gemaakt door">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Met dank aan">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Als u HTTPS Everywhere leuk vindt, zou u dit ook leuk kunnen vinden">
 <!ENTITY https-everywhere.about.donate_tor "Doneren aan Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "nl">
 <!ENTITY https-everywhere.about.or "of">
 <!ENTITY https-everywhere.about.donate_eff "Doneren aan EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Over HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Voorkeuren">
 <!ENTITY https-everywhere.menu.globalEnable "Schakel HTTPS Everywhere in">
 <!ENTITY https-everywhere.menu.globalDisable "Schakel HTTPS Everywhere uit">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokkeer alle HTTP aanvragen">
 <!ENTITY https-everywhere.menu.showCounter "Toon de Teller">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Laat alle regels zien">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Voorkeuren">
 <!ENTITY https-everywhere.prefs.enable_all "Schakel alles in">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Terugzetten naar Standaard Instellingen">
 <!ENTITY https-everywhere.prefs.view_xml_source "Bekijk XML broncode">
 
-<!ENTITY https-everywhere.source.downloading "Aan het downloaden">
-<!ENTITY https-everywhere.source.filename "Bestandsnaam">
-<!ENTITY https-everywhere.source.unable_to_download "Niet in staat om de bron de downloaden.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Annuleer">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oeps. U was de stabiele versie van HTTPS Everywhere aan het gebruiken, maar het kan dat we u per ongeluk een upgrade gegeven hebben naar de ontwikkelingsversie in onze laatste software release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Wilt u graag teruggaan naar de stabiele versie?">
-<!ENTITY https-everywhere.popup.paragraph3 "We zouden het fijn vinden indien u de ontwikkelingsversie verder zou gebruiken om zo HTTPS Everywhere beter te maken! U zal misschien hier en daar wat meer fouten ondervinden, maar die kan u rapporteren aan https-everywhere@eff.org. Onze excuses voor de overlast en bedankt om HTTPS Everywhere te gebruiken.">
-<!ENTITY https-everywhere.popup.keep "Behoudt de ontwikkelingsversie">
-<!ENTITY https-everywhere.popup.revert "Download de laatste stabiele versie">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regelset Testen">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annuleer">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.properties
index ddd0373..3ebb680 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nl_BE/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = Schakel HTTPS Everywhere in
 https-everywhere.menu.globalDisable = Schakel HTTPS Everywhere uit
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.menu.enableDisable = Schakel regels in/uit
+https-everywhere.menu.noRules = (Geen regels voor deze pagina)
+https-everywhere.menu.unknownRules = (Regels voor deze pagina zijn onbekend)
 https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
 https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
 https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nn/https-everywhere.dtd
index 14f2eae..47d730b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nn/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Krypter veven! Bruk HTTPS-tryggleik automatisk på mange sider.">
 <!ENTITY https-everywhere.about.version "Versjon">
 <!ENTITY https-everywhere.about.created_by "Laga av">
+<!ENTITY https-everywhere.about.and ", og">
 <!ENTITY https-everywhere.about.librarians "Regelsettbibliotekarar">
 <!ENTITY https-everywhere.about.thanks "Takk til">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Om du likar HTTPS Everywhere, kunne du kanskje vurdere å ">
 <!ENTITY https-everywhere.about.donate_tor "Donere til Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "eller">
 <!ENTITY https-everywhere.about.donate_eff "Donerer til EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Om HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Innstillingar">
 <!ENTITY https-everywhere.menu.globalEnable "Slå på HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Slå av HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokker alle HTTP-førespurnadar">
 <!ENTITY https-everywhere.menu.showCounter "Vis teljar">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar">
 <!ENTITY https-everywhere.prefs.enable_all "Slå på alle">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Still tilbake til standard">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vis XML-kjelde">
 
-<!ENTITY https-everywhere.source.downloading "Lastar ned">
-<!ENTITY https-everywhere.source.filename "Filnamn">
-<!ENTITY https-everywhere.source.unable_to_download "Klarte ikkje å lasta ned kjelde.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0utvikling.11 varsel">
-<!ENTITY https-everywhere.popup.paragraph1 "Ojsann. Du brukte den stabile versjonen av HTTPS Everywhere, men vi kan ved eit uhell ha oppgradert deg til utviklarversjonen i vår siste utgjeving.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vil du gå tilbake til den stabile?">
-<!ENTITY https-everywhere.popup.paragraph3 "Vi vert glade om du held fram å bruka utviklarversjonen vår og hjelpte oss å gjera HTTPS Everywhere betre! Det kan vera at du finn ut at det er nokre fleire feil her og der som du kan rapportera til https-everywhere@eff.org. Beklagar ulempa, og takk for at du brukar HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Eg vil bruka utviklarversjonen">
-<!ENTITY https-everywhere.popup.revert "Last ned siste stabile versjon">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regelsett-testar">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nso/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nso/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nso/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/nso/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/oc/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/oc/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/oc/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/oc/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/or/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/or/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/or/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/or/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pa/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pa/https-everywhere.dtd
index 1a06e3e..8235bf5 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pa/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pa/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "ਫਾਇਲਨਾਂ">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ਰੱਦ ਕਰੋ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ਰੱਦ ਕਰੋ">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pap/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pap/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pap/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pap/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pl/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pl/https-everywhere.dtd
index 7be3f9e..73645eb 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pl/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pl/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Szyfruj sieć! Automatycznie używaj zabezpieczeń HTTPS na wielu stronach.">
 <!ENTITY https-everywhere.about.version "Wersja">
 <!ENTITY https-everywhere.about.created_by "Stworzone przez">
+<!ENTITY https-everywhere.about.and ", i">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Dzięki dla">
+<!ENTITY https-everywhere.about.many_contributors "W tym wielu współtworóców, jak">
+<!ENTITY https-everywhere.about.noscript "Ponadto, fragmenty protokołu HTTPS Everywhere oparte są na kodzie z NoScript, od Giorgio Maone i innych. Jesteśmy wdzięczni za ich wspaniałą pracę!">
 <!ENTITY https-everywhere.about.contribute  "Jeżeli lubisz HTTPS Everywhere, możesz rozważyć ">
 <!ENTITY https-everywhere.about.donate_tor "Dotacje dla Tora">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "albo">
 <!ENTITY https-everywhere.about.donate_eff "Dotacje dla Electronic Frontier Foundation">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Wspomóż finansowo EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Ustawienia SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Włącz HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Wyłącz HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blokuj wszystkie próby połączenia HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Pokaż Licznik">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Wyświetl wszystkie reguły">
 
 <!ENTITY https-everywhere.prefs.title "Ustawienia HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Włącz wszystko">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Przywróć ustawienia fabryczne">
 <!ENTITY https-everywhere.prefs.view_xml_source "Zobacz źródło XML ">
 
-<!ENTITY https-everywhere.source.downloading "Ściąganie">
-<!ENTITY https-everywhere.source.filename "Nazwa pliku">
-<!ENTITY https-everywhere.source.unable_to_download "Nie można ściągnąć źródła.  ">
+<!ENTITY https-everywhere.chrome.stable_rules "Reguły stabilne">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Wymuszaj szyfrowane połączenie do tych stron internetowych:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Reguły eksperymentalne">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Może powodować ostrzeżenia lub uszkodzenia. Domyślnie wyłączone.">
+<!ENTITY https-everywhere.chrome.add_rule "Dodaj nową regułę dla tej strony">
+<!ENTITY https-everywhere.chrome.add_new_rule "Dodaj nową regułę dla tej strony">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Zawsze używaj https dla tego hosta">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Pokaż zaawansowane">
+<!ENTITY https-everywhere.chrome.hide_advanced "Ukryj zaawansowane">
+<!ENTITY https-everywhere.chrome.rule_name "Nazwa reguły">
+<!ENTITY https-everywhere.chrome.regex "Pasujący regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Przekieruj do">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Anuluj">
 
-<!ENTITY https-everywhere.popup.title "Powiadomienie o wersji HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Ojej. Używałeś stabilnej wersji HTTPS Everywhere, ale mogliśmy wraz z najnowszą wersją przypadkowo zaktualizować Twój system do wersji rozwojowej.">
-<!ENTITY https-everywhere.popup.paragraph2 "Czy chciałbyś wrócić do wersji stabilnej?">
-<!ENTITY https-everywhere.popup.paragraph3 "Pragnęlibyśmy abyś dalej używał naszej wersji rozwojowej i pomógł nam uczyć HTTPS Everywhere lepszym! Może się okazać, że jest trochę więcej błędów tu i tam, które możesz zgłosić pod adres https-everywhere@eff.org. Wybacz proszę tę niedogodność. Dziękujemy za używanie HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Pozostań przy wersji rozwojowej">
-<!ENTITY https-everywhere.popup.revert "Pobierz najnowszą wersję stabilną">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Uruchom testowe zestawienie reguł HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Anuluj">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pms/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pms/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pms/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pms/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ps/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ps/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ps/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ps/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.dtd
index a78d4a0..370469e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "Acerca do HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "Sobre HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Use automaticamente a segurança HTTPS em vários sítios.">
+<!ENTITY https-everywhere.about.ext_description "Encripte a Web! Utilize automaticamente a segurança HTTPS em vários sites.">
 <!ENTITY https-everywhere.about.version "Versão">
 <!ENTITY https-everywhere.about.created_by "Criado por">
-<!ENTITY https-everywhere.about.librarians "Bibliotecas de Regras">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Bibliotecas do conjunto de regras">
 <!ENTITY https-everywhere.about.thanks "Obrigado a">
-<!ENTITY https-everywhere.about.contribute  "Se gosta de HTTPS Em todo o lado, poderá considerar">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "Se gosta do HTTPS Everywhere, poderá considerar">
 <!ENTITY https-everywhere.about.donate_tor "Doar ao Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "pt">
+<!ENTITY https-everywhere.about.tor_lang_code "pt-PT">
 <!ENTITY https-everywhere.about.or "ou">
 <!ENTITY https-everywhere.about.donate_eff "Doar à EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Sobre o HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "Preferências do SSL Observatory">
+<!ENTITY https-everywhere.menu.observatory "Preferências do Observatório de SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Ativar HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Desativar HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Bloquear todos os pedidos HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Mostrar Contador">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Ver Todas as Regras">
 
 <!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere">
-<!ENTITY https-everywhere.prefs.enable_all "Ativar tudo">
-<!ENTITY https-everywhere.prefs.disable_all "Desativar tudo">
-<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar predefinições">
+<!ENTITY https-everywhere.prefs.enable_all "Ativar Tudo">
+<!ENTITY https-everywhere.prefs.disable_all "Desativar Tudo">
+<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar Predefinições">
 <!ENTITY https-everywhere.prefs.search "Procurar">
-<!ENTITY https-everywhere.prefs.site "Sítio">
+<!ENTITY https-everywhere.prefs.site "Site">
 <!ENTITY https-everywhere.prefs.notes "Notas">
-<!ENTITY https-everywhere.prefs.list_caption "Quais as regras de redireção HTTPS que se devem aplicar?">
+<!ENTITY https-everywhere.prefs.list_caption "Quais as regras de redireção HTTPS que deverão ser aplicadas?">
 <!ENTITY https-everywhere.prefs.enabled "Ativada">
-<!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios grupos de regras (para adicionar suporte para outros sítios)">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Pode aprender a escrever os seus próprios conjuntos de regras (para adicionar suporte para outros sites da Web)">
 <!ENTITY https-everywhere.prefs.here_link "aqui">
 <!ENTITY https-everywhere.prefs.toggle "Alternar">
-<!ENTITY https-everywhere.prefs.reset_default "Restaurar predefinição">
-<!ENTITY https-everywhere.prefs.view_xml_source "Ver fonte XML">
+<!ENTITY https-everywhere.prefs.reset_default "Reiniciar Predefinição">
+<!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML">
 
-<!ENTITY https-everywhere.source.downloading "A descarregar">
-<!ENTITY https-everywhere.source.filename "Nome do ficheiro">
-<!ENTITY https-everywhere.source.unable_to_download "Não é possível transferir a fonte.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 development.11 notificação">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups!. Estava a utilizar a última versão do HTTPS Everywhere estável, mas nós poderemos ter-lhe atualizado acidentalmente para a versão de desenvolvimento no nosso último lançamento.">
-<!ENTITY https-everywhere.popup.paragraph2 "Gostaria de voltar para a versão estável?">
-<!ENTITY https-everywhere.popup.paragraph3 "Nós iríamos adorar que continuasse a utilizar o nosso lançamento de desenvolvimento e que nos ajudasse a tornar o HTTPS Everywhere melhor! Poderá encontrar ainda alguns erros aqui e acolá, que poderá reportar para https-everywhere@eff.org. Pedimos desculpa pela inconveniência, e obrigado por utilizar o HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Manter-me na versão de desenvolvimento">
-<!ENTITY https-everywhere.popup.revert "Transferir a úlitma versão estável">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Iniciar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.properties
index 1763a06..db44891 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/https-everywhere.properties
@@ -1,4 +1,4 @@
-https-everywhere.menu.globalEnable = Ativar HTTPS Everywhere
+https-everywhere.menu.globalEnable = Ativar o HTTPS Everywhere
 https-everywhere.menu.globalDisable = Desativar HTTPS Everywhere
 https-everywhere.menu.enableDisable = Regras de Ativação / Desativação
 https-everywhere.menu.noRules = (Sem Regras para Esta Página)
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/ssl-observatory.dtd
index 947635e..4b54f24 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt/ssl-observatory.dtd
@@ -3,7 +3,9 @@
 <!ENTITY ssl-observatory.popup.later "Perguntar Mais Tarde">
 <!ENTITY ssl-observatory.popup.no "Não">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere pode detetar ataques contra o seu navegador, enviando os certificados que recebe para o Observatório. Ativar isto?">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere pode detetar ataques
+contra o seu navegador, ao enviar os certificados que recebe para o
+Observatório. Ativar isto?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,7 +13,7 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"HTTPS Everywhere deverá usar o Observatório SSL?">
+"HTTPS Everywhere deverá utilizar o Observatório SSL?">
 
 <!ENTITY ssl-observatory.popup.yes "Sim">
 
@@ -22,13 +24,13 @@ to turn it on?">-->
  rede empresarial muito intrusiva:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Apropriado, a menos que use uma rede empresarial, com servidores de intranet cujos nomes sejam confidenciais:">
+"Seguro, a menos que utilize uma rede empresarial com nomes de servidor de intranet secretos:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
 "Submeter e verificar os certificados assinados por raizes não padrões CAs">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"É apropriado (e uma boa ideia) ativar esta opção, a menos que use uma rede corporativa que vigia sua navegação por meio de um proxy TLS e uma Autoridade Certificadora Raiz privada.  Se for ativada em tal rede, esta opção poderá divulgar detalhes dos domínios https:// específicos que se acessaram através daquele proxy, por causa dos certificados distintivos assim criados.  Por isso, esta opção é desativada por padrão.">
+"É seguro (e uma boa ideia) ativar esta opção, a menos que utilize uma rede de empresa intrusiva ou o programa de antivírus Kaspersky que monitoriza a sua navegação com um proxy TLS e uma Autoridade Certificadora de raiz privada.  Se for ativada em tal rede, esta opção poderá divulgar os detalhes dos domínios https:// que tenham sido visitados através deste proxy, por causa dos certificados únicos que este poderia criar. Por isso, nós deixámos esta opção desativada por predefinição.">
 
 <!ENTITY ssl-observatory.prefs.anonymous "Verificar os certificados utilizando o Tor para anonimato">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
@@ -48,7 +50,7 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "Este irá verificar certificados submetidos contra conhecidas Listas de Revogação de Certificados. Infelizmente não podemos garantir que iremos marcar cada certificado revogado, mas se efectivamente vir um alerta existe uma boa chance de que algo está errado.">
 
-<!ENTITY ssl-observatory.prefs.done "Completo">
+<!ENTITY ssl-observatory.prefs.done "Concluído">
 
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Em Qualquer Lugar pode utilizar o Observatório SSL EFF's. Acontecem duas coisas: (1)
@@ -63,10 +65,10 @@ Mouseover the options for further details:">-->
 
 <!ENTITY ssl-observatory.prefs.explanation2
 
-"Por exemplo, ao visitar https://www.something.com, o certificado
-recebido pelo Observatório vai indicar que alguém visitou
-https://www.something.com, mas não quem visitou o sítio ou que página foi especificamente
-visualizada. Passe com o rato em cima das opções para mais pormenores:">
+"Por exemplo, quando visita https://www.something.com, o certificado
+recebido pelo Observatório irá indicar que alguém visitou
+https://www.something.com, mas não quem visitou o sítio ou que página especifica
+foi visualizada. Passe o rato por cima das opções para mais detalhes:">
 
 <!ENTITY ssl-observatory.prefs.hide "Ocultar as opções avançadas">
 
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt_BR/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt_BR/https-everywhere.dtd
index 425949b..1ec5834 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt_BR/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/pt_BR/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Criptografar a Web! Use automaticamente a segurança HTTPS em diversos sites.">
 <!ENTITY https-everywhere.about.version "Versão">
 <!ENTITY https-everywhere.about.created_by "Criado por">
+<!ENTITY https-everywhere.about.and ", e">
 <!ENTITY https-everywhere.about.librarians "Biblioteca de Conjunto de Regras">
 <!ENTITY https-everywhere.about.thanks "Obrigado a">
+<!ENTITY https-everywhere.about.many_contributors "Muitos contribuidores, incluindo">
+<!ENTITY https-everywhere.about.noscript "Também, porções do HTTPS Everywhere são baseadas no código do NoScript de Giorgio Maone e outros. Nós somos gratos pelo trabalho excelente que eles fizeram!">
 <!ENTITY https-everywhere.about.contribute  "Se você gostar do HTTPS Everywhere, considere">
 <!ENTITY https-everywhere.about.donate_tor "Fazer uma doação para o Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "pt_BR">
 <!ENTITY https-everywhere.about.or "ou">
 <!ENTITY https-everywhere.about.donate_eff "Fazer uma doação ao EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Doar para EFF">
 <!ENTITY https-everywhere.menu.about "Sobre o HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Preferências do Observatório SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Habilitar HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Restaurar as configurações padrão">
 <!ENTITY https-everywhere.prefs.view_xml_source "Ver Fonte XML">
 
-<!ENTITY https-everywhere.source.downloading "Fazendo download">
-<!ENTITY https-everywhere.source.filename "Nome do Arquivo">
-<!ENTITY https-everywhere.source.unable_to_download "Impossível fazer download da fonte.">
+<!ENTITY https-everywhere.chrome.stable_rules "protecção colectiva">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Força ligações a estas Web site criptografado:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Regras experimentais">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar avisos ou ruptura. Desabilitado por padrão.">
+<!ENTITY https-everywhere.chrome.add_rule "Adicione uma regra para esse site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Adicione uma nova regra para esse site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Sempre usar https para este hospedeiro">
+<!ENTITY https-everywhere.chrome.host "Hospedeiro:">
+<!ENTITY https-everywhere.chrome.show_advanced "Mostrar opções avançadas">
+<!ENTITY https-everywhere.chrome.hide_advanced "Ocultar">
+<!ENTITY https-everywhere.chrome.rule_name "Nome da regra">
+<!ENTITY https-everywhere.chrome.regex "Expressão regular correspondente">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirecionar para:">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">
 
-<!ENTITY https-everywhere.popup.title "Aviso do HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Desculpe. Você estava usando a versão estável do HTTPS Everywhere, mas, ao lançar nossa última versão, sem querer podemos ter atualizado seu navegador para a versão de desenvolvimento.">
-<!ENTITY https-everywhere.popup.paragraph2 "Você gostaria de voltar à versão estável?">
-<!ENTITY https-everywhere.popup.paragraph3 "Nós gostaríamos que você continuasse a usar a versão de desenvolvimento para nos ajudar a melhorar o HTTPS Everywhere. Talvez você encontre mais bugs e poderá nos informar sobre eles escrevendo para https-everywhere@eff.org. Desculpe pelo incômodo, e obrigado por usar o HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Manter o navegador na versão de desenvolvimento">
-<!ENTITY https-everywhere.popup.revert "Fazer download da versão estável mais recente">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Executar os Testes do Conjunto de Regras do HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelado">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Iniciar">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ro/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ro/https-everywhere.dtd
index a8d108e..473f6b6 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ro/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ro/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Criptează web-ul! Folosește automat securitatea HTTPS pe multe saituri.">
 <!ENTITY https-everywhere.about.version "Versiune">
 <!ENTITY https-everywhere.about.created_by "Creat de">
+<!ENTITY https-everywhere.about.and ", și">
 <!ENTITY https-everywhere.about.librarians "Setul de reguli al bibliotecarilor">
 <!ENTITY https-everywhere.about.thanks "Mulțumiri către">
+<!ENTITY https-everywhere.about.many_contributors "Mulți, mulți contributori, inclusiv">
+<!ENTITY https-everywhere.about.noscript "De asemenea, porțiuni de HTTPS Everywhere se bazează pe codul de NoScript, de Giorgio Maone și alții. Suntem recunoscatori pentru munca lor excelenta!">
 <!ENTITY https-everywhere.about.contribute  "Dacă îți place HTTPS Oriunde, poți considera">
 <!ENTITY https-everywhere.about.donate_tor "Să donezi către Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "ro">
 <!ENTITY https-everywhere.about.or "sau">
 <!ENTITY https-everywhere.about.donate_eff "Să donezi către EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donează la EFF">
 <!ENTITY https-everywhere.menu.about "Despre HTTPS Oriunde">
 <!ENTITY https-everywhere.menu.observatory "Preferințele pentru Observatorul SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Activează HTTPS Oriunde">
 <!ENTITY https-everywhere.menu.globalDisable "Dezactivează HTTPS Oriunde">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Blochează toate cererile HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Afișează contorul">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Vezi toate regulile">
 
 <!ENTITY https-everywhere.prefs.title "Preferințe HTTPS Oriunde">
 <!ENTITY https-everywhere.prefs.enable_all "Activează tot">
@@ -34,18 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Revino la setările inițiale">
 <!ENTITY https-everywhere.prefs.view_xml_source "Vezi sursa XML">
 
-<!ENTITY https-everywhere.source.downloading "Se descarcă">
-<!ENTITY https-everywhere.source.filename "Nume fișier">
-<!ENTITY https-everywhere.source.unable_to_download "Nu se poate descărca sursa.">
+<!ENTITY https-everywhere.chrome.stable_rules "Reguli stabile">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Pentru aceste pagini se folosesc obligatoriu conexiuni criptate:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Reguli experimentale">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Poate genera avertismente sau pierderi. Implicit dezactivat. ">
+<!ENTITY https-everywhere.chrome.add_rule "Adaugă o regulă pentru acest site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Adaugă o nouă regulă pentru acest site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Folosește mereu https pentru această gazdă">
+<!ENTITY https-everywhere.chrome.host "Gazdă:">
+<!ENTITY https-everywhere.chrome.show_advanced "Arată opțiuni avansate">
+<!ENTITY https-everywhere.chrome.hide_advanced "Ascunde opțiunile avansate">
+<!ENTITY https-everywhere.chrome.rule_name "Numele regulii">
+<!ENTITY https-everywhere.chrome.regex "Regex potrivit">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirecționează la">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Renunță">
 
-<!ENTITY https-everywhere.popup.title "Notificare HTTPS Everywhere 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Foloseai versiunea stabilă de HTTPS Oriunde dar accidental te-am actualizat la versiunea de dezvoltare la ultima noastră lansare.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vrei să te întorci la versiunea stabilă?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ne-ar plăcea dacă ai continua să folosești versiunea de dezvoltare, ajutându-ne să facem HTTPS Oriunde mai bună! Ai putea găsi câteva hibe pe alocuri pe care le poți raporta la https-everywhere@eff.org.
-Ne pare rău de neplăcerea produsă și îți mulțumim pentru că folosești HTTPS Oriunde.">
-<!ENTITY https-everywhere.popup.keep "Ține-mă pe versiunea de dezvoltare">
-<!ENTITY https-everywhere.popup.revert "Descarcă ultima versiune stabilă">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Teste pentru seturile de reguli ale HTTPS Oriunde">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Anulare">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.dtd
index e951a79..3a79d88 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Зашифруйте сеть! Автоматически переключайтесь на безопасный протокол HTTPS там, где это возможно.">
 <!ENTITY https-everywhere.about.version "Версия">
 <!ENTITY https-everywhere.about.created_by "Авторы">
+<!ENTITY https-everywhere.about.and ", и">
 <!ENTITY https-everywhere.about.librarians "Хранители правил">
 <!ENTITY https-everywhere.about.thanks "Благодарности">
+<!ENTITY https-everywhere.about.many_contributors "Многим участникам, включая">
+<!ENTITY https-everywhere.about.noscript "Кроме того, части HTTPS Everywhere основаны на коде из NoScript от Джорджио Maone и других. Мы благодарны им за их отличную работу!">
 <!ENTITY https-everywhere.about.contribute  "Если Вам нравится HTTPS Everywhere, возможно, Вы хотели бы сделать">
 <!ENTITY https-everywhere.about.donate_tor "пожертвование Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "ru">
 <!ENTITY https-everywhere.about.or "или">
 <!ENTITY https-everywhere.about.donate_eff "пожертвование EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Пожертвуйте EFF">
 <!ENTITY https-everywhere.menu.about "О HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Настройки SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Включить HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Сбросить к значению по умолчанию">
 <!ENTITY https-everywhere.prefs.view_xml_source "Просмотреть исходник XML">
 
-<!ENTITY https-everywhere.source.downloading "Загрузка">
-<!ENTITY https-everywhere.source.filename "Имя файла">
-<!ENTITY https-everywhere.source.unable_to_download "Не могу загрузить исходник">
+<!ENTITY https-everywhere.chrome.stable_rules "Стабильные правила">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Принудительное шифрование на эти сайтах:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Экспериментальные правила">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Может вызвать предупреждения или поломку. Отключено по умолчанию.">
+<!ENTITY https-everywhere.chrome.add_rule "Добавить правило для этого сайта">
+<!ENTITY https-everywhere.chrome.add_new_rule "Добавить новое правило для этого сайта">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Всегда использовать https для этого хоста">
+<!ENTITY https-everywhere.chrome.host "Хост:">
+<!ENTITY https-everywhere.chrome.show_advanced "Показать расширенные">
+<!ENTITY https-everywhere.chrome.hide_advanced "Скрыть расширенные">
+<!ENTITY https-everywhere.chrome.rule_name "Имя правила">
+<!ENTITY https-everywhere.chrome.regex "Соответствие regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Перенаправление на">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Отмена">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 уведомление">
-<!ENTITY https-everywhere.popup.paragraph1 "Ой. Вы использовали стабильную версию HTTPS Everywhere, но мы, возможно, случайно обновили Вам её до разрабатываемой версии.">
-<!ENTITY https-everywhere.popup.paragraph2 "Хотели бы Вы вернуться к стабильной версии?">
-<!ENTITY https-everywhere.popup.paragraph3 "Мы были бы рады, если бы Вы продолжили использовать разрабатываемую версию, и помогли нам сделать HTTPS Everywhere лучше! Вы могли бы найти несколько ошибок, и прислать их нам на https-everywhere@eff.org. Извините за неудобства, и спасибо за использование HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Остаться на разрабатываемой версии">
-<!ENTITY https-everywhere.popup.revert "Загрузить последнюю стабильную версию">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Тесты правил HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Отменить">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Старт">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.properties
index a387629..5990746 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru/https-everywhere.properties
@@ -3,6 +3,6 @@ https-everywhere.menu.globalDisable = Выключить HTTPS Everywhere
 https-everywhere.menu.enableDisable = Включить / Выключить правила
 https-everywhere.menu.noRules = Нет правил для этой страницы
 https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны
-https-everywhere.toolbar.hint = HTTPS Everywhere активен. Вы можете отключить его для этого сайта кликнув по значку.
-https-everywhere.migration.notification0 = В целях реализации критических исправлений, это обновление сбрасывает настройки правил HTTPS Everywhere к значениям по умолчанию.
+https-everywhere.toolbar.hint = Теперь HTTPS Everywhere активен. Вы можете переключать его для каждого сайта кликая по значку.
+https-everywhere.migration.notification0 = По причине установки критических обновлений, данное обновление сбрасывает настройки правил HTTPS Everywhere к значениям по умолчанию.
 https-everywhere.menu.ruleset-tests = Запустить тесты правил HTTPS Everywhere
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru@petr1708/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru@petr1708/https-everywhere.dtd
index 2a6c513..fa9b472 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru@petr1708/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ru@petr1708/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Версия">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Загрузка">
-<!ENTITY https-everywhere.source.filename "Имя файла">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sa/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sa/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sa/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sa/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/scn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/scn/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/scn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/scn/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sco/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sco/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sco/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sco/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si_LK/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si_LK/https-everywhere.dtd
index 0898155..b5875d2 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si_LK/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/si_LK/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "බොහෝ වෙබ් අඩවි සඳහා HTTPS ආරක්ෂාව ස්වයංක්‍රීයව පාවිච්චි කරන්න.">
 <!ENTITY https-everywhere.about.version "සංස්කරණය">
 <!ENTITY https-everywhere.about.created_by "නිර්මිත">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "ස්තුතිය">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "HTTPS Everywhere පිලිබඳව ඔබ කැමතිනම් මේවා සලකා බැලිය යුතුය">
 <!ENTITY https-everywhere.about.donate_tor "Tor වලට ආධාර කිරීම">
 <!ENTITY https-everywhere.about.tor_lang_code "ඉංග්‍රීසි">
 <!ENTITY https-everywhere.about.or "හෝ">
 <!ENTITY https-everywhere.about.donate_eff " EFF වලට ආධාර කරන්න">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere පිලිබඳව">
 <!ENTITY https-everywhere.menu.observatory "SSL නිරික්ෂණාගාර මනාප ">
 <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ක්‍රියාකරවන්න">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "යථා තත්වයට පත් කරන්න">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML කේත පෙන්වන්න ">
 
-<!ENTITY https-everywhere.source.downloading "භාගත වෙමින්">
-<!ENTITY https-everywhere.source.filename "ගොනු නම">
-<!ENTITY https-everywhere.source.unable_to_download "භාගත කිරීම සිදුකල නොහැක.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "අවලංගු කරන්න">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "අවලංගු කරන්න">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "අරඹන්න">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk/https-everywhere.dtd
index 9a0fbe0..6db2852 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Zašifruj Web! Automatické použitie HTTPS zabezpečenia na mnohých stránkach.">
 <!ENTITY https-everywhere.about.version "Verzia">
 <!ENTITY https-everywhere.about.created_by "Autori">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Poďakovanie">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Ak sa Vám páči HTTPS Everywhere, môžno by ste mohli">
 <!ENTITY https-everywhere.about.donate_tor "Prispieť na Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "sk">
 <!ENTITY https-everywhere.about.or "alebo">
 <!ENTITY https-everywhere.about.donate_eff "Prispieť na EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Nastavenia SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Povoliť HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Zakázať HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Zablokovať všetky HTTP žiadosti">
 <!ENTITY https-everywhere.menu.showCounter "Zobraziť počítadlo">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Zobraziť všetky pravidlá">
 
 <!ENTITY https-everywhere.prefs.title "Nastavenia HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Povoliť všetko">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Obnoviť predvolené">
 <!ENTITY https-everywhere.prefs.view_xml_source "Zobraziť zdroj XML">
 
-<!ENTITY https-everywhere.source.downloading "Sťahovanie">
-<!ENTITY https-everywhere.source.filename "Názov súboru">
-<!ENTITY https-everywhere.source.unable_to_download "Nie je možné stiahnuť zdroj.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Zrušiť">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 oznámenie">
-<!ENTITY https-everywhere.popup.paragraph1 "Hop! Používali ste stabilnú verziu HTTPS Everywhere, ale možno sme Vás nechtiac aktualizovali na našu najnovšiu vývojovú verziu.">
-<!ENTITY https-everywhere.popup.paragraph2 "Chcete prejsť späť na stabilnú?">
-<!ENTITY https-everywhere.popup.paragraph3 "Boli by sme vďační, keby ste pokračovali v používaní našej vývojovej verzie a pomohli nám vylepšiť HTTPS Everywhere! Sem-tam sa môže objaviť niekoľko ďalších chýb, ktoré môžete nahlásiť na https-everywhere@eff.org. Ospravedlňujeme sa za nepríjemnosti a ďakujeme že používate HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Chcem zostať na vývojovej verzii">
-<!ENTITY https-everywhere.popup.revert "Stiahni poslednú stabilnú verziu">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Testy">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Zrušiť">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Štart">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk_SK/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk_SK/https-everywhere.dtd
index eb706d2..077b858 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk_SK/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sk_SK/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Zašifrujte web! Automaticky používajte bezpečnosť HTTPS na mnohých stránkach.">
 <!ENTITY https-everywhere.about.version "Verzia">
 <!ENTITY https-everywhere.about.created_by "Vytvorili">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Tvorcovia sád pravidiel">
 <!ENTITY https-everywhere.about.thanks "Poďakovanie">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Ak sa vám HTTPS Everywhere páči, zvážte">
 <!ENTITY https-everywhere.about.donate_tor "Dar pre Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "sk">
 <!ENTITY https-everywhere.about.or "alebo">
 <!ENTITY https-everywhere.about.donate_eff "Dar pre EEF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Nastavenia SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Zapnúť HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Obnoviť pôvodné">
 <!ENTITY https-everywhere.prefs.view_xml_source "Zobraziť XML zdroj">
 
-<!ENTITY https-everywhere.source.downloading "Preberanie">
-<!ENTITY https-everywhere.source.filename "Názov súboru">
-<!ENTITY https-everywhere.source.unable_to_download "Nie je možné prevziať zdroj.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Zrušiť">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Hops. Používate stabilnú verziu HTTPS Everywhere, my sme však v poslednom vydaní omylom aktualizovali vašu verziu na vývojársku.">
-<!ENTITY https-everywhere.popup.paragraph2 "Prajete si vrátiť sa späť k stabilnej verzii?">
-<!ENTITY https-everywhere.popup.paragraph3 "Boli by sme radi, keby ste ďalej používali našu vývojársku verziu a pomohli nám robiť HTTPS Everywhere lepším! Možno zistíte, že v tejto verzii je sem-tam trochu viac chýb, ktoré však môžete nahlásiť na https-everywhere@eff.org. Ospravedlňujeme sa za nepríjemnosti a ďakujeme, že používate HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Ponechať vývojársku verziu">
-<!ENTITY https-everywhere.popup.revert "Prevziať najnovšiu stabilnú verziu">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Testy sady pravidiel HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Zrušiť">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Spustiť">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/https-everywhere.dtd
index c9a3d28..91d5dd0 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Zakodirajte internet! Samodejno uporabite HTTPS zaščito na mnogih spletnih straneh.">
 <!ENTITY https-everywhere.about.version "Različica">
 <!ENTITY https-everywhere.about.created_by "Izdelal">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Izdelovalci pravil">
 <!ENTITY https-everywhere.about.thanks "Zahvala">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Če vam je HTTPS Everywhere všeč, razmislite o">
 <!ENTITY https-everywhere.about.donate_tor "donaciji za Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.or "ali">
 <!ENTITY https-everywhere.about.donate_eff "donaciji za EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Nastavitve SSL Observatorija">
 <!ENTITY https-everywhere.menu.globalEnable "Omogoči HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Onemogoči HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Blokiraj vse HTTP zahteve">
 <!ENTITY https-everywhere.menu.showCounter "Prikaži števec">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Preglej vsa pravila">
 
 <!ENTITY https-everywhere.prefs.title "Nastavitve HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "Omogoči vse">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Ponastavi na privzeto">
 <!ENTITY https-everywhere.prefs.view_xml_source "Ogled XML kode">
 
-<!ENTITY https-everywhere.source.downloading "Prenos">
-<!ENTITY https-everywhere.source.filename "Ime datoteke">
-<!ENTITY https-everywhere.source.unable_to_download "Ne morem prenesti izvora.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Prekliči">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 obvestilo">
-<!ENTITY https-everywhere.popup.paragraph1 "Glej ga zlomka. Uporabljali ste stabilno različico HTTPS Everywhere, mi pa smo vam jo z zadnjo izdajo nadgradili z razvijalsko.">
-<!ENTITY https-everywhere.popup.paragraph2 "Bi želeli zopet uporabljati stabilno?">
-<!ENTITY https-everywhere.popup.paragraph3 "Všeč nam bo, če boste še nadaljne uporabljali našo javno razvojno izdajo in pomagali narediti HTTPS Everywhere še boljši! Morda boste ugotovili, da je nekaj več hroščov tu in tam, ki jih lahko javite na https-everywhere@eff.org. Se opravičujemo za neprijetnosti in zahvaljujemo za uporabo HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Ohrani razvijalsko različico">
-<!ENTITY https-everywhere.popup.revert "Prenesi zadnjo stabilno različico">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Prekliči">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Začni">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/ssl-observatory.dtd
index 907af64..250dad9 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl/ssl-observatory.dtd
@@ -48,7 +48,7 @@ vsiljivo poslovno omrežje:">
 "Pokaži opozorilo ko Observatorij zazna preklicane certifikate, ki jih vaš brskalnik ni našel.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+"To bo preverilo predložene certifikate s seznamom preklicanih potrdil. Žal vam ne moremo zagotoviti, da bomo označili vsako preklicano potrdilo, če pa vidite opozorilo je možno, da je nekaj narobe.">
 
 <!ENTITY ssl-observatory.prefs.done "Končano">
 
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.dtd
index bf623b0..fdb5b23 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.dtd
@@ -1,23 +1,27 @@
-<!ENTITY https-everywhere.about.title "O HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Šifrirajte splet! Avtomatska uporaba HTTPS varnosti za veliko spletnih mest.">
+<!ENTITY https-everywhere.about.title "O HTTPS povsod">
+<!ENTITY https-everywhere.about.ext_name "HTTPS povsod">
+<!ENTITY https-everywhere.about.ext_description "Šifrirajte splet! Avtomatska uporaba HTTPS zaščite na različnih straneh.">
 <!ENTITY https-everywhere.about.version "Različica">
 <!ENTITY https-everywhere.about.created_by "Ustvaril">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Knjižnice pravil">
 <!ENTITY https-everywhere.about.thanks "Zahvaljujoč">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Če vam je všeč HTTPS Everywhere, boste morda premislili o">
 <!ENTITY https-everywhere.about.donate_tor "Doniranju Tor projektu">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ali">
 <!ENTITY https-everywhere.about.donate_eff "Doniranju EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Možnosti SSL Opazovalnice">
 <!ENTITY https-everywhere.menu.globalEnable "Omogoči HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Onemogoči HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Ustavi vse HTTP zahtevke">
 <!ENTITY https-everywhere.menu.showCounter "Prikaži števec">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Preglej vsa pravila">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere možnosti">
 <!ENTITY https-everywhere.prefs.enable_all "Omogoči vse">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Ponastavi">
 <!ENTITY https-everywhere.prefs.view_xml_source "Ogled XML kode">
 
-<!ENTITY https-everywhere.source.downloading "Prenašanje">
-<!ENTITY https-everywhere.source.filename "Ime datoteke">
-<!ENTITY https-everywhere.source.unable_to_download "Izvorne kode ni bilo moč prenesti.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Prekliči">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0razvojna.11 obvestilo">
-<!ENTITY https-everywhere.popup.paragraph1 "Marička. Uporabljali ste stabilno različico HTTPS Everywhere, vendar smo jo ponesreči nadgradili z razvojno pri zadnji izdaji.">
-<!ENTITY https-everywhere.popup.paragraph2 "Želite nazaj na stabilno?">
-<!ENTITY https-everywhere.popup.paragraph3 "Všeč nam bo, če boste še nadalje uporabljali razvojno izdajo in tako pomagali izboljšati HTTPS Everywhere! Morda boste od časa do časa našli več hroščev, ki jih lahko sporočite na https-everywhere@eff.org. Za neprijetnosti se opravičujemo in ob enem zahvaljujemo za uporabo HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Obdržati želim razvojno različico">
-<!ENTITY https-everywhere.popup.revert "Snemite zadnjo stabilno različico">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere testiranje pravil">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Prekliči">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Začni">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.properties
index fe1fbe4..4fa5e06 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Omogoči HTTPS Povsod
-https-everywhere.menu.globalDisable = Onemogoči HTTPS Povsod
-https-everywhere.menu.enableDisable = Omogoči /Onemogoči Pravila
-https-everywhere.menu.noRules = (Ni Pravil za to stran )
+https-everywhere.menu.globalEnable = Omogoči HTTPS Everywhere
+https-everywhere.menu.globalDisable = Onemogoči HTTPS Everywhere
+https-everywhere.menu.enableDisable = Omogoči / onemogoči pravila
+https-everywhere.menu.noRules = (Ni pravil za to stran)
 https-everywhere.menu.unknownRules = (Pravila za to stran neznana)
-https-everywhere.toolbar.hint = HTTPS Povsod je zdaj aktiven. Za posamezna web mesta ga lahko preklopite s klikom na ikono v naslovni vrstici. 
-https-everywhere.migration.notification0 = Za izvedbo pomembnih popravkov, bo ta nadgraditev resetirala vaše HTTPS Povsod nastavitve pravilnika na njihovo privzeto vrednost.
-https-everywhere.menu.ruleset-tests = Testiranje HTTPS Povsod pravilnika
+https-everywhere.toolbar.hint = HTTPS Everywhere je zdaj aktiven. Nastavite ga lahko na podlagah site-by-site z klikom na ikono v naslovni vrstici.
+https-everywhere.migration.notification0 = Za izvedbo pomembnih popravkov, bo ta nadgraditev ponastavila vaše HTTPS Everywhere nastavitve pravilnika na njihovo privzeto vrednost.
+https-everywhere.menu.ruleset-tests = Zagon HTTPS Everywhere Ruleset testiranj
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/ssl-observatory.dtd
index af030dd..0b1590f 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sl_SI/ssl-observatory.dtd
@@ -3,9 +3,7 @@
 <!ENTITY ssl-observatory.popup.later "Vprašaj me kasneje">
 <!ENTITY ssl-observatory.popup.no "Ne">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS Povsod lahko zazna napade
-na vaš brskalnik tako, da pošlje certifikate ki jih prejmete v
-Observatorij. Želite to vključiti?">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere lahko zazna napade proti vašemu brskalniku z pošiljanjem certifikatov, ki jih prejmete v opazovalnico. Želite to vključiti?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -13,18 +11,17 @@ and auditing the certificates being presented to your browser. Would you like
 to turn it on?">-->
 
 <!ENTITY ssl-observatory.popup.title 
-"Ali naj HTTPS Everywhere uporablja SSL Observatorij?">
+"Ali naj HTTPS Everywhere uporablja SSL opazovalnico?">
 
 <!ENTITY ssl-observatory.popup.yes "Da">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"To omogočanje je varno dokler ne uporabite zelo
-vsiljivo poslovno omrežje:">
+"Varno je da to vključite, dokler ne uporabljate zelo vsivljivega poslovnega omrežja.">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Varno dokler ne uporabite poslovno omrežje s tajnimi imeni intranet strežnikov:">
+"Varno, dokler ne uporabite poslovno omrežje s tajnimi imeni intranet strežnikov:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
 "Predloži in preveri certifikate nestandardnih overoviteljev">
@@ -50,7 +47,7 @@ vsiljivo poslovno omrežje:">
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "To preverjanje bo predložilo certifikate pred Seznam Preklicanih Certifikatov. Na žalost ne moremo zagotoviti, da bomo označili vsak razveljavljen certifikat, če pa vidite opozorilo obstaja velika verjetnost, da je nekaj narobe.">
 
-<!ENTITY ssl-observatory.prefs.done "Narejeno">
+<!ENTITY ssl-observatory.prefs.done "Opravljeno">
 
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Povsod uporablja EFF's SSL Observatorij. To naredi dvoje: (1)
@@ -88,7 +85,7 @@ si je ogledal. Pridržite miško nad izbirami za več podrobnosti:">
 
 <!ENTITY ssl-observatory.prefs.title "Izbire SSL Opazovalnice">
 
-<!ENTITY ssl-observatory.prefs.use "Uporabim Observatorij?">
+<!ENTITY ssl-observatory.prefs.use "Uporabim opazovalnico?">
 <!ENTITY ssl-observatory.warning.title "OPOZORILO od EFF's SSL Observatorija">
 <!ENTITY ssl-observatory.warning.showcert "Prikaži certifikatno verigo">
 <!ENTITY ssl-observatory.warning.okay "Razumem">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sn/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sn/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sn/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sn/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/so/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/so/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/so/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/so/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/son/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/son/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/son/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/son/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq/https-everywhere.dtd
index 57e8d57..40167ca 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "Kriptojeni Web-in! Përdorni automatikisht sigurinë HTTPS në shumë webfaqe.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Krijuar prej">
+<!ENTITY https-everywhere.about.and ", dhe">
 <!ENTITY https-everywhere.about.librarians "Bibliotekarët e Kompleteve të Rregullave ">
 <!ENTITY https-everywhere.about.thanks "Në sajë të">
+<!ENTITY https-everywhere.about.many_contributors "Shumë, shumë kontribuues, përfshirë">
+<!ENTITY https-everywhere.about.noscript "Gjithashtu, porcione të HTTPS Gjithkund mbështeten tek kodi nga NoScript, prej Xhiorxhio Maone dhe të tjerëve.  U jemi mirënjohës për punën e tyre të shkëlqyer!">
 <!ENTITY https-everywhere.about.contribute  "Nëse ju pëlqen HTTPS Kudo, duhet të merrni parasysh">
 <!ENTITY https-everywhere.about.donate_tor "Dhuroni për Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "an">
 <!ENTITY https-everywhere.about.or "ose">
 <!ENTITY https-everywhere.about.donate_eff "Dhuroni për EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Dhuroni për EFF">
 <!ENTITY https-everywhere.menu.about "Rreth HTTPS Kudo">
 <!ENTITY https-everywhere.menu.observatory "Parapëlqimet për Vëzhguesin SSL">
 <!ENTITY https-everywhere.menu.globalEnable "Aftësoni HTTPS Kudo">
 <!ENTITY https-everywhere.menu.globalDisable "Paaftësoni HTTPS Kudo">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Pengojini të gjitha kërkesat HTTP">
 <!ENTITY https-everywhere.menu.showCounter "Shfaqeni Llogaritësin">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "Shihini të Gjitha Rregullat">
 
 <!ENTITY https-everywhere.prefs.title "Parapëlqimet për HTTPS Kudo">
 <!ENTITY https-everywhere.prefs.enable_all "Aftësoni Gjithçka">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Rivendoseni Parazgjedhhjen">
 <!ENTITY https-everywhere.prefs.view_xml_source "Shiheni Burimin XML">
 
-<!ENTITY https-everywhere.source.downloading "Shkarkim">
-<!ENTITY https-everywhere.source.filename "Emër skedari">
-<!ENTITY https-everywhere.source.unable_to_download "E pamundur të shkarkohet burimi.">
+<!ENTITY https-everywhere.chrome.stable_rules "Rregulla të qëndrueshme">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Lidhje të shifruara paraprakisht me këto webfaqe:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Rregulla eksperimentale">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Mund të shkaktojë paralajmërime apo thyerje. Paaftësuar me parazgjedhje.">
+<!ENTITY https-everywhere.chrome.add_rule "Shtoni një rregull për këtë webfaqe">
+<!ENTITY https-everywhere.chrome.add_new_rule "Shtoni një rregull të ri për këtë webfaqe">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Përdorni gjithmonë https për këtë pritës">
+<!ENTITY https-everywhere.chrome.host "Pritësi:">
+<!ENTITY https-everywhere.chrome.show_advanced "Shfaqni të përparuarat">
+<!ENTITY https-everywhere.chrome.hide_advanced "Fshihini të përparuarat">
+<!ENTITY https-everywhere.chrome.rule_name "Emërtimi i rregullit">
+<!ENTITY https-everywhere.chrome.regex "Përputhshmëri me shprehjet e rregullta">
+<!ENTITY https-everywhere.chrome.redirect_to "E ridrejtuar tek">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Hiqeni">
 
-<!ENTITY https-everywhere.popup.title "Njoftim për HTTPS Kudo 4.0development.11">
-<!ENTITY https-everywhere.popup.paragraph1 "Ouu. Ju po përdornit versionin e qëndrueshëm të HTTPS Kudo, por ne aksidentalisht mund t'ju kemi përmirësuar me versionin e zhvillimit, në ofertën tonë të fundit.">
-<!ENTITY https-everywhere.popup.paragraph2 "Dëshironi të ktheheni tek i qëndrueshmi?">
-<!ENTITY https-everywhere.popup.paragraph3 "Do ta dëshironim atë nëse ju do vijoni të përdorni versionin tonë të zhvillimit dhe të na ndihmoni që ta bëjmë HTTPS Kudo më të mirë! Në të mund të gjeni pak më shumë gabime, aty-këtu, të cilat mund t'i raportoni tek https-everywhere@eff.org. Kërkojmë ndjesë për shqetësimin dhe ju falënderojmë që përdorni HTTPS Kudo.">
-<!ENTITY https-everywhere.popup.keep "Mbamëni në versionin e zhvillimit">
-<!ENTITY https-everywhere.popup.revert "Shkarkoni versionin e fundit të qëndrueshëm">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Provat e Kompleteve të Rregullave për HTTPS Kudo">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Anuloni">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Nisje">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/https-everywhere.dtd
index 9a63c45..0bbb1fe 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/https-everywhere.dtd
@@ -3,18 +3,24 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/ssl-observatory.dtd
index 9457a96..69f1cfd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sq_AL/ssl-observatory.dtd
@@ -44,6 +44,12 @@ intrusive corporate network:">
 <!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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
 <!ENTITY ssl-observatory.prefs.done "Done">
 
 <!ENTITY ssl-observatory.prefs.explanation 
@@ -87,7 +93,7 @@ looked at.  Mouseover the options for further details:">
 <!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.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
 
 <!ENTITY ssl-observatory.prefs.self_signed
 "Submit and check self-signed certificates">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr/https-everywhere.dtd
index a6bc04c..b24478b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Sifriraj Web! Automatski koristi HTTPS sigurnost na mnogim sajtovima.">
 <!ENTITY https-everywhere.about.version "Verzija">
 <!ENTITY https-everywhere.about.created_by "Stvorio">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Bibliotekari">
 <!ENTITY https-everywhere.about.thanks "Zahvaljujuci">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "Ako vam se svida HTTPS, mogli bi ste da razmislite o">
 <!ENTITY https-everywhere.about.donate_tor "donaciji za Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "ili">
 <!ENTITY https-everywhere.about.donate_eff "doniranju EFF-u">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "O HTTPS svuda">
 <!ENTITY https-everywhere.menu.observatory "SSL observatorij postavki">
 <!ENTITY https-everywhere.menu.globalEnable "Omoguci HTTPS svuda">
@@ -34,19 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Vrati na uobicajeno">
 <!ENTITY https-everywhere.prefs.view_xml_source "Pogledaj XML izvor">
 
-<!ENTITY https-everywhere.source.downloading "Skidanje">
-<!ENTITY https-everywhere.source.filename "Imefajla">
-<!ENTITY https-everywhere.source.unable_to_download "Ne moze se skinuti izvor.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Откажи">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0, razvoj.11. obavestenje">
-<!ENTITY https-everywhere.popup.paragraph1 "Ups. Koristili ste stabilnu verziju HTTPS Everywhere, ali mozda smo slucajno nadogradili na razvojnu verziju u nasem poslednjem izdanju.">
-<!ENTITY https-everywhere.popup.paragraph2 "Hocete li da se vratite na stabilnu verziju?">
-<!ENTITY https-everywhere.popup.paragraph3 "Voleli bi smo kad bi ste nastavili da koristite nase razvojno izdanje i pomogli nam da ucinimo 
-HTTPS Everywhere boljim! Mozda ce te otkriti da postoji par bugova koje mozete da prijavite na
-https-everywhere@eff.org. Izvinite na neugodnosti i hvala sto koristite HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Zadrzi me na razvojnoj verziji.">
-<!ENTITY https-everywhere.popup.revert "Preuzmi poslednju stabilnu verziju">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Testovi">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Откажи">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr@latin/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr@latin/https-everywhere.dtd
index 3ecba3c..8e8c5d4 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr@latin/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sr@latin/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Otkaži">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Otkaži">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/st/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/st/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/st/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/st/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/su/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/su/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/su/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/su/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sv/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sv/https-everywhere.dtd
index 365a274..9d5aa7d 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sv/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sv/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Kryptera webben! Använd HTTPS automatiskt på många webbsidor.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Skapat av">
+<!ENTITY https-everywhere.about.and ", och">
 <!ENTITY https-everywhere.about.librarians "Regelförfattare">
 <!ENTITY https-everywhere.about.thanks "Tack till">
+<!ENTITY https-everywhere.about.many_contributors "Flera flera bidragsgivare, inklusive">
+<!ENTITY https-everywhere.about.noscript "Även, delar av HTTPS Everywhere är baserade på kod från NoScript, av Giorgio Maone och andra. Vi är tacksamma för deras utmärkta arbete!">
 <!ENTITY https-everywhere.about.contribute  "Om du gillar HTTPS Everywhere, kanske du kan tänka dig">
 <!ENTITY https-everywhere.about.donate_tor "Donera till Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "eller">
 <!ENTITY https-everywhere.about.donate_eff "Donera till EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donera till EFF">
 <!ENTITY https-everywhere.menu.about "Om HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Inställningar för SSL Observatoriet">
 <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Återställ till standardvärden">
 <!ENTITY https-everywhere.prefs.view_xml_source "Visa XML källkod">
 
-<!ENTITY https-everywhere.source.downloading "Hämtar">
-<!ENTITY https-everywhere.source.filename "Filnamn">
-<!ENTITY https-everywhere.source.unable_to_download "Kunde ej hämta källkoden.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stabila regler">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimentella regler">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan orsaka varningar eller avbrott. Inaktiverad som standard.">
+<!ENTITY https-everywhere.chrome.add_rule "Lägg till en reger för denna sida">
+<!ENTITY https-everywhere.chrome.add_new_rule "Lägg till en ny regel för denna sida">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Använd alltid https för denna värd">
+<!ENTITY https-everywhere.chrome.host "Värd:">
+<!ENTITY https-everywhere.chrome.show_advanced "Visa avancerad">
+<!ENTITY https-everywhere.chrome.hide_advanced "Göm avancerad">
+<!ENTITY https-everywhere.chrome.rule_name "Regel namn">
+<!ENTITY https-everywhere.chrome.regex "Matchar regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Omdirigera till">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 meddelande">
-<!ENTITY https-everywhere.popup.paragraph1 "Oj då. Du använde den stabila versionen av HTTPS Everywhere, men vi har av misstag uppgraderat dig till utvecklingsversionen i vår senaste utgåva.">
-<!ENTITY https-everywhere.popup.paragraph2 "Vill du gå tillbaka till den stabila versionen?">
-<!ENTITY https-everywhere.popup.paragraph3 "Vi skulle vara tacksamma ifall du fortsatte använda utvecklingsversionen och hjälpte oss göra HTTPS Everywhere ännu bättre! Du kanske hittar någon bugg här och där, som du kan rapportera till https-everywhere@eff.org. Vi ber om ursäkt för besväret. Tack för att du använder HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Fortsätt använda utvecklingsversionen">
-<!ENTITY https-everywhere.popup.revert "Ladda ner den senaste stabila versionen">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere regeltester">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Kör">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sw/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sw/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sw/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/sw/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/szl/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/szl/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/szl/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/szl/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ta/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ta/https-everywhere.dtd
index 29961eb..4cf2c07 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ta/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ta/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "வலை Encrypt! தானாகவே பல தளங்களில் HTTPS பாதுகாப்பு பயன்படுத்த.">
 <!ENTITY https-everywhere.about.version "பதிப்பு">
 <!ENTITY https-everywhere.about.created_by "உருவாக்கப்பட்டது">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset நூலகர்கள்">
 <!ENTITY https-everywhere.about.thanks "நன்றிகள்">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "நீங்கள் எல்லா இடங்களிலும் HTTPS விரும்பினால், நீங்கள் பரிசீலிக்க வேண்டும்">
 <!ENTITY https-everywhere.about.donate_tor "Tor நன்கொடை">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "அல்லது">
 <!ENTITY https-everywhere.about.donate_eff "EFF நன்கொடை">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "எல்லா இடங்களிலும் HTTPS பற்றி">
 <!ENTITY https-everywhere.menu.observatory "SSL அவதான விருப்பங்கள்">
 <!ENTITY https-everywhere.menu.globalEnable "எல்லா இடங்களிலும் HTTPS செயலாக்கு">
 <!ENTITY https-everywhere.menu.globalDisable "எல்லா இடங்களிலும் HTTPS முடக்கு">
 <!ENTITY https-everywhere.menu.blockHttpRequests "அனைத்து HTTP கோரிக்கைகள் தடு">
 <!ENTITY https-everywhere.menu.showCounter "காட்டு கருமபீடம்">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "அனைத்து விதிகள் காண்கவும்">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS எல்லா இடங்களிலும் விருப்பங்கள்">
 <!ENTITY https-everywhere.prefs.enable_all "அனைத்தும் செயலாக்கு">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "இயல்புநிலைக்கு மீட்டமை">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML மூலத்தை காண">
 
-<!ENTITY https-everywhere.source.downloading "பதிவிறக்குகிறது">
-<!ENTITY https-everywhere.source.filename "கோப்பின் பெயர்">
-<!ENTITY https-everywhere.source.unable_to_download "மூலத்தை பதிவிறக்க இயலவில்லை.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ரத்துசெய்">
 
-<!ENTITY https-everywhere.popup.title "HTTPS எல்லா இடங்களிலும் 4.0மேம்பாட்டு.11 அறிவிக்கை">
-<!ENTITY https-everywhere.popup.paragraph1 "அடடா. நீங்கள் எல்லா இடங்களிலும் HTTPS நிலையான பதிப்பு பயன்படுத்தி இருந்தன, ஆனால் நாம் தற்செயலாக எங்கள் கடந்த வெளியீட்டில் வளர்ச்சி பதிப்பு நீங்கள் மேம்படுத்தப்படும் என்று.">
-<!ENTITY https-everywhere.popup.paragraph2 "நீங்கள் மீண்டும் நிலையாக செல்ல விரும்புகிறீர்களா?">
-<!ENTITY https-everywhere.popup.paragraph3 "சிறப்பாக HTTPS செய்ய உதவியது என்றால் நாம் அதை விரும்புகிறோம்! நீங்கள் https-everywhere@eff.org தெரிவிக்க முடியும், இது இங்கே மற்றும் அங்கே இன்னும் சில பிழைகள் உள்ளன கண்டுபிடிக்க வேண்டும். சிரமத்திற்கு மன்னிக்கவும், எல்லா இடங்களிலும் HTTPS பயன்படுத்தி நன்றி.">
-<!ENTITY https-everywhere.popup.keep "வளர்ச்சி பதிப்பு என்னை வைத்து">
-<!ENTITY https-everywhere.popup.revert "சமீபத்திய நிலையான பதிப்பை பதிவிறக்கு">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS எல்லா இடங்களிலும் Ruleset சோதனைகள்">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ரத்துசெய்">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "தொடங்கு">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.dtd
index eac7ddf..e1563b4 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.dtd
@@ -3,18 +3,22 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalEnable "ప్రతీచోటా HTTPS చేతనించు">
+<!ENTITY https-everywhere.menu.globalDisable "ప్రతీచోటా HTTPS అచేతనించు">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
 <!ENTITY https-everywhere.menu.showCounter "Show Counter">
 <!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.properties
index be83831..c2c0043 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.menu.globalEnable = ప్రతీచోటా HTTPS చేతనించు
+https-everywhere.menu.globalDisable = ప్రతీచోటా HTTPS అచేతనించు
+https-everywhere.menu.enableDisable = నియమాలను చేతనించు/అచేతనించు
+https-everywhere.menu.noRules = (ఈ పుటకి నియమాలు లేవు)
+https-everywhere.menu.unknownRules = (ఈ పుటకి ఏ నియమాలు ఉన్నాయో తెలియదు)
 https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
 https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
 https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/ssl-observatory.dtd
index 69f1cfd..7f7bed8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/te_IN/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 <!-- Observatory popup window -->
 <!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.no "కాదు ">
 
 <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
 against your browser by sending the certificates you receive to the
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/templates/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/templates/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/templates/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/templates/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tg/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tg/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tg/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tg/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.dtd
index bbe9f39..12c2135 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.dtd
@@ -3,21 +3,25 @@
 <!ENTITY https-everywhere.about.ext_description "เข้ารหัสเว็บ! ใช้ความปลอดภัย HTTPS โดยอัตโนมัติกับหลายเว็บไซต์">
 <!ENTITY https-everywhere.about.version "รุ่น">
 <!ENTITY https-everywhere.about.created_by "สร้างโดย">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "คลังกฎ">
 <!ENTITY https-everywhere.about.thanks "ขอบคุณ">
-<!ENTITY https-everywhere.about.contribute  "ถ้าคุณชอบ HTTPS Everywhere คุณอาจพิจารณา">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "ถ้าคุณชอบ HTTPS Everywhere คุณอาจลองพิจารณา">
 <!ENTITY https-everywhere.about.donate_tor "บริจาคให้กับ Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "หรือ">
 <!ENTITY https-everywhere.about.donate_eff "บริจาคให้กับ EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "เกี่ยวกับ HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "ปรับแต่งหอสำรวจ SSL">
 <!ENTITY https-everywhere.menu.globalEnable "เปิดใช้ HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "ปิดใช้ HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "หยุดการเชื่อมต่อผ่าน HTTP">
-<!ENTITY https-everywhere.menu.showCounter "แสดงตัวนับ">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.showCounter "แสดงตัวนับผู้ดู">
+<!ENTITY https-everywhere.menu.viewAllRules "ดูกติกาทั้งหมด">
 
 <!ENTITY https-everywhere.prefs.title "ปรับแต่ง HTTPS Everywhere">
 <!ENTITY https-everywhere.prefs.enable_all "เปิดใช้ทั้งหมด">
@@ -25,26 +29,28 @@
 <!ENTITY https-everywhere.prefs.reset_defaults "ล้างเป็นค่าตั้งต้น">
 <!ENTITY https-everywhere.prefs.search "ค้นหา">
 <!ENTITY https-everywhere.prefs.site "ไซต์">
-<!ENTITY https-everywhere.prefs.notes "บันทึก">
+<!ENTITY https-everywhere.prefs.notes "โน้ต">
 <!ENTITY https-everywhere.prefs.list_caption "กฎ HTTPS redirection อันไหนที่ควรใช้?">
 <!ENTITY https-everywhere.prefs.enabled "เปิดใช้">
 <!ENTITY https-everywhere.prefs.ruleset_howto "คุณสามารถเรียนรู้วิธีการเขียนกฎเอง (เพื่อให้รองรับเว็บไซต์อื่นๆ เพิ่มขึ้น)">
 <!ENTITY https-everywhere.prefs.here_link "ที่นี่">
 <!ENTITY https-everywhere.prefs.toggle "สลับ">
-<!ENTITY https-everywhere.prefs.reset_default "ล้างเป็นค่าตั้งต้น">
+<!ENTITY https-everywhere.prefs.reset_default "คืนค่าเริ่มต้น">
 <!ENTITY https-everywhere.prefs.view_xml_source "ดูซอร์ส XML">
 
-<!ENTITY https-everywhere.source.downloading "กำลังดาวน์โหลด">
-<!ENTITY https-everywhere.source.filename "ชื่อแฟ้ม">
-<!ENTITY https-everywhere.source.unable_to_download "ไม่สามารถดาวน์โหลดได้">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "ยกเลิก">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "เอ๊ะ! คุณเคยใช้รุ่นเสถียรของ HTTPS Everywhere แต่เราอาจจะเผลอปรับรุ่นไปยังรุ่นพัฒนาในการปรับรุ่นครั้งล่าสุด">
-<!ENTITY https-everywhere.popup.paragraph2 "คุณต้องการกลับไปยังรุ่นเสถียรหรือไม่?">
-<!ENTITY https-everywhere.popup.paragraph3 "เรายินดีหากคุณยังคงใช้รุ่นพัฒนา และช่วยเราทำให้ HTTPS Everywhere ดีขั้น คุณอาจพบบั้ก ซึ่งคุณสามารถรายงานไปที่ https-everywhere@eff.org ขออภัยในความไม่สะดวกและขอบคุณที่ใช้ HTTPS Everywhere">
-<!ENTITY https-everywhere.popup.keep "คงอยู่ในรุ่นพัฒนา">
-<!ENTITY https-everywhere.popup.revert "ดาวน์โหลดรุ่นเสถียรล่าสุด">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "การทดสอบกฎ HTTPS">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ยกเลิก">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "เริ่ม">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.properties
index 3743acf..624bd87 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/th/https-everywhere.properties
@@ -1,4 +1,4 @@
-https-everywhere.menu.globalEnable = เปิดใช้ HTTPS Everywhere
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
 https-everywhere.menu.globalDisable = ปิดใช้ HTTPS Everywhere
 https-everywhere.menu.enableDisable = เปิดใช้ / ปิดใช้กฎ
 https-everywhere.menu.noRules = (ไม่มีกฎสำหรับหน้านี้)
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ti/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ti/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ti/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ti/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tk/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tk/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tk/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tk/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tl_PH/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tl_PH/https-everywhere.dtd
index 6d1f317..bf9eaf8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tl_PH/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tl_PH/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "Tungkol sa HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.dtd
index 7862b3f..126b7f1 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.dtd
@@ -2,19 +2,23 @@
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Web iletişiminizi şifreleyin! Birçok sitede otomatik olarak HTTPS güvenliğini kullanın.">
 <!ENTITY https-everywhere.about.version "Sürüm">
-<!ENTITY https-everywhere.about.created_by "Oluşturan:">
+<!ENTITY https-everywhere.about.created_by "Oluşturan">
+<!ENTITY https-everywhere.about.and ", ve">
 <!ENTITY https-everywhere.about.librarians "Kural Kümesi Kitaplıkları">
 <!ENTITY https-everywhere.about.thanks "Teşekkürler">
-<!ENTITY https-everywhere.about.contribute  "HTTPS Everywhere yazılımını beğendiyseniz destek olun">
-<!ENTITY https-everywhere.about.donate_tor "Tor Projesine Bağış Yapın">
+<!ENTITY https-everywhere.about.many_contributors "Şu kişilerin yer aldığı birçok katılımcı">
+<!ENTITY https-everywhere.about.noscript "Ek olarak, bazı HTTPS Everywhere bölümleri Giorgio Maone ve diğerleri tarafından yazılmış NoScript kodlarına dayanmaktadır. Harika katkıları için minnettarız!">
+<!ENTITY https-everywhere.about.contribute  "HTTPS Everywhere'i beğendiyseniz">
+<!ENTITY https-everywhere.about.donate_tor "Tor'a">
 <!ENTITY https-everywhere.about.tor_lang_code "tr">
 <!ENTITY https-everywhere.about.or "ya da">
-<!ENTITY https-everywhere.about.donate_eff "EFF Projesine Bağış Yapın">
+<!ENTITY https-everywhere.about.donate_eff "EFF'ye bağışta bulunun">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "EFF projesine bağış yapın">
 <!ENTITY https-everywhere.menu.about "HTTPS Everywhere Hakkında">
 <!ENTITY https-everywhere.menu.observatory "SSL Gözlemcisi Ayarları">
-<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere Kullanılsın">
-<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere Kullanılmasın">
+<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere'i Etkinleştir">
+<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere'i Devre Dışı Bırak">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Tüm HTTP isteklerini engelle">
 <!ENTITY https-everywhere.menu.showCounter "Sayacı Görüntüle">
 <!ENTITY https-everywhere.menu.viewAllRules "Tüm Kuralları Görüntüle">
@@ -23,28 +27,30 @@
 <!ENTITY https-everywhere.prefs.enable_all "Tümünü Etkinleştir">
 <!ENTITY https-everywhere.prefs.disable_all "Tümünü Devre Dışı Bırak">
 <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle">
-<!ENTITY https-everywhere.prefs.search "Arama">
+<!ENTITY https-everywhere.prefs.search "Ara">
 <!ENTITY https-everywhere.prefs.site "Site">
 <!ENTITY https-everywhere.prefs.notes "Notlar">
-<!ENTITY https-everywhere.prefs.list_caption "Hangi HTTPS yeniden yönlendirme kurallarını uygulamak istersiniz?">
-<!ENTITY https-everywhere.prefs.enabled "Etkin">
+<!ENTITY https-everywhere.prefs.list_caption "Hangi HTTPS yeniden yönlendirme kuralları uygulanmalı?">
+<!ENTITY https-everywhere.prefs.enabled "Etkinleştirildi">
 <!ENTITY https-everywhere.prefs.ruleset_howto "Kendi kural kümelerinizi nasıl yazabileceğinizi öğrenebilirsiniz (diğer web sitelerini desteklemek için)">
-<!ENTITY https-everywhere.prefs.here_link "buraya tıklayın">
+<!ENTITY https-everywhere.prefs.here_link "buradan">
 <!ENTITY https-everywhere.prefs.toggle "Geçiş">
 <!ENTITY https-everywhere.prefs.reset_default "Varsayılanı Yükle">
 <!ENTITY https-everywhere.prefs.view_xml_source "XML Kaynağını Görüntüle">
 
-<!ENTITY https-everywhere.source.downloading "İndiriliyor">
-<!ENTITY https-everywhere.source.filename "Dosya Adı">
-<!ENTITY https-everywhere.source.unable_to_download "Kaynak indirilemedi.">
+<!ENTITY https-everywhere.chrome.stable_rules "Kararlı kurallar">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Şu web siteleri için şifreli bağlantı dayatılsın:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Deneysel kurallar">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Uyarı ve sorunlara yol açabilir. Varsayılan olarak devre dışıdır.">
+<!ENTITY https-everywhere.chrome.add_rule "Bu site için bir kural ekleyin">
+<!ENTITY https-everywhere.chrome.add_new_rule "Bu site için yeni bir kural ekleyin">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Bu sunucu için herzaman HTTPS kullanılsın">
+<!ENTITY https-everywhere.chrome.host "Sunucu:">
+<!ENTITY https-everywhere.chrome.show_advanced "Gelişmiş seçenekleri göster">
+<!ENTITY https-everywhere.chrome.hide_advanced "Gelişmiş seçenekleri gizle">
+<!ENTITY https-everywhere.chrome.rule_name "Kural adı">
+<!ENTITY https-everywhere.chrome.regex "Eşleşen kurallı ifade">
+<!ENTITY https-everywhere.chrome.redirect_to "Şuraya yönlendir">
+<!ENTITY https-everywhere.chrome.status_cancel_button "İptal">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0geliştirme.11 bildirimi">
-<!ENTITY https-everywhere.popup.paragraph1 "Malesef, kullandığınız HTTPS Everywhere kararlı sürümünü yanlışlıkla son dağıtımın geliştirme sürümüne güncellemiş olabiliriz.">
-<!ENTITY https-everywhere.popup.paragraph2 "Kararlı sürüme dönmek ister misininiz?">
-<!ENTITY https-everywhere.popup.paragraph3 "Geliştirme sürümünü kullanmaya devam ederek ve HTTPS Everywhere yazılımını geliştirmemize yardımcı olursanız çok seviniriz! Sağda solda saklanan birkaç hatayı bularak https-everywhere@eff.org adresine gönderebilirsiniz. Verdiğimiz rahatsızlıktan dolayı özür diler, HTTPS Everywhere yazılımını kullandığınız için teşekkür ederiz.">
-<!ENTITY https-everywhere.popup.keep "Geliştirme sürümünde kalayım">
-<!ENTITY https-everywhere.popup.revert "Son kararlı sürümü indireyim">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Kural Kümesi Sınamaları">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "İptal">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Başlat">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.properties
index b43cdb4..4e96550 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = HTTPS Everywhere Kullanılsın
-https-everywhere.menu.globalDisable = HTTPS Everywhere Kullanılmasın
-https-everywhere.menu.enableDisable = Kuralları Aç / Kapat
-https-everywhere.menu.noRules = (Bu Sayfa için Henüz Bir Kural Yok)
+https-everywhere.menu.globalEnable = HTTPS Everywhere'i Etkinleştir
+https-everywhere.menu.globalDisable = HTTPS Everywhere'i Devre Dışı Bırak
+https-everywhere.menu.enableDisable = Kuralları Etkinleştir / Devre Dışı Bırak
+https-everywhere.menu.noRules = (Bu Sayfa için Kural Yok)
 https-everywhere.menu.unknownRules = (Bu Sayfanın Kuralları Bilinmiyor)
 https-everywhere.toolbar.hint = HTTPS Everywhere kullanılıyor. Adres çubuğundaki simgeye tıklayarak istediğiniz siteler için açıp kapatabilirsiniz.
-https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için, HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine çevirir.
-https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Yap
+https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine sıfırlar.
+https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Çalıştır
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/ssl-observatory.dtd
index 5f840ec..a35e6d9 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tr/ssl-observatory.dtd
@@ -3,9 +3,9 @@
 <!ENTITY ssl-observatory.popup.later "Daha Sonra Sor">
 <!ENTITY ssl-observatory.popup.no "Hayır">
 
-<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere tarayıcınıza
-karşı yapılacak saldırıları, güvenlik sertifikalarını Gözlem altına alarak algılayabilir.
-Bu özelliği etkinleştirmek ister misiniz?">
+<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere tarayıcınıza karşı
+yapılacak saldırıları gönderip aldığınız sertifikaları gözlemleyerek
+algılayabilir.  Bu özellik etkinleştirilsin mi?">
 
 <!--<!ENTITY ssl-observatory.popup.text 
 "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -30,25 +30,25 @@ bu seçeneği etkinleştirmek güvenlidir.">
 "Standart dışı kök otorite tarafından imzalanmış sertifikaları gönder ve denetle">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"TLS vekil sunucu ya da özel bir kök Sertifika Otoritesi ile İnternet gezintilerini gözlemleyebilen Kaspersky antivirüs yazılımı ya da sıkı güvenlikli bir kurumsal ağ kullanmıyorsanız bu özelliği etkinleştirmek güvenlidir (ve akıllıca). Sıkı güvenlikli bir ağ kullanıyorsanız, bu seçenek eşsiz sertifikalar oluşturduğundan, vekil sunucu üzerinden hangi https:// adreslerine eriştiğiniz kanıtlanır. Bu nedenle bu seçenek varsayılan olarak devre dışıdır.">
+"TLS vekil sunucu ya da özel bir kök Sertifika Otoritesi ile İnternet gezintilerini gözlemleyebilen Kaspersky antivirüs yazılımı ya da sıkı güvenlikli bir kurumsal ağ kullanmıyorsanız bu özelliği etkinleştirmek güvenlidir (ve akıllıca). Sıkı güvenlikli bir ağ kullanıyorsanız, bu seçenek eşsiz sertifikalar oluşturduğundan, vekil sunucu üzerinden hangi https:// adreslerine eriştiğiniz kanıtlanır. Bu nedenle bu seçenek varsayılan olarak kapalıdır.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "Gizlilik için Tor kullanırken sertifikalar denetlensin">
+<!ENTITY ssl-observatory.prefs.anonymous "Gizlilik için Tor kullanılırken sertifikalar denetlensin">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Gizlilik için Tor kullanırken sertifikalar denetlensin (Tor gereklidir)">
+"Gizlilik için Tor kullanılırken sertifikalar denetlensin (Tor gereklidir)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"Bu özellik için Tor yazılımı yüklenmiş ve çalışıyor olmalıdır">
+"Bu özellik için Tor yüklenmiş ve çalışıyor olmalıdır">
 
 <!ENTITY ssl-observatory.prefs.asn 
 "Yeni bir sertifika görüldüğünde, Gözlemciye hangi ISS üzerinden bağlandığım bildirilsin">
 
 <!ENTITY ssl-observatory.prefs.asn_tooltip
-"Bu ağın &quot;Özerk Sistemi Numarası&quot; alınarak gönderilecek. Böylece HTTPS karşıtı saldırıların yerel olarak belirlenerek, İran ve Suriye gibi saldırıların sıklıkla görüldüğü yerlerin gözlenmesine yardımcı olacaktır.">
+"Bu ağın &quot;Özerk Sistem numarası&quot; alınarak gönderilecek. Böylece HTTPS karşıtı saldırıların yerel olarak belirlenerek, İran ve Suriye gibi saldırıların sıklıkla görüldüğü yerlerin gözlenmesine yardımcı olacaktır.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Gözlemci, tarayıcı tarafından yakalanamayan geçersiz bir sertifika algıladığında uyarı görüntülensin">
+"Gözlemci, tarayıcı tarafından yakalanamayan geçersiz bir sertifika algıladığında uyarı görüntülesin">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"Bu özellik, gönderilen sertifikaları bilinen Sertifika İptal Listeleri ile denetler. Malesef iptal edilmiş her sertifikayı işaretlemiş olduğumuzu söyleyemeyiz. Ancak bir uyarı görüyorsanız, bir şeyler yanlış demektir.">
+"Bu özellik, gönderilen sertifikaları bilinen Sertifika İptal Listeleri ile denetler. Maalesef iptal edilmiş her sertifikayı işaretlemiş olduğumuzu söyleyemeyiz. Ancak bir uyarı görüyorsanız, bir şeyler yanlış demektir.">
 
 <!ENTITY ssl-observatory.prefs.done "Tamamlandı">
 
@@ -85,13 +85,13 @@ Ayrıntılı bilgiler için fareyi seçeneklerin üzerinde dolaştırın:">
 
 <!ENTITY ssl-observatory.prefs.show "Gelişmiş ayarları görüntüle">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Gözlemci Ayarları">
+<!ENTITY ssl-observatory.prefs.title "SSL Gözlemcisi Ayarları">
 
-<!ENTITY ssl-observatory.prefs.use "Gözlemci kullanılsın">
-<!ENTITY ssl-observatory.warning.title " EFF SSL Gözlemcisinden UYARI">
+<!ENTITY ssl-observatory.prefs.use "Gözlemci kullanılsın mı?">
+<!ENTITY ssl-observatory.warning.title "EFF SSL Gözlemcisinden UYARI">
 <!ENTITY ssl-observatory.warning.showcert "Sertifika zincirini görüntüle">
 <!ENTITY ssl-observatory.warning.okay "Anladım">
-<!ENTITY ssl-observatory.warning.text "EFF SSL Gözlemcisi bu sitenin HTTPS serfikası(ları) ile ilgili bir uyarı veriyor:">
+<!ENTITY ssl-observatory.warning.text "EFF SSL Gözlemcisi bu sitenin HTTPS sertifikası(ları) ile ilgili bir uyarı veriyor:">
 <!ENTITY ssl-observatory.warning.defense "Bu sitede oturum açtıysanız, güvenli bir bağlantı kurduktan sonra parolanızı değiştirmeniz önerilebilir (Bu uyarılar HTTPS Everywhere ayarları bölümündeki &quot;SSL Gözlemcisi&quot; sekmesinden devre dışı bırakılabilir).">
 
 <!ENTITY ssl-observatory.prefs.self_signed
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.dtd
new file mode 100644
index 0000000..2ac51cd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.dtd
@@ -0,0 +1,56 @@
+<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
+<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.or "or">
+<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
+<!ENTITY https-everywhere.menu.showCounter "Show Counter">
+<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">
+<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
+<!ENTITY https-everywhere.prefs.search "Search">
+<!ENTITY https-everywhere.prefs.site "Site">
+<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.enabled "Enabled">
+<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.here_link "here">
+<!ENTITY https-everywhere.prefs.toggle "Toggle">
+<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
+<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
+
+
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.properties
new file mode 100644
index 0000000..be83831
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/ssl-observatory.dtd
new file mode 100644
index 0000000..69f1cfd
--- /dev/null
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/tzm/ssl-observatory.dtd
@@ -0,0 +1,101 @@
+<!-- Observatory popup window -->
+<!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 "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
+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 "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 "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.show_cert_warning
+"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+
+<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
+"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+
+<!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
+somebody visited that site, but will not know who or what page they looked at.
+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 "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 "Show advanced options">
+
+<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+
+<!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
+
+<!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/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ug@Arab/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ug@Arab/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ug@Arab/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ug@Arab/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/https-everywhere.dtd
index 87f3b97..6388799 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "O HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "Про HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_description "Зашифруйте Web! Автоматично застосовуйте безпеку HTTPS на великой кількістью сайтів.">
 <!ENTITY https-everywhere.about.version "Версія">
 <!ENTITY https-everywhere.about.created_by "Створенно">
+<!ENTITY https-everywhere.about.and ", і">
 <!ENTITY https-everywhere.about.librarians "Хранителі правил">
 <!ENTITY https-everywhere.about.thanks "Завдяки">
+<!ENTITY https-everywhere.about.many_contributors "Багато-багато учасників, у тому числі: ">
+<!ENTITY https-everywhere.about.noscript "Також частинки HTTPS Everywhere базуються на коді з NoScript авторства Джороджіо Маоне та інших. Дякуємо за їхню чудову роботу!">
 <!ENTITY https-everywhere.about.contribute  "Якщо Вам подобається HTTPS Everywhere, можливо, Ви хотіли б зробити">
 <!ENTITY https-everywhere.about.donate_tor "Пожертвуйте Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "або">
 <!ENTITY https-everywhere.about.donate_eff "Пожертвування EFF">
 
-<!ENTITY https-everywhere.menu.about "O HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Зробити пожертву EFF">
+<!ENTITY https-everywhere.menu.about "Про HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "Налаштування SSL Observatory">
 <!ENTITY https-everywhere.menu.globalEnable "Увімкнути HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "Вимкнути HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.blockHttpRequests "Блокувати всі HTTP-запити">
 <!ENTITY https-everywhere.menu.showCounter "Показати Лічильник">
-<!ENTITY https-everywhere.menu.viewAllRules "Показати усі правила">
+<!ENTITY https-everywhere.menu.viewAllRules "Переглянути всі правила">
 
 <!ENTITY https-everywhere.prefs.title "Налаштування HTTPS Everywhere">
-<!ENTITY https-everywhere.prefs.enable_all "Включити все">
+<!ENTITY https-everywhere.prefs.enable_all "Увімкнути все">
 <!ENTITY https-everywhere.prefs.disable_all "Вимкнути все">
-<!ENTITY https-everywhere.prefs.reset_defaults "За замовчуванням">
+<!ENTITY https-everywhere.prefs.reset_defaults "Скинути до типових">
 <!ENTITY https-everywhere.prefs.search "Пошук">
 <!ENTITY https-everywhere.prefs.site "Сайт">
 <!ENTITY https-everywhere.prefs.notes "Примітка">
 <!ENTITY https-everywhere.prefs.list_caption "Які правила перенаправлень слід використовувати?">
-<!ENTITY https-everywhere.prefs.enabled "Включено">
+<!ENTITY https-everywhere.prefs.enabled "Увімкнено">
 <!ENTITY https-everywhere.prefs.ruleset_howto "Керівництво по створенню нових правил (для нових сайтів) знаходиться">
 <!ENTITY https-everywhere.prefs.here_link "тут">
-<!ENTITY https-everywhere.prefs.toggle "Переключитися">
-<!ENTITY https-everywhere.prefs.reset_default "Скинути до значення за замовчуванням">
-<!ENTITY https-everywhere.prefs.view_xml_source "Подивитися ісходник XML">
+<!ENTITY https-everywhere.prefs.toggle "Перемкнути">
+<!ENTITY https-everywhere.prefs.reset_default "Скинути до типових значень">
+<!ENTITY https-everywhere.prefs.view_xml_source "Переглянути джерело XML">
 
-<!ENTITY https-everywhere.source.downloading "Завантаження">
-<!ENTITY https-everywhere.source.filename "Ім'я файлу">
-<!ENTITY https-everywhere.source.unable_to_download "Не можу завантажити ісходник">
+<!ENTITY https-everywhere.chrome.stable_rules "Стабільні правила">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Примусово створювати зашифровані з'єдання до цих веб-сайтів: ">
+<!ENTITY https-everywhere.chrome.experimental_rules "Експериментальні правила">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Може спричинити попередження чи поломку. Вимкнено за замовчуванням.">
+<!ENTITY https-everywhere.chrome.add_rule "Додати правило для цього сайту">
+<!ENTITY https-everywhere.chrome.add_new_rule "Додати нове правило для нового сайту">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Завжди використовувати https для цього хоста">
+<!ENTITY https-everywhere.chrome.host "Хост:">
+<!ENTITY https-everywhere.chrome.show_advanced "Показати розширені">
+<!ENTITY https-everywhere.chrome.hide_advanced "Сховати розширені">
+<!ENTITY https-everywhere.chrome.rule_name "Ім'я правила">
+<!ENTITY https-everywhere.chrome.regex "Підходящий регулярний вираз">
+<!ENTITY https-everywhere.chrome.redirect_to "Перенаправити на">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Скасувати">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 сповіщення">
-<!ENTITY https-everywhere.popup.paragraph1 "Ой. Ви використовували стабільну версію HTTPS Everywhere, але ми, можливо, випадково оновили Вам її до розроблюваної версії.">
-<!ENTITY https-everywhere.popup.paragraph2 "Хотіли б Ви повернутися до стабільної версії?">
-<!ENTITY https-everywhere.popup.paragraph3 "Ми були б раді, якби Ви продовжили використовувати розроблювану версію, і допомогли нам зробити HTTPS Everywhere краще! Ви могли б знайти кілька помилок, і надіслати їх нам на https-everywhere@eff.org. Вибачте за незручності, і спасибі за використання HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Залишитися на версії що розробляється ">
-<!ENTITY https-everywhere.popup.revert "Завантажити останню стабільну версію">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "Тести правил HTTPS Everywhere">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Відмова">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Старт">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/ssl-observatory.dtd
index 4d5e62c..eeeba73 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uk/ssl-observatory.dtd
@@ -20,7 +20,7 @@ to turn it on?">-->
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"Включення даної опції є безпечним, крім випадків 
+"Увімкнення цієї опції є безпечним, крім випадків 
 використання дуже нав'язливої корпоративної мережі:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
@@ -30,7 +30,7 @@ to turn it on?">-->
 "Відправити і перевірити сертифікати, підписані нестандартними кореневими центрами сертифікації">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-"Це безпечно (і гарна ідея), щоб включити цю опцію, якщо Ви не використовуєте нав'язливу корпоративну мережу або антивірусне програмне забезпечення Kaspersky, яке контролює Ваш перегляд через TLS проксі та приватного кореневого Центру Сертифікації. Якщо вона буде включена у такій мережі, ця опція може публікувати докази, які https:// доменів були відвідані через цей проксі, через унікальні сертифікати, які він буде видавати. Таким чином, ми залишаємо її увімкненою за замовчуванням.">
+"Увімкнення цієї опції є безпечним (і гарна ідея), якщо Ви не використовуєте нав'язливу корпоративну мережу або антивірусне програмне забезпечення Kaspersky, яке контролює Ваш перегляд через TLS проксі та приватного кореневого Центру Сертифікації. Якщо вона буде увімкнена в такій мережі, ця опція може публікувати докази, які https:// домени були відвідані через цей проксі, через унікальні сертифікати, які він буде видавати. Отже типово, ми залишаємо її вимкненою.">
 
 <!ENTITY ssl-observatory.prefs.anonymous "Перевірити сертифікати використовувані Tor для анонімності">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
@@ -55,8 +55,8 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Everywhere може використовувати EFF SSL Observatory. Це робить дві речі: (1)
 надсилає копії HTTPS сертифікатів до Observatory, щоб допомогти нам
-виявити атаки &quot;людина посередині&quot; та підвищення безпеку користувачів, а також (2)
-дозволяє нам попередити Вас про небезпечні з'єднання або напади на Ваш браузер.">
+виявити атаки &quot;людина посередині&quot; та підвищити безпеку користувачів, а також (2)
+дозволяє нам попередити Вас про небезпечні з'єднання або атаки на Ваш браузер.">
 
 <!--<!ENTITY ssl-observatory.prefs.explanation2
 "When you visit https://www.example.com, the Observatory will learn that
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.dtd
index eac7ddf..aa704fc 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ (HTTPS Everywhere) کے بارے میں ">
+<!ENTITY https-everywhere.about.ext_name "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ ">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.version "ورژن">
+<!ENTITY https-everywhere.about.created_by "یه سافٹ ویئر بنانے والے:">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "رولسیٹ لیبراریانس (Ruleset Librarians)">
+<!ENTITY https-everywhere.about.thanks "ان کی شرکت کے لئے شکریہ:">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "آپ کو اگر HTTPS everywhere سافٹ ویئر پسند آیا ہے، پھر یے سافٹ ویئر بھی دیکھیں">
+<!ENTITY https-everywhere.about.donate_tor "طور کو بخشیش دیجیے">
+<!ENTITY https-everywhere.about.tor_lang_code "انگریزی">
+<!ENTITY https-everywhere.about.or "یا">
+<!ENTITY https-everywhere.about.donate_eff "EEF کو بخشیش دیجیے">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "ہائپر ٹیکسٹ پروٹوکول ہر جگہ (HTTPS Everywhere) کے بارے میں ">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.globalEnable "شروع کرئیں">
+<!ENTITY https-everywhere.menu.globalDisable "بند کرئیں">
+<!ENTITY https-everywhere.menu.blockHttpRequests "HTTP کی عرض روک دیں">
+<!ENTITY https-everywhere.menu.showCounter "کاؤنٹر دکھائیں">
+<!ENTITY https-everywhere.menu.viewAllRules "تمام قانون دکھائیں">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.title "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کی سیٹنگز">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
 <!ENTITY https-everywhere.prefs.disable_all "Disable All">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
-<!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.search "ڈھونڈیں">
+<!ENTITY https-everywhere.prefs.site "ویب سائٹ">
+<!ENTITY https-everywhere.prefs.notes "خط">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
 <!ENTITY https-everywhere.prefs.enabled "Enabled">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
 <!ENTITY https-everywhere.prefs.here_link "here">
 <!ENTITY https-everywhere.prefs.toggle "Toggle">
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.view_xml_source "XML سورس دیکھیں">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "تنسیخ کیجیے">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.properties
index be83831..15a1f3a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = شروع کرئیں
+https-everywhere.menu.globalDisable = بند کرئیں
+https-everywhere.menu.enableDisable = کانوں شروع/بند کرئیں
+https-everywhere.menu.noRules = (اس پیج کے لئے کوہی کانوں نہیں ہیں)
+https-everywhere.menu.unknownRules = (اس پیج کے کانوں نہیں پتا)
+https-everywhere.toolbar.hint =  HTTPS ہر جگہہ شروع ہو گیا ہے. آپ شروع اور بند کر سک تے ہیں سائٹ کے مطابق
+https-everywhere.migration.notification0 = HTTPS ہر جگہہ اپ ڈیٹ کیوجہ سے آپ کی سیٹنگز ریسٹ کر رہا ہیں.
+https-everywhere.menu.ruleset-tests = HTTPS ہر جگہہ کے کانوں کے آزمائش شروع کرئیں
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/ssl-observatory.dtd
index 69f1cfd..fc92847 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 <!-- Observatory popup window -->
-<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
+<!ENTITY ssl-observatory.popup.details "تفصیلات اور ذاتی معلومات">
 <!ENTITY ssl-observatory.popup.later "Ask Me Later">
 <!ENTITY ssl-observatory.popup.no "No">
 
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.dtd
index 203afab..17aff22 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
+<!ENTITY https-everywhere.about.title "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ (HTTPS Everywhere) کے بارے میں ">
+<!ENTITY https-everywhere.about.ext_name "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ ">
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "ورژن">
-<!ENTITY https-everywhere.about.created_by "Created by">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
+<!ENTITY https-everywhere.about.created_by "یه سافٹ ویئر بنانے والے:">
+<!ENTITY https-everywhere.about.and ", and">
+<!ENTITY https-everywhere.about.librarians "رولسیٹ لیبراریانس (Ruleset Librarians)">
+<!ENTITY https-everywhere.about.thanks "ان کی شرکت کے لئے شکریہ:">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
+<!ENTITY https-everywhere.about.contribute  "آپ کو اگر HTTPS everywhere سافٹ ویئر پسند آیا ہے، پھر یے سافٹ ویئر بھی دیکھیں">
+<!ENTITY https-everywhere.about.donate_tor "طور کو بخشیش دیجیے">
+<!ENTITY https-everywhere.about.tor_lang_code "انگریزی">
 <!ENTITY https-everywhere.about.or "یا">
-<!ENTITY https-everywhere.about.donate_eff "ای ایف ایف کو عطیہ دیجیے">
+<!ENTITY https-everywhere.about.donate_eff "EEF کو عطیہ دیجیے">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ (HTTPS Everywhere) کے بارے میں ">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.globalEnable "شروع کرئیں">
+<!ENTITY https-everywhere.menu.globalDisable "بند کرئیں">
+<!ENTITY https-everywhere.menu.blockHttpRequests "HTTP کی عرض روک دیں">
+<!ENTITY https-everywhere.menu.showCounter "کاؤنٹر دکھائیں">
+<!ENTITY https-everywhere.menu.viewAllRules "تمام قانون دکھائیں">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.title "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کی سیٹنگز">
 <!ENTITY https-everywhere.prefs.enable_all "Enable All">
 <!ENTITY https-everywhere.prefs.disable_all "Disable All">
 <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
-<!ENTITY https-everywhere.prefs.search "Search">
-<!ENTITY https-everywhere.prefs.site "Site">
-<!ENTITY https-everywhere.prefs.notes "Notes">
+<!ENTITY https-everywhere.prefs.search "ڈھونڈیں">
+<!ENTITY https-everywhere.prefs.site "ویب سائٹ">
+<!ENTITY https-everywhere.prefs.notes "خط">
 <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
 <!ENTITY https-everywhere.prefs.enabled "Enabled">
 <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
 <!ENTITY https-everywhere.prefs.here_link "here">
 <!ENTITY https-everywhere.prefs.toggle "Toggle">
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.view_xml_source "XML سورس دیکھیں">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "فائل کا نام">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "منسوخ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "تنسیخ کیجیے">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.properties
index be83831..a900e5a 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ur_PK/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = شروع کرئیں
+https-everywhere.menu.globalDisable = بند کرئیں
+https-everywhere.menu.enableDisable = کانوں شروع/بند کرئیں
+https-everywhere.menu.noRules = (اس پیج کے لئے کوہی کانوں نہیں ہیں)
+https-everywhere.menu.unknownRules = (اس پیج کے کانوں نہیں پتا)
+https-everywhere.toolbar.hint =  HTTPS ہر جگہہ شروع ہو گیا ہے. آپ شروع اور بند کر سک تے ہیں سائٹ کے مطابق
+https-everywhere.migration.notification0 =  HTTPS ہر جگہہ اپ ڈیٹ کیوجہ سے آپ کی سیٹنگز ریسٹ کر رہا ہیں.
+https-everywhere.menu.ruleset-tests = HTTPS ہر جگہہ کے کانوں کے آزمائش شروع کرئیں
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/https-everywhere.dtd
index 8579fb3..a87dbe8 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Bekor qilish">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Bekor qilish">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/ssl-observatory.dtd
index 3c66a33..b2cbd2f 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/uz/ssl-observatory.dtd
@@ -50,7 +50,7 @@ intrusive corporate network:">
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
 "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
 
-<!ENTITY ssl-observatory.prefs.done "Done">
+<!ENTITY ssl-observatory.prefs.done "Bajarildi">
 
 <!ENTITY ssl-observatory.prefs.explanation 
 "HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ve/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ve/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ve/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/ve/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.dtd
index b09f254..b389e9b 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.dtd
@@ -3,48 +3,54 @@
 <!ENTITY https-everywhere.about.ext_description "Mã hóa trang web! Tự động sử dụng bảo mật HTTPS ở nhiều trang web.">
 <!ENTITY https-everywhere.about.version "Phiên bản">
 <!ENTITY https-everywhere.about.created_by "Tạo ra bởi">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.and ", và">
+<!ENTITY https-everywhere.about.librarians "Thư Viện Các Quy Tắc">
 <!ENTITY https-everywhere.about.thanks "Nhờ có">
-<!ENTITY https-everywhere.about.contribute  "Nếu như bạn thích HTTPS Everywhere, có thể bạn cũng thích">
+<!ENTITY https-everywhere.about.many_contributors "Rất rất nhiều người đóng góp, bao gồm cả">
+<!ENTITY https-everywhere.about.noscript "Portions của HTTPS Everywhere được dựa trên mã từ NoScript, bởi Giorgio Maone và những người khác. Chúng tôi rất biết ơn vì những gì họ đã làm rất xuất sắc.">
+<!ENTITY https-everywhere.about.contribute  "Nếu như bạn thích HTTPS Everywhere, có thể bạn cũng quan tâm đến">
 <!ENTITY https-everywhere.about.donate_tor "Đóng góp cho Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "Hoặc">
+<!ENTITY https-everywhere.about.or "hoặc">
 <!ENTITY https-everywhere.about.donate_eff "Đóng góp cho EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Đóng góp cho EFF">
 <!ENTITY https-everywhere.menu.about "Thông tin về HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
-<!ENTITY https-everywhere.menu.globalEnable "Kích hoạt HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.globalDisable "Ngừng HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.observatory "Các Tùy Chọn Ưu Tiên cho SSL Observatory">
+<!ENTITY https-everywhere.menu.globalEnable "Bật HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.globalDisable "Tắt HTTPS Everywhere">
+<!ENTITY https-everywhere.menu.blockHttpRequests "Chặn tất cả các yêu cầu HTTP">
+<!ENTITY https-everywhere.menu.showCounter "Hiển Thị Bộ Đếm">
+<!ENTITY https-everywhere.menu.viewAllRules "Xem Tất Cả Quy Tắc">
 
-<!ENTITY https-everywhere.prefs.title "Cài đặt HTTPS Everywhere">
-<!ENTITY https-everywhere.prefs.enable_all "Kích hoạt tất">
-<!ENTITY https-everywhere.prefs.disable_all "Tắt hết">
-<!ENTITY https-everywhere.prefs.reset_defaults "Khôi phục mặc định">
+<!ENTITY https-everywhere.prefs.title "Các Tùy Chọn Ưu Tiên Cho HTTPS Everywhere">
+<!ENTITY https-everywhere.prefs.enable_all "Bật tất cả">
+<!ENTITY https-everywhere.prefs.disable_all "Tắt tất cả">
+<!ENTITY https-everywhere.prefs.reset_defaults "Khôi phục về Mặc định">
 <!ENTITY https-everywhere.prefs.search "Tìm kiếm">
 <!ENTITY https-everywhere.prefs.site "Trang web">
-<!ENTITY https-everywhere.prefs.notes "Ghi chép">
-<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
-<!ENTITY https-everywhere.prefs.enabled "Kích hoạt">
-<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
-<!ENTITY https-everywhere.prefs.here_link "Tại đây">
+<!ENTITY https-everywhere.prefs.notes "Các Lưu Ý">
+<!ENTITY https-everywhere.prefs.list_caption "Những quy tắc chuyển hướng HTTPS nào nên được áp dụng?">
+<!ENTITY https-everywhere.prefs.enabled "Bật">
+<!ENTITY https-everywhere.prefs.ruleset_howto "Bạn có thể tìm hiểu về cách tự viết các quy tắc của riêng bạn (để hỗ trợ cho những trang web khác)">
+<!ENTITY https-everywhere.prefs.here_link "tại đây">
 <!ENTITY https-everywhere.prefs.toggle "Bật tắt">
-<!ENTITY https-everywhere.prefs.reset_default "Khôi phục mặc định">
+<!ENTITY https-everywhere.prefs.reset_default "Khôi phục về Mặc định">
 <!ENTITY https-everywhere.prefs.view_xml_source "Tìm nguồn XML">
 
-<!ENTITY https-everywhere.source.downloading "Đang tải xuống">
-<!ENTITY https-everywhere.source.filename "Tên tệp">
-<!ENTITY https-everywhere.source.unable_to_download "Không thể tải nguồn xuống được">
+<!ENTITY https-everywhere.chrome.stable_rules "Các quy tắc ổn định">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Ép buộc mã hóa các kết nối đến các trang web này:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Các quy tắc trải nghiệm">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "Có thể gây ra các cảnh báo hay hư hại. Mặc định là tắt.">
+<!ENTITY https-everywhere.chrome.add_rule "Thêm một quy tắc cho trang này">
+<!ENTITY https-everywhere.chrome.add_new_rule "Thêm một quy tắc mới cho trang này">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Luôn sử dụng https cho host này">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Hiển thị chi tiết">
+<!ENTITY https-everywhere.chrome.hide_advanced "Ẩn chi tiết">
+<!ENTITY https-everywhere.chrome.rule_name "Tên quy tắc">
+<!ENTITY https-everywhere.chrome.regex "Regex phù hợp">
+<!ENTITY https-everywhere.chrome.redirect_to "Chuyển hướng đến">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Hủy bỏ">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Ối. Bạn đang dùng phiên bản ổn định của HTTPS Everywhere, nhưng có lẽ chúng tôi đã tình cờ nâng cấp lên phiên bản phát triển trong lần phát hành vừa rồi.">
-<!ENTITY https-everywhere.popup.paragraph2 "Bạn có muốn quay lại phiên bản ổn định?">
-<!ENTITY https-everywhere.popup.paragraph3 "Chúng tôi rất vui nếu như bạn tiếp tục sử dụng phiên bản phát triển và giúp chúng tôi làm cho HTTPS tốt hơn! Bạn có thể thấy có một vài lỗi kỹ thuật, mà bạn có thể báo lại với https-everywhere@eff.org. Xin lỗi vì sự bất tiện này, và cám ơn bạn vì đã sử dụng HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Giữ phiên bản phát triển">
-<!ENTITY https-everywhere.popup.revert "Tải về phiên bản ổn định mới nhất">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Hủy bỏ">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Bắt đầu">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.properties
index ec74d28..16d6807 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/https-everywhere.properties
@@ -1,8 +1,8 @@
-https-everywhere.menu.globalEnable = Kích hoạt HTTPS Everywhere
-https-everywhere.menu.globalDisable = Ngừng HTTPS Everywhere
-https-everywhere.menu.enableDisable = Bật / Tắt Qui tắc
-https-everywhere.menu.noRules = (Không có Qui tắc nào cho trang này)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.globalEnable = Bật HTTPS Everywhere
+https-everywhere.menu.globalDisable = Tắt HTTPS Everywhere
+https-everywhere.menu.enableDisable = Bật / Tắt Các Quy Tắc
+https-everywhere.menu.noRules = (Không Có Quy tắc Nào Cho Trang Này)
+https-everywhere.menu.unknownRules = (Quy Tắc Cho Trang Này Chưa Rõ)
+https-everywhere.toolbar.hint = HTTPS Everywhere đang hoạt động. Bạn có thể bật tắt nó bằng cách bấm vào biểu tượng trên thanh địa chỉ.
+https-everywhere.migration.notification0 = Để thực hiện khắc phục cốt yếu, bản cập nhật này đặt lại các tuỳ chọn quy tắc HTTPS Everywhere của bạn về giá trị mặc định.
+https-everywhere.menu.ruleset-tests = Thực hiện kiểm tra tập quy tắc HTTPS Everywhere
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/ssl-observatory.dtd
index baeeeca..b2ebf17 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/vi/ssl-observatory.dtd
@@ -13,42 +13,42 @@ 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?">
+"HTTPS Everywhere có nên dùng SSL Observatory?">
 
 <!ENTITY ssl-observatory.popup.yes "Có">
 
 <!-- Observatory preferences dialog -->
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts1
-"It is safe to enable this, unless you use a very
-intrusive corporate network:">
+"Việc kích hoạt điều này là an toàn, trừ khi bạn dùng một
+mạng công ty dễ bị xâm nhập:">
 
 <!ENTITY ssl-observatory.prefs.adv_priv_opts2
-"Safe, unless you use a corporate network with secret intranet server names:">
+"An toàn, trừ khi bạn dùng một mạng công ty với những tên máy chủ intranet bí mật:">
 
 <!ENTITY ssl-observatory.prefs.alt_roots 
-"Submit and check certificates signed by non-standard root CAs">
+"Gửi và kiểm tra chứng thực được ký bởi CA gốc không chuẩn">
 
 <!ENTITY ssl-observatory.prefs.alt_roots_tooltip 
 "Thật an toàn (và là ý tưởng hay) để cho phép tùy chọn này, trừ khi bạn dùng mạng lưới xâm nhập công ty hoặc phần mềm diệt virus Kasspersky để theo dõi trình duyệt của bạn với TLS Proxy và root Certificate Authority riêng. Nếu bạn cho phép những mạng lưới như vậy, tùy chọn này có thể công khai bằng chứng của những tên miền https:// đang được bạn ghé thăm thông qua proxy đó, bởi vì những chứng chỉ duy nhất mà nó sẽ sinh ra. Vì vậy chúng ta nên để mặc định cho nó tắt.">
 
-<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity">
+<!ENTITY ssl-observatory.prefs.anonymous "Kiểm tra chứng thực bằng Tor để ẩn danh">
 <!ENTITY ssl-observatory.prefs.anonymous_unavailable 
-"Check certificates using Tor for anonymity (requires Tor)">
+"Kiểm tra chứng thực bằng Tor để ẩn danh (yêu cầu Tor)">
 <!ENTITY ssl-observatory.prefs.anonymous_tooltip 
-"This option requires Tor to be installed and running">
+"Tuỳ chọn này yêu cầu Tor phải được cài đặt và đang chạy">
 
 <!ENTITY ssl-observatory.prefs.asn 
-"When you see a new certificate, tell the Observatory which ISP you are connected to">
+"Khi bạn thấy chứng thực mới, cho Observatory biết ISP nào bạn đang kết nối vào">
 
 <!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.">
+"Việc này sẽ tải và gửi &quot;Số Hệ thống Tự quản&quot; mạng của bạn. Việc này sẽ giúp chúng tôi định vị tấn công chống lại HTTPS và xác định xem chúng tôi có quan sát từ mạng trong những nơi như Iran và Syria hay không, đây là những nơi có tấn công tương đối phổ biến.">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning
-"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
+"Hiện cảnh báo khi Observatory phát hiện một chứng thực bị thu hồi không được trình duyệt phát hiện">
 
 <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
-"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
+"Việc này sẽ kiểm tra chứng thực đã gửi trước những Danh sách Thu hồi Chứng thực được xác định. Thật không may, chúng tôi không thể đảm bảo rằng chúng tôi sẽ đánh dấu mỗi chứng thực bị thu hồi, nhưng nếu bạn thấy cảnh báo thì có thể có gì đó không đúng.">
 
 <!ENTITY ssl-observatory.prefs.done "Hoàn thành">
 
@@ -70,27 +70,27 @@ 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 "Hide advanced options">
+<!ENTITY ssl-observatory.prefs.hide "Ẩn tuỳ chọn nâng cao">
 
 <!ENTITY ssl-observatory.prefs.nonanon 
-"Check certificates even if Tor is not available">
+"Kiểm tra chứng thực kể cả khi Tor không khả dụng">
 
 <!ENTITY ssl-observatory.prefs.nonanon_tooltip
-"We will still try to keep the data anonymous, but this option is less secure">
+"Chúng tôi vẫn sẽ cố giữ dữ liệu ẩn danh, nhưng tuỳ chọn này ít an toàn hơn">
 
 <!ENTITY ssl-observatory.prefs.priv_dns 
-"Submit and check certificates for non-public DNS names">
+"Gửi và kiểm tra chứng thực cho những tên DNS không công khai">
 
 <!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 "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "Tuỳ chọn quan sát SSL">
 
 <!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.showcert "Hiện chuỗi chứng thực">
 <!ENTITY ssl-observatory.warning.okay "Tôi hiểu">
 <!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. (These warnings can be disabled in the &quot;SSL Observatory&quot; tab of the HTTPS Everywhere preferences dialog.)">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wa/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wa/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wa/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wa/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wo/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/wo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/yo/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/yo/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/yo/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/yo/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh-CN/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh-CN/https-everywhere.dtd
index 9e6e072..cb9d724 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh-CN/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh-CN/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。">
 <!ENTITY https-everywhere.about.version "版本">
 <!ENTITY https-everywhere.about.created_by "创建者">
+<!ENTITY https-everywhere.about.and "，及">
 <!ENTITY https-everywhere.about.librarians "规则管理员">
 <!ENTITY https-everywhere.about.thanks "致谢">
+<!ENTITY https-everywhere.about.many_contributors "许多许多贡献者，包括">
+<!ENTITY https-everywhere.about.noscript "另外，HTTPS Everywhere 的部分源代码基于 NoScript，作者是 Giorgio Maone 等人。我们非常感谢他们出色的成果！">
 <!ENTITY https-everywhere.about.contribute  "如果喜欢 HTTPS Everywhere，您可以考虑">
 <!ENTITY https-everywhere.about.donate_tor "捐助 Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "zh_CN">
 <!ENTITY https-everywhere.about.or "或">
 <!ENTITY https-everywhere.about.donate_eff "捐助电子前线基金会 (EFF)">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "捐助电子前线基金会 (EFF)">
 <!ENTITY https-everywhere.menu.about "关于 HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory 首选项">
 <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "重置为默认值">
 <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码">
 
-<!ENTITY https-everywhere.source.downloading "正在下载">
-<!ENTITY https-everywhere.source.filename "文件名">
-<!ENTITY https-everywhere.source.unable_to_download "无法下载源代码。">
+<!ENTITY https-everywhere.chrome.stable_rules "稳定规则">
+<!ENTITY https-everywhere.chrome.stable_rules_description "强制对这些网站加密连接：">
+<!ENTITY https-everywhere.chrome.experimental_rules "实验规则">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "可能引发警告或异常。默认被禁用。">
+<!ENTITY https-everywhere.chrome.add_rule "为此站点添加规则">
+<!ENTITY https-everywhere.chrome.add_new_rule "为此站点添加新规则">
+<!ENTITY https-everywhere.chrome.always_https_for_host "对此主机始终使用 https">
+<!ENTITY https-everywhere.chrome.host "主角:">
+<!ENTITY https-everywhere.chrome.show_advanced "显示高级选项">
+<!ENTITY https-everywhere.chrome.hide_advanced "隐藏高级选项">
+<!ENTITY https-everywhere.chrome.rule_name "规则名称">
+<!ENTITY https-everywhere.chrome.regex "正则表达式匹配">
+<!ENTITY https-everywhere.chrome.redirect_to "重定向到">
+<!ENTITY https-everywhere.chrome.status_cancel_button "取消">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 通知">
-<!ENTITY https-everywhere.popup.paragraph1 "抱歉，你之前用的是 HTTPS Everywhere 稳定版，在上次发布时，我们可能不小心将你用的版本升级为开发版。">
-<!ENTITY https-everywhere.popup.paragraph2 "是否需要换为稳定版？">
-<!ENTITY https-everywhere.popup.paragraph3 "如果您愿意，我们非常欢迎您继续使用我们的开发版本，并以此帮助我们改善 HTTPS Everywhere！您也许会遇到更多的缺陷问题，您可以报告到 https-everywhere@eff.org。对此带来的不便我们深感抱歉，感谢您使用 HTTPS Everywhere。">
-<!ENTITY https-everywhere.popup.keep "我要继续使用开发版">
-<!ENTITY https-everywhere.popup.revert "下载最新稳定版">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere 规则集测试">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "取消">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "开始">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.dtd
index c24bf36..17e7334 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.dtd
@@ -1,50 +1,56 @@
-<!ENTITY https-everywhere.about.title "About HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
-<!ENTITY https-everywhere.about.version "Version">
-<!ENTITY https-everywhere.about.created_by "Created by">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
+<!ENTITY https-everywhere.about.title "關於 「到處HTTPS」">
+<!ENTITY https-everywhere.about.ext_name "「到處HTTPS」">
+<!ENTITY https-everywhere.about.ext_description "將互聯網加密! 自動在大部網站使用HTTPS連線。">
+<!ENTITY https-everywhere.about.version "版本">
+<!ENTITY https-everywhere.about.created_by "制作人：">
+<!ENTITY https-everywhere.about.and "，以及">
+<!ENTITY https-everywhere.about.librarians "規則管理員">
 <!ENTITY https-everywhere.about.thanks "多謝">
-<!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.many_contributors "許多貢獻者，包括">
+<!ENTITY https-everywhere.about.noscript "並且，到處HTTPS有部份的程式碼是 Giorgio Maone 和其他人從 NoScript 裡移植並修改而來的，我們非常地感謝他們如此傑出的貢獻！">
+<!ENTITY https-everywhere.about.contribute  "若你喜歡「到處HTTPS」，你可以考慮">
+<!ENTITY https-everywhere.about.donate_tor "捐款給Tor">
+<!ENTITY https-everywhere.about.tor_lang_code "英文">
+<!ENTITY https-everywhere.about.or "或">
+<!ENTITY https-everywhere.about.donate_eff "捐款給電子前哨基金會">
 
-<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.about "關於「到處HTTPS」">
+<!ENTITY https-everywhere.menu.observatory "SSL 觀測站設定">
 <!ENTITY https-everywhere.menu.globalEnable "啟用到處HTTPS">
 <!ENTITY https-everywhere.menu.globalDisable "停用到處HTTPS">
-<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests">
-<!ENTITY https-everywhere.menu.showCounter "Show Counter">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.blockHttpRequests "封鎖所有HTTP要求">
+<!ENTITY https-everywhere.menu.showCounter "顯示計數器">
+<!ENTITY https-everywhere.menu.viewAllRules "檢視所有規則">
 
-<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
+<!ENTITY https-everywhere.prefs.title "「到處HTTPS」 設定">
 <!ENTITY https-everywhere.prefs.enable_all "啟用所有">
 <!ENTITY https-everywhere.prefs.disable_all "停用所有">
 <!ENTITY https-everywhere.prefs.reset_defaults "恢復原本設定">
 <!ENTITY https-everywhere.prefs.search "尋找">
 <!ENTITY https-everywhere.prefs.site "網站">
 <!ENTITY https-everywhere.prefs.notes "筆記">
-<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?">
+<!ENTITY https-everywhere.prefs.list_caption "要套用哪些 HTTPS 重新導向規則？">
 <!ENTITY https-everywhere.prefs.enabled "已啟用">
-<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)">
+<!ENTITY https-everywhere.prefs.ruleset_howto "你可以學習自行編寫規則(以支援其他網站)">
 <!ENTITY https-everywhere.prefs.here_link "這裡">
-<!ENTITY https-everywhere.prefs.toggle "Toggle">
-<!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
-<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
+<!ENTITY https-everywhere.prefs.toggle "切換">
+<!ENTITY https-everywhere.prefs.reset_default "重設至預設值">
+<!ENTITY https-everywhere.prefs.view_xml_source "檢視XML原始碼">
 
-<!ENTITY https-everywhere.source.downloading "下載中">
-<!ENTITY https-everywhere.source.filename "檔案名稱">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "穩定規則">
+<!ENTITY https-everywhere.chrome.stable_rules_description "在以下網站強制使用加密連線：">
+<!ENTITY https-everywhere.chrome.experimental_rules "實驗性規則">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "可能會導致警告和錯誤，預設為關閉。">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "取消">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "下載最新穩定版本">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "取消">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "開始">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.properties
index 207faff..7cbdb85 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/https-everywhere.properties
@@ -2,7 +2,7 @@ https-everywhere.menu.globalEnable = 啟用到處HTTPS
 https-everywhere.menu.globalDisable = 停用到處HTTPS
 https-everywhere.menu.enableDisable = 啟用 / 停用規則
 https-everywhere.menu.noRules = (這頁沒有規則)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.unknownRules = (適用此網頁的規則不明)
+https-everywhere.toolbar.hint = 正在使用到處HTTPS。您可以在瀏覽不同網頁時按網址列中的圖示開關。
+https-everywhere.migration.notification0 = 為了修正重大問題，此更新將把您的到處HTTPS設定重設。
+https-everywhere.menu.ruleset-tests = 執行到處HTTPS規則集測試
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/ssl-observatory.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/ssl-observatory.dtd
index e01339b..52c2c1e 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/ssl-observatory.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_HK/ssl-observatory.dtd
@@ -86,7 +86,7 @@ looked at.  Mouseover the options for further details:">
 
 <!ENTITY ssl-observatory.prefs.show "Show advanced options">
 
-<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences">
+<!ENTITY ssl-observatory.prefs.title "SSL 觀測站設定">
 
 <!ENTITY ssl-observatory.prefs.use "Use the Observatory?">
 <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.dtd
index 227500a..8519574 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.dtd
@@ -1,23 +1,27 @@
 <!ENTITY https-everywhere.about.title "關於 HTTPS Everywhere">
 <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "加密整個網路！自動在眾多網站上自動啟用 HTTPS 安全連線。">
+<!ENTITY https-everywhere.about.ext_description "加密整個網路！自動在網站上使用 HTTPS 安全連線。">
 <!ENTITY https-everywhere.about.version "版本">
 <!ENTITY https-everywhere.about.created_by "建立於">
+<!ENTITY https-everywhere.about.and "，以及">
 <!ENTITY https-everywhere.about.librarians "規則集管理員">
 <!ENTITY https-everywhere.about.thanks "致謝">
+<!ENTITY https-everywhere.about.many_contributors "許許多多的貢獻者，包括了">
+<!ENTITY https-everywhere.about.noscript "並且，在 HTTPS Everyhere 中有部份的程式碼，是 Giorgio Maone 及其他人從 NoScript 裡移植並修改而來的，我們非常地感謝他們如此傑出的貢獻！">
 <!ENTITY https-everywhere.about.contribute  "若您喜歡 HTTPS Everywhere，您或許可以考慮">
-<!ENTITY https-everywhere.about.donate_tor "贊助 Tor">
+<!ENTITY https-everywhere.about.donate_tor "贊助洋蔥路由">
 <!ENTITY https-everywhere.about.tor_lang_code "zh-TW">
 <!ENTITY https-everywhere.about.or "或">
-<!ENTITY https-everywhere.about.donate_eff "贊助 EFF">
+<!ENTITY https-everywhere.about.donate_eff "贊助電子前哨基金會(EFF)">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "贊助電子前哨基金會(EFF)">
 <!ENTITY https-everywhere.menu.about "關於 HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL 觀測站偏好設定">
 <!ENTITY https-everywhere.menu.globalEnable "啟用 HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.globalDisable "停用 HTTPS Everywhere">
-<!ENTITY https-everywhere.menu.blockHttpRequests "阻擋所有　HTTP 請求">
+<!ENTITY https-everywhere.menu.blockHttpRequests "阻擋所有 HTTP 請求">
 <!ENTITY https-everywhere.menu.showCounter "顯示計數器">
-<!ENTITY https-everywhere.menu.viewAllRules "View All Rules">
+<!ENTITY https-everywhere.menu.viewAllRules "檢視所有規則">
 
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 偏好設定">
 <!ENTITY https-everywhere.prefs.enable_all "全部啟用">
@@ -26,25 +30,27 @@
 <!ENTITY https-everywhere.prefs.search "搜尋">
 <!ENTITY https-everywhere.prefs.site "網站">
 <!ENTITY https-everywhere.prefs.notes "備註">
-<!ENTITY https-everywhere.prefs.list_caption "要套用哪些 HTTPS 重新導向規則?">
+<!ENTITY https-everywhere.prefs.list_caption "要套用哪些 HTTPS 重新導向規則？">
 <!ENTITY https-everywhere.prefs.enabled "已啟用">
-<!ENTITY https-everywhere.prefs.ruleset_howto "您可以學習如何編寫您自己的規則集(以增加對其他網站的支援)">
+<!ENTITY https-everywhere.prefs.ruleset_howto "您可以學習如何建立您自己的規則集(以增加對其他網站的支援)">
 <!ENTITY https-everywhere.prefs.here_link "請看這裡">
 <!ENTITY https-everywhere.prefs.toggle "切換">
 <!ENTITY https-everywhere.prefs.reset_default "重設成預設值">
 <!ENTITY https-everywhere.prefs.view_xml_source "檢視 XML 原始碼">
 
-<!ENTITY https-everywhere.source.downloading "下載中">
-<!ENTITY https-everywhere.source.filename "檔案名稱">
-<!ENTITY https-everywhere.source.unable_to_download "無法下載原始碼">
+<!ENTITY https-everywhere.chrome.stable_rules "穩定版規則">
+<!ENTITY https-everywhere.chrome.stable_rules_description "與下列網站建立強制加密的連線：">
+<!ENTITY https-everywhere.chrome.experimental_rules "試驗版規則">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "可能會產生警告訊息或程式錯誤，預設值是關閉狀態。">
+<!ENTITY https-everywhere.chrome.add_rule "為該網站新增規則">
+<!ENTITY https-everywhere.chrome.add_new_rule "為該網站增添新規則">
+<!ENTITY https-everywhere.chrome.always_https_for_host "該主機皆使用https加密網址">
+<!ENTITY https-everywhere.chrome.host "主機:">
+<!ENTITY https-everywhere.chrome.show_advanced "顯示進階選項">
+<!ENTITY https-everywhere.chrome.hide_advanced "隱藏進階選項">
+<!ENTITY https-everywhere.chrome.rule_name "規則名稱">
+<!ENTITY https-everywhere.chrome.regex "比對正規表達方式">
+<!ENTITY https-everywhere.chrome.redirect_to "重新導向">
+<!ENTITY https-everywhere.chrome.status_cancel_button "取消">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 dev.11通知">
-<!ENTITY https-everywhere.popup.paragraph1 "糟糕。之前您一直使用 HTTPS Everywhere 的穩定版本，但是我們可能意外地將您升級成最新的開發中版本。">
-<!ENTITY https-everywhere.popup.paragraph2 "您想回復成穩定版本?">
-<!ENTITY https-everywhere.popup.paragraph3 "如果您繼續使用我們的開發中版本，將幫助我們使得 HTTPS Everywhere 變得更好!您可能會發現一些錯誤，您可以向 https-everywhere@eff.org 提交報告。很抱歉造成您的不便，並感謝您使用 HTTPS Everywhere。">
-<!ENTITY https-everywhere.popup.keep "持續使用開發中版本">
-<!ENTITY https-everywhere.popup.revert "下載最新的穩定版本">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere 規則集測試">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "取消">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "開始">
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.properties b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.properties
index dddfef8..dd98b97 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.properties
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zh_TW/https-everywhere.properties
@@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = 啟用 / 停用規則
 https-everywhere.menu.noRules = (沒有規則適用於此網頁)
 https-everywhere.menu.unknownRules = (適用此網頁的規則不明)
 https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。
-https-everywhere.migration.notification0 = 為了實現關鍵性的修正，此更新將您的 HTTPS Everywhere 規則偏好設定重設成其預設值。
+https-everywhere.migration.notification0 = 為了實現關鍵性的修正，此更新將您的 HTTPS Everywhere 規則偏好設定重設為預設值。
 https-everywhere.menu.ruleset-tests = 執行 HTTPS Everywhere 規則集測試
diff --git a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zu/https-everywhere.dtd b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zu/https-everywhere.dtd
index eac7ddf..2ac51cd 100644
--- a/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zu/https-everywhere.dtd
+++ b/data/extensions/https-everywhere-eff@eff.org/chrome/locale/zu/https-everywhere.dtd
@@ -3,14 +3,18 @@
 <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
 <!ENTITY https-everywhere.about.version "Version">
 <!ENTITY https-everywhere.about.created_by "Created by">
+<!ENTITY https-everywhere.about.and ", and">
 <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
 <!ENTITY https-everywhere.about.thanks "Thanks to">
+<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
+<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others.  We are grateful for their excellent work!">
 <!ENTITY https-everywhere.about.contribute  "If you like HTTPS Everywhere, you might consider">
 <!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
 <!ENTITY https-everywhere.about.tor_lang_code "en">
 <!ENTITY https-everywhere.about.or "or">
 <!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
 
+<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
 <!ENTITY https-everywhere.menu.about "About HTTPS Everywhere">
 <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences">
 <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere">
@@ -34,17 +38,19 @@
 <!ENTITY https-everywhere.prefs.reset_default "Reset to Default">
 <!ENTITY https-everywhere.prefs.view_xml_source "View XML Source">
 
-<!ENTITY https-everywhere.source.downloading "Downloading">
-<!ENTITY https-everywhere.source.filename "Filename">
-<!ENTITY https-everywhere.source.unable_to_download "Unable to download source.">
+<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
+<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
+<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules">
+<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">
+<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site">
+<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site">
+<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host">
+<!ENTITY https-everywhere.chrome.host "Host:">
+<!ENTITY https-everywhere.chrome.show_advanced "Show advanced">
+<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced">
+<!ENTITY https-everywhere.chrome.rule_name "Rule name">
+<!ENTITY https-everywhere.chrome.regex "Matching regex">
+<!ENTITY https-everywhere.chrome.redirect_to "Redirect to">
+<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel">
 
-<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
-<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
-<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
-<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
-<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
-<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
 
-<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests">
-<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel">
-<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">
-- 
cgit v1.2.3