diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/de_DE.csv
+++ b/app/code/Magento/Backend/i18n/de_DE.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/es_ES.csv
+++ b/app/code/Magento/Backend/i18n/es_ES.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/fr_FR.csv
+++ b/app/code/Magento/Backend/i18n/fr_FR.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/nl_NL.csv
+++ b/app/code/Magento/Backend/i18n/nl_NL.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/pt_BR.csv
+++ b/app/code/Magento/Backend/i18n/pt_BR.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Backend/i18n/zh_Hans_CN.csv b/app/code/Magento/Backend/i18n/zh_Hans_CN.csv
index 8bd82b41c2050a73b6cefcad5a4a53a280627769..7c6b4dab5992d69ca9214ebabc18c6b9e4e6eca3 100644
--- a/app/code/Magento/Backend/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Backend/i18n/zh_Hans_CN.csv
@@ -606,3 +606,11 @@ Tags,Tags
 Options,Options
 "Magento Admin","Magento Admin"
 "Community Edition","Community Edition"
+Marketing,Marketing
+Communications,Communications
+"SEO & Search","SEO & Search"
+"User Content","User Content"
+"Data Transfer","Data Transfer"
+"Import History","Import History"
+Extensions,Extensions
+"Web Setup Wizard","Web Setup Wizard"
diff --git a/app/code/Magento/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv
index 835c5a2fa1b3305b8fc0e01ebf16d18ae6fbd9e6..13f728de1c48bf5b7d2129e11186f94fcb71780a 100644
--- a/app/code/Magento/Catalog/i18n/de_DE.csv
+++ b/app/code/Magento/Catalog/i18n/de_DE.csv
@@ -161,6 +161,8 @@ Empty,Leer
 "Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen"
 "Add New Set","Neuen Satz hinzufügen"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Fenster Schließen"
 "New Product","Neues Produkt"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Kategorien
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index e6583169c3b1a16c97bf0eca7337860fe333ffc2..87bcbd26408da6c7cf300b6a6af1bbe718158aad 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -161,6 +161,8 @@ Empty,Empty
 "Add New Attribute Set","Add New Attribute Set"
 "Add New Set","Add New Set"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Close Window"
 "New Product","New Product"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categories
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/es_ES.csv b/app/code/Magento/Catalog/i18n/es_ES.csv
index 2c45038e94f15121b8bad82417b80686d512e8b0..b80323c57f1d54b730d2396e535efec64cef92b2 100644
--- a/app/code/Magento/Catalog/i18n/es_ES.csv
+++ b/app/code/Magento/Catalog/i18n/es_ES.csv
@@ -161,6 +161,8 @@ Empty,Vacío(a)
 "Add New Attribute Set","Agregar nuevo conjunto de atributos"
 "Add New Set","Agregar nuevo conjunto"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Cerrar Ventana"
 "New Product","Nuevo producto"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categorías
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/fr_FR.csv b/app/code/Magento/Catalog/i18n/fr_FR.csv
index 37740e1e7db80830df449d9616672fcba40c8ca2..1ea1cd2d717d2d0c1a0c0362bb912878ef85fc33 100644
--- a/app/code/Magento/Catalog/i18n/fr_FR.csv
+++ b/app/code/Magento/Catalog/i18n/fr_FR.csv
@@ -161,6 +161,8 @@ Empty,Vide
 "Add New Attribute Set","Ajouter un nouveau jeu d'attributs"
 "Add New Set","Ajouter une nouvelle série"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Fermer la fenêtre"
 "New Product","Nouveau produit"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,catégories
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/nl_NL.csv b/app/code/Magento/Catalog/i18n/nl_NL.csv
index 650ef8463833457672dacf24b1c669ff075b7cf7..5b99980e6ecae088a5ded2b78d6adca58bb4f413 100644
--- a/app/code/Magento/Catalog/i18n/nl_NL.csv
+++ b/app/code/Magento/Catalog/i18n/nl_NL.csv
@@ -161,6 +161,8 @@ Empty,Leeg
 "Add New Attribute Set","Voeg Nieuwe Attribuut Set toe"
 "Add New Set","Voeg Nieuwe Reeks Toe"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Venster Sluiten"
 "New Product","Nieuw Product"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categoriën
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/pt_BR.csv b/app/code/Magento/Catalog/i18n/pt_BR.csv
index d2c337913df3a40bf24326c1a74b11fc5b634ca0..f539953fb7554f505e900850da9d5a9c0bc3543b 100644
--- a/app/code/Magento/Catalog/i18n/pt_BR.csv
+++ b/app/code/Magento/Catalog/i18n/pt_BR.csv
@@ -161,6 +161,8 @@ Empty,Vazio
 "Add New Attribute Set","Adicionar Novo Conjunto de Atributos"
 "Add New Set","Adicionar Novo Conjunto"
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window","Fechar Janela"
 "New Product","Novo Produto"
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categorias
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos."
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv
index ed8938feb0f02af531fbbdf9916ff33521d5c849..5180add5db942ca46a9d3159b7c7858e4625ecd7 100644
--- a/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Catalog/i18n/zh_Hans_CN.csv
@@ -161,6 +161,8 @@ Empty,空
 "Add New Attribute Set",添加新属性集
 "Add New Set",添加新集
 "Attribute Sets","Attribute Sets"
+"Product Templates","Product Templates"
+"Product Template","Product Template"
 "Close Window",关闭窗口
 "New Product",新产品
 "Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,分类
 "You saved the attribute set.","You saved the attribute set."
 "An error occurred while saving the attribute set.",保存属性集时发生错误。
 "New Attribute Set","New Attribute Set"
+"New Product Template","New Product Template"
 "The attribute set has been removed.","The attribute set has been removed."
 "An error occurred while deleting this set.","An error occurred while deleting this set."
 "Search Terms","Search Terms"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html
index e4ac4affabb341b664f3e868b6d298989fbf416b..751e4eaaa51425b29f2c8dce5478da8b7541fb2d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html
@@ -6,7 +6,7 @@
 -->
 <tr class="grand totals">
     <th class="mark" colspan="1" scope="row">
-        <strong data-bind="text: $t(title)"></strong>
+        <strong data-bind="text: title"></strong>
     </th>
     <td class="amount" data-th="Order Total">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html
index 17c41206ab4e65e210343ce60b15c53e041f7073..7cf6d85f66884f5e2f0565287fe7f20689ff923a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html
@@ -6,7 +6,7 @@
 -->
 <!-- ko if: isCalculated() -->
 <tr class="totals shipping excl">
-    <th class="mark" colspan="1" scope="row" data-bind="text: $t(title) + ' (' + $t(getShippingMethodTitle()) + ')'"></th>
+    <th class="mark" colspan="1" scope="row" data-bind="text: title + ' (' + getShippingMethodTitle() + ')'"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValue()"></span>
     </td>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html
index b5b7e2ecf683a8342a869bfcebded09457a60d20..be761940327f8e43fe3c1c46a8db537d013bc2cb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html
@@ -5,7 +5,7 @@
  */
 -->
 <tr class="totals sub">
-    <th class="mark" colspan="1" scope="row" data-bind="text: $t(title)"></th>
+    <th class="mark" colspan="1" scope="row" data-bind="text: title"></th>
     <td class="amount" data-th="Subtotal">
         <span class="price" data-bind="text: getValue()"></span>
     </td>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
index 36009ab7b4634ab66da8c232712b33c6aa052fd1..f8b396939cef704fceedbda2413f5b3dd848614e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
@@ -7,7 +7,7 @@
 <div class="opc-estimated-wrapper" data-bind="blockLoader: isLoading">
     <div class="estimated-block">
         <span class="estimated-label" data-bind="i18n: 'Estimated Total'"></span>
-        <span class="estimated-price" data-bind="i18n: getValue()"></span>
+        <span class="estimated-price" data-bind="text: getValue()"></span>
     </div>
     <div class="minicart-wrapper">
         <button type="button" class="action showcart" data-bind="click: showSidebar" data-toggle="opc-summary">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index d73f8ff5cb3434721a62ef47bff0f27efb6fe9e9..964be62c167b5dc2db04d1348d4e395c41120afa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -5,7 +5,7 @@
  */
 -->
 <li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
