Bug 1244795 - adding a string for the default container under cookie manager, r=paolo

browser/components/preferences/cookies.js

@@ -505,6 +505,14 @@ var gCookiesWindow = {
     return this._bundle.getString("expireAtEndOfSession");
   },
 
+  _getUserContextString: function(aUserContextId) {
+    if (parseInt(aItem.originAttributes.userContextId) == 0) {
+      return this._bundle.getString("noUserContextLabel");
+    }
+
+    return UserContextUI.getUserContextLabel(aUserContextId);
+  },
+
   _updateCookieData: function (aItem) {
     var seln = this._view.selection;
     var ids = ["name", "value", "host", "path", "isSecure", "expires", "userContext"];
@@ -517,7 +525,7 @@ var gCookiesWindow = {
                                               : this._bundle.getString("hostColon"),
                      isSecure: aItem.isSecure ? this._bundle.getString("forSecureOnly")
                                               : this._bundle.getString("forAnyConnection"),
-                     userContext: UserContextUI.getUserContextLabel(aItem.originAttributes.userContextId) };
+                     userContext: this._getUserContextString(aItem.originAttributes.userContextId) };
       for (var i = 0; i < ids.length; ++i) {
         document.getElementById(ids[i]).disabled = false;
       }

browser/locales/en-US/chrome/browser/browser.properties

@@ -745,7 +745,7 @@ e10s.accessibilityNotice.enableAndRestart.accesskey = E
 #                    usercontext.work.label,
 #                    usercontext.shopping.label,
 #                    usercontext.banking.label):
-# These strings specify the four default contexts included in support of the
+# These strings specify the four predefined contexts included in support of the
 # Contextual Identity / Containers project. Each context is meant to represent
 # the context that the user is in when interacting with the site. Different
 # contexts will store cookies and other information from those sites in

browser/locales/en-US/chrome/browser/preferences/preferences.properties

@@ -129,6 +129,7 @@ cookiesFiltered=The following cookies match your search:
 # For example this is the English string with numbers:   
 # removeSelectedCookied=Remove #1 Selected;Remove #1 Selected
 removeSelectedCookies=Remove Selected;Remove Selected
+noUserContextLabel=None
 
 #### Offline apps
 offlineAppsList.height=7em