diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index ee4e2d4d6fc6..87a5a051ce9a 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ef1afd9c3076..6e9882adfea4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2b228d9b0b11..e9cdb31a523b 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index a99d454cb6ec..75dc19a56000 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ef1afd9c3076..6e9882adfea4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 238b5d4a0967..3195a52ceb1a 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index e7f0d81da10f..ab1b36b8ba0b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e4ff2f252f0c..b902b3fa895d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
- "revision": "c9aa3de647fdab439fe4cbfffdca6cfb4c91c331",
+ "revision": "f434a7b8fede62f8849f68e71f52b8f1de912aae",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index a6bcb5b4d8fa..6400d4b80ef8 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 80a108a7b9dc..5b77f7b44904 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 6ed4ef397afe..504fddf93082 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d1d754067c25..6d38d5a5167c 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 2956a2f49cd7..eb233e838262 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
-
+
@@ -120,6 +120,12 @@
+
+
+
+
+
+
diff --git a/browser/components/preferences/cookies.js b/browser/components/preferences/cookies.js
index 69ef93c9c4a7..26654707380f 100644
--- a/browser/components/preferences/cookies.js
+++ b/browser/components/preferences/cookies.js
@@ -5,6 +5,8 @@
const nsICookie = Components.interfaces.nsICookie;
+Components.utils.import("resource://gre/modules/PluralForm.jsm");
+
var gCookiesWindow = {
_cm : Components.classes["@mozilla.org/cookiemanager;1"]
.getService(Components.interfaces.nsICookieManager),
@@ -551,12 +553,11 @@ var gCookiesWindow = {
if (item && seln.count == 1 && item.container && item.open)
selectedCookieCount += 2;
- var removeCookie = document.getElementById("removeCookie");
- var removeCookies = document.getElementById("removeCookies");
- removeCookie.parentNode.selectedPanel =
- selectedCookieCount == 1 ? removeCookie : removeCookies;
+ let buttonLabel = this._bundle.getString("removeSelectedCookies");
+ let removeSelectedCookies = document.getElementById("removeSelectedCookies");
+ removeSelectedCookies.label = PluralForm.get(selectedCookieCount, buttonLabel);
- removeCookie.disabled = removeCookies.disabled = !(seln.count > 0);
+ removeSelectedCookies.disabled = !(seln.count > 0);
},
performDeletion: function gCookiesWindow_performDeletion(deleteItems) {
diff --git a/browser/components/preferences/cookies.xul b/browser/components/preferences/cookies.xul
index bfde43f64fab..8cba71329981 100644
--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -92,16 +92,11 @@
-
-
-
-
+
#ifndef XP_MACOSX
diff --git a/browser/components/preferences/tests/browser_bug705422.js b/browser/components/preferences/tests/browser_bug705422.js
index 955456c29c0f..b62370c2de9e 100644
--- a/browser/components/preferences/tests/browser_bug705422.js
+++ b/browser/components/preferences/tests/browser_bug705422.js
@@ -81,7 +81,7 @@ function runTest(win, searchTerm, cookies, matches) {
// select first cookie and delete
var tree = win.document.getElementById("cookiesList");
- var deleteButton = win.document.getElementById("removeCookie");
+ var deleteButton = win.document.getElementById("removeSelectedCookies");
var rect = tree.treeBoxObject.getCoordsForCellItem(0, tree.columns[0], "cell");
EventUtils.synthesizeMouse(tree.body, rect.x + rect.width / 2, rect.y + rect.height / 2, {}, win);
EventUtils.synthesizeMouseAtCenter(deleteButton, {}, win);
@@ -91,7 +91,6 @@ function runTest(win, searchTerm, cookies, matches) {
// select two adjacent cells and delete
EventUtils.synthesizeMouse(tree.body, rect.x + rect.width / 2, rect.y + rect.height / 2, {}, win);
- deleteButton = win.document.getElementById("removeCookies");
var eventObj = {};
if (navigator.platform.indexOf("Mac") >= 0)
eventObj.metaKey = true;
diff --git a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
index 06f57c435ba6..033de3e2f254 100644
--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
@@ -7,11 +7,9 @@
-
-
-
-
-
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.properties b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
index 619e015e041a..edef771191ec 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -92,6 +92,10 @@ cannot=Block
noCookieSelected=
cookiesAll=The following cookies are stored on your computer:
cookiesFiltered=The following cookies match your search:
+# LOCALIZATION NOTE (removeSelectedCookies):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+removeSelectedCookies=Remove Selected;Remove Selected
#### Offline apps
offlineAppsList.height=7em
diff --git a/security/manager/boot/src/StaticHPKPins.h b/security/manager/boot/src/StaticHPKPins.h
index 337f50b0ebe8..27ba13fa5a76 100644
--- a/security/manager/boot/src/StaticHPKPins.h
+++ b/security/manager/boot/src/StaticHPKPins.h
@@ -1139,4 +1139,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1427541145717000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1428145844390000);
diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors
index 3031fcb0723a..dd8e0ccf0ded 100644
--- a/security/manager/boot/src/nsSTSPreloadList.errors
+++ b/security/manager/boot/src/nsSTSPreloadList.errors
@@ -67,7 +67,6 @@ cybershambles.com: could not connect to host
daylightcompany.com: did not receive HSTS header
de.search.yahoo.com: did not receive HSTS header
decibelios.li: did not receive HSTS header
-destinationbijoux.fr: did not receive HSTS header
developers.facebook.com: did not receive HSTS header
digitaldaddy.net: could not connect to host
discovery.lookout.com: did not receive HSTS header
@@ -86,10 +85,10 @@ email.lookout.com: could not connect to host
en-maktoob.search.yahoo.com: did not receive HSTS header
encrypted.google.com: did not receive HSTS header (error ignored - included regardless)
epoxate.com: did not receive HSTS header
+errors.zenpayroll.com: could not connect to host
es.search.yahoo.com: did not receive HSTS header
espanol.search.yahoo.com: did not receive HSTS header
espra.com: could not connect to host
-ethitter.com: did not receive HSTS header
etsysecure.com: could not connect to host
facebook.com: did not receive HSTS header
fatzebra.com.au: did not receive HSTS header
@@ -115,7 +114,6 @@ googleplex.com: could not connect to host (error ignored - included regardless)
goto.google.com: did not receive HSTS header (error ignored - included regardless)
gparent.org: did not receive HSTS header
gr.search.yahoo.com: did not receive HSTS header
-grandmascookieblog.com: did not receive HSTS header
greplin.com: could not connect to host
groups.google.com: did not receive HSTS header (error ignored - included regardless)
hackerone-user-content.com: could not connect to host
@@ -135,13 +133,14 @@ id.search.yahoo.com: did not receive HSTS header
ie.search.yahoo.com: did not receive HSTS header
ilmconpm.de: did not receive HSTS header
in.search.yahoo.com: did not receive HSTS header
-inertianetworks.com: could not connect to host
+inertianetworks.com: did not receive HSTS header
intercom.io: did not receive HSTS header
iop.intuit.com: max-age too low: 86400
irccloud.com: did not receive HSTS header
it.search.yahoo.com: did not receive HSTS header
itriskltd.com: did not receive HSTS header
jottit.com: could not connect to host
+keycdn.com: could not connect to host
keymaster.lookout.com: did not receive HSTS header
kitsta.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
kiwiirc.com: max-age too low: 5256000
@@ -169,6 +168,7 @@ m.gparent.org: could not connect to host
mail.google.com: did not receive HSTS header (error ignored - included regardless)
maktoob.search.yahoo.com: did not receive HSTS header
malaysia.search.yahoo.com: did not receive HSTS header
+manage.zenpayroll.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
market.android.com: did not receive HSTS header (error ignored - included regardless)
mbasic.facebook.com: did not receive HSTS header
megashur.se: did not receive HSTS header
@@ -180,6 +180,7 @@ mobilethreat.net: could not connect to host
mobilethreatnetwork.net: could not connect to host
mocloud.eu: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
movelaria.com.br: did not receive HSTS header
+mqas.net: could not connect to host
mt.search.yahoo.com: did not receive HSTS header
mtouch.facebook.com: did not receive HSTS header
mu.search.yahoo.com: did not receive HSTS header
@@ -190,6 +191,7 @@ my.alfresco.com: did not receive HSTS header
mydigipass.com: did not receive HSTS header
mykolab.com: did not receive HSTS header
mykreuzfahrt.de: did not receive HSTS header
+myplaceonline.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
neftaly.com: could not connect to host
neonisi.com: could not connect to host
netzpolitik.org: did not receive HSTS header
@@ -294,7 +296,6 @@ uprotect.it: could not connect to host
uy.search.yahoo.com: did not receive HSTS header
uz.search.yahoo.com: did not receive HSTS header
ve.search.yahoo.com: did not receive HSTS header
-viennan.net: did not receive HSTS header
vn.search.yahoo.com: did not receive HSTS header
wallet.google.com: did not receive HSTS header (error ignored - included regardless)
webmail.mayfirst.org: did not receive HSTS header
@@ -303,7 +304,6 @@ wieninternational.at: could not connect to host
wikidsystems.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
wiz.biz: did not receive HSTS header
wohnungsbau-ludwigsburg.de: did not receive HSTS header
-www.airbnb.com: did not receive HSTS header
www.apollo-auto.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
www.calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134" data: no]
www.cueup.com: could not connect to host
diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc
index 38ff58bc3f1a..7741639f1c2f 100644
--- a/security/manager/boot/src/nsSTSPreloadList.inc
+++ b/security/manager/boot/src/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
/*****************************************************************************/
#include
-const PRTime gPreloadListExpirationTime = INT64_C(1429960340886000);
+const PRTime gPreloadListExpirationTime = INT64_C(1430565041240000);
class nsSTSPreload
{
@@ -216,6 +216,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "depechemode-live.com", true },
{ "derevtsov.com", false },
{ "derhil.de", true },
+ { "destinationbijoux.fr", true },
{ "detectify.com", false },
{ "developer.mydigipass.com", false },
{ "devh.de", true },
@@ -257,6 +258,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "esec.rs", true },
{ "espra.com", true },
{ "ethack.org", true },
+ { "ethitter.com", true },
{ "eurotramp.com", true },
{ "everhome.de", true },
{ "evstatus.com", true },
@@ -318,6 +320,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "googleplex.com", true },
{ "goto.google.com", true },
{ "gplintegratedit.com", true },
+ { "grandmascookieblog.com", false },
{ "grc.com", false },
{ "greensolid.biz", true },
{ "grepular.com", true },
@@ -819,7 +822,8 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "vaddder.com", true },
{ "vhost.co.id", true },
{ "viasinc.com", false },
- { "visionless.me", true },
+ { "viennan.net", true },
+ { "visionless.me", false },
{ "vmoagents.com", false },
{ "vocaloid.my", true },
{ "vortexhobbies.com", true },
@@ -869,6 +873,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "wubthecaptain.eu", true },
{ "wunderlist.com", true },
{ "www.aclu.org", false },
+ { "www.airbnb.com", true },
{ "www.apollo-auto.com", true },
{ "www.banking.co.at", false },
{ "www.braintreepayments.com", false },