-    <div class="step-title" data-bind="i18n: title" data-role="title"></div>
+    <div class="step-title" data-bind="text: title" data-role="title"></div>
     <div id="checkout-step-payment"
          class="step-content"
          data-role="content"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
index 6276cae43639e4c7b873f6184c49b47455911286..7e51c678147ebc4911738ccd18a3735d4ebb2f3c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
@@ -7,7 +7,7 @@
 <ul class="opc-progress-bar">
     <!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
         <li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
-            <span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
+            <span data-bind="text: item.title, click: $parent.navigateTo"></span>
         </li>
     <!-- /ko -->
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
index 1cb610134a90caf59dcf99c6982563142c9df138..53c1248a210ab36f26f9d238bf38fd168d0aa9ba 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
@@ -13,6 +13,6 @@
     </form>
     <!-- /ko -->
     <!-- ko if: accountCreated -->
-    <p data-bind="i18n: $t('A letter with further instructions will be sent to your email.')"></p>
+    <p data-bind="i18n: 'A letter with further instructions will be sent to your email.'"></p>
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
index 0e6ad40d317031dddbe7b120901432bf3e7bca8e..a7c4edce8a64c0eb026019f78a73b9283692d2d4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
@@ -28,7 +28,7 @@
             </button>
         </div>
         <div class="shipping-information-content">
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 7c981e83bc97859cef4e11ca96ebf8b679262f48..91960304668539f2d4b6c09b5f592ad948da3381 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -112,17 +112,17 @@
                             </td>
 
                             <td class="col col-method"
-                                    data-bind="i18n: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"></td>
+                                    data-bind="text: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"></td>
 
                             <td class="col col-carrier"
-                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"></td>
+                                    data-bind="text: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->
                         <tr class="row row-error">
                             <td class="col col-error" colspan="4">
                                 <div class="message error">
-                                    <div data-bind="i18n: method.error_message"></div>
+                                    <div data-bind="text: method.error_message"></div>
                                 </div>
                                 <span class="no-display">
                                     <input name="shipping_method" type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
@@ -143,7 +143,7 @@
                 </div>
                 <!-- ko if: errorValidationMessage().length > 0 -->
                 <div class="message notice">
-                    <span><!-- ko i18n: errorValidationMessage()--><!-- /ko --></span>
+                    <span><!-- ko text: errorValidationMessage()--><!-- /ko --></span>
                 </div>
                 <!-- /ko -->
                 <div class="actions-toolbar" id="shipping-method-buttons-container">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
index 107907b157acfd2ef31db7fb9bfd08e7d5659551..009c7e01435019d493d9f6ea93a8321ebd19ddb5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -6,9 +6,9 @@
 -->
 <!-- ko if: isDisplayed() -->
 <tr>
-    <td colspan="2" data-bind="i18n: title"></td>
+    <td colspan="2" data-bind="text: title"></td>
     <td class="col grandtotal">
-        <span data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
+        <span data-bind ="text: getValue(), attr:{'data-label': title}"></span>
         <!-- ko foreach: elems() -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index 05b39a8f11e00bc8ea5f9953422bde9d6d78e6e1..69f698a7a5a4a1c0b9dc7a40ba8928d5e0d16b04 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -12,7 +12,7 @@
 
     <div class="product-item-inner">
         <div class="product-item-name-block">
-            <strong class="product-item-name" data-bind="i18n: $parent.name"></strong>
+            <strong class="product-item-name" data-bind="text: $parent.name"></strong>
             <div class="details-qty">
                 <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
                 <span class="value" data-bind="text: $parent.qty"></span>
@@ -30,7 +30,7 @@
             <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
             <dl class="item-options">
                 <!--ko foreach: JSON.parse($parent.options)-->
-                <dt class="label" data-bind="i18n: label"></dt>
+                <dt class="label" data-bind="text: label"></dt>
                     <!-- ko if: ($data.full_view)-->
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
index f3a22cef746e52c1147a86475bc4f48fc0ec2713..a6dc09dc74656e0d31d1c52aeabb7814c6c7a7bd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
@@ -7,17 +7,17 @@
 <!-- ko if: quoteIsVirtual == 0 -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="i18n: title"></span>
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="label" data-bind="text: title"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
index e217668f605f177665d97229dd1f9720bb426257..47b1bbc221fe4bbee89cfd669f3ca5c88658ad5b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
@@ -6,9 +6,9 @@
 -->
 
 <tr class="totals">
-    <th class="mark" scope="row" data-bind="i18n: title"></th>
+    <th class="mark" scope="row" data-bind="text: title"></th>
     <td class="amount">
-        <span class="price" data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
+        <span class="price" data-bind ="text: getValue(), attr:{'data-label': title}"></span>
         <!-- ko foreach: elems() -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
diff --git a/app/code/Magento/Cms/i18n/de_DE.csv b/app/code/Magento/Cms/i18n/de_DE.csv
index 09eb96234df10a47b690764805513bf260645591..e3dc8b9b189c695de297a33e56f1528356a047eb 100644
--- a/app/code/Magento/Cms/i18n/de_DE.csv
+++ b/app/code/Magento/Cms/i18n/de_DE.csv
@@ -119,3 +119,8 @@ Template,Vorlage
 "CMS Static Block","CMS statischer Block"
 "Contents of a Static Block","Inhalte eines statischen Blocks"
 "CMS Static Block Default Template","CMS statischer Block Standardvorlage"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
index 03a82317472dc7df606cb40782c2eeca7954a2d8..58485f3d9d2c5193bd5f6ecc2a1f7fa05e13cb1f 100644
--- a/app/code/Magento/Cms/i18n/en_US.csv
+++ b/app/code/Magento/Cms/i18n/en_US.csv
@@ -119,3 +119,8 @@ Template,Template
 "CMS Static Block","CMS Static Block"
 "Contents of a Static Block","Contents of a Static Block"
 "CMS Static Block Default Template","CMS Static Block Default Template"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/es_ES.csv b/app/code/Magento/Cms/i18n/es_ES.csv
index 90bcb395cd0570d7961667d5e8b1e7927dd1a326..62584b6799530621a270f7d7e383236985bfd2b6 100644
--- a/app/code/Magento/Cms/i18n/es_ES.csv
+++ b/app/code/Magento/Cms/i18n/es_ES.csv
@@ -119,3 +119,8 @@ Template,Plantilla
 "CMS Static Block","Bloque estático CMS"
 "Contents of a Static Block","Cotenidos de un bloque estático"
 "CMS Static Block Default Template","Tema por defecto del bloque estático CMS"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/fr_FR.csv b/app/code/Magento/Cms/i18n/fr_FR.csv
index 3feb0add8c11d203677a235adb6e4f3c4b9846e8..92e0c3ab029d77f7bfa6806f5ebfd3bc8e9ae5fa 100644
--- a/app/code/Magento/Cms/i18n/fr_FR.csv
+++ b/app/code/Magento/Cms/i18n/fr_FR.csv
@@ -119,3 +119,8 @@ Template,"Modèle visuel"
 "CMS Static Block","Bloc statique du CMS"
 "Contents of a Static Block","Contenu des blocs statiques"
 "CMS Static Block Default Template","Modèle de bloc statique par défaut du CMS"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/nl_NL.csv b/app/code/Magento/Cms/i18n/nl_NL.csv
index 259123f1fe6e20312d69e9491575193b9d5b1122..ef34949cc0eb94c03568e7980577ec2c07c11e62 100644
--- a/app/code/Magento/Cms/i18n/nl_NL.csv
+++ b/app/code/Magento/Cms/i18n/nl_NL.csv
@@ -119,3 +119,8 @@ Template,Thema
 "CMS Static Block","CMS statisch blok"
 "Contents of a Static Block","Inhoud van een statisch blok"
 "CMS Static Block Default Template","CMS statisch blok standaard thema"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/pt_BR.csv b/app/code/Magento/Cms/i18n/pt_BR.csv
