diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl
index 8931488e6..9e8ae6652 100644
--- a/admin-dev/themes/default/template/controllers/emails/content.tpl
+++ b/admin-dev/themes/default/template/controllers/emails/content.tpl
@@ -24,12 +24,12 @@
 *}
 
 <script type="text/javascript">
-	var textMsg = "{l s='This is a test message, your server is now configured to send e-mail'}";
-	var textSubject = "{l s='Test message - Prestashop'}";
-	var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified'}";
-	var textSendError= "{l s='Error: please check your configuration'}";
+	var textMsg = "{l s='This is a test message, your server is now configured to send e-mail' js=1}";
+	var textSubject = "{l s='Test message - Prestashop' js=1}";
+	var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified' js=1}";
+	var textSendError= "{l s='Error: please check your configuration' js=1}";
 	var token_mail = '{$token}';
-	var errorMail = "{l s='This e-mail address is invalid'}";
+	var errorMail = "{l s='This e-mail address is invalid' js=1}";
 	$(document).ready(function() {
 		if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
 			$('#smtp').show();
diff --git a/themes/default/mobile/errors.tpl b/themes/default/mobile/errors.tpl
index 08f2a8609..be26c41ed 100644
--- a/themes/default/mobile/errors.tpl
+++ b/themes/default/mobile/errors.tpl
@@ -42,7 +42,7 @@
 		}
 		$(function()
 		{
-			var errorTitle = '{/literal}{if $errors|@count > 1}{l s='There are %d errors:' sprintf=$errors|@count}{else}{l s='There is %d error:' sprintf=$errors|@count}{/if}{literal}';
+			var errorTitle = '{/literal}{if $errors|@count > 1}{l s='There are %d errors:' js=1 sprintf=$errors|@count}{else}{l s='There is %d error:' js=1 sprintf=$errors|@count}{/if}{literal}';
 			var errorMessage = '<ol>';
 			{/literal}
 			{foreach from=$errors key=k item=error}
diff --git a/themes/default/mobile/order-opc.tpl b/themes/default/mobile/order-opc.tpl
index e402f314c..e0067ee37 100644
--- a/themes/default/mobile/order-opc.tpl
+++ b/themes/default/mobile/order-opc.tpl
@@ -52,20 +52,20 @@
 	var countriesNeedZipCode = new Array();
 	var vat_management = {$vat_management|intval};
 	
-	var txtWithTax = "{l s='(tax incl.)'}";
-	var txtWithoutTax = "{l s='(tax excl.)'}";
-	var txtHasBeenSelected = "{l s='has been selected'}";
-	var txtNoCarrierIsSelected = "{l s='No carrier has been selected'}";
-	var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order'}";
-	var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted'}";
-	var txtTOSIsAccepted = "{l s='Terms of Service have been accepted'}";
-	var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted'}";
-	var txtThereis = "{l s='There is'}";
-	var txtErrors = "{l s='error(s)'}";
-	var txtDeliveryAddress = "{l s='Delivery address'}";
-	var txtInvoiceAddress = "{l s='Invoice address'}";
-	var txtModifyMyAddress = "{l s='Modify my address'}";
-	var txtInstantCheckout = "{l s='Instant checkout'}";
+	var txtWithTax = "{l s='(tax incl.)' js=1}";
+	var txtWithoutTax = "{l s='(tax excl.)' js=1}";
+	var txtHasBeenSelected = "{l s='has been selected' js=1}";
+	var txtNoCarrierIsSelected = "{l s='No carrier has been selected' js=1}";
+	var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order' js=1}";
+	var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted' js=1}";
+	var txtTOSIsAccepted = "{l s='Terms of Service have been accepted' js=1}";
+	var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted' js=1}";
+	var txtThereis = "{l s='There is' js=1}";
+	var txtErrors = "{l s='error(s)' js=1}";
+	var txtDeliveryAddress = "{l s='Delivery address' js=1}";
+	var txtInvoiceAddress = "{l s='Invoice address' js=1}";
+	var txtModifyMyAddress = "{l s='Modify my address' js=1}";
+	var txtInstantCheckout = "{l s='Instant checkout' js=1}";
 	var errorCarrier = "{$errorCarrier}";
 	var errorTOS = "{$errorTOS}";
 	var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}";
diff --git a/themes/default/order-address-multishipping.tpl b/themes/default/order-address-multishipping.tpl
index 5000fc9dc..6ff1cf865 100644
--- a/themes/default/order-address-multishipping.tpl
+++ b/themes/default/order-address-multishipping.tpl
@@ -67,9 +67,9 @@
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';
 	var currencyBlank = '{$currencyBlank|intval}';
-	var txtProduct = "{l s='product'}";
-	var txtProducts = "{l s='products'}";
-	var txtSelectAnAddressFirst = "{l s='Please start by selecting an address'}";
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
+	var txtSelectAnAddressFirst = "{l s='Please start by selecting an address' js=1}";
 	{/if}
 
 	var formatedAddressFieldsValuesList = new Array();
@@ -112,7 +112,7 @@
 		dest_comp.html('');
 
 		li_content['title'] = adr_titles_vals[address_type];
-		li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a>';
+		li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}">{l s='Update' js=1}</a>';
 
 		appendAddressList(dest_comp, li_content, ordered_fields_name);
 	}
diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl
index 9a6c88b4e..87b988dba 100644
--- a/themes/default/order-address.tpl
+++ b/themes/default/order-address.tpl
@@ -71,8 +71,8 @@
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';
 	var currencyBlank = '{$currencyBlank|intval}';
-	var txtProduct = "{l s='product'}";
-	var txtProducts = "{l s='products'}";
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
 	{/if}
 	
 	var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}";
@@ -99,8 +99,8 @@
 	function getAddressesTitles()
 	{
 		return {
-						'invoice': "{l s='Your billing address'}",
-						'delivery': "{l s='Your delivery address'}"
+						'invoice': "{l s='Your billing address' js=1}",
+						'delivery': "{l s='Your delivery address' js=1}"
 			};
 
 	}
@@ -118,7 +118,7 @@
 		dest_comp.html('');
 
 		li_content['title'] = adr_titles_vals[address_type];
-		li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back={$back_order_page}?step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">&raquo; {l s='Update'}</a>';
+		li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back={$back_order_page}?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}">&raquo; {l s='Update' js=1}</a>';
 
 		appendAddressList(dest_comp, li_content, ordered_fields_name);
 	}
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index b408e6944..b0bcf45f4 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -30,8 +30,8 @@
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';
 	var currencyBlank = '{$currencyBlank|intval}';
-	var txtProduct = "{l s='product'}";
-	var txtProducts = "{l s='products'}";
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
 	var orderUrl = '{$link->getPageLink("order", true)}';
 
 	var msg = "{l s='You must agree to the terms of service before continuing.' js=1}";
diff --git a/themes/default/order-opc.tpl b/themes/default/order-opc.tpl
index 0fe763de4..94af93278 100755
--- a/themes/default/order-opc.tpl
+++ b/themes/default/order-opc.tpl
@@ -57,21 +57,21 @@
 	var countriesNeedZipCode = new Array();
 	var vat_management = {$vat_management|intval};
 	
