Revert "Issue #756 - Remove Contextual Identity from Basilisk"

This reverts commit ac50c95756.

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

@@ -638,6 +638,37 @@ e10s.accessibilityNotice.acceptButton.accesskey = O
 e10s.accessibilityNotice.enableAndRestart.label = Enable (Requires Restart)
 e10s.accessibilityNotice.enableAndRestart.accesskey = E
 
+# LOCALIZATION NOTE (userContextPersonal.label,
+#                    userContextWork.label,
+#                    userContextShopping.label,
+#                    userContextBanking.label,
+#                    userContextNone.label):
+# 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
+# different, isolated locations. You can enable the feature by typing
+# about:config in the URL bar and changing privacy.userContext.enabled to true.
+# Once enabled, you can open a new tab in a specific context by clicking
+# File > New Container Tab > (1 of 4 contexts). Once opened, you will see these
+# strings on the right-hand side of the URL bar.
+userContextPersonal.label = Personal
+userContextWork.label = Work
+userContextBanking.label = Banking
+userContextShopping.label = Shopping
+userContextNone.label = No Container
+
+userContextPersonal.accesskey = P
+userContextWork.accesskey = W
+userContextBanking.accesskey = B
+userContextShopping.accesskey = S
+userContextNone.accesskey = N
+
+userContext.aboutPage.label = Manage containers
+userContext.aboutPage.accesskey = O
+
+userContextOpenLink.label = Open Link in New %S Tab
+
 muteTab.label = Mute Tab
 muteTab.accesskey = M
 unmuteTab.label = Unmute Tab

application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd

@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY label.label          "Name">
+<!ENTITY addButton.label      "Add New Container">
+<!ENTITY addButton.accesskey  "A">
+<!-- &#171; is &laquo; however it's not defined in XML -->
+<!ENTITY backLink.label       "&#171; Go Back to Privacy">
+
+<!ENTITY window.title         "Add New Container">
+<!ENTITY window.width         "45em">
+
+<!ENTITY name.label           "Name:">
+<!ENTITY name.accesskey       "N">
+<!ENTITY icon.label           "Icon:">
+<!ENTITY icon.accesskey       "I">
+<!ENTITY color.label          "Color:">
+<!ENTITY color.accesskey      "o">
+<!ENTITY windowClose.key      "w">
+
+<!ENTITY button.ok.label      "Done">
+<!ENTITY button.ok.accesskey  "D">
+

application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties

@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+containers.removeButton = Remove
+containers.preferencesButton = Preferences
+containers.colorHeading = Color:
+containers.labelMinWidth = 4rem
+containers.nameLabel = Name:
+containers.namePlaceholder = Enter a container name
+containers.submitButton = Done
+containers.iconHeading = Icon:
+containers.updateContainerTitle = %S Container Preferences
+
+containers.blue.label = Blue
+containers.turquoise.label = Turquoise
+containers.green.label = Green
+containers.yellow.label = Yellow
+containers.orange.label = Orange
+containers.red.label = Red
+containers.pink.label = Pink
+containers.purple.label = Purple
+
+containers.fingerprint.label = Fingerprint
+containers.briefcase.label = Briefcase
+# LOCALIZATION NOTE (containers.dollar.label)
+# String represents a money sign but currently uses a dollar sign so don't change to local currency
+# See Bug 1291672
+containers.dollar.label = Dollar sign
+containers.cart.label = Shopping cart
+containers.circle.label = Dot

application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd

@@ -14,6 +14,7 @@
 <!ENTITY     props.path.label               "Path:">
 <!ENTITY     props.secure.label             "Send For:">
 <!ENTITY     props.expires.label            "Expires:">
+<!ENTITY     props.container.label          "Container:">
 
 <!ENTITY     window.title                   "Cookies">
 <!ENTITY     windowClose.key                "w">

application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd

@@ -18,6 +18,7 @@
 <!ENTITY  paneContent.title       "Content">
 <!ENTITY  paneApplications.title  "Applications">
 <!ENTITY  panePrivacy.title       "Privacy">
+<!ENTITY  paneContainers.title    "Container Tabs">
 <!ENTITY  paneSecurity.title      "Security">
 <!ENTITY  paneAdvanced.title      "Advanced">
 

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

@@ -191,3 +191,17 @@ revertNoRestartButton=Revert
 
 restartNow=Restart Now
 restartLater=Restart Later
+
+disableContainersAlertTitle=Close All Container Tabs?
+
+# LOCALIZATION NOTE (disableContainersMsg): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #S is the number of container tabs
+disableContainersMsg=If you disable Container Tabs now, #S container tab will be closed. Are you sure you want to disable Container Tabs?;If you disable Container Tabs now, #S container tabs will be closed. Are you sure you want to disable Container Tabs?
+
+# LOCALIZATION NOTE (disableContainersOkButton): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #S is the number of container tabs
+disableContainersOkButton=Close #S Container Tab;Close #S Container Tabs
+
+disableContainersButton2=Keep enabled

application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd

@@ -110,3 +110,10 @@
 
 <!ENTITY  clearOnCloseSettings.label     "Settings…">
 <!ENTITY  clearOnCloseSettings.accesskey "t">
+
+<!ENTITY  browserContainersHeader.label         "Container Tabs">
+<!ENTITY  browserContainersLearnMore.label      "Learn more">
+<!ENTITY  browserContainersEnabled.label        "Enable Container Tabs">
+<!ENTITY  browserContainersEnabled.accesskey    "n">
+<!ENTITY  browserContainersSettings.label        "Settings…">
+<!ENTITY  browserContainersSettings.accesskey    "i">

application/basilisk/locales/jar.mn

@@ -79,8 +79,10 @@
     locale/browser/preferences/permissions.dtd        (%chrome/browser/preferences/permissions.dtd)
     locale/browser/preferences/preferences.dtd        (%chrome/browser/preferences/preferences.dtd)
     locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
+    locale/browser/preferences/containers.properties  (%chrome/browser/preferences/containers.properties)
 *   locale/browser/preferences/privacy.dtd            (%chrome/browser/preferences/privacy.dtd)
     locale/browser/preferences/security.dtd           (%chrome/browser/preferences/security.dtd)
+    locale/browser/preferences/containers.dtd         (%chrome/browser/preferences/containers.dtd)
     locale/browser/preferences/sync.dtd               (%chrome/browser/preferences/sync.dtd)
     locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
     locale/browser/preferences/search.dtd             (%chrome/browser/preferences/search.dtd)