index daf3cf4a6f53e4aabc1948ae39ddff01b1436004..706c52533cad0f4a4f10f2c98bb855a7ea7c8aaa 100644
--- a/app/code/Magento/Cms/i18n/pt_BR.csv
+++ b/app/code/Magento/Cms/i18n/pt_BR.csv
@@ -119,3 +119,8 @@ Template,Modelo
 "CMS Static Block","Bloco Estático do CMS"
 "Contents of a Static Block","Conteúdos de um Bloco Estático"
 "CMS Static Block Default Template","Template Padrão do Bloco Estático do CMS"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/i18n/zh_Hans_CN.csv b/app/code/Magento/Cms/i18n/zh_Hans_CN.csv
index e27e81aa3b8ef4737e17e9af0c97b88f530852aa..338aa81bc8cfb6af9925f72e57e3b90c80dc151d 100644
--- a/app/code/Magento/Cms/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Cms/i18n/zh_Hans_CN.csv
@@ -119,3 +119,8 @@ Template,模板
 "CMS Static Block","CMS 静态区块"
 "Contents of a Static Block",静态区块的内容
 "CMS Static Block Default Template","CMS 静态区块默认模板"
+Elements,Elements
+Blocks,Blocks
+Widgets,Widgets
+Themes,Themes
+Schedule,Schedule
diff --git a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml
index 9c51cd0004f6c28cafd1c583841a6fdb6c7b0c4e..4fae6ce09006f455f289f4be5de61304d1f97e22 100644
--- a/app/code/Magento/Cms/view/frontend/templates/default/home.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/default/home.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-There was no Home CMS page configured or found.
+There was no Home CMS page configured or found.
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index a56ee49266f28a19835338c4da287ea02b745f3d..0286f7c556108936d871bc628e448357dd5def64 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -213,7 +213,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                             </li>
                                             <li>
                                                 <a class="action-menu-item" data-bind="
-                                                    i18n: variation.status == 1 ? 'Disable Product' : 'Enable Product',
+                                                    text: variation.status == 1 ? $t('Disable Product') : $t('Enable Product'),
                                                     click: $parent.toggleProduct.bind($parent, $index())">
                                                 </a>
                                             </li>
diff --git a/app/code/Magento/Customer/i18n/de_DE.csv b/app/code/Magento/Customer/i18n/de_DE.csv
index e138d63071cf90f8d6ef40ef8de27353c9aec7d5..ec5acd01becc9b74ca3f1dafaee1ce2c7c13844c 100644
--- a/app/code/Magento/Customer/i18n/de_DE.csv
+++ b/app/code/Magento/Customer/i18n/de_DE.csv
@@ -415,3 +415,5 @@ n/a,"Keine Angabe"
 "Password forgotten","Passwort vergessen"
 "My Dashboard","Meine Startseite"
 "You are now logged out","Sie sind jetzt abgemeldet"
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index f3ed0e19fb9e3d087f254aa5694a15c5877161f7..24d087d95d06cf5aaca2f26f069e7183e31df66f 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -414,3 +414,5 @@ n/a,n/a
 "Password forgotten","Password forgotten"
 "My Dashboard","My Dashboard"
 "You are now logged out","You are now logged out"
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/es_ES.csv b/app/code/Magento/Customer/i18n/es_ES.csv
index 6ee5727639a0e87b37b1e8b2b606bcc51d7d11ed..a2d8a49b8e6cd62d637b5e6d4030c277788a0b65 100644
--- a/app/code/Magento/Customer/i18n/es_ES.csv
+++ b/app/code/Magento/Customer/i18n/es_ES.csv
@@ -414,3 +414,5 @@ n/a,n/d
 "Password forgotten","Olvido de contraseña"
 "My Dashboard","Mi panel de control"
 "You are now logged out","Ha cerrado sesión."
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/fr_FR.csv b/app/code/Magento/Customer/i18n/fr_FR.csv
index e32c2759c36ce1355a2701d6fa58a33183142e54..ded34d3149b9d6c4040fbf36924014165e94fa67 100644
--- a/app/code/Magento/Customer/i18n/fr_FR.csv
+++ b/app/code/Magento/Customer/i18n/fr_FR.csv
@@ -414,3 +414,5 @@ n/a,n/a
 "Password forgotten","Mot de passe oublié"
 "My Dashboard","Mon espace de travail"
 "You are now logged out","Vous êtes maintenant déconnecté."
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/nl_NL.csv b/app/code/Magento/Customer/i18n/nl_NL.csv
index bde6b074652d886e1e53606600c0dbb044e43596..4953a8783567dfa27d7609249384855839a3fc1a 100644
--- a/app/code/Magento/Customer/i18n/nl_NL.csv
+++ b/app/code/Magento/Customer/i18n/nl_NL.csv
@@ -414,3 +414,5 @@ n/a,n.v.t.
 "Password forgotten","Wachtwoord vergeten"
 "My Dashboard","Mijn Dashboard"
 "You are now logged out","U bent nu uitgelogd"
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/pt_BR.csv b/app/code/Magento/Customer/i18n/pt_BR.csv
index b02e6801702bab888b2741cb932bbf68bf5acf86..e3f1d8e704a73d39f6953849433856919d62fcb7 100644
--- a/app/code/Magento/Customer/i18n/pt_BR.csv
+++ b/app/code/Magento/Customer/i18n/pt_BR.csv
@@ -414,3 +414,5 @@ n/a,n/d
 "Password forgotten","Senha esquecida"
 "My Dashboard","Meu Painel"
 "You are now logged out","Agora você está desconectado"
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/Customer/i18n/zh_Hans_CN.csv b/app/code/Magento/Customer/i18n/zh_Hans_CN.csv
index e344fa595c39e2e87f0340f5f88f143b18249a5a..927f8db2406783e9a4192f8c4767b83eb04f50c5 100644
--- a/app/code/Magento/Customer/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Customer/i18n/zh_Hans_CN.csv
@@ -414,3 +414,5 @@ n/a,不可用
 "Password forgotten",密码忘记
 "My Dashboard",我的仪表板
 "You are now logged out",您已注销
+"All Customers", "All Customers"
+"Now Online", "Now Online"
diff --git a/app/code/Magento/EncryptionKey/i18n/de_DE.csv b/app/code/Magento/EncryptionKey/i18n/de_DE.csv
index 6f364baa1ff9fbf44f2e7c5a64f1b795a02a3b58..705d98a99d2982a35101e309641c8d508a084f75 100644
--- a/app/code/Magento/EncryptionKey/i18n/de_DE.csv
+++ b/app/code/Magento/EncryptionKey/i18n/de_DE.csv
@@ -17,3 +17,4 @@ Username,Benutzername
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Änderung des Verschlüsselungscodes"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/en_US.csv b/app/code/Magento/EncryptionKey/i18n/en_US.csv
index 792bc2f60f5a8def580c8675735e45a6e085fe99..f111edc33abb1104585153b846ad91ac3d42ed24 100644
--- a/app/code/Magento/EncryptionKey/i18n/en_US.csv
+++ b/app/code/Magento/EncryptionKey/i18n/en_US.csv
@@ -17,3 +17,4 @@ Username,Username
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Encryption Key Change"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/es_ES.csv b/app/code/Magento/EncryptionKey/i18n/es_ES.csv
index 0840d0cb0b5b2e257052b579913561c1e47d62ab..16fe7d35f56db0e6d6765344bc56a664b8c288ae 100644
--- a/app/code/Magento/EncryptionKey/i18n/es_ES.csv
+++ b/app/code/Magento/EncryptionKey/i18n/es_ES.csv
@@ -17,3 +17,4 @@ Username,"Nombre de Usuario"
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Cambio de clave de encriptación"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/fr_FR.csv b/app/code/Magento/EncryptionKey/i18n/fr_FR.csv
index 0604b96989aef7ece5052119ada362ddb58325f5..6311d1da4f3e34cb60e93229c9e13e045a494b5f 100644
--- a/app/code/Magento/EncryptionKey/i18n/fr_FR.csv
+++ b/app/code/Magento/EncryptionKey/i18n/fr_FR.csv
@@ -17,3 +17,4 @@ Username,"Nom d'utilisateur"
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Modification Clé de Chiffrement"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/nl_NL.csv b/app/code/Magento/EncryptionKey/i18n/nl_NL.csv
index cffae21b4184be2befdef775de0bf08798fa9cd8..11268b36d5d1bb5e228d8fcea0255a9b06f9a455 100644
--- a/app/code/Magento/EncryptionKey/i18n/nl_NL.csv
+++ b/app/code/Magento/EncryptionKey/i18n/nl_NL.csv
@@ -17,3 +17,4 @@ Username,Gebruikersnaam
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Encryptie Code Veranderen"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/pt_BR.csv b/app/code/Magento/EncryptionKey/i18n/pt_BR.csv
index 495e0c38d96cff463f3235907d667bd4203158ff..2529b0b015a7d1b0b6d8a72df6ebfdd0f8f9227e 100644
--- a/app/code/Magento/EncryptionKey/i18n/pt_BR.csv
+++ b/app/code/Magento/EncryptionKey/i18n/pt_BR.csv
@@ -17,3 +17,4 @@ Username,"Nome do usuário"
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change","Mudança na Chave de Criptografia"
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv b/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv
index 3b5711dc0af9b1b68e12220bd7aaa16372859c67..02b9c53f97bb4de358834eaa8a9148bec10cfd71 100644
--- a/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/EncryptionKey/i18n/zh_Hans_CN.csv
@@ -17,3 +17,4 @@ Username,用户名
 "The encryption key format is invalid.","The encryption key format is invalid."
 "File %1 is not writeable.","File %1 is not writeable."
 "Encryption Key Change",加密密钥已更改
