From 28ac4722cc50fad0a9ae7200b91dbdaa837fec7d Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Tue, 7 Apr 2015 09:52:21 -0700
Subject: [PATCH 1/3] Disable some rules.

Fixes https://github.com/EFForg/https-everywhere/issues/1361
Fixes https://github.com/EFForg/https-everywhere/issues/1377
Fixes https://github.com/EFForg/https-everywhere/issues/1376
Fixes https://github.com/EFForg/https-everywhere/issues/1362
Fixes https://github.com/EFForg/https-everywhere/pull/1371
---
 src/chrome/content/rules/First_Amendment_Center.org.xml | 5 +++--
 src/chrome/content/rules/How_To_Geek.com.xml            | 3 +++
 src/chrome/content/rules/Ikea.com.xml                   | 3 ++-
 src/chrome/content/rules/Speedtest.net.xml              | 3 ++-
 src/chrome/content/rules/Start.me.xml                   | 3 ++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/First_Amendment_Center.org.xml b/src/chrome/content/rules/First_Amendment_Center.org.xml
index 8fde769351d5..f1537a43251b 100644
--- a/src/chrome/content/rules/First_Amendment_Center.org.xml
+++ b/src/chrome/content/rules/First_Amendment_Center.org.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1376
 	For problematic rules, see First_Amendment_Center.org-problematic.xml.
 
 
@@ -13,7 +14,7 @@
 	^firstamendmentcenter.org does not exist.
 
 -->
-<ruleset name="First Amendment Center.org (partial)">
+<ruleset name="First Amendment Center.org (partial)" default_off="Breaks site">
 
 	<target host="*.firstamendmentcenter.org" />
 		<!--
@@ -28,4 +29,4 @@
 	<rule from="^http://www\.firstamendmentcenter\.org/"
 		to="https://s111617.gridserver.com/" />
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/src/chrome/content/rules/How_To_Geek.com.xml b/src/chrome/content/rules/How_To_Geek.com.xml
index 2b943b3fc6e4..89641185143d 100644
--- a/src/chrome/content/rules/How_To_Geek.com.xml
+++ b/src/chrome/content/rules/How_To_Geek.com.xml
@@ -1,4 +1,7 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/pull/1371
+	Please don't re-enable until hearing from the site maintainer.
+
 	Nonfunctional subdomains:
 
 		- dicuss *
diff --git a/src/chrome/content/rules/Ikea.com.xml b/src/chrome/content/rules/Ikea.com.xml
index f4d43e517394..7062ce29e1c1 100644
--- a/src/chrome/content/rules/Ikea.com.xml
+++ b/src/chrome/content/rules/Ikea.com.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1377
 	- ikea.com.122.2o7.net
 
 		- metrics
@@ -16,7 +17,7 @@
 		- smetrics
 
 -->
-<ruleset name="Ikea.com (partial)">
+<ruleset name="Ikea.com (partial)" default_off="Breaks site">
 
 	<target host="ikea.com" />
 	<target host="*.ikea.com" />
diff --git a/src/chrome/content/rules/Speedtest.net.xml b/src/chrome/content/rules/Speedtest.net.xml
index 8b81ac534431..ee7f0508d66f 100644
--- a/src/chrome/content/rules/Speedtest.net.xml
+++ b/src/chrome/content/rules/Speedtest.net.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1362
 	For other Ookla coverage, see Ookla.xml.
 
 
@@ -7,7 +8,7 @@
 		- Ad/bug on www from ads.ookla.com
 
 -->
-<ruleset name="Speedtest.net (partial)">
+<ruleset name="Speedtest.net (partial)" default_off="Breaks site">
 
 	<target host="speedtest.net" />
 	<target host="c.speedtest.net" />
diff --git a/src/chrome/content/rules/Start.me.xml b/src/chrome/content/rules/Start.me.xml
index 1308b95947eb..64fc74fc9183 100644
--- a/src/chrome/content/rules/Start.me.xml
+++ b/src/chrome/content/rules/Start.me.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1361
 	For problematic rules, see Start.me-problematic.xml.
 
 
@@ -52,7 +53,7 @@
 	* Secured by us
 
 -->
-<ruleset name="Start.me (partial)">
+<ruleset name="Start.me (partial)" default_off="Breaks icons">
 
 	<target host="assets.start.me" />
 	<target host="assets.blog.start.me" />

From 71e0ef81e5e2e3f540eb178adf885e725ac547e0 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Tue, 7 Apr 2015 10:46:15 -0700
Subject: [PATCH 2/3] Rename "HTTP Nowhere" to "Block all HTTP requests."