-	var txtWithTax = "{l s='(tax incl.)'}";
-	var txtWithoutTax = "{l s='(tax excl.)'}";
-	var txtHasBeenSelected = "{l s='has been selected'}";
-	var txtNoCarrierIsSelected = "{l s='No carrier has been selected'}";
-	var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order'}";
-	var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted'}";
-	var txtTOSIsAccepted = "{l s='Terms of Service have been accepted'}";
-	var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted'}";
-	var txtThereis = "{l s='There is'}";
-	var txtErrors = "{l s='error(s)'}";
-	var txtDeliveryAddress = "{l s='Delivery address'}";
-	var txtInvoiceAddress = "{l s='Invoice address'}";
-	var txtModifyMyAddress = "{l s='Modify my address'}";
-	var txtInstantCheckout = "{l s='Instant checkout'}";
-	var txtSelectAnAddressFirst = "{l s='Please start by selecting an address'}";
+	var txtWithTax = "{l s='(tax incl.)' js=1}";
+	var txtWithoutTax = "{l s='(tax excl.)' js=1}";
+	var txtHasBeenSelected = "{l s='has been selected' js=1}";
+	var txtNoCarrierIsSelected = "{l s='No carrier has been selected' js=1}";
+	var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order' js=1}";
+	var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted' js=1}";
+	var txtTOSIsAccepted = "{l s='Terms of Service have been accepted' js=1}";
+	var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted' js=1}";
+	var txtThereis = "{l s='There is' js=1}";
+	var txtErrors = "{l s='error(s)' js=1}";
+	var txtDeliveryAddress = "{l s='Delivery address' js=1}";
+	var txtInvoiceAddress = "{l s='Invoice address'}" js=1;
+	var txtModifyMyAddress = "{l s='Modify my address' js=1}";
+	var txtInstantCheckout = "{l s='Instant checkout' js=1}";
+	var txtSelectAnAddressFirst = "{l s='Please start by selecting an address' js=1}";
 	var errorCarrier = "{$errorCarrier}";
 	var errorTOS = "{$errorTOS}";
 	var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}";
diff --git a/themes/default/order-payment.tpl b/themes/default/order-payment.tpl
index 2ed5c633f..b4380f3f2 100644
--- a/themes/default/order-payment.tpl
+++ b/themes/default/order-payment.tpl
@@ -30,8 +30,8 @@
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';
 	var currencyBlank = '{$currencyBlank|intval}';
-	var txtProduct = "{l s='product'}";
-	var txtProducts = "{l s='products'}";
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
 	// ]]>
 	</script>
 
diff --git a/themes/default/scenes.tpl b/themes/default/scenes.tpl
index 011bb8230..2721db97f 100644
--- a/themes/default/scenes.tpl
+++ b/themes/default/scenes.tpl
@@ -28,7 +28,7 @@
 <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.scrollTo.js"></script>
 <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.serialScroll.js"></script>
 <script type="text/javascript">// <![CDATA[
-i18n_scene_close = '{l s='Close'}';
+i18n_scene_close = '{l s='Close' js=1}';
 $(function () {ldelim}
 	li_width = parseInt({$thumbSceneImageType.width} + 10);
 {rdelim});
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 96b5b6b24..cfcd20405 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -48,8 +48,8 @@
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';
 	var currencyBlank = '{$currencyBlank|intval}';
-	var txtProduct = "{l s='product'}";
-	var txtProducts = "{l s='products'}";
+	var txtProduct = "{l s='product' js=1}";
+	var txtProducts = "{l s='products' js=1}";
 	var deliveryAddress = {$cart->id_address_delivery|intval};
 	// ]]>
 	</script>
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index 4443ecb17..a0f0c2f9f 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -28,14 +28,14 @@
 	{/if}
 	var lastMove = '';
 	var saveOK = '{l s='Module position saved'}';
-	var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'}';
-	var close = '{l s='Close'}';
-	var cancel = '{l s='Cancel'}';
-	var confirm = '{l s='Confirm'}';
-	var add = '{l s='Add this module'}';
-	var unableToUnregisterHook = '{l s='Unable to unregister hook'}';
-	var unableToSaveModulePosition = '{l s='Unable to save module position'}';
-	var loadFail = '{l s='Failed to load module list'}';
+	var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'  js=1}';
+	var close = '{l s='Close' js=1}';
+	var cancel = '{l s='Cancel' js=1}';
+	var confirm = '{l s='Confirm' js=1}';
+	var add = '{l s='Add this module' js=1}';
+	var unableToUnregisterHook = '{l s='Unable to unregister hook' js=1}';
+	var unableToSaveModulePosition = '{l s='Unable to save module position' js=1}';
+	var loadFail = '{l s='Failed to load module list' js=1}';
 </script>
 
 <div style=" background-color:000; background-color: rgba(0,0,0, 0.7); border-bottom: 1px solid #000; width:100%;height:30px; padding:5px 10px; position:fixed;top:0;left:0;z-index:9999;">