+"Manage Encryption Key","Manage Encryption Key"
diff --git a/app/code/Magento/Marketplace/i18n/de_DE.csv b/app/code/Magento/Marketplace/i18n/de_DE.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/de_DE.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/en_US.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/es_ES.csv b/app/code/Magento/Marketplace/i18n/es_ES.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/es_ES.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/fr_FR.csv b/app/code/Magento/Marketplace/i18n/fr_FR.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/fr_FR.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/nl_NL.csv b/app/code/Magento/Marketplace/i18n/nl_NL.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/nl_NL.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/pt_BR.csv b/app/code/Magento/Marketplace/i18n/pt_BR.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/pt_BR.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv b/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e0a266e1291f3390c5baee7087ada17c1bcdf28a
--- /dev/null
+++ b/app/code/Magento/Marketplace/i18n/zh_Hans_CN.csv
@@ -0,0 +1 @@
+"Find Partners & Extensions","Find Partners & Extensions"
diff --git a/app/code/Magento/Newsletter/i18n/de_DE.csv b/app/code/Magento/Newsletter/i18n/de_DE.csv
index 2fc3bee3bc65b5b1a9af57970fa18a590568df88..98a16ae2e77028ea0434282a11dfae6a54a5aad1 100644
--- a/app/code/Magento/Newsletter/i18n/de_DE.csv
+++ b/app/code/Magento/Newsletter/i18n/de_DE.csv
@@ -138,3 +138,4 @@ Unsubscribe,"Abonnement kündigen"
 Subscribed,Abonniert
 Unsubscribed,"Abonnements gekündigt"
 Unconfirmed,Unbestätigt
+"Newsletter Template","Newsletter Vorlage"
diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv
index ac79fef143eec52fc0462266718693aebafa8954..a30b48f0c939a8833cc606209a2ce70d8db62129 100644
--- a/app/code/Magento/Newsletter/i18n/en_US.csv
+++ b/app/code/Magento/Newsletter/i18n/en_US.csv
@@ -138,3 +138,4 @@ Unsubscribe,Unsubscribe
 Subscribed,Subscribed
 Unsubscribed,Unsubscribed
 Unconfirmed,Unconfirmed
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/Newsletter/i18n/es_ES.csv b/app/code/Magento/Newsletter/i18n/es_ES.csv
index 3be9617100dd0566047b3a0b03eb643331444af3..43c2e724ea7692433db5052fdd27e0346d036403 100644
--- a/app/code/Magento/Newsletter/i18n/es_ES.csv
+++ b/app/code/Magento/Newsletter/i18n/es_ES.csv
@@ -138,3 +138,4 @@ Unsubscribe,"Cancelar suscripción"
 Subscribed,Suscrito
 Unsubscribed,"Suscripción cancelada"
 Unconfirmed,"Sin confirmar"
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/Newsletter/i18n/fr_FR.csv b/app/code/Magento/Newsletter/i18n/fr_FR.csv
index cec853133f4625ae16b9523880b7c0d9971a16bd..65134aa5e433b3ca3ba6c370d401f4fcaecc399b 100644
--- a/app/code/Magento/Newsletter/i18n/fr_FR.csv
+++ b/app/code/Magento/Newsletter/i18n/fr_FR.csv
@@ -138,3 +138,4 @@ Unsubscribe,"Se désinscrire"
 Subscribed,Inscrit
 Unsubscribed,Désinscrit
 Unconfirmed,"Non confirmé"
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/Newsletter/i18n/nl_NL.csv b/app/code/Magento/Newsletter/i18n/nl_NL.csv
index 9280f66bdc00cebce78415489a1305e68b193884..7999b25e129757daf61e6ba0f1836818c07ea877 100644
--- a/app/code/Magento/Newsletter/i18n/nl_NL.csv
+++ b/app/code/Magento/Newsletter/i18n/nl_NL.csv
@@ -138,3 +138,4 @@ Unsubscribe,Uitschrijven
 Subscribed,Uitschrijven
 Unsubscribed,Uitgeschreven
 Unconfirmed,Onbevestigd
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/Newsletter/i18n/pt_BR.csv b/app/code/Magento/Newsletter/i18n/pt_BR.csv
index 4ec9dd0d67d0d4d9048bb3a2861df954ebc5b3e3..cb2fecc6a5900a91aba2d04614f26824d814fc1c 100644
--- a/app/code/Magento/Newsletter/i18n/pt_BR.csv
+++ b/app/code/Magento/Newsletter/i18n/pt_BR.csv
@@ -138,3 +138,4 @@ Unsubscribe,Desinscrever
 Subscribed,Assinado
 Unsubscribed,Desinscrito
 Unconfirmed,"Não Confirmado"
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv b/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv
index 96d65bc535252d743c200ca195c3b1268de5e9ae..71be218444fbc4ddbb97887efc076549cdb887ad 100644
--- a/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Newsletter/i18n/zh_Hans_CN.csv
@@ -138,3 +138,4 @@ Unsubscribe,退订
 Subscribed,已订阅
 Unsubscribed,已退订
 Unconfirmed,未确认
+"Newsletter Template","Newsletter Template"
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
index e20e15111e5b6b393efba087fa2c3c2cd7e72975..64385884483dd132f627f833166de6ef6f69b9a1 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
@@ -25,12 +25,12 @@
         <dl class="items check payable">
             <!-- ko if: getPayableTo() -->
             <dt class="title"><!-- ko i18n: 'Make Check payable to:' --><!-- /ko --></dt>
-            <dd class="content"><!-- ko i18n: getPayableTo() --><!-- /ko --></dd>
+            <dd class="content"><!-- ko text: getPayableTo() --><!-- /ko --></dd>
             <!-- /ko -->
             <!-- ko if: getMailingAddress() -->
             <dt class="title"><!-- ko i18n: 'Send Check to:' --><!-- /ko --></dt>
             <dd class="content">
-                <address class="checkmo mailing address" data-bind="html: $t(getMailingAddress())"></address>
+                <address class="checkmo mailing address" data-bind="html: getMailingAddress()"></address>
             </dd>
             <!-- /ko -->
         </dl>
diff --git a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
index 45233bb59c70b2d61504d4a983ec00ad7624a4e7..eb428f7c0300a3d58c8cf74cbbe38a5bef0fa853 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
@@ -23,8 +23,14 @@ class Application implements \Magento\Framework\Option\ArrayInterface
     public function toOptionArray()
     {
         return [
-            ['value' => \Magento\PageCache\Model\Config::BUILT_IN, 'label' => __('Built-in Application')],
-            ['value' => \Magento\PageCache\Model\Config::VARNISH, 'label' => __('Varnish Caching')]
+            [
+                'value' => \Magento\PageCache\Model\Config::BUILT_IN,
+                'label' => __('Built-in Application (Not Recommended for Production Use)')
+            ],
+            [
+                'value' => \Magento\PageCache\Model\Config::VARNISH,
+                'label' => __('Varnish Caching')
+            ]
         ];
     }
 