Fixes https://github.com/EFForg/https-everywhere/issues/1348
---
 chromium/_locales/de/messages.json | 3 +++
 chromium/_locales/en/messages.json | 3 +++
 chromium/_locales/es/messages.json | 3 +++
 chromium/_locales/fi/messages.json | 3 +++
 chromium/_locales/sv/messages.json | 3 +++
 chromium/popup.html                | 3 ++-
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/chromium/_locales/de/messages.json b/chromium/_locales/de/messages.json
index 9db3c1992034..40b7e7aa817f 100644
--- a/chromium/_locales/de/messages.json
+++ b/chromium/_locales/de/messages.json
@@ -1,4 +1,7 @@
 {
+    "menu_blockHttpRequests": {
+        "message": "Block all HTTP requests"
+    },
     "about_title": {
         "message": "Über HTTPS Everywhere"
     },
diff --git a/chromium/_locales/en/messages.json b/chromium/_locales/en/messages.json
index d6ce17065f45..8d01a04faeef 100644
--- a/chromium/_locales/en/messages.json
+++ b/chromium/_locales/en/messages.json
@@ -1,4 +1,7 @@
 {
+    "menu_blockHttpRequests": {
+        "message": "Block all HTTP requests"
+    },
     "about_title": {
         "message": "About HTTPS Everywhere"
     },
diff --git a/chromium/_locales/es/messages.json b/chromium/_locales/es/messages.json
index a897a7951ea5..4dbbc0dcf275 100644
--- a/chromium/_locales/es/messages.json
+++ b/chromium/_locales/es/messages.json
@@ -1,4 +1,7 @@
 {
+    "menu_blockHttpRequests": {
+        "message": "Block all HTTP requests"
+    },
     "about_title": {
         "message": "Acerca de HTTPS Everywhere"
     },
diff --git a/chromium/_locales/fi/messages.json b/chromium/_locales/fi/messages.json
index e391014f65f4..9be9aeb128ca 100644
--- a/chromium/_locales/fi/messages.json
+++ b/chromium/_locales/fi/messages.json
@@ -1,4 +1,7 @@
 {
+    "menu_blockHttpRequests": {
+        "message": "Block all HTTP requests"
+    },
     "about_ext_name": {
         "message": "HTTPS Everywhere"
     },
diff --git a/chromium/_locales/sv/messages.json b/chromium/_locales/sv/messages.json
index 67451106e66b..b9c845fb4d12 100644
--- a/chromium/_locales/sv/messages.json
+++ b/chromium/_locales/sv/messages.json
@@ -1,4 +1,7 @@
 {
+    "menu_blockHttpRequests": {
+        "message": "Block all HTTP requests"
+    },
     "about_title": {
         "message": "Om HTTPS Everywhere"
     },
diff --git a/chromium/popup.html b/chromium/popup.html
index 6a08f69890bb..c5e43b98f58a 100755
--- a/chromium/popup.html
+++ b/chromium/popup.html
@@ -15,7 +15,8 @@ <h1 i18n="about_ext_name"></h1>
 </header>
 <section id="HttpNowhere" class="options">
   <input id="http-nowhere-checkbox" type="checkbox" value="httpNowhere"/>
-  <label for="http-nowhere-checkbox">Turn on HTTP Nowhere</label>
+  <label i18n="menu_blockHttpRequests" for="http-nowhere-checkbox"
+    >Block all HTTP requests</label>
 </section>
 <section>
   <a href="#" id="add-rule-link">Add a rule for this site</a>

From 5203d3b72336c99d2ebc61711593aea0e2ecfae8 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Tue, 7 Apr 2015 11:04:57 -0700
Subject: [PATCH 3/3] Disable Bing.net

Fixes https://github.com/EFForg/https-everywhere/issues/1344
---
 src/chrome/content/rules/Bing.net.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Bing.net.xml b/src/chrome/content/rules/Bing.net.xml
index b6eaac460ea0..54767f147590 100644
--- a/src/chrome/content/rules/Bing.net.xml
+++ b/src/chrome/content/rules/Bing.net.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1344
 	For other Microsoft coverage, see Microsoft.xml.
 
 
@@ -15,7 +16,7 @@
 		- *.mm.bing.net
 
 -->
-<ruleset name="Bing.net">
+<ruleset name="Bing.net" default_off="Breaks startpage image search">
 
 	<target host="*.api.bing.net" />
 	<target host="*.mm.bing.net" />