diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
index 3f9ccac0da312..193a1faed662d 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Please confirm your {{var store.getFrontendName()}} account @-->
+<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
index 012f82d47efa8..f5fe960e99fff 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Welcome to {{var store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name account" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
index a4487743ebbc8..14cd8e98f8bfe 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Welcome to {{var store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars { 
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL", 
 "var customer.email":"Customer Email", 
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
index f3c02dd200c5b..ab24368c02239 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} email has been changed @-->
+<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {} @-->
 {{template config_path="design/email/header_template"}}
 
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
index 6fd8a6e593d0e..d2ca4d4cae0a2 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} email and password has been changed @-->
+<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {} @-->
 {{template config_path="design/email/header_template"}}
 
diff --git a/app/code/Magento/Customer/view/frontend/email/password_new.html b/app/code/Magento/Customer/view/frontend/email/password_new.html
index 9fdb8457c63b5..12c5a30ddf103 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_new.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Reset your {{var store.getFrontendName()}} password @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl(store, 'customer/account/')":"Customer Account URL",
 "var customer.name":"Customer Name"
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index 3618da44da199..061e640810705 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} password has been changed @-->
+<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var customer.name":"Customer Name"
 } @-->
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
index 77f48b4e0d6e5..a07b36c148005 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Reset your {{var store.getFrontendName()}} password @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var customer.name":"Customer Name",
 "var this.getUrl($store, 'customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"
diff --git a/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html b/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
index d60c72bc851e7..068e027f5bb46 100644
--- a/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
+++ b/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter subscription confirmation @-->
+<!--@subject {{trans "Newsletter subscription confirmation"}} @-->
 <!--@vars {
 "var customer.name":"Customer Name",
 "var subscriber.getConfirmationLink()":"Subscriber Confirmation URL"
diff --git a/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html b/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html
index c6e8c71868922..f60c3213a72d8 100644
--- a/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html
+++ b/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter subscription success @-->
+<!--@subject {{trans "Newsletter subscription success"}} @-->
 <!--@vars {
 "template config_path=\"design\/email\/footer_template\"":"Email Footer Template",
 "template config_path=\"design\/email\/header_template\"":"Email Header Template"
diff --git a/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html b/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html
index 17946c1f80c8d..20255368df2b9 100644
--- a/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html
+++ b/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter unsubscription success @-->
+<!--@subject {{trans "Newsletter unsubscription success"}} @-->
 <!--@vars {
 "template config_path=\"design\/email\/footer_template\"":"Email Footer Template",
 "template config_path=\"design\/email\/header_template\"":"Email Header Template"
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
index 23dfb23334fcd..5f9fb3d0574de 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Credit memo for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var comment":"Credit Memo Comment",
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
index 253b3b16e1394..44e09b34f1cf1 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Credit memo for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var comment":"Credit Memo Comment",
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
index 43d1e4a36bade..52b6452912620 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} credit memo @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var comment":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index 6b09bf566311a..d5ff2750efd9f 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} credit memo @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var comment":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new.html b/app/code/Magento/Sales/view/frontend/email/invoice_new.html
index 02cb9abd447a7..4878597b55bee 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Invoice for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
index 572a8e13d2c2c..4a4176bfc8ef6 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Invoice for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var billing.getName()":"Guest Customer Name",
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
index 4d5075be92b53..32bb4eefd89e6 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} invoice @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
index 6962ffff0dc1c..d64688476c0cc 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} invoice @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Invoice Comment",
diff --git a/app/code/Magento/Sales/view/frontend/email/order_new.html b/app/code/Magento/Sales/view/frontend/email/order_new.html
index 25e4450540534..bb2b0bddd8267 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order confirmation @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order.getEmailCustomerNote()":"Email Order Note",
diff --git a/app/code/Magento/Sales/view/frontend/email/order_new_guest.html b/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
index 0bc5e6bc46264..40d55011a035e 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order confirmation @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order.getEmailCustomerNote()":"Email Order Note",
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html
index d00441898905a..d90070e51db03 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
index 6ae0dd1e01201..4167c93a70825 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
index 7cb5bf4086ccc..64bd22ce9cc22 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order has shipped @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index 0afed9607c116..bda4d0628cafe 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order has shipped @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var billing.getName()":"Guest Customer Name",
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
index 578fb9c0475ce..b126b56c7af4d 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} shipment @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
index 7a1b3b70202c8..afbb4a1b622a2 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} shipment @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
index 9c0cb530237f4..6007f2890db1b 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Welcome to {{var store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",