@@ -36,7 +42,8 @@ class Application implements \Magento\Framework\Option\ArrayInterface
     public function toArray()
     {
         return [
-            \Magento\PageCache\Model\Config::BUILT_IN => __('Built-in Application'),
+            \Magento\PageCache\Model\Config::BUILT_IN =>
+                __('Built-in Application (Not Recommended for Production Use)'),
             \Magento\PageCache\Model\Config::VARNISH => __('Varnish Caching')
         ];
     }
diff --git a/app/code/Magento/PageCache/i18n/de_DE.csv b/app/code/Magento/PageCache/i18n/de_DE.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/de_DE.csv
+++ b/app/code/Magento/PageCache/i18n/de_DE.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/en_US.csv b/app/code/Magento/PageCache/i18n/en_US.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/en_US.csv
+++ b/app/code/Magento/PageCache/i18n/en_US.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/es_ES.csv b/app/code/Magento/PageCache/i18n/es_ES.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/es_ES.csv
+++ b/app/code/Magento/PageCache/i18n/es_ES.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/fr_FR.csv b/app/code/Magento/PageCache/i18n/fr_FR.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/fr_FR.csv
+++ b/app/code/Magento/PageCache/i18n/fr_FR.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/nl_NL.csv b/app/code/Magento/PageCache/i18n/nl_NL.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/nl_NL.csv
+++ b/app/code/Magento/PageCache/i18n/nl_NL.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/pt_BR.csv b/app/code/Magento/PageCache/i18n/pt_BR.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/pt_BR.csv
+++ b/app/code/Magento/PageCache/i18n/pt_BR.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv b/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv
index 0d57f18488d74de68e153b35e305fa7629c104f0..701e12300596b25fedafc3bdd766ee5f064c98af 100644
--- a/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/PageCache/i18n/zh_Hans_CN.csv
@@ -1,6 +1,6 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application","Built-in Application"
+"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
 "Varnish Caching","Varnish Caching"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
diff --git a/app/code/Magento/Reports/etc/acl.xml b/app/code/Magento/Reports/etc/acl.xml
index 834fcdc528545f48bf118741349507b57b99a3a2..6d6972fd734122ad48d6c2a52637e1aec0c15a01 100644
--- a/app/code/Magento/Reports/etc/acl.xml
+++ b/app/code/Magento/Reports/etc/acl.xml
@@ -42,7 +42,7 @@
                         <resource id="Magento_Reports::downloads" title="Downloads" sortOrder="50" />
                     </resource>
                     <resource id="Magento_Reports::statistics" title="Statistics" sortOrder="80">
-                        <resource id="Magento_Reports::statistics_refresh" title="Refresh statistics" sortOrder="10"/>
+                        <resource id="Magento_Reports::statistics_refresh" title="Refresh Statistics" sortOrder="10"/>
                     </resource>
                 </resource>
                 <resource id="Magento_Backend::stores">
diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv
index b2bd8ea9e794c94b53e26c11e1327a4b606c2230..c751048ec4fd224e38561e220861b868186431de 100644
--- a/app/code/Magento/Reports/i18n/de_DE.csv
+++ b/app/code/Magento/Reports/i18n/de_DE.csv
@@ -218,3 +218,10 @@ Hits,Treffer
 "Refresh Statistics for the Last Day","Aktualisiere Statistik für den letzten Tag"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,undefiniert
+"Products in Cart","Artikel in den Warenkörbe"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv
index 03173d8b230fd1ecb99988c578b422ccfb2d2e4a..3ab4dda3fe68c2f1a4935bd58e955aa6a0e59ad5 100644
--- a/app/code/Magento/Reports/i18n/en_US.csv
+++ b/app/code/Magento/Reports/i18n/en_US.csv
@@ -219,3 +219,10 @@ Hits,Hits
 "Refresh Statistics for the Last Day","Refresh Statistics for the Last Day"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,undefined
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/es_ES.csv b/app/code/Magento/Reports/i18n/es_ES.csv
index 26595380f01b54e41e4dd5bcaec1462c32883200..b025859c92e5165beeda1d478914a66b1346c056 100644
--- a/app/code/Magento/Reports/i18n/es_ES.csv
+++ b/app/code/Magento/Reports/i18n/es_ES.csv
@@ -218,3 +218,10 @@ Hits,Visitas.
 "Refresh Statistics for the Last Day","Actualiza estadísticas del último día"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,Indefinido
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/fr_FR.csv b/app/code/Magento/Reports/i18n/fr_FR.csv
index 488b76e42c438ae720f3bef18496d7172d46f4c2..de79ece2ef85639ec67c6598c2215df41e650ca8 100644
--- a/app/code/Magento/Reports/i18n/fr_FR.csv
+++ b/app/code/Magento/Reports/i18n/fr_FR.csv
@@ -218,3 +218,10 @@ Hits,Clics
 "Refresh Statistics for the Last Day","Rafraîchir les statistiques de la veille"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,indéfini
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/nl_NL.csv b/app/code/Magento/Reports/i18n/nl_NL.csv
index d35cbaf6f8596c5018af24d5c16531646d61847f..f8b5dc7e7c8ec45bf3957f663d135f7d4d9bde9b 100644
--- a/app/code/Magento/Reports/i18n/nl_NL.csv
+++ b/app/code/Magento/Reports/i18n/nl_NL.csv
@@ -218,3 +218,10 @@ Hits,Bezoeken
 "Refresh Statistics for the Last Day","Statistiek voor de laatste dag verversen"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,ongedefinieerd
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/pt_BR.csv b/app/code/Magento/Reports/i18n/pt_BR.csv
index 03072fb8a8dc293f50cfd4b97d9109fa33e2d3ea..8ef822b53a296caf6ef2a9fb615bfe6cc44ddbb5 100644
--- a/app/code/Magento/Reports/i18n/pt_BR.csv
+++ b/app/code/Magento/Reports/i18n/pt_BR.csv
@@ -218,3 +218,10 @@ Hits,Críticas
 "Refresh Statistics for the Last Day","Atualizar estatísticas para o Último dia"
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,indefinido
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Reports/i18n/zh_Hans_CN.csv b/app/code/Magento/Reports/i18n/zh_Hans_CN.csv
index 3b36163f6b0e33456feaa2170fe8ebc758509d39..bf85485daa4fd388c8325b68833e802ea5e4ff0a 100644
--- a/app/code/Magento/Reports/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Reports/i18n/zh_Hans_CN.csv
@@ -218,3 +218,10 @@ Hits,提示
 "Refresh Statistics for the Last Day",刷新昨天的状态
 "Are you sure you want to refresh statistics for last day?","Are you sure you want to refresh statistics for last day?"
 undefined,未定义
+"Products in Cart","Products in Cart"
+"By Customers","By Customers"
+"By Products","By Products"
+Refunds,Refunds
+"PayPal Settlement","PayPal Settlement"
+"Order Count","Order Count"
+Bestseller,Bestseller
diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv
index 8cd4ff0cf4df0f2a0f1a19dd8cd76501b258800c..736a5f91b8f7bdff46c575f58cef97634cc23241 100644
--- a/app/code/Magento/Sales/i18n/de_DE.csv
+++ b/app/code/Magento/Sales/i18n/de_DE.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","PDF Packzettel"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index 56fadf4515509308f95b77540604dc5f2d71d75a..5970b2ff82e61180ca857b984033987e748a25c1 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","PDF Packing Slips"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/es_ES.csv b/app/code/Magento/Sales/i18n/es_ES.csv
index b14dd0c68fcbf24da272a1ee87d018e6707d71b7..d524aad0e94bab691f993b401f27bab7eaf89dd9 100644
--- a/app/code/Magento/Sales/i18n/es_ES.csv
+++ b/app/code/Magento/Sales/i18n/es_ES.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","Albaranes en PDF"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/fr_FR.csv b/app/code/Magento/Sales/i18n/fr_FR.csv
index d56acf87271da135c373d7758235de4e1dd3a419..e6ee0ec1c4a3f222b700b3a69b8608483fcea766 100644
--- a/app/code/Magento/Sales/i18n/fr_FR.csv
+++ b/app/code/Magento/Sales/i18n/fr_FR.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","Bons de livraison PDF"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/nl_NL.csv b/app/code/Magento/Sales/i18n/nl_NL.csv
index 8018624c475f507c9340145fd0b3b6b1f607e03f..1675d096d63af089cbc00fdadaf6521edde2f1b3 100644
--- a/app/code/Magento/Sales/i18n/nl_NL.csv
+++ b/app/code/Magento/Sales/i18n/nl_NL.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","PDF Packing Slips"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/pt_BR.csv b/app/code/Magento/Sales/i18n/pt_BR.csv
index ffba7bb166d6bd8f27bbbe74f2d1a791a88cec8e..41380ea687d54ada86ccbf21d77d50d9f14ae801 100644
--- a/app/code/Magento/Sales/i18n/pt_BR.csv
+++ b/app/code/Magento/Sales/i18n/pt_BR.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips","Guias de remessas em PDF"
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/Sales/i18n/zh_Hans_CN.csv b/app/code/Magento/Sales/i18n/zh_Hans_CN.csv
index ecbf74067715d46205ac92e77f11cf9eee47236a..72b4d5663d7eb6446ac3440a68092a338c16d861 100644
--- a/app/code/Magento/Sales/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Sales/i18n/zh_Hans_CN.csv
@@ -679,3 +679,4 @@ order-header,order-header
 "State Code and Title","State Code and Title"
 "PDF Packing Slips",PDF版包裹清单
 "Status can't be unassigned, because it is used by existing order(s).","Status can't be unassigned, because it is used by existing order(s)."
+Operations,Operations
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
index 1797b8ff9c276d5d0e3ecb760b764e594410eaf3..b8a057ff065dd211efb54bc8b6167d441e7702dc 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
@@ -7,7 +7,7 @@
 <!-- ko if: isDisplayed() -->
 <tr class="totals">
     <th colspan="1" style="" class="mark" scope="row" data-bind="text: title"></th>
-    <td class="amount" data-bind="attr: {'data-th': $t(title) }">
+    <td class="amount" data-bind="attr: {'data-th': title}">
         <span><span class="price" data-bind="text: getValue()"></span></span>
     </td>
 </tr>
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
index 60ac9c7982a5f6a0a510abd25fb67e4ee11dc13a..705541de3b4fc90bb16fad0d109b58d587380e26 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
@@ -11,7 +11,7 @@
         <span class="discount coupon" data-bind="text: getCouponCode()"></span>
     </th>
     <td class="amount">
-        <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(name) }"></span>
+        <span class="price" data-bind="text: getValue(), attr: {'data-th': name}"></span>
     </td>
 </tr>
 <!-- /ko -->
diff --git a/app/code/Magento/Store/i18n/de_DE.csv b/app/code/Magento/Store/i18n/de_DE.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/de_DE.csv
+++ b/app/code/Magento/Store/i18n/de_DE.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/en_US.csv b/app/code/Magento/Store/i18n/en_US.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/en_US.csv
+++ b/app/code/Magento/Store/i18n/en_US.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/es_ES.csv b/app/code/Magento/Store/i18n/es_ES.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/es_ES.csv
+++ b/app/code/Magento/Store/i18n/es_ES.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/fr_FR.csv b/app/code/Magento/Store/i18n/fr_FR.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/fr_FR.csv
+++ b/app/code/Magento/Store/i18n/fr_FR.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/nl_NL.csv b/app/code/Magento/Store/i18n/nl_NL.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/nl_NL.csv
+++ b/app/code/Magento/Store/i18n/nl_NL.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/pt_BR.csv b/app/code/Magento/Store/i18n/pt_BR.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/pt_BR.csv
+++ b/app/code/Magento/Store/i18n/pt_BR.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Store/i18n/zh_Hans_CN.csv b/app/code/Magento/Store/i18n/zh_Hans_CN.csv
index e498731b13b2ca4ef3655fbedbdd1abce242bdd7..5cbbe3e5697db62873b9fc7128aaa82510709608 100644
--- a/app/code/Magento/Store/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Store/i18n/zh_Hans_CN.csv
@@ -21,3 +21,6 @@ Layouts,Layouts
 "Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files).","Paths to pre-processed view files (e.g, CSS files with fixed paths or generated from LESS files)."
 "Collections Data","Collections Data"
 "Collection data files.","Collection data files."
+"All Stores","All Stores"
+"Other Settings","Other Settings"
+Attribute,Attribute
diff --git a/app/code/Magento/Tax/i18n/de_DE.csv b/app/code/Magento/Tax/i18n/de_DE.csv
index 2365399967075268f0f0216770da3295cb27bba0..4fc035fa2f4a311e7ecfc689c6fb355f336671bb 100644
--- a/app/code/Magento/Tax/i18n/de_DE.csv
+++ b/app/code/Magento/Tax/i18n/de_DE.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,Bundesstaat/Region
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv
index 078cef5d97b22d509be9cefcd6ded7e3abd56629..af228accb3440110e6172e35b33168e274b3deaa 100644
--- a/app/code/Magento/Tax/i18n/en_US.csv
+++ b/app/code/Magento/Tax/i18n/en_US.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,State/Region
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/es_ES.csv b/app/code/Magento/Tax/i18n/es_ES.csv
index 999f3930c262c6cad3e89e6d12601d8e18bbe016..b97d5fe9cb3eec69d81bcaa5aad642f9dad170a8 100644
--- a/app/code/Magento/Tax/i18n/es_ES.csv
+++ b/app/code/Magento/Tax/i18n/es_ES.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,Estado/Región
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/fr_FR.csv b/app/code/Magento/Tax/i18n/fr_FR.csv
index bf297e3d67360cb1c8bd3c8242e46fe96fbc7fb7..2687af941e9b2ee07dc46311a1ff8d0d46a84353 100644
--- a/app/code/Magento/Tax/i18n/fr_FR.csv
+++ b/app/code/Magento/Tax/i18n/fr_FR.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,État/Région
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/nl_NL.csv b/app/code/Magento/Tax/i18n/nl_NL.csv
index ac644e6510cc1478a1b7a9b1b6a780e80cf8888c..212f01a0c4761fe4fd9694798f60fb95ae839db7 100644
--- a/app/code/Magento/Tax/i18n/nl_NL.csv
+++ b/app/code/Magento/Tax/i18n/nl_NL.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,Provincie
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/pt_BR.csv b/app/code/Magento/Tax/i18n/pt_BR.csv
index 2c52eee8e592aaebe71c3cfc598032cf2257c7e1..d22d24f7218e324c1d0c3e3ea4b44361ee91a6af 100644
--- a/app/code/Magento/Tax/i18n/pt_BR.csv
+++ b/app/code/Magento/Tax/i18n/pt_BR.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,Estado/Região
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/i18n/zh_Hans_CN.csv b/app/code/Magento/Tax/i18n/zh_Hans_CN.csv
index d47d26b939bd199abc6c46c2e69e7dad6edaff95..2a4d9e43e27e0972cd50eb939f4871c3be2e0644 100644
--- a/app/code/Magento/Tax/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/Tax/i18n/zh_Hans_CN.csv
@@ -157,3 +157,5 @@ Note:,Note:
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 State/Region,州/地区
 "Subtotal Only","Subtotal Only"
+Taxes,Taxes
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html
index f756837bb1e7aa3be01ea1958ec7293ff99fe2bd..31bf3448f2020c312eae0b3667ba5e85f83a89c1 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html
@@ -7,17 +7,17 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(inclTaxLabel)"></strong>
+        <strong data-bind="text: inclTaxLabel"></strong>
     </th>
-    <td data-bind="attr: {'data-th': $t(inclTaxLabel) }" class="amount">
+    <td data-bind="attr: {'data-th': inclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(exclTaxLabel)"></strong>
+        <strong data-bind="text: exclTaxLabel"></strong>
     </th>
-    <td data-bind="attr: {'data-th': exclTaxLabel }" class="amount">
+    <td data-bind="attr: {'data-th': exclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
     </td>
 </tr>
@@ -25,9 +25,9 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(title)"></strong>
+        <strong data-bind="text: title"></strong>
     </th>
-    <td data-bind="attr: {'data-th': $t(title)}" class="amount">
+    <td data-bind="attr: {'data-th': title}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
index 13fe7f3e716a63b661d5bf96e91dc1320435233e..37a8e82688a83dd963bcbdf07d235807854a26ca 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
@@ -8,46 +8,46 @@
     <!-- ko if: isBothPricesDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(excludingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="text: title + ' ' + excludingTaxMessage"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <span class="price"
-                  data-bind="text: $t(getExcludingValue()), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"></span>
         </td>
     </tr>
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(includingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="text: title + ' ' + includingTaxMessage"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"></span>
         </td>
     </tr>
     <!-- /ko -->
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="text: title"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title}"></span>
         </td>
     </tr>
     <!-- /ko -->
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="text: title"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <span class="price"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getValue(), attr: {'data-th': title}"></span>
         </td>
     </tr>
     <!-- /ko -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
index c6f4c7833e0c0f346d70d1e350b82ad5522fb5c5..8d70052ddc2288568187cd9b041937a0c65e7ddb 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
@@ -7,9 +7,9 @@
 
 <!-- ko if: ifShowValue() && !ifShowDetails() -->
 <tr class="totals-tax">
-    <th data-bind="text: $t(title)" class="mark" colspan="1" scope="row"></th>
-    <td data-bind="attr: {'data-th': $t(title) }" class="amount">
-        <span class="price" data-bind="text: $t(getValue())"></span>
+    <th data-bind="text: title" class="mark" colspan="1" scope="row"></th>
+    <td data-bind="attr: {'data-th': title}" class="amount">
+        <span class="price" data-bind="text: getValue()"></span>
     </td>
 </tr>
 <!-- /ko -->
@@ -17,10 +17,10 @@
     <tr class="totals-tax-summary"
         data-bind="mageInit: {'toggleAdvanced':{'selectorsToggleClass': 'shown', 'baseToggleClass': 'expanded', 'toggleContainers': '.totals-tax-details'}}">
         <th class="mark" scope="row" colspan="1">
-            <span class="detailed" data-bind="text: $t(title)"></span>
+            <span class="detailed" data-bind="text: title"></span>
         </th>
-        <td data-bind="attr: {'data-th': $t(title) }" class="amount">
-            <span class="price" data-bind="text: $t(getValue())"></span>
+        <td data-bind="attr: {'data-th': title}" class="amount">
+            <span class="price" data-bind="text: getValue()"></span>
         </td>
     </tr>
     <!-- ko foreach: getDetails() -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
index 4451adbf528d64dc6330e734e48389057062a710..9d2072b1bf99840ed11401c277a8c0362d2e493b 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
@@ -7,17 +7,17 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="i18n: inclTaxLabel"></strong>
+        <strong data-bind="text: inclTaxLabel"></strong>
     </th>
-    <td data-bind="attr: {'data-th': $t(inclTaxLabel) }" class="amount">
+    <td data-bind="attr: {'data-th': inclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="i18n: exclTaxLabel"></strong>
+        <strong data-bind="text: exclTaxLabel"></strong>
     </th>
-    <td data-bind="attr: {'data-th': exclTaxLabel }" class="amount">
+    <td data-bind="attr: {'data-th': exclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
     </td>
 </tr>
@@ -25,18 +25,18 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="i18n: title"></strong>
+        <strong data-bind="text: title"></strong>
     </th>
-    <td data-bind="attr: {'data-th': $t(title)}" class="amount">
+    <td data-bind="attr: {'data-th': title}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
 <!-- /ko -->
 <!-- ko if: isBaseGrandTotalDisplayNeeded() && isDisplayed() -->
 <tr class="totals charge">
-    <th class="mark" data-bind="i18n: basicCurrencyMessage" scope="row"></th>
+    <th class="mark" data-bind="text: basicCurrencyMessage" scope="row"></th>
     <td class="amount">
-        <span class="price" data-bind="text: getBaseValue(), attr: {'data-th': $t(basicCurrencyMessage)}"></span>
+        <span class="price" data-bind="text: getBaseValue(), attr: {'data-th': basicCurrencyMessage}"></span>
     </td>
 </tr>
 <!-- /ko -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
index 1608f78ad1c91708b66d777eb472ba331562f479..3bcd9bccd15ea60ddd7718044417537f409f53fc 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -8,33 +8,33 @@
     <!-- ko if: isBothPricesDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)+ ' ' + $t(excludingTaxMessage)"></span>
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="label" data-bind="text: title+ ' ' + excludingTaxMessage"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getExcludingValue(), attr: {'data-th': excludingTaxMessage}"></span>
             <!-- /ko -->
         </td>
     </tr>
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(includingTaxMessage)"></span>
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="label" data-bind="text: title + ' ' + includingTaxMessage"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title + ' ' + excludingTaxMessage}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -42,17 +42,17 @@
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="i18n: title"></span>
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="label" data-bind="text: title"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getIncludingValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -60,17 +60,17 @@
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="i18n: title"></span>
-            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
+            <span class="label" data-bind="text: title"></span>
+            <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
+                  data-bind="text: getValue(), attr: {'data-th': title}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
index a51407475cbfc66ad2f11a4c50166362efe2ef4d..618bb6fd3281fc280206cb809d8233ed489169b3 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
@@ -7,36 +7,36 @@
 <!-- ko if: isBothPricesDisplayed() -->
 <tr class="totals sub excl">
     <th class="mark" scope="row">
-        <span data-bind="i18n: title"></span>
-        <span data-bind="i18n: excludingTaxMessage"></span>
+        <span data-bind="text: title"></span>
+        <span data-bind="text: excludingTaxMessage"></span>
     </th>
     <td class="amount">
-        <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(excludingTaxMessage) }"></span>
+        <span class="price" data-bind="text: getValue(), attr: {'data-th': excludingTaxMessage}"></span>
     </td>
 </tr>
 <tr class="totals sub incl">
     <th class="mark" scope="row">
-        <span data-bind="i18n: title"></span>
-        <span data-bind="i18n: includingTaxMessage"></span>
+        <span data-bind="text: title"></span>
+        <span data-bind="text: includingTaxMessage"></span>
     </th>
     <td class="amount">
-        <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(includingTaxMessage) }"></span>
+        <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': includingTaxMessage}"></span>
     </td>
 </tr>
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="i18n: title" class="mark" scope="row"></th>
+    <th data-bind="text: title" class="mark" scope="row"></th>
     <td class="amount">
-        <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(title)}"></span>
+        <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': title}"></span>
     </td>
 </tr>
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && !isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="i18n: title" class="mark" scope="row"></th>
+    <th data-bind="text: title" class="mark" scope="row"></th>
     <td class="amount">
-        <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(title)}"></span>
+        <span class="price" data-bind="text: getValue(), attr: {'data-th': title}"></span>
     </td>
 </tr>
 <!-- /ko -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index 5aa8b53e7fd082c0a477903db60a01cbdf24a347..3305b6956b8c74bfed641e1517cf04c9259bf9b2 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -6,15 +6,15 @@
 -->
 <!-- ko if: ifShowValue() && !ifShowDetails() -->
 <tr class="totals-tax">
-    <th data-bind="i18n: title" class="mark" scope="row"></th>
-    <td data-bind="attr: {'data-th': $t(title) }" class="amount">
+    <th data-bind="text: title" class="mark" scope="row"></th>
+    <td data-bind="attr: {'data-th': title}" class="amount">
         <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getValue()"></span>
+                  data-bind="text: getValue()"></span>
         <!-- /ko -->
         <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getValue()"></span>
+                  data-bind="text: getValue()"></span>
         <!-- /ko -->
     </td>
 </tr>
@@ -22,15 +22,15 @@
 <!-- ko if: ifShowValue() && ifShowDetails() -->
     <tr class="totals-tax-summary"
         data-bind="mageInit: {'toggleAdvanced':{'selectorsToggleClass': 'shown', 'baseToggleClass': 'expanded', 'toggleContainers': '.totals-tax-details'}}">
-        <th data-bind="i18n: title" class="mark" scope="row"></th>
-        <td data-bind="attr: {'data-th': $t(title) }" class="amount">
+        <th data-bind="text: title" class="mark" scope="row"></th>
+        <td data-bind="attr: {'data-th': title }" class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="i18n: getValue()"></span>
+                  data-bind="text: getValue()"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="i18n: getValue()"></span>
+                  data-bind="text: getValue()"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index ee6d8b3f5df193ae8444ba3c4e1ca9a87d61f617..a12859fe254d109a8a50a2dcb3ce1108327f2167 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -129,7 +129,7 @@ class DataProvider implements DataProviderInterface
             if ($result) {
                 if (isset($matches[2])) {
                     foreach ($matches[2] as $match) {
-                        $phrases[] = $match;
+                        $phrases[] = str_replace('\\\'', '\'', $match);
                     }
                 }
             }
diff --git a/app/code/Magento/User/i18n/de_DE.csv b/app/code/Magento/User/i18n/de_DE.csv
index 63367a6ff3a321b4002fff23db3184b217fb90bf..eb4689a2501f93ea2407b2e12ff0b33c8ce21f0c 100644
--- a/app/code/Magento/User/i18n/de_DE.csv
+++ b/app/code/Magento/User/i18n/de_DE.csv
@@ -118,3 +118,5 @@ Unlock,Entsperren
 "Last login","Letzter Login"
 Failures,Fehler
 Unlocked,"Gesperrt bis"
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
index 1f56f067006fcfc049f895c82d4be8e59d1eaa7f..7c85088044d4270d9274aeaa4c2b37c768122401 100644
--- a/app/code/Magento/User/i18n/en_US.csv
+++ b/app/code/Magento/User/i18n/en_US.csv
@@ -118,3 +118,5 @@ Unlock,Unlock
 "Last login","Last login"
 Failures,Failures
 Unlocked,Unlocked
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/es_ES.csv b/app/code/Magento/User/i18n/es_ES.csv
index 4dd4f371b4af5b3f4d91980e708cf2a166194117..1e9397fee14cac86e26df285f382fb8575296752 100644
--- a/app/code/Magento/User/i18n/es_ES.csv
+++ b/app/code/Magento/User/i18n/es_ES.csv
@@ -119,3 +119,5 @@ Unlock,Desbloquear
 "Last login","Ultimo acceso"
 Failures,Fallos
 Unlocked,"Bloqueado hasta"
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/fr_FR.csv b/app/code/Magento/User/i18n/fr_FR.csv
index bbe1e63a96cbdd9c48e1695577d071fd5c69648e..42116af645b085fc8f38a176a0805f6c90c35591 100644
--- a/app/code/Magento/User/i18n/fr_FR.csv
+++ b/app/code/Magento/User/i18n/fr_FR.csv
@@ -119,3 +119,5 @@ Unlock,Déverrouiller
 "Last login","Dernière connexion"
 Failures,Echecs
 Unlocked,"Verrouillé jusqu'"
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/nl_NL.csv b/app/code/Magento/User/i18n/nl_NL.csv
index 91813e3a13311cf7eef604e490e8290319e62f56..3745ad043022040dac213c07f7c699a6feff89a9 100644
--- a/app/code/Magento/User/i18n/nl_NL.csv
+++ b/app/code/Magento/User/i18n/nl_NL.csv
@@ -119,3 +119,5 @@ Unlock,Openen
 "Last login","Laatste login"
 Failures,Mislukkingen
 Unlocked,"Gesloten tot"
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/pt_BR.csv b/app/code/Magento/User/i18n/pt_BR.csv
index d8d16b8cd04f7e50e2301b010a834f019803e0f9..0edca55b30ea62af431ef96ad0f68a9fdccbcce3 100644
--- a/app/code/Magento/User/i18n/pt_BR.csv
+++ b/app/code/Magento/User/i18n/pt_BR.csv
@@ -119,3 +119,5 @@ Unlock,Desbloquear
 "Last login","Último login"
 Failures,Falhas
 Unlocked,"Bloqueado até"
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/User/i18n/zh_Hans_CN.csv b/app/code/Magento/User/i18n/zh_Hans_CN.csv
index 1c10afb0b649b2bbf78b617f2768563ba2dc382e..1c0292bf2db046eaef74958a6fb6f6ca40caa784 100644
--- a/app/code/Magento/User/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/User/i18n/zh_Hans_CN.csv
@@ -119,3 +119,5 @@ Unlock,解锁
 "Last login",上一次登录
 Failures,失败
 Unlocked,锁定直到
+"All Users","All Users"
+"User Roles","User Roles"
diff --git a/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html b/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html
index 886e2443918e634c70676bc8218f9e3a66e41bcb..c8d5d922f95677df77c0e5d16d27abcf1d80ec44 100644
--- a/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html
+++ b/app/code/Magento/Weee/view/frontend/web/template/checkout/summary/weee.html
@@ -7,7 +7,7 @@
 <!-- ko if: isDisplayed() -->
 <tr class="totals">
     <th data-bind="text: title" class="mark" scope="row"></th>
-    <td class="amount" data-bind="attr: {'data-th': $t(title) }">
+    <td class="amount" data-bind="attr: {'data-th': title}">
         <span class="price" data-bind="text: getValue()"></span>
     </td>
 </tr>
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv
index 0895edb09f36d9517729c3538d70811015e50acb..6c873fee5c89b7146fd2b97044fb7c169f024562 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv
@@ -1,9 +1,11 @@
 Helper,Helper,module,Magento_FirstModule
-Model,Model,module,"Magento_FirstModule,Magento_SecondModule"
+Model,Model,module,Magento_FirstModule
 "Module template","Module template",module,Magento_FirstModule
+Model,Model,module,Magento_SecondModule
 "Theme template","Theme template",theme,adminhtml/default/backend
 "Module js","Module js",module,Magento_FirstModule
-"Lib js","Lib js",lib,"lib/web/mage/file.js,lib/web/varien/file.js"
+"Lib js","Lib js",lib,lib/web/mage/file.js
+"Lib js","Lib js",lib,lib/web/varien/file.js
 "Module layout label","Module layout label",module,Magento_FirstModule
 "Module layout title","Module layout title",module,Magento_FirstModule
 "Theme layout label","Theme layout label",theme,adminhtml/default/backend
diff --git a/setup/src/Magento/Setup/Module/I18n/Locale.php b/setup/src/Magento/Setup/Module/I18n/Locale.php
index e3bb79e9adb2fd6007dfef92bb711394aa85244e..053ee398a2f71e061d7efee256fe6e686b54e473 100644
--- a/setup/src/Magento/Setup/Module/I18n/Locale.php
+++ b/setup/src/Magento/Setup/Module/I18n/Locale.php
@@ -30,9 +30,7 @@ class Locale
      */
     public function __construct($locale)
     {
-        if ($locale == self::DEFAULT_SYSTEM_LOCALE) {
-            throw new \InvalidArgumentException('Target locale is system default locale.');
-        } elseif (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) {
+        if (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) {
             throw new \InvalidArgumentException('Target locale must match the following format: "aa_AA".');
         }
         $this->_locale = $locale;
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
index d759eb11b2be3620a1e4855b9a8f0c4e9082071f..cbeca7d79d6d8535ee674b36212f85af5833a0e2 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php
@@ -63,7 +63,7 @@ class Contextual extends AbstractParser
      */
     protected function _addPhrase($phraseData, $contextType, $contextValue)
     {
-        $phraseKey = $contextType . stripslashes($phraseData['phrase']);
+        $phraseKey = $contextType . $contextValue. stripslashes($phraseData['phrase']);
 
         if (isset($this->_phrases[$phraseKey])) {
             /** @var \Magento\Setup\Module\I18n\Dictionary\Phrase $phrase */
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php
index 09914f7863146d54f3256457a71523da26c7889e..9eec9b6901456d87eacd5ed8014f9cdbabe78fee 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php
@@ -9,15 +9,6 @@ use \Magento\Setup\Module\I18n\Locale;
 
 class LocaleTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Target locale is system default locale.
-     */
-    public function testLocaleIsSystemDefaultLocaleException()
-    {
-        new Locale('en_US');
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Target locale must match the following format: "aa